update nits

Author: mjudeikis

pkg/admission/workspace/admission.go

@@ -212,10 +212,16 @@ func (o *workspace) Validate(ctx context.Context, a admission.Attributes, _ admi
 			if !isSystemPrivileged && ws.Spec.Type != nil {
 				return admission.NewForbidden(a, errors.New("spec.type cannot be set for mounted workspaces"))
 			}
-
-			if old.Spec.Type.Path != ws.Spec.Type.Path || old.Spec.Type.Name != ws.Spec.Type.Name {
+			// Check for immutability of spec.type via pointers checks first.
+			if (old.Spec.Type == nil && ws.Spec.Type != nil) || (old.Spec.Type != nil && ws.Spec.Type == nil) {
 				return admission.NewForbidden(a, errors.New("spec.type is immutable"))
 			}
+			// Check for immutability of spec.type via field checks.
+			if old.Spec.Type != nil && ws.Spec.Type != nil {
+				if old.Spec.Type.Path != ws.Spec.Type.Path || old.Spec.Type.Name != ws.Spec.Type.Name {
+					return admission.NewForbidden(a, errors.New("spec.type is immutable"))
+				}
+			}
 		}
 	case admission.Create:
 		// only system users can set spec.Cluster or spec.URL

test/e2e/mounts/mounts_machinery_test.go

@@ -70,17 +70,19 @@ func TestMountsMachinery(t *testing.T) {
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	t.Cleanup(cancelFunc)
 
-	_, _ = kcptesting.NewWorkspaceFixture(t, server, core.RootCluster.Path())
-
-	orgSource, _ := kcptesting.NewWorkspaceFixture(t, server, core.RootCluster.Path(),
-		kcptesting.WithName("source"),
-		kcptesting.WithType(core.RootCluster.Path(), "organization"))
-	orgDestination, _ := kcptesting.NewWorkspaceFixture(t, server, core.RootCluster.Path(),
-		kcptesting.WithName("destination"),
-		kcptesting.WithType(core.RootCluster.Path(), "organization"))
-
-	sourcePath, _ := kcptesting.NewWorkspaceFixture(t, server, orgSource, kcptesting.WithName("source"))
-	_, destinationWorkspaceObj := kcptesting.NewWorkspaceFixture(t, server, orgDestination, kcptesting.WithName("destination"))
+	// This will create structure as bellow for testing:
+	// └── root
+	//   └── e2e-workspace-n784f
+	//    ├── destination
+	//    └── source
+	//        └── mount
+	//
+	rootOrg, _ := kcptesting.NewWorkspaceFixture(t, server, core.RootCluster.Path())
+
+	sourcePath, _ := kcptesting.NewWorkspaceFixture(t, server, rootOrg,
+		kcptesting.WithName("source"))
+	_, destinationWorkspaceObj := kcptesting.NewWorkspaceFixture(t, server, rootOrg,
+		kcptesting.WithName("destination"))
 
 	cfg := server.BaseConfig(t)
 	kcpClusterClient, err := kcpclientset.NewForConfig(cfg)
@@ -142,7 +144,7 @@ func TestMountsMachinery(t *testing.T) {
 		Resource: "kubeclusters",
 	}
 	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
-		destinationWorkspace, err := kcpClusterClient.Cluster(orgDestination).TenancyV1alpha1().Workspaces().Get(ctx, destinationWorkspaceObj.Name, metav1.GetOptions{})
+		destinationWorkspace, err := kcpClusterClient.Cluster(rootOrg).TenancyV1alpha1().Workspaces().Get(ctx, destinationWorkspaceObj.Name, metav1.GetOptions{})
 		require.NoError(t, err)
 
 		if destinationWorkspace.Spec.URL == "" {