Update the ResourceRef message with namespace.

Signed-off-by: Michael Nelson <minelson@vmware.com>

cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json

@@ -3452,9 +3452,13 @@
         "name": {
           "type": "string",
           "description": "The name of the specific resource in the context of the installed package."
+        },
+        "namespace": {
+          "type": "string",
+          "description": "The namespace of the specific resource in the context of the installed\npackage. In most cases this will be identical to the namespace of the\ninstalled package. Exceptions will be non-namespaced resources and packages\nthat install resources in other namespaces for special reasons."
         }
       },
-      "description": "A reference to a Kubernetes resource related to a specific installed package.\nThe context (cluster, namespace) for each resource is that of the related\ninstalled package.",
+      "description": "A reference to a Kubernetes resource related to a specific installed package.\nThe context (cluster) for each resource is that of the related\ninstalled package.",
       "title": "Resource reference"
     },
     "v1alpha1RollbackInstalledPackageRequest": {

cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/getresources_test.go

@@ -47,12 +47,14 @@ apiVersion: v1
 kind: Service
 metadata:
   name: apache-test
+  namespace: default
 ---
 # Source: apache/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: apache-test
+  namespace: default
 `,
 				},
 			},
@@ -74,11 +76,64 @@ metadata:
 					{
 						ApiVersion: "v1",
 						Name:       "apache-test",
+						Namespace:  "default",
 						Kind:       "Service",
 					},
 					{
 						ApiVersion: "apps/v1",
 						Name:       "apache-test",
+						Namespace:  "default",
+						Kind:       "Deployment",
+					},
+				},
+			},
+		},
+		{
+			name: "returns resource references for resources in other namespaces",
+			existingReleases: []releaseStub{
+				{
+					name:      "my-apache",
+					namespace: "default",
+					manifest: `
+---
+apiVersion: v1
+kind: ClusterRole
+metadata:
+  name: test-cluster-role
+---
+# Source: apache/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-other-namespace
+  namespace: some-other-namespace
+`,
+				},
+			},
+			request: &corev1.GetInstalledPackageResourceRefsRequest{
+				InstalledPackageRef: &corev1.InstalledPackageReference{
+					Context: &corev1.Context{
+						Cluster:   "default",
+						Namespace: "default",
+					},
+					Identifier: "my-apache",
+				},
+			},
+			expectedResponse: &corev1.GetInstalledPackageResourceRefsResponse{
+				Context: &corev1.Context{
+					Cluster:   "default",
+					Namespace: "default",
+				},
+				ResourceRefs: []*corev1.ResourceRef{
+					{
+						ApiVersion: "v1",
+						Name:       "test-cluster-role",
+						Kind:       "ClusterRole",
+					},
+					{
+						ApiVersion: "apps/v1",
+						Name:       "test-other-namespace",
+						Namespace:  "some-other-namespace",
 						Kind:       "Deployment",
 					},
 				},

cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server.go

@@ -1244,6 +1244,7 @@ func resourceRefsFromManifest(m string) ([]*corev1.ResourceRef, error) {
 				ApiVersion: doc.APIVersion,
 				Kind:       doc.Kind,
 				Name:       doc.Metadata.Name,
+				Namespace:  doc.Metadata.Namespace,
 			})
 		}
 	}

cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/packages.proto

@@ -910,7 +910,7 @@ message PackageAppVersion {
 // Resource reference
 //
 // A reference to a Kubernetes resource related to a specific installed package.
-// The context (cluster, namespace) for each resource is that of the related
+// The context (cluster) for each resource is that of the related
 // installed package.
 message ResourceRef {
   // The APIVersion directly from the resource has the group and version, eg. "apps/v1"
@@ -921,4 +921,9 @@ message ResourceRef {
   string kind = 2;
   // The name of the specific resource in the context of the installed package.
   string name = 3;
+  // The namespace of the specific resource in the context of the installed
+  // package. In most cases this will be identical to the namespace of the
+  // installed package. Exceptions will be non-namespaced resources and packages
+  // that install resources in other namespaces for special reasons.
+  string namespace = 4;
 }

dashboard/src/gen/google/api/http.ts

@@ -397,14 +397,11 @@ export const Http = {
   fromJSON(object: any): Http {
     const message = { ...baseHttp } as Http;
     message.rules = (object.rules ?? []).map((e: any) => HttpRule.fromJSON(e));
-    if (
+    message.fullyDecodeReservedExpansion =
       object.fullyDecodeReservedExpansion !== undefined &&
       object.fullyDecodeReservedExpansion !== null
-    ) {
-      message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion);
-    } else {
-      message.fullyDecodeReservedExpansion = false;
-    }
+        ? Boolean(object.fullyDecodeReservedExpansion)
+        : false;
     return message;
   },
 
@@ -513,51 +510,25 @@ export const HttpRule = {
 
   fromJSON(object: any): HttpRule {
     const message = { ...baseHttpRule } as HttpRule;
-    if (object.selector !== undefined && object.selector !== null) {
-      message.selector = String(object.selector);
-    } else {
-      message.selector = "";
-    }
-    if (object.get !== undefined && object.get !== null) {
-      message.get = String(object.get);
-    } else {
-      message.get = undefined;
-    }
-    if (object.put !== undefined && object.put !== null) {
-      message.put = String(object.put);
-    } else {
-      message.put = undefined;
-    }
-    if (object.post !== undefined && object.post !== null) {
-      message.post = String(object.post);
-    } else {
-      message.post = undefined;
-    }
-    if (object.delete !== undefined && object.delete !== null) {
-      message.delete = String(object.delete);
-    } else {
-      message.delete = undefined;
-    }
-    if (object.patch !== undefined && object.patch !== null) {
-      message.patch = String(object.patch);
-    } else {
-      message.patch = undefined;
-    }
-    if (object.custom !== undefined && object.custom !== null) {
-      message.custom = CustomHttpPattern.fromJSON(object.custom);
-    } else {
-      message.custom = undefined;
-    }
-    if (object.body !== undefined && object.body !== null) {
-      message.body = String(object.body);
-    } else {
-      message.body = "";
-    }
-    if (object.responseBody !== undefined && object.responseBody !== null) {
-      message.responseBody = String(object.responseBody);
-    } else {
-      message.responseBody = "";
-    }
+    message.selector =
+      object.selector !== undefined && object.selector !== null ? String(object.selector) : "";
+    message.get = object.get !== undefined && object.get !== null ? String(object.get) : undefined;
+    message.put = object.put !== undefined && object.put !== null ? String(object.put) : undefined;
+    message.post =
+      object.post !== undefined && object.post !== null ? String(object.post) : undefined;
+    message.delete =
+      object.delete !== undefined && object.delete !== null ? String(object.delete) : undefined;
+    message.patch =
+      object.patch !== undefined && object.patch !== null ? String(object.patch) : undefined;
+    message.custom =
+      object.custom !== undefined && object.custom !== null
+        ? CustomHttpPattern.fromJSON(object.custom)
+        : undefined;
+    message.body = object.body !== undefined && object.body !== null ? String(object.body) : "";
+    message.responseBody =
+      object.responseBody !== undefined && object.responseBody !== null
+        ? String(object.responseBody)
+        : "";
     message.additionalBindings = (object.additionalBindings ?? []).map((e: any) =>
       HttpRule.fromJSON(e),
     );
@@ -594,11 +565,10 @@ export const HttpRule = {
     message.post = object.post ?? undefined;
     message.delete = object.delete ?? undefined;
     message.patch = object.patch ?? undefined;
-    if (object.custom !== undefined && object.custom !== null) {
-      message.custom = CustomHttpPattern.fromPartial(object.custom);
-    } else {
-      message.custom = undefined;
-    }
+    message.custom =
+      object.custom !== undefined && object.custom !== null
+        ? CustomHttpPattern.fromPartial(object.custom)
+        : undefined;
     message.body = object.body ?? "";
     message.responseBody = object.responseBody ?? "";
     message.additionalBindings = (object.additionalBindings ?? []).map(e =>
@@ -644,16 +614,8 @@ export const CustomHttpPattern = {
 
   fromJSON(object: any): CustomHttpPattern {
     const message = { ...baseCustomHttpPattern } as CustomHttpPattern;
-    if (object.kind !== undefined && object.kind !== null) {
-      message.kind = String(object.kind);
-    } else {
-      message.kind = "";
-    }
-    if (object.path !== undefined && object.path !== null) {
-      message.path = String(object.path);
-    } else {
-      message.path = "";
-    }
+    message.kind = object.kind !== undefined && object.kind !== null ? String(object.kind) : "";
+    message.path = object.path !== undefined && object.path !== null ? String(object.path) : "";
     return message;
   },
 

dashboard/src/gen/google/protobuf/any.ts

@@ -160,16 +160,12 @@ export const Any = {
 
   fromJSON(object: any): Any {
     const message = { ...baseAny } as Any;
-    if (object.typeUrl !== undefined && object.typeUrl !== null) {
-      message.typeUrl = String(object.typeUrl);
-    } else {
-      message.typeUrl = "";
-    }
-    if (object.value !== undefined && object.value !== null) {
-      message.value = bytesFromBase64(object.value);
-    } else {
-      message.value = new Uint8Array();
-    }
+    message.typeUrl =
+      object.typeUrl !== undefined && object.typeUrl !== null ? String(object.typeUrl) : "";
+    message.value =
+      object.value !== undefined && object.value !== null
+        ? bytesFromBase64(object.value)
+        : new Uint8Array();
     return message;
   },