step 6

gfichtenholt · Sep 22, 2021 · 4c0d677 · 4c0d677
1 parent d0b3fee
commit 4c0d677
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go
@@ -389,7 +389,11 @@ func (s *Server) updateRelease(ctx context.Context, packageRef *corev1.Installed
 
 	unstructuredRel, err := ifc.Get(ctx, packageRef.Identifier, metav1.GetOptions{})
 	if err != nil {
-		return nil, err
+		if errors.IsNotFound(err) {
+			return nil, status.Errorf(codes.NotFound, "%q", err)
+		} else {
+			return nil, status.Errorf(codes.Internal, "%q", err)
+		}
 	}
 
 	if versionRef.GetVersion() != "" {

diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_test.go
@@ -655,6 +655,18 @@ func TestUpdateInstalledPackage(t *testing.T) {
 			},
 			expectedRelease: flux_helm_release_updated_1,
 		},
+		{
+			name: "returns invalid if installed package doesn't exist",
+			request: &corev1.UpdateInstalledPackageRequest{
+				InstalledPackageRef: &corev1.InstalledPackageReference{
+					Context: &corev1.Context{
+						Namespace: "default",
+					},
+					Identifier: "not-a-valid-identifier",
+				},
+			},
+			expectedStatusCode: codes.NotFound,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -715,6 +727,13 @@ func TestUpdateInstalledPackage(t *testing.T) {
 }
 
 func newRuntimeObjects(t *testing.T, existingK8sObjs []testSpecGetInstalledPackages) (runtimeObjs []runtime.Object, cleanup func()) {
+	httpServers := []*httptest.Server{}
+	cleanup = func() {
+		for _, ts := range httpServers {
+			ts.Close()
+		}
+	}
+
 	for _, existing := range existingK8sObjs {
 		tarGzBytes, err := ioutil.ReadFile(existing.chartTarGz)
 		if err != nil {
@@ -726,7 +745,7 @@ func newRuntimeObjects(t *testing.T, existingK8sObjs []testSpecGetInstalledPacka
 			w.WriteHeader(200)
 			w.Write(tarGzBytes)
 		}))
-		cleanup = func() { ts.Close() }
+		httpServers = append(httpServers, ts)
 
 		chartSpec := map[string]interface{}{
 			"chart": existing.chartName,

diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go
@@ -444,8 +444,6 @@ func (s *Server) UpdateInstalledPackage(ctx context.Context, request *corev1.Upd
 		return nil, status.Errorf(codes.InvalidArgument, "no request InstalledPackageRef provided")
 	}
 
-	request.ProtoMessage()
-
 	if installedRef, err := s.updateRelease(
 		ctx,
 		request.InstalledPackageRef,