Merge pull request #3518 from ntnn/fix-cli-panic

Fix `create-workspace` on an existing workspace throwing a panic

Author: kcp-ci-bot

cli/pkg/workspace/plugin/create.go

@@ -177,7 +177,7 @@ func (o *CreateWorkspaceOptions) Run(ctx context.Context) error {
 
 	workspaceReference := fmt.Sprintf("Workspace %q (type %s)", o.Name, logicalcluster.NewPath(ws.Spec.Type.Path).Join(string(ws.Spec.Type.Name)).String())
 	if preExisting {
-		if ws.Spec.Type.Name != "" && ws.Spec.Type.Name != structuredWorkspaceType.Name || ws.Spec.Type.Path != structuredWorkspaceType.Path {
+		if structuredWorkspaceType != nil && (ws.Spec.Type.Name != "" && ws.Spec.Type.Name != structuredWorkspaceType.Name || ws.Spec.Type.Path != structuredWorkspaceType.Path) {
 			wsTypeString := logicalcluster.NewPath(ws.Spec.Type.Path).Join(string(ws.Spec.Type.Name)).String()
 			structuredWorkspaceTypeString := logicalcluster.NewPath(structuredWorkspaceType.Path).Join(string(structuredWorkspaceType.Name)).String()
 			return fmt.Errorf("workspace %q cannot be created with type %s, it already exists with different type %s", o.Name, structuredWorkspaceTypeString, wsTypeString)

cli/pkg/workspace/plugin/create_test.go

@@ -48,6 +48,7 @@ func TestCreate(t *testing.T) {
 		config clientcmdapi.Config
 
 		existingWorkspaces []string // existing workspaces
+		skipInitialType    bool
 		markReady          bool
 
 		newWorkspaceName                 string
@@ -109,6 +110,18 @@ func TestCreate(t *testing.T) {
 				AuthInfos: map[string]*clientcmdapi.AuthInfo{"test": {Token: "test"}},
 			},
 			existingWorkspaces: []string{"bar"},
+			skipInitialType:    true,
+			newWorkspaceName:   "bar",
+			ignoreExisting:     true,
+		},
+		{
+			name: "create, already existing, use after creation",
+			config: clientcmdapi.Config{CurrentContext: "test",
+				Contexts:  map[string]*clientcmdapi.Context{"test": {Cluster: "test", AuthInfo: "test"}},
+				Clusters:  map[string]*clientcmdapi.Cluster{"test": {Server: "https://test/clusters/root:foo"}},
+				AuthInfos: map[string]*clientcmdapi.AuthInfo{"test": {Token: "test"}},
+			},
+			existingWorkspaces: []string{"bar"},
 			newWorkspaceName:   "bar",
 			useAfterCreation:   true,
 			wantErr:            true,
@@ -257,7 +270,9 @@ func TestCreate(t *testing.T) {
 
 			opts := NewCreateWorkspaceOptions(genericclioptions.NewTestIOStreamsDiscard())
 			opts.Name = tt.newWorkspaceName
-			opts.Type = workspaceType.Path + ":" + string(workspaceType.Name)
+			if !tt.skipInitialType {
+				opts.Type = workspaceType.Path + ":" + string(workspaceType.Name)
+			}
 			opts.IgnoreExisting = tt.ignoreExisting
 			opts.EnterAfterCreate = tt.useAfterCreation
 			opts.ReadyWaitTimeout = time.Second