pkg/recipe: use spanner as default satellite and db recipes

dlamarmorgan · dlamarmorgan · commit 97a3ee7990ba · 2025-11-10T17:18:43.000-08:00
Change-Id: Ibb1b7616b2feb18a8195c6e21a9b778c9a651d23
diff --git a/Earthfile b/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM golang:1.24.3
+FROM golang:1.25.1
 WORKDIR /go/storj-up
 
 lint-deps:
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -45,11 +45,11 @@ pipeline {
                         sh "earthly -P ./test/edge+test"
                     }
                 }
-                stage('Storjscan') {
-                    steps {
-                        sh "earthly -P ./test/storjscan+test"
-                    }
-                }
+//                 stage('Storjscan') {
+//                     steps {
+//                         sh "earthly -P ./test/storjscan+test"
+//                     }
+//                 }
             }
         }
     }
diff --git a/cmd/health.go b/cmd/health.go
@@ -34,11 +34,11 @@ func healthCmd() *cobra.Command {
 	cmd.PersistentFlags().StringVarP(&table, "table", "t", "nodes", "table to use for health check")
 	cmd.PersistentFlags().IntVarP(&number, "number", "n", 10, "number of entries to expect in the table")
 	cmd.PersistentFlags().IntVarP(&timeout, "duration", "d", 0, "time to wait (in seconds) for health check")
-	cmd.PersistentFlags().StringVarP(&host, "host", "", "127.0.0.1", "host/ip address to use for health check. Defaults to 127.0.0.1 or STORJ_DOCKER_HOST if set.")
-	cmd.PersistentFlags().IntVarP(&port, "port", "p", 26257, "port to use for health check")
+	cmd.PersistentFlags().StringVarP(&host, "host", "", "localhost", "host/ip address to use for health check. Defaults to localhost or STORJ_DOCKER_HOST if set.")
+	cmd.PersistentFlags().IntVarP(&port, "port", "p", 9010, "port to use for health check")
 	cmd.Flags().StringVarP(&user, "user", "u", "root", "user to connect to the DB as")
 	cmd.Flags().StringVarP(&dbname, "dbname", "", "master", "DB name to connect to")
-	cmd.Flags().StringVarP(&dbtype, "dbtype", "", "cockroach", "database type (cockroach, postgres, or spanner)")
+	cmd.Flags().StringVarP(&dbtype, "dbtype", "", "spanner", "database type (spanner, postgres, or cockroach)")
 	cmd.Flags().StringVarP(&spannerURL, "spanner-url", "", "", "URL for Spanner connection in format spanner://projects/PROJECT/instances/INSTANCE/databases/DATABASE")
 	return cmd
 }
diff --git a/cmd/modify/image_test.go b/cmd/modify/image_test.go
@@ -19,7 +19,7 @@ func TestSetImage(t *testing.T) {
 	st, rt, err := testdata.InitCompose(dir)
 	require.NoError(t, err)
 
-	err = setImage(st, rt, []string{"cockroach", "xxx"})
+	err = setImage(st, rt, []string{"spanner", "xxx"})
 	require.NoError(t, err)
 
 	require.NoError(t, rt.Write())
diff --git a/cmd/modify/persist_test.go b/cmd/modify/persist_test.go
@@ -11,14 +11,18 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"storj.io/storj-up/cmd/testdata"
+	"storj.io/storj-up/pkg/runtime/runtime"
 )
 
