Merge pull request #1838 from trungutt/fix/persistent-pre-run-ancestor-chain

fix: walk full ancestor chain in addGatewayFlags PersistentPreRunE

Author: dgageot

cmd/root/flags.go

@@ -98,8 +98,14 @@ func addGatewayFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) {
 		if persistentPreRunE != nil {
 			return persistentPreRunE(cmd, args)
 		}
-		if cmd.Parent() != nil && cmd.Parent().PersistentPreRunE != nil {
-			return cmd.Parent().PersistentPreRunE(cmd, args)
+		// Walk up the ancestor chain to find and call the nearest PersistentPreRunE.
+		// A single cmd.Parent() check is not sufficient when this command is nested
+		// more than one level deep (e.g. root → serve → api): the immediate parent
+		// may have no PersistentPreRunE, but a grandparent (such as root) might.
+		for p := cmd.Parent(); p != nil; p = p.Parent() {
+			if p.PersistentPreRunE != nil {
+				return p.PersistentPreRunE(cmd, args)
+			}
 		}
 
 		return nil

cmd/root/flags_test.go

@@ -98,6 +98,37 @@ func TestGatewayLogic(t *testing.T) {
 	}
 }
 
+func TestGatewayFlags_CallsAncestorPersistentPreRunE(t *testing.T) {
+	// Regression test: addGatewayFlags overrides PersistentPreRunE on the command
+	// it is applied to. When that command is nested under an intermediate parent
+	// (e.g. root → serve → api), the old code only checked cmd.Parent(), so a
+	// grandparent's PersistentPreRunE was silently skipped.
+	called := false
+
+	root := &cobra.Command{Use: "root"}
+	root.PersistentPreRunE = func(*cobra.Command, []string) error {
+		called = true
+		return nil
+	}
+
+	middle := &cobra.Command{Use: "middle"}
+
+	leaf := &cobra.Command{
+		Use:  "leaf",
+		Args: cobra.NoArgs,
+		RunE: func(*cobra.Command, []string) error { return nil },
+	}
+	runConfig := config.RuntimeConfig{}
+	addGatewayFlags(leaf, &runConfig)
+
+	middle.AddCommand(leaf)
+	root.AddCommand(middle)
+
+	root.SetArgs([]string{"middle", "leaf"})
+	require.NoError(t, root.Execute())
+	assert.True(t, called, "root PersistentPreRunE should have been called through the intermediate parent")
+}
+
 func TestCanonize(t *testing.T) {
 	t.Parallel()