Export Spanner credential JSON for datastore

Closes authzed#1941 Signed-off-by: Lex Cao <[email protected]>
lexcao · Jun 17, 2024 · 020e0e7 · 020e0e7
1 parent b3acf2f
commit 020e0e7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/pkg/cmd/datastore/datastore.go b/pkg/cmd/datastore/datastore.go
@@ -134,6 +134,7 @@ type Config struct {
 
 	// Spanner
 	SpannerCredentialsFile string `debugmap:"visible"`
+	SpannerCredentialsJSON []byte `debugmap:"sensitive"`
 	SpannerEmulatorHost    string `debugmap:"visible"`
 	SpannerMinSessions     uint64 `debugmap:"visible"`
 	SpannerMaxSessions     uint64 `debugmap:"visible"`
@@ -429,6 +430,7 @@ func newSpannerDatastore(ctx context.Context, opts Config) (datastore.Datastore,
 		spanner.RevisionQuantization(opts.RevisionQuantization),
 		spanner.MaxRevisionStalenessPercent(opts.MaxRevisionStalenessPercent),
 		spanner.CredentialsFile(opts.SpannerCredentialsFile),
+		spanner.CredentialsJSON(opts.SpannerCredentialsJSON),
 		spanner.WatchBufferLength(opts.WatchBufferLength),
 		spanner.WatchBufferWriteTimeout(opts.WatchBufferWriteTimeout),
 		spanner.EmulatorHost(opts.SpannerEmulatorHost),

diff --git a/pkg/cmd/datastore/zz_generated.options.go b/pkg/cmd/datastore/zz_generated.options.go