Merge pull request #1946 from lexcao/feat/export-spanner-option

Export Spanner credential JSON for datastore
authzed · Jun 17, 2024 · e78b5d8 · e78b5d8
2 parents 966767e + 020e0e7
commit e78b5d8
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