Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

point release v1.91.2 #6466

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/satellite/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ COPY --from=ui /app/static /app/static
COPY --from=ui /app/dist /app/dist
COPY --from=ui /app/dist_vuetify_poc /app/dist_vuetify_poc
COPY --from=ca-cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY release/${TAG}/wasm /app/static/
COPY release/${TAG}/wasm /app/static/wasm
COPY release/${TAG}/satellite_linux_${GOARCH:-amd64} /app/satellite
COPY --from=storjup /go/bin/storj-up /usr/local/bin/storj-up
COPY --from=dlv /go/bin/dlv /usr/local/bin/dlv
Expand Down
5 changes: 4 additions & 1 deletion cmd/tools/segment-verify/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,13 @@ type ReadCSVConfig struct {
}

func verifySegments(cmd *cobra.Command, args []string) error {

ctx, _ := process.Ctx(cmd)
log := zap.L()

return verifySegmentsInContext(ctx, log, cmd, satelliteCfg, rangeCfg)
}

func verifySegmentsInContext(ctx context.Context, log *zap.Logger, cmd *cobra.Command, satelliteCfg Satellite, rangeCfg RangeConfig) error {
// open default satellite database
db, err := satellitedb.Open(ctx, log.Named("db"), satelliteCfg.Database, satellitedb.Options{
ApplicationName: "segment-verify",
Expand Down
6 changes: 5 additions & 1 deletion cmd/tools/segment-verify/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"

"storj.io/common/memory"
"storj.io/common/storj"
Expand Down Expand Up @@ -57,12 +58,14 @@ func TestCommandLineTool(t *testing.T) {
problemPiecesCSV := ctx.File("problempieces.csv")

// set up global config that the main func will use
satelliteCfg := satelliteCfg
satelliteCfg.Config = satellite.Config
satelliteCfg.Database = dbConnString
satelliteCfg.Metainfo.DatabaseURL = metaDBConnString
satelliteCfg.Identity.KeyPath = ctx.File("identity-key")
satelliteCfg.Identity.CertPath = ctx.File("identity-cert")
require.NoError(t, satelliteCfg.Identity.Save(satellite.Identity))
rangeCfg := rangeCfg
rangeCfg.Verify = VerifierConfig{
PerPieceTimeout: time.Second,
OrderRetryThrottle: 500 * time.Millisecond,
Expand Down Expand Up @@ -119,7 +122,8 @@ func TestCommandLineTool(t *testing.T) {
require.Len(t, result.Segments, uplinkCount*nodeCount)

// perform the verify!
err = verifySegments(&cobra.Command{Use: "range"}, nil)
log := zaptest.NewLogger(t)
err = verifySegmentsInContext(ctx, log, &cobra.Command{Use: "range"}, satelliteCfg, rangeCfg)
require.NoError(t, err)

// open the CSVs to check that we get the expected results
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<v-banner
v-if="isLowBalance && content"
class="account-billing-area__wrap__low-balance"
message="Your STORJ Token balance is low. Deposit more STORJ tokens or add a credit card to avoid interruptions in service."
message="Your STORJ Token balance is low. Deposit more STORJ tokens or make sure you have a credit card on file to avoid interruptions in service."
link-text="Deposit tokens"
severity="warning"
:dashboard-ref="content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<v-banner
v-if="isLowBalance && content && billingEnabled"
class="project-dashboard__low-balance"
message="Your STORJ Token balance is low. Deposit more STORJ tokens or add a credit card to avoid interruptions in service."
message="Your STORJ Token balance is low. Deposit more STORJ tokens or make sure you have a credit card on file to avoid interruptions in service."
link-text="Go to billing"
severity="warning"
:dashboard-ref="content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<v-banner
v-if="isLowBalance && parentRef && billingEnabled"
class="all-dashboard-banners__low-balance"
message="Your STORJ Token balance is low. Deposit more STORJ tokens or add a credit card to avoid interruptions in service."
message="Your STORJ Token balance is low. Deposit more STORJ tokens or make sure you have a credit card on file to avoid interruptions in service."
link-text="Go to billing"
severity="warning"
:dashboard-ref="parentRef"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function onViewChangeClicked(view: string): void {
}

onMounted(async () => {
if (!configStore.state.config.nativeTokenPaymentsEnabled) {
if (!(configStore.state.config.nativeTokenPaymentsEnabled && configStore.state.config.billingFeaturesEnabled)) {
return;
}

Expand Down