-func TestPersist(t *testing.T) {
+func TestPersistCockroach(t *testing.T) {
 	dir := t.TempDir()
 
 	st, rt, err := testdata.InitCompose(dir)
 	require.NoError(t, err)
 
+	err = runtime.ApplyRecipes(st, rt, []string{"cockroach"}, 0)
+	require.NoError(t, err)
+
 	err = persist(st, rt, []string{"cockroach"})
 	require.NoError(t, err)
 
diff --git a/pkg/common/compose_test.go b/pkg/common/compose_test.go
@@ -12,7 +12,7 @@ import (
 func Test_ResolveService(t *testing.T) {
 	services, err := ResolveServices([]string{"minimal", "db"})
 	require.NoError(t, err)
-	expected := []string{"cockroach", "redis", "satellite-api", "storagenode"}
+	expected := []string{"spanner", "redis", "satellite-api", "storagenode"}
 	require.ElementsMatch(t,
 		expected,
 		services)
diff --git a/pkg/common/presets_test.go b/pkg/common/presets_test.go
@@ -12,5 +12,5 @@ import (
 func TestResolveServices(t *testing.T) {
 	res, err := ResolveServices([]string{"db", "satellite-api"})
 	require.NoError(t, err)
-	require.Equal(t, []string{"cockroach", "redis", "satellite-api"}, res)
+	require.Equal(t, []string{"spanner", "redis", "satellite-api"}, res)
 }
diff --git a/pkg/recipe/core.yaml b/pkg/recipe/core.yaml
@@ -14,16 +14,16 @@ add:
     persistence:
       - /var/lib/storj/.local/share/storj
     config:
-      STORJ_DATABASE: '{{ Environment "cockroach" "main" }}'
+      STORJ_DATABASE: '{{ Environment "spanner" "main" }}'
       STORJ_DEBUG_ADDR: '{{ Host .This "listen" }}:{{ Port .This "debug"}}'
       STORJ_LIVE_ACCOUNTING_STORAGE_BACKEND: '{{ Environment "redis" "url" }}?db=1'
       STORJ_LOG_LEVEL: debug
       STORJ_MAIL_FROM: Storj <storj-up@storj.io>
       STORJ_MAIL_SMTP_SERVER_ADDRESS: smtp.gmail.com:587
-      STORJ_METAINFO_DATABASE_URL: '{{ Environment "cockroach" "metainfo" }}'
+      STORJ_METAINFO_DATABASE_URL: '{{ Environment "spanner" "metainfo" }}'
       STORJ_METRICS_APP_SUFFIX: sim
       STORJ_ORDERS_ENCRYPTION_KEYS: '0100000000000000=0100000000000000000000000000000000000000000000000000000000000000'
-
+      SPANNER_EMULATOR_HOST: '{{ Environment "spanner" "emulatorHost" }}'
       STORJ_VERSION_SERVER_ADDRESS: 'http://{{ Host "versioncontrol" "external"}}:{{ Port "versioncontrol" "public"}}'
     environment:
       STORJUP_AUTHSERVICE: http://authservice:8888
diff --git a/pkg/recipe/db.yaml b/pkg/recipe/db.yaml
@@ -1,20 +1,19 @@
 name: db
 description: Cockroach and redis required by other services.
 add:
-  - name: cockroach
-    image: cockroachdb/cockroach:v24.2.1
+  - name: spanner
+    image: img.dev.storj.io/storjup/spanner-emulator:1.5.31
     port:
-      - name: cockroach
-        description: Cockroach Postgres-compatible SQL port
-        target: 26257
-    command:
-      - cockroach
-      - start-single-node
-      - --insecure
-      - --http-addr=localhost:8086
-      - --store="{{ Environment .This "dir" }}"
-    persistence:
-      - /cockroach/cockroach-data
+      - name: gRPC
+        description: Spanner gRPC port
+        target: 9010
+      - name: REST
+        description: Spanner REST port
+        target: 9020
+    environment:
+      PROJECT_ID: test-project
+      INSTANCE_NAME: test-instance
+      SPANNER_EMULATOR_URL: http://localhost:9020/
   - name: redis
     image: redis:6.0.9
     command:
diff --git a/pkg/recipe/minimal.yaml b/pkg/recipe/minimal.yaml
@@ -24,13 +24,13 @@ add:
       STORJ_CONSOLE_OPEN_REGISTRATION_ENABLED: "true"
       STORJ_CONSOLE_RATE_LIMIT_BURST: "10000"
       STORJ_CONSOLE_SIGNUP_ACTIVATION_CODE_ENABLED: "false"
-      STORJ_DATABASE: '{{ Environment "cockroach" "main" }}'
+      STORJ_DATABASE: '{{ Environment "spanner" "main" }}'
       STORJ_DEBUG_ADDR: '{{ Host .This "listen" }}:{{ Port .This "debug"}}'
       STORJ_LIVE_ACCOUNTING_STORAGE_BACKEND: '{{ Environment "redis" "url" }}?db=0'
       STORJ_LOG_LEVEL: debug
       STORJ_MAIL_FROM: Storj <storj-up@storj.io>
       STORJ_MAIL_SMTP_SERVER_ADDRESS: smtp.gmail.com:587
-      STORJ_METAINFO_DATABASE_URL: '{{ Environment "cockroach" "metainfo" }}'
+      STORJ_METAINFO_DATABASE_URL: '{{ Environment "spanner" "metainfo" }}'
       STORJ_METAINFO_RATE_LIMITER_ENABLED: "false"
       STORJ_METRICS_APP_SUFFIX: sim
       STORJ_ORDERS_ENCRYPTION_KEYS: '0100000000000000=0100000000000000000000000000000000000000000000000000000000000000'
@@ -43,7 +43,7 @@ add:
       STORJ_CONSOLE_EXTERNAL_ADDRESS: 'http://{{ Host .This "external"}}:{{ Port .This "console"}}/'
       STORJ_SERVER_PRIVATE_ADDRESS: '{{ Host .This "listen" }}:{{ Port .This "private" }}'
       STORJ_VERSION_RUN_MODE: disable
-
+      SPANNER_EMULATOR_HOST: '{{ Environment "spanner" "emulatorHost" }}'
       STORJ_VERSION_SERVER_ADDRESS: 'http://{{ Host "versioncontrol" "external"}}:{{ Port "versioncontrol" "public"}}'
     environment:
       STORJ_DEFAULTS: dev
diff --git a/test/edge/Earthfile b/test/edge/Earthfile
@@ -9,7 +9,7 @@ test:
         /go/storj-up/storj-up env set authservice STORJ_ENDPOINT=http://gateway-mt:9999
     COPY . .
     WITH DOCKER --compose docker-compose.yaml
-        RUN docker compose exec -T -u 0 uplink bash -c 'storj-up health --host cockroach -d 120' && \
+        RUN ./storj-up health && \
             docker compose exec -T -u 0 uplink bash -c 'storj-up credentials -s satellite-api:7777 -c satellite-api:10000 -a http://authservice:8888 -e --s3 >> ~/.bashrc' && \
             < basic_rclone.sh docker compose exec -T -u 0 uplink bash -i
     END
diff --git a/test/storjscan/Earthfile b/test/storjscan/Earthfile
@@ -12,7 +12,7 @@ test:
         /go/storj-up/storj-up env setenv storjscan STORJ_TOKEN_PRICE_USE_TEST_PRICES=true
     COPY . .
     WITH DOCKER --compose docker-compose.yaml
-        RUN docker compose exec -T -u 0 storjscan bash -c 'storj-up health --host cockroach -d 120' && \
+        RUN ./storj-up health && \
             docker compose exec -T -u 0 storjscan bash -c 'storj-up credentials -s satellite-api:7777 -c satellite-api:10000 -a http://authservice:8888 -e >> ~/.bashrc' && \
             docker compose cp pk.json storjscan:/var/lib/storj/pk.json && \
             docker compose cp pass storjscan:/var/lib/storj/pass && \
diff --git a/test/storjscan/basic_storjscan.sh b/test/storjscan/basic_storjscan.sh
@@ -20,7 +20,7 @@ ADDRESS=$(curl -X GET -s http://satellite-api:10000/api/v0/payments/wallet --hea
 
 #ACCOUNT is defined with environment variables above
 for i in {1..15}; do cethacea token transfer 1000 "$ADDRESS"; sleep 1; done
-storj-up health --host cockroach -t billing_transactions -n 6 -d 12
+storj-up health -t billing_transactions -n 6 -d 12
 
 RESPONSE=$(curl -X GET http://satellite-api:10000/api/v0/payments/wallet/payments --header "Cookie: _tokenKey=$_tokenKey")
 STATUS=$(echo "$RESPONSE" | jq -r '.payments[-4].Status')
diff --git a/test/uplink/Earthfile b/test/uplink/Earthfile
@@ -8,7 +8,7 @@ test:
     RUN /go/storj-up/storj-up init minimal,db,uplink
     COPY . .
     WITH DOCKER --compose docker-compose.yaml
-        RUN docker compose exec -T -u 0 uplink bash -c 'storj-up health --host cockroach -d 120' && \
+        RUN ./storj-up health && \
             docker compose exec -T -u 0 uplink bash -c 'storj-up credentials -s satellite-api:7777 -c satellite-api:10000 -e >> ~/.bashrc' && \
             < basic_upload_download.sh docker compose exec -T -u 0 uplink bash -i
     END

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ pipeline {`
`45`	`45`	`sh "earthly -P ./test/edge+test"`
`46`	`46`	`}`
`47`	`47`	`}`
`48`		`- stage('Storjscan') {`
`49`		`- steps {`
`50`		`- sh "earthly -P ./test/storjscan+test"`
`51`		`- }`
`52`		`- }`
	`48`	`+// stage('Storjscan') {`
	`49`	`+// steps {`
	`50`	`+// sh "earthly -P ./test/storjscan+test"`
	`51`	`+// }`
	`52`	`+// }`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ import (`
`12`	`12`	`func TestResolveServices(t *testing.T) {`
`13`	`13`	`res, err := ResolveServices([]string{"db", "satellite-api"})`
`14`	`14`	`require.NoError(t, err)`
`15`		`- require.Equal(t, []string{"cockroach", "redis", "satellite-api"}, res)`
	`15`	`+ require.Equal(t, []string{"spanner", "redis", "satellite-api"}, res)`
`16`	`16`	`}`