cmd: expand all string input

Signed-off-by: Jimmy Zelinskie <jimmy@zelinskie.com>
authzed · Oct 25, 2021 · 89576ad · 89576ad
1 parent bbc2c05
commit 89576ad
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/cmd/spicedb/developer.go b/cmd/spicedb/developer.go
@@ -69,7 +69,7 @@ func developerServiceRun(cmd *cobra.Command, args []string) {
 	registerDeveloperGrpcServices(grpcServer, shareStore)
 
 	go func() {
-		addr := cobrautil.MustGetString(cmd, "grpc-addr")
+		addr := cobrautil.MustGetStringExpanded(cmd, "grpc-addr")
 		l, err := net.Listen("tcp", addr)
 		if err != nil {
 			log.Fatal().Str("addr", addr).Msg("failed to listen on addr for gRPC server")
@@ -99,8 +99,8 @@ func developerServiceRun(cmd *cobra.Command, args []string) {
 }
 
 func shareStoreFromCmd(cmd *cobra.Command) (v0svc.ShareStore, error) {
-	shareStoreSalt := cobrautil.MustGetString(cmd, "share-store-salt")
-	shareStoreKind := cobrautil.MustGetString(cmd, "share-store")
+	shareStoreSalt := cobrautil.MustGetStringExpanded(cmd, "share-store-salt")
+	shareStoreKind := cobrautil.MustGetStringExpanded(cmd, "share-store")
 	event := log.Info()
 
 	var shareStore v0svc.ShareStore
@@ -109,11 +109,11 @@ func shareStoreFromCmd(cmd *cobra.Command) (v0svc.ShareStore, error) {
 		shareStore = v0svc.NewInMemoryShareStore(shareStoreSalt)
 
 	case "s3":
-		bucketName := cobrautil.MustGetString(cmd, "s3-bucket")
-		accessKey := cobrautil.MustGetString(cmd, "s3-access-key")
-		secretKey := cobrautil.MustGetString(cmd, "s3-secret-key")
-		endpoint := cobrautil.MustGetString(cmd, "s3-endpoint")
-		region := stringz.DefaultEmpty(cobrautil.MustGetString(cmd, "s3-region"), "auto")
+		bucketName := cobrautil.MustGetStringExpanded(cmd, "s3-bucket")
+		accessKey := cobrautil.MustGetStringExpanded(cmd, "s3-access-key")
+		secretKey := cobrautil.MustGetStringExpanded(cmd, "s3-secret-key")
+		endpoint := cobrautil.MustGetStringExpanded(cmd, "s3-endpoint")
+		region := stringz.DefaultEmpty(cobrautil.MustGetStringExpanded(cmd, "s3-region"), "auto")
 
 		optsNames := []string{"s3-bucket", "s3-access-key", "s3-secret-key", "s3-endpoint"}
 		opts := []string{bucketName, accessKey, secretKey, endpoint}

diff --git a/cmd/spicedb/migrate.go b/cmd/spicedb/migrate.go
@@ -30,8 +30,8 @@ func registerMigrateCmd(rootCmd *cobra.Command) {
 }
 
 func migrateRun(cmd *cobra.Command, args []string) {
-	datastoreEngine := cobrautil.MustGetString(cmd, "datastore-engine")
-	dbURL := cobrautil.MustGetString(cmd, "datastore-conn-uri")
+	datastoreEngine := cobrautil.MustGetStringExpanded(cmd, "datastore-engine")
+	dbURL := cobrautil.MustGetStringExpanded(cmd, "datastore-conn-uri")
 
 	if datastoreEngine == "cockroachdb" {
 		log.Info().Msg("migrating cockroachdb datastore")
@@ -81,7 +81,7 @@ func registerHeadCmd(rootCmd *cobra.Command) {
 }
 
 func headRevisionRun(cmd *cobra.Command, args []string) {
-	datastoreEngine := cobrautil.MustGetString(cmd, "datastore-engine")
+	datastoreEngine := cobrautil.MustGetStringExpanded(cmd, "datastore-engine")
 
 	var headRevision string
 	var err error

diff --git a/cmd/spicedb/serve.go b/cmd/spicedb/serve.go
@@ -128,21 +128,21 @@ func registerServeCmd(rootCmd *cobra.Command) {
 }
 
 func serveRun(cmd *cobra.Command, args []string) {
-	token := cobrautil.MustGetString(cmd, "grpc-preshared-key")
+	token := cobrautil.MustGetStringExpanded(cmd, "grpc-preshared-key")
 	if len(token) < 1 {
 		log.Fatal().Msg("a preshared key must be provided via --grpc-preshared-key to authenticate API requests")
 	}
 
-	datastoreEngine := cobrautil.MustGetString(cmd, "datastore-engine")
-	datastoreURI := cobrautil.MustGetString(cmd, "datastore-conn-uri")
+	datastoreEngine := cobrautil.MustGetStringExpanded(cmd, "datastore-engine")
+	datastoreURI := cobrautil.MustGetStringExpanded(cmd, "datastore-conn-uri")
 
 	revisionFuzzingTimedelta := cobrautil.MustGetDuration(cmd, "datastore-revision-fuzzing-duration")
 	gcWindow := cobrautil.MustGetDuration(cmd, "datastore-gc-window")
 	maxRetries := cobrautil.MustGetInt(cmd, "datastore-max-tx-retries")
-	overlapKey := cobrautil.MustGetString(cmd, "datastore-tx-overlap-key")
-	overlapStrategy := cobrautil.MustGetString(cmd, "datastore-tx-overlap-strategy")
+	overlapKey := cobrautil.MustGetStringExpanded(cmd, "datastore-tx-overlap-key")
+	overlapStrategy := cobrautil.MustGetStringExpanded(cmd, "datastore-tx-overlap-strategy")
 
-	splitQuerySize, err := units.ParseBase2Bytes(cobrautil.MustGetString(cmd, "datastore-query-split-size"))
+	splitQuerySize, err := units.ParseBase2Bytes(cobrautil.MustGetStringExpanded(cmd, "datastore-query-split-size"))
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to parse datastore-query-split-size")
 	}
@@ -277,13 +277,13 @@ func serveRun(cmd *cobra.Command, args []string) {
 	redispatch := graph.NewLocalOnlyDispatcher(nsm, ds)
 	redispatchClientCtx, redispatchClientCancel := context.WithCancel(context.Background())
 
-	redispatchTarget := cobrautil.MustGetString(cmd, "dispatch-redispatch-dns-name")
-	redispatchServiceName := cobrautil.MustGetString(cmd, "dispatch-redispatch-service-name")
+	redispatchTarget := cobrautil.MustGetStringExpanded(cmd, "dispatch-redispatch-dns-name")
+	redispatchServiceName := cobrautil.MustGetStringExpanded(cmd, "dispatch-redispatch-service-name")
 	if redispatchTarget != "" {
 		log.Info().Str("target", redispatchTarget).Msg("initializing remote redispatcher")
 
-		resolverAddr := cobrautil.MustGetString(cmd, "dispatch-peer-resolver-addr")
-		resolverCertPath := cobrautil.MustGetString(cmd, "dispatch-peer-resolver-cert-path")
+		resolverAddr := cobrautil.MustGetStringExpanded(cmd, "dispatch-peer-resolver-addr")
+		resolverCertPath := cobrautil.MustGetStringExpanded(cmd, "dispatch-peer-resolver-cert-path")
 		var resolverConfig *consistentbackend.EndpointResolverConfig
 		if resolverCertPath != "" {
 			log.Debug().Str("addr", resolverAddr).Str("cacert", resolverCertPath).Msg("using TLS protected peer resolver")
@@ -294,8 +294,8 @@ func serveRun(cmd *cobra.Command, args []string) {
 		}
 
 		peerCertPath := cobrautil.MustGetStringExpanded(cmd, "grpc-cert-path")
-		peerPSK := cobrautil.MustGetString(cmd, "grpc-preshared-key")
-		selfEndpoint := cobrautil.MustGetString(cmd, "internal-grpc-addr")
+		peerPSK := cobrautil.MustGetStringExpanded(cmd, "grpc-preshared-key")
+		selfEndpoint := cobrautil.MustGetStringExpanded(cmd, "internal-grpc-addr")
 
 		var endpointConfig *consistentbackend.EndpointConfig
 		var fallbackConfig *consistentbackend.FallbackEndpointConfig
@@ -356,7 +356,7 @@ func serveRun(cmd *cobra.Command, args []string) {
 	)
 
 	go func() {
-		addr := cobrautil.MustGetString(cmd, "grpc-addr")
+		addr := cobrautil.MustGetStringExpanded(cmd, "grpc-addr")
 		l, err := net.Listen("tcp", addr)
 		if err != nil {
 			log.Fatal().Str("addr", addr).Msg("failed to listen on addr for gRPC server")
@@ -370,7 +370,7 @@ func serveRun(cmd *cobra.Command, args []string) {
 	}()
 
 	go func() {
-		addr := cobrautil.MustGetString(cmd, "internal-grpc-addr")
+		addr := cobrautil.MustGetStringExpanded(cmd, "internal-grpc-addr")
 		l, err := net.Listen("tcp", addr)
 		if err != nil {
 			log.Fatal().Str("addr", addr).Msg("failed to listen on addr for internal gRPC server")
@@ -397,10 +397,10 @@ func serveRun(cmd *cobra.Command, args []string) {
 		}
 	}()
 
-	dashboardAddr := cobrautil.MustGetString(cmd, "dashboard-addr")
+	dashboardAddr := cobrautil.MustGetStringExpanded(cmd, "dashboard-addr")
 	dashboard := dashboard.NewDashboard(dashboardAddr, dashboard.Args{
 		GrpcNoTLS:       cobrautil.MustGetBool(cmd, "grpc-no-tls"),
-		GrpcAddr:        cobrautil.MustGetString(cmd, "grpc-addr"),
+		GrpcAddr:        cobrautil.MustGetStringExpanded(cmd, "grpc-addr"),
 		DatastoreEngine: datastoreEngine,
 	}, ds)
 	if dashboardAddr != "" {
@@ -471,7 +471,7 @@ func newRestGateway(ctx context.Context, cmd *cobra.Command) (*http.Server, erro
 	}
 
 	mux := runtime.NewServeMux(runtime.WithMetadata(auth.PresharedKeyAnnotator))
-	upstream := cobrautil.MustGetString(cmd, "grpc-addr")
+	upstream := cobrautil.MustGetStringExpanded(cmd, "grpc-addr")
 	v1.RegisterSchemaServiceHandlerFromEndpoint(ctx, mux, upstream, opts)
 	v1.RegisterPermissionsServiceHandlerFromEndpoint(ctx, mux, upstream, opts)
 

diff --git a/cmd/spicedb/testserver.go b/cmd/spicedb/testserver.go
@@ -59,7 +59,7 @@ func registerTestserverCmd(rootCmd *cobra.Command) {
 }
 
 func runTestServer(cmd *cobra.Command, args []string) {
-	configFilePaths := cobrautil.MustGetStringSlice(cmd, "load-configs")
+	configFilePaths := cobrautil.MustGetStringSliceExpanded(cmd, "load-configs")
 
 	backendMiddleware := &perTokenBackendMiddleware{
 		&sync.Map{},
@@ -87,7 +87,7 @@ func runTestServer(cmd *cobra.Command, args []string) {
 	}
 
 	go func() {
-		addr := cobrautil.MustGetString(cmd, "grpc-addr")
+		addr := cobrautil.MustGetStringExpanded(cmd, "grpc-addr")
 		l, err := net.Listen("tcp", addr)
 		if err != nil {
 			log.Fatal().Str("addr", addr).Msg("failed to listen on addr for gRPC server")
@@ -100,7 +100,7 @@ func runTestServer(cmd *cobra.Command, args []string) {
 	}()
 
 	go func() {
-		addr := cobrautil.MustGetString(cmd, "readonly-grpc-addr")
+		addr := cobrautil.MustGetStringExpanded(cmd, "readonly-grpc-addr")
 		l, err := net.Listen("tcp", addr)
 		if err != nil {
 			log.Fatal().Str("addr", addr).Msg("failed to listen on readonly addr for gRPC server")

diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/johannesboyne/gofakes3 v0.0.0-20210608054100-92d5d4af5fde
 	github.com/jpillora/backoff v1.0.0
 	github.com/jwangsadinata/go-multimap v0.0.0-20190620162914-c29f3d7f33b6
-	github.com/jzelinskie/cobrautil v0.0.4
+	github.com/jzelinskie/cobrautil v0.0.5
 	github.com/jzelinskie/stringz v0.0.1
 	github.com/lib/pq v1.10.3
 	github.com/mitchellh/mapstructure v1.4.2 // indirect

diff --git a/go.sum b/go.sum
@@ -384,8 +384,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/jwangsadinata/go-multimap v0.0.0-20190620162914-c29f3d7f33b6 h1:OzCtZaD1uI5Fc1C+4oNAp7kZ4ibh5OIgxI29moH/IbE=
 github.com/jwangsadinata/go-multimap v0.0.0-20190620162914-c29f3d7f33b6/go.mod h1:CEusGbCRDFcHX9EgEhPsgJX33kpp9CfSFRBAoSGOems=
-github.com/jzelinskie/cobrautil v0.0.4 h1:OIYfoDHVDvftmzmwsDjQzmnuozxd2LANcFti3aql+n4=
-github.com/jzelinskie/cobrautil v0.0.4/go.mod h1:svcV0pfy8vH8O+IpYaJgWw70PJuAtvoKXsIELG8Krzs=
+github.com/jzelinskie/cobrautil v0.0.5 h1:R78XJnCrlpcTRixsvkk2sZnvpUl2DU3pv3eAkf+ZNsU=
+github.com/jzelinskie/cobrautil v0.0.5/go.mod h1:svcV0pfy8vH8O+IpYaJgWw70PJuAtvoKXsIELG8Krzs=
 github.com/jzelinskie/stringz v0.0.0-20210414224931-d6a8ce844a70/go.mod h1:hHYbgxJuNLRw91CmpuFsYEOyQqpDVFg8pvEh23vy4P0=
 github.com/jzelinskie/stringz v0.0.1 h1:IahR+y8ct2nyj7B6i8UtFsGFj4ex1SX27iKFYsAheLk=
 github.com/jzelinskie/stringz v0.0.1/go.mod h1:hHYbgxJuNLRw91CmpuFsYEOyQqpDVFg8pvEh23vy4P0=