addressing comments

Signed-off-by: Vishwanath Hiremath <[email protected]>
radius-project · Feb 16, 2024 · 990ca8f · 990ca8f
1 parent c784e27
commit 990ca8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/corerp/frontend/controller/secretstores/kubernetes.go b/pkg/corerp/frontend/controller/secretstores/kubernetes.go
@@ -185,9 +185,10 @@ func UpsertSecret(ctx context.Context, newResource, old *datamodel.SecretStore,
 	if ref == "" && old != nil {
 		ref = old.Properties.Resource
 	}
-	if isGlobalScopedResource(newResource) && newResource.Properties.Resource == "" {
+	if isGlobalScopedResource(newResource) && ref == "" {
 		return rest.NewBadRequestResponse("$.properties.resource cannot be empty for global scoped resource."), nil
 	}
+
 	ns, name, err := fromResourceID(ref)
 	if err != nil {
 		return nil, err
@@ -198,6 +199,7 @@ func UpsertSecret(ctx context.Context, newResource, old *datamodel.SecretStore,
 			return nil, err
 		}
 	}
+
 	err = options.KubeClient.Create(ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: ns}})
 	if err != nil && apierrors.IsAlreadyExists(err) {
 		logger.Info("Using existing namespace", "namespace", ns)

diff --git a/pkg/corerp/frontend/controller/secretstores/kubernetes_test.go b/pkg/corerp/frontend/controller/secretstores/kubernetes_test.go
@@ -505,6 +505,7 @@ func TestUpsertSecret(t *testing.T) {
 				"secret0"),
 		}, newResource.Properties.Status.OutputResources[0])
 	})
+
 	t.Run("create a new secret resource with invalid resource", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		sc := store.NewMockStorageClient(ctrl)
@@ -522,6 +523,7 @@ func TestUpsertSecret(t *testing.T) {
 		require.Error(t, err)
 		require.Equal(t, err.Error(), "no Kubernetes namespace")
 	})
+
 	t.Run("create a new secret resource with empty resource", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		sc := store.NewMockStorageClient(ctrl)