run-resourcewatch: Add --to-json and --from-json

These allow:
* writing to a json file instead of a git repository
* reading from a json file instead of an api-server

Author: mdbooth

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/observe/observe.go

@@ -136,12 +136,14 @@ func emitUpdate(observedResources map[types.UID]*resourceMeta, gvr schema.GroupV
 	}
 
 	resourceC <- &ResourceObservation{
-		GroupVersionResource: gvr,
-		UID:                  resource.GetUID(),
-		ObservationType:      observationType,
-		Object:               resource,
-		OldObject:            observedMeta.lastObserved,
-		ObservationTime:      time.Now(),
+		Group:           gvr.Group,
+		Version:         gvr.Version,
+		Resource:        gvr.Resource,
+		UID:             resource.GetUID(),
+		ObservationType: observationType,
+		Object:          resource,
+		OldObject:       observedMeta.lastObserved,
+		ObservationTime: time.Now(),
 	}
 
 	observedMeta.resourceVersions[resource.GetResourceVersion()] = struct{}{}
@@ -152,11 +154,13 @@ func emitDelete(observedResources map[types.UID]*resourceMeta, gvr schema.GroupV
 	delete(observedResources, resource.GetUID())
 
 	resourceC <- &ResourceObservation{
-		GroupVersionResource: gvr,
-		UID:                  resource.GetUID(),
-		ObservationType:      ObservationTypeDelete,
-		Object:               resource,
-		ObservationTime:      time.Now(),
+		Group:           gvr.Group,
+		Version:         gvr.Version,
+		Resource:        gvr.Resource,
+		UID:             resource.GetUID(),
+		ObservationType: ObservationTypeDelete,
+		Object:          resource,
+		ObservationTime: time.Now(),
 	}
 }
 
@@ -171,11 +175,13 @@ func emitInferredDelete(observedResources map[types.UID]*resourceMeta, lastObser
 	tombstone.SetUID(uid)
 
 	resourceC <- &ResourceObservation{
-		GroupVersionResource: gvr,
-		UID:                  uid,
-		ObservationType:      ObservationTypeDelete,
-		ObservationTime:      time.Now(),
-		Object:               &tombstone,
+		Group:           gvr.Group,
+		Version:         gvr.Version,
+		Resource:        gvr.Resource,
+		UID:             uid,
+		ObservationType: ObservationTypeDelete,
+		ObservationTime: time.Now(),
+		Object:          &tombstone,
 	}
 }
 

pkg/resourcewatch/observe/types.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 )
 
@@ -17,15 +16,15 @@ const (
 )
 
 type ResourceObservation struct {
-	schema.GroupVersionResource
+	Group    string `json:"group"`
+	Version  string `json:"version"`
+	Resource string `json:"resource"`
 
-	UID       types.UID
-	Namespace string
-	Name      string
+	UID types.UID `json:"uid"`
 
-	Object    *unstructured.Unstructured
-	OldObject *unstructured.Unstructured
+	Object    *unstructured.Unstructured `json:"object,omitempty"`
+	OldObject *unstructured.Unstructured `json:"oldObject,omitempty"`
 
-	ObservationType ObservationType
-	ObservationTime time.Time
+	ObservationType ObservationType `json:"observationType"`
+	ObservationTime time.Time       `json:"observationTime"`
 }