refactor: hydrate, initialize, and version commands with flag handling

Author: mikebz

cmd/nomos/flags/flags.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package flags contains flags used by several CLI commands.
+// the local flags will be found in the command folder in the flags.go file.
 package flags
 
 import (

cmd/nomos/hydrate/hydrate.go renamed to cmd/nomos/hydrate/cmd.go

@@ -0,0 +1,48 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package version
+
+import (
+	"github.com/spf13/cobra"
+	"kpt.dev/configsync/cmd/nomos/flags"
+)
+
+func init() {
+	// Initialize flags for the bugreport command
+	// This separation keeps flag definitions isolated from command execution logic
+	flags.AddClientTimeout(Cmd)
+}
+
+// Cmd is the Cobra object representing the nomos version command.
+var Cmd = &cobra.Command{
+	Use:   "version",
+	Short: "Prints the version of ACM for each cluster as well this CLI",
+	Long: `Prints the version of Configuration Management installed on each cluster and the version
+of the "nomos" client binary for debugging purposes.`,
+	Example: `  nomos version`,
+	RunE: func(cmd *cobra.Command, _ []string) error {
+		// Don't show usage on error, as argument validation passed.
+		cmd.SilenceUsage = true
+
+		// Create execution parameters from parsed flags
+		params := ExecParams{
+			Contexts:      flags.Contexts,
+			ClientTimeout: flags.ClientTimeout,
+		}
+
+		// Execute the version command logic
+		return ExecuteVersion(cmd.Context(), params)
+	},
+}

cmd/nomos/initialize/init.go renamed to cmd/nomos/initialize/cmd.go

@@ -23,7 +23,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/spf13/cobra"
 	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -40,12 +39,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func init() {
-	// Initialize flags for the bugreport command
-	// This separation keeps flag definitions isolated from command execution logic
-	flags.AddClientTimeout(Cmd)
-}
-
 // GetVersionReadCloser returns a ReadCloser with the output produced by running the "nomos version" command as a string
 func GetVersionReadCloser(ctx context.Context) (io.ReadCloser, error) {
 	r, w, _ := os.Pipe()
@@ -68,28 +61,6 @@ var clientVersion = func() string {
 	return version.VERSION
 }
 
-// Cmd is the Cobra object representing the nomos version command.
-var Cmd = &cobra.Command{
-	Use:   "version",
-	Short: "Prints the version of ACM for each cluster as well this CLI",
-	Long: `Prints the version of Configuration Management installed on each cluster and the version
-of the "nomos" client binary for debugging purposes.`,
-	Example: `  nomos version`,
-	RunE: func(cmd *cobra.Command, _ []string) error {
-		// Don't show usage on error, as argument validation passed.
-		cmd.SilenceUsage = true
-
-		// Create execution parameters from parsed flags
-		params := ExecParams{
-			Contexts:      flags.Contexts,
-			ClientTimeout: flags.ClientTimeout,
-		}
-
-		// Execute the version command logic
-		return ExecuteVersion(cmd.Context(), params)
-	},
-}
-
 // allKubectlConfigs gets all kubectl configs, with error handling
 // This function is maintained for backward compatibility with existing code
 func allKubectlConfigs() (map[string]*rest.Config, error) {