fix(cli): make flag registration non-racy

ory · May 30, 2022 · 8415ced · 8415ced
1 parent 7502bf2
commit 8415ced
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/cmd/relationtuple/create.go b/cmd/relationtuple/create.go
@@ -27,7 +27,7 @@ func newCreateCmd() *cobra.Command {
 		Args: cobra.MinimumNArgs(1),
 		RunE: transactRelationTuples(rts.RelationTupleDelta_ACTION_INSERT),
 	}
-	cmd.Flags().AddFlagSet(packageFlags)
+	registerPackageFlags(cmd.Flags())
 
 	return cmd
 }

diff --git a/cmd/relationtuple/delete.go b/cmd/relationtuple/delete.go
@@ -22,7 +22,7 @@ func newDeleteCmd() *cobra.Command {
 		Args: cobra.MinimumNArgs(1),
 		RunE: transactRelationTuples(rts.RelationTupleDelta_ACTION_DELETE),
 	}
-	cmd.Flags().AddFlagSet(packageFlags)
+	registerPackageFlags(cmd.Flags())
 
 	return cmd
 }

diff --git a/cmd/relationtuple/delete_all.go b/cmd/relationtuple/delete_all.go
@@ -27,7 +27,7 @@ func newDeleteAllCmd() *cobra.Command {
 		Args: cobra.ExactArgs(0),
 		RunE: deleteRelationTuplesFromQuery,
 	}
-	cmd.Flags().AddFlagSet(packageFlags)
+	registerPackageFlags(cmd.Flags())
 	registerRelationTupleFlags(cmd.Flags())
 	cmd.Flags().Bool(FlagForce, false, "Force the deletion of relation tuples")
 

diff --git a/cmd/relationtuple/get.go b/cmd/relationtuple/get.go
@@ -81,7 +81,7 @@ func newGetCmd() *cobra.Command {
 		RunE: getTuples(&pageSize, &pageToken),
 	}
 
-	cmd.Flags().AddFlagSet(packageFlags)
+	registerPackageFlags(cmd.Flags())
 	registerRelationTupleFlags(cmd.Flags())
 
 	cmd.Flags().StringVar(&pageToken, FlagPageToken, "", "page token acquired from a previous response")

diff --git a/cmd/relationtuple/root.go b/cmd/relationtuple/root.go
@@ -16,8 +16,6 @@ func newRelationCmd() *cobra.Command {
 	}
 }
 
-var packageFlags = pflag.NewFlagSet("relation package flags", pflag.ContinueOnError)
-
 func RegisterCommandsRecursive(parent *cobra.Command) {
 	relationCmd := newRelationCmd()
 
@@ -26,7 +24,7 @@ func RegisterCommandsRecursive(parent *cobra.Command) {
 	relationCmd.AddCommand(newGetCmd(), newCreateCmd(), newDeleteCmd(), newDeleteAllCmd(), newParseCmd())
 }
 
-func init() {
-	client.RegisterRemoteURLFlags(packageFlags)
-	cmdx.RegisterFormatFlags(packageFlags)
+func registerPackageFlags(flags *pflag.FlagSet) {
+	client.RegisterRemoteURLFlags(flags)
+	cmdx.RegisterFormatFlags(flags)
 }