remove Kind specificity on requests

Author: joshri

api/core/core.proto

@@ -186,7 +186,7 @@ message GetObjectResponse {
 
 message ListObjectsRequest {
     string namespace   = 1;
-    Kind   kind        = 2;
+    string kind        = 2;
     string clusterName = 3;
 }
 
@@ -198,7 +198,7 @@ message ListObjectsResponse {
 message GetReconciledObjectsRequest {
     string         automationName         = 1;
     string         namespace              = 2;
-    Kind           automationKind         = 3;
+    string         automationKind         = 3;
     repeated       GroupVersionKind kinds = 4;
     string         clusterName            = 5;
 }

api/core/core.swagger.json

@@ -330,20 +330,7 @@
             "name": "kind",
             "in": "query",
             "required": false,
-            "type": "string",
-            "enum": [
-              "GitRepository",
-              "Bucket",
-              "HelmRepository",
-              "HelmChart",
-              "Kustomization",
-              "HelmRelease",
-              "Cluster",
-              "OCIRepository",
-              "Provider",
-              "Alert"
-            ],
-            "default": "GitRepository"
+            "type": "string"
           },
           {
             "name": "clusterName",
@@ -705,7 +692,7 @@
           "type": "string"
         },
         "automationKind": {
-          "$ref": "#/definitions/v1Kind"
+          "type": "string"
         },
         "kinds": {
           "type": "array",

core/server/fluxruntime.go

@@ -164,18 +164,18 @@ func (cs *coreServer) GetReconciledObjects(ctx context.Context, msg *pb.GetRecon
 	var opts client.MatchingLabels
 
 	switch msg.AutomationKind {
-	case pb.Kind_Kustomization:
+	case "Kustomization":
 		opts = client.MatchingLabels{
 			KustomizeNameKey:      msg.AutomationName,
 			KustomizeNamespaceKey: msg.Namespace,
 		}
-	case pb.Kind_HelmRelease:
+	case "HelmRelease":
 		opts = client.MatchingLabels{
 			HelmNameKey:      msg.AutomationName,
 			HelmNamespaceKey: msg.Namespace,
 		}
 	default:
-		return nil, fmt.Errorf("unsupported application kind: %s", msg.AutomationKind.String())
+		return nil, fmt.Errorf("unsupported application kind: %s", msg.AutomationKind)
 	}
 
 	result := []unstructured.Unstructured{}

core/server/fluxruntime_test.go

@@ -71,7 +71,7 @@ func TestGetReconciledObjects(t *testing.T) {
 	res, err := c.GetReconciledObjects(ctx, &pb.GetReconciledObjectsRequest{
 		AutomationName: automationName,
 		Namespace:      ns.Name,
-		AutomationKind: pb.Kind_Kustomization,
+		AutomationKind: "Kustomization",
 		Kinds:          []*pb.GroupVersionKind{{Group: "apps", Version: "v1", Kind: "Deployment"}},
 		ClusterName:    clustersmngr.DefaultCluster,
 	})

core/server/objects.go

@@ -36,7 +36,7 @@ func getUnstructuredHelmReleaseInventory(ctx context.Context, obj unstructured.U
 func (cs *coreServer) ListObjects(ctx context.Context, msg *pb.ListObjectsRequest) (*pb.ListObjectsResponse, error) {
 	respErrors := []*pb.ListError{}
 
-	gvk, err := cs.primaryKinds.Lookup(msg.Kind.String())
+	gvk, err := cs.primaryKinds.Lookup(msg.Kind)
 	if err != nil {
 		return nil, err
 	}

core/server/objects_test.go

@@ -361,7 +361,7 @@ func TestListObjectSingle(t *testing.T) {
 
 	res, err := c.ListObjects(ctx, &pb.ListObjectsRequest{
 		Namespace: ns.Name,
-		Kind:      pb.Kind_Kustomization,
+		Kind:      "Kustomization",
 	})
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(res.Errors).To(BeEmpty())
@@ -413,7 +413,7 @@ func TestListObjectMultiple(t *testing.T) {
 
 	res, err := c.ListObjects(ctx, &pb.ListObjectsRequest{
 		Namespace: ns.Name,
-		Kind:      pb.Kind_HelmRelease,
+		Kind:      "HelmRelease",
 	})
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(res.Errors).To(BeEmpty())
@@ -454,7 +454,7 @@ func TestListObjectSingleWithClusterName(t *testing.T) {
 
 	res, err := c.ListObjects(ctx, &pb.ListObjectsRequest{
 		Namespace:   ns.Name,
-		Kind:        pb.Kind_Kustomization,
+		Kind:        "Kustomization",
 		ClusterName: "Default",
 	})
 	g.Expect(err).NotTo(HaveOccurred())
@@ -507,7 +507,7 @@ func TestListObjectMultipleWithClusterName(t *testing.T) {
 
 	res, err := c.ListObjects(ctx, &pb.ListObjectsRequest{
 		Namespace:   ns.Name,
-		Kind:        pb.Kind_HelmRelease,
+		Kind:        "HelmRelease",
 		ClusterName: "Default",
 	})
 	g.Expect(err).NotTo(HaveOccurred())
@@ -564,7 +564,7 @@ func TestListObject_HelmReleaseWithInventory(t *testing.T) {
 
 	res, err := c.ListObjects(ctx, &pb.ListObjectsRequest{
 		Namespace: ns.Name,
-		Kind:      pb.Kind_HelmRelease,
+		Kind:      "HelmRelease",
 	})
 
 	g.Expect(err).NotTo(HaveOccurred())
@@ -610,7 +610,7 @@ func TestListObject_HelmReleaseCantGetSecret(t *testing.T) {
 
 	res, err := c.ListObjects(ctx, &pb.ListObjectsRequest{
 		Namespace: ns.Name,
-		Kind:      pb.Kind_HelmRelease,
+		Kind:      "HelmRelease",
 	})
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(res.Errors).To(HaveLen(1))