Skip to content

Commit b2bbc28

Browse files
committed
pkg/{recipe,runtime}: add spanner variables to runtime
Change-Id: I42826a7e65a80efd9d4fa8a4248ce508dc4dba61
1 parent 6a892b5 commit b2bbc28

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

pkg/recipe/spanner.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ modify:
2424
satellite-rangedloop,
2525
satellite-repair
2626
config:
27-
SPANNER_EMULATOR_HOST: 'spanner:9010'
28-
STORJ_METAINFO_DATABASE_URL: "spanner://projects/test-project/instances/test-instance/databases/metainfo"
29-
STORJ_DATABASE: "spanner://projects/test-project/instances/test-instance/databases/master"
27+
SPANNER_EMULATOR_HOST: '{{ Environment "spanner" "emulatorHost" }}'
28+
STORJ_METAINFO_DATABASE_URL: '{{ Environment "spanner" "metainfo" }}'
29+
STORJ_DATABASE: '{{ Environment "spanner" "main" }}'

pkg/runtime/compose/compose.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ func NewCompose(dir string) (*Compose, error) {
162162
"metainfo": "cockroach://root@cockroach:26257/metainfo?sslmode=disable",
163163
"dir": "/tmp/cockroach",
164164
},
165+
"spanner": {
166+
"main": "spanner://projects/test-project/instances/test-instance/databases/master",
167+
"metainfo": "spanner://projects/test-project/instances/test-instance/databases/metainfo",
168+
"emulatorHost": "spanner:9010",
169+
},
165170
"storagenode": {
166171
"identityDir": "/var/lib/storj/.local/share/storj/identity/storagenode/",
167172
},

pkg/runtime/standalone/standalone.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,11 @@ func NewStandalone(paths Paths) (*Standalone, error) {
299299
"metainfo": "cockroach://root@localhost:26257/metainfo?sslmode=disable",
300300
"dir": filepath.Join(paths.ScriptDir, "cockroach", "0", "data"),
301301
},
302+
"spanner": {
303+
"main": "spanner://projects/test-project/instances/test-instance/databases/master",
304+
"metainfo": "spanner://projects/test-project/instances/test-instance/databases/metainfo",
305+
"emulatorHost": "spanner:9010",
306+
},
302307
"storagenode": {
303308
"staticDir": filepath.Join(paths.StorjDir, "web/storagenode"),
304309
},

0 commit comments

Comments
 (0)