[Bugfix] [DP] Propagate Timeout Across Subcommands (#1978)

ajanikow · web-flow · commit faef39e000b6 · 2025-10-28T08:40:51.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - (Bugfix) (Platform) Increase memory limit for Inventory
 - (Feature) (LM) Inventory Generator
 - (Feature) (License) Activation CLI
+- (Bugfix) (DP) Propagate Timeout Across Subcommands
 
 ## [1.3.1](https://github.com/arangodb/kube-arangodb/tree/1.3.1) (2025-10-07)
 - (Documentation) Add ArangoPlatformStorage Docs & Examples
diff --git a/cmd/admin.go b/cmd/admin.go
@@ -57,11 +57,12 @@ const (
 	ArgMemberName     = "member-name"
 	ArgAcceptedCode   = "accepted-code"
 	ArgTimeout        = "timeout"
+	ArgTimeoutDefault = time.Minute
 )
 
 func init() {
 	cmdMain.AddCommand(cmdAdmin)
-	cmdAdminAgencyDump.PersistentFlags().DurationP(ArgTimeout, "t", time.Minute,
+	cmdAdmin.PersistentFlags().DurationP(ArgTimeout, "t", ArgTimeoutDefault,
 		"timeout of the request")
 
 	cmdAdmin.AddCommand(cmdAdminAgency)
@@ -134,7 +135,7 @@ func extractTimeout(cmd *cobra.Command) (context.Context, context.CancelFunc) {
 		return context.WithTimeout(cmd.Context(), v)
 	}
 
-	return context.WithCancel(cmd.Context())
+	return context.WithTimeout(cmd.Context(), ArgTimeoutDefault)
 }
 
 func cmdGetAdminMemberRequestGetE(cmd *cobra.Command, args []string) error {

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,12 @@ const (`
`57`	`57`	`ArgMemberName = "member-name"`
`58`	`58`	`ArgAcceptedCode = "accepted-code"`
`59`	`59`	`ArgTimeout = "timeout"`
	`60`	`+ ArgTimeoutDefault = time.Minute`
`60`	`61`	`)`
`61`	`62`
`62`	`63`	`func init() {`
`63`	`64`	`cmdMain.AddCommand(cmdAdmin)`
`64`		`- cmdAdminAgencyDump.PersistentFlags().DurationP(ArgTimeout, "t", time.Minute,`
	`65`	`+ cmdAdmin.PersistentFlags().DurationP(ArgTimeout, "t", ArgTimeoutDefault,`
`65`	`66`	`"timeout of the request")`
`66`	`67`
`67`	`68`	`cmdAdmin.AddCommand(cmdAdminAgency)`
`@@ -134,7 +135,7 @@ func extractTimeout(cmd *cobra.Command) (context.Context, context.CancelFunc) {`
`134`	`135`	`return context.WithTimeout(cmd.Context(), v)`
`135`	`136`	`}`
`136`	`137`
`137`		`- return context.WithCancel(cmd.Context())`
	`138`	`+ return context.WithTimeout(cmd.Context(), ArgTimeoutDefault)`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`func cmdGetAdminMemberRequestGetE(cmd *cobra.Command, args []string) error {`