Merge pull request #29955 from mdbooth/resourcewatch

NO-JIRA: Improve performance of run-resourcewatch

Author: openshift-merge-bot[bot]

go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/go-ldap/ldap/v3 v3.4.3
+	github.com/go-logr/logr v1.4.2
 	github.com/golang/protobuf v1.5.4
 	github.com/google/gnostic-models v0.6.8
 	github.com/google/go-cmp v0.6.0
@@ -172,7 +173,6 @@ require (
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-fonts/liberation v0.3.1 // indirect
 	github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect

pkg/cmd/openshift-tests/run_resource_watch/resourcewatch.go

@@ -1,12 +1,16 @@
 package run_resource_watch
 
 import (
+	"fmt"
+
 	"github.com/openshift/origin/pkg/resourcewatch/operator"
 	"github.com/spf13/cobra"
 	"k8s.io/kubectl/pkg/util/templates"
 )
 
 func NewRunResourceWatchCommand() *cobra.Command {
+	var toJsonPath, fromJsonPath string
+
 	cmd := &cobra.Command{
 		Use:   "run-resourcewatch",
 		Short: "Run watch for resource changes and commit each to a git repository",
@@ -22,12 +26,22 @@ func NewRunResourceWatchCommand() *cobra.Command {
 
 		SilenceUsage:  true,
 		SilenceErrors: true,
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			// Check for mutual exclusivity of --to-json and --from-json
+			if toJsonPath != "" && fromJsonPath != "" {
+				return fmt.Errorf("--to-json and --from-json are mutually exclusive")
+			}
+			return nil
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return operator.RunResourceWatch()
+			return operator.RunResourceWatch(toJsonPath, fromJsonPath)
 		},
 	}
 	var dummy string
 	cmd.Flags().StringVar(&dummy, "kubeconfig", "", "This option is not used any more. It will be removed in later releases")
 	cmd.Flags().StringVar(&dummy, "namespace", "", "This option is not used any more. It will be removed in later releases")
+	cmd.Flags().StringVar(&toJsonPath, "to-json", "", "Path to JSON file for output (mutually exclusive with --from-json)")
+	cmd.Flags().StringVar(&fromJsonPath, "from-json", "", "Path to JSON file for input (mutually exclusive with --to-json)")
+
 	return cmd
 }

pkg/resourcewatch/controller/configmonitor/crd_controller.go

@@ -1,4 +1,4 @@
-package storage
+package git
 
 import (
 	"encoding/json"