Update error message for context not found

vmware-tanzu · Dec 20, 2023 · 5d84d5c · 5d84d5c
1 parent 450decc
commit 5d84d5c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/config/context_server_test.go b/config/context_server_test.go
@@ -124,7 +124,7 @@ currentContext:
 	err = DeleteContext("test-mc2")
 	assert.NoError(t, err)
 	ctx, err = GetContext("test-mc2")
-	assert.Equal(t, "context test-mc2 not found", err.Error())
+	assert.Equal(t, "context \"test-mc2\" not found", err.Error())
 	assert.Nil(t, ctx)
 }
 func TestContextsServersSyncWhenNoContextsExist(t *testing.T) {
@@ -189,7 +189,7 @@ currentContext:
 	// Get Context
 	context, err := GetContext("test-mc")
 	assert.Nil(t, context)
-	assert.Equal(t, "context test-mc not found", err.Error())
+	assert.Equal(t, "context \"test-mc\" not found", err.Error())
 
 	// Add new Server
 	newServer := &configtypes.Server{
@@ -235,6 +235,6 @@ currentContext:
 	err = DeleteContext("test-mc2")
 	assert.NoError(t, err)
 	ctx, err = GetContext("test-mc2")
-	assert.Equal(t, "context test-mc2 not found", err.Error())
+	assert.Equal(t, "context \"test-mc2\" not found", err.Error())
 	assert.Nil(t, ctx)
 }
diff --git a/config/contexts.go b/config/contexts.go
@@ -334,7 +334,7 @@ func getContext(node *yaml.Node, name string) (*configtypes.Context, error) {
 			return ctx, nil
 		}
 	}
-	return nil, fmt.Errorf("context %v not found", name)
+	return nil, fmt.Errorf("context %q not found", name)
 }
 
 func getActiveContext(node *yaml.Node, contextType configtypes.ContextType) (*configtypes.Context, error) {

diff --git a/config/contexts_it_test.go b/config/contexts_it_test.go
@@ -407,6 +407,6 @@ func TestContextsIntegration(t *testing.T) {
 	err = DeleteContext("test-mc2")
 	assert.NoError(t, err)
 	ctx, err = GetContext("test-mc2")
-	assert.Equal(t, "context test-mc2 not found", err.Error())
+	assert.Equal(t, "context \"test-mc2\" not found", err.Error())
 	assert.Nil(t, ctx)
 }
diff --git a/config/contexts_test.go b/config/contexts_test.go
@@ -74,7 +74,7 @@ func TestSetGetDeleteContext(t *testing.T) {
 	}
 
 	ctx, err := GetContext("test1")
-	assert.Equal(t, "context test1 not found", err.Error())
+	assert.Equal(t, "context \"test1\" not found", err.Error())
 	assert.Nil(t, ctx)
 
 	err = SetContext(ctx1, true)
@@ -100,14 +100,14 @@ func TestSetGetDeleteContext(t *testing.T) {
 	assert.Equal(t, ctx1, ctx)
 
 	err = DeleteContext("test")
-	assert.Equal(t, "context test not found", err.Error())
+	assert.Equal(t, "context \"test\" not found", err.Error())
 
 	err = DeleteContext("test1")
 	assert.Nil(t, err)
 
 	ctx, err = GetContext("test1")
 	assert.Nil(t, ctx)
-	assert.Equal(t, "context test1 not found", err.Error())
+	assert.Equal(t, "context \"test1\" not found", err.Error())
 }
 
 func TestSetContextWithOldVersion(t *testing.T) {
@@ -525,7 +525,7 @@ func TestGetContext(t *testing.T) {
 		{
 			name:    "failure",
 			ctxName: "test",
-			errStr:  "context test not found",
+			errStr:  "context \"test\" not found",
 		},
 	}
 
@@ -872,7 +872,7 @@ func TestRemoveContext(t *testing.T) {
 		{
 			name:    "failure",
 			ctxName: "test",
-			errStr:  "context test not found",
+			errStr:  "context \"test\" not found",
 		},
 	}
 

diff --git a/config/tanzu_context_test.go b/config/tanzu_context_test.go
@@ -165,7 +165,7 @@ func TestGetTanzuContextActiveResource(t *testing.T) {
 	// Test getting the Tanzu active resource of a non-existent context
 	_, err = GetTanzuContextActiveResource("non-existent-context")
 	assert.Error(t, err)
-	assert.ErrorContains(t, err, "context non-existent-context not found")
+	assert.ErrorContains(t, err, "context \"non-existent-context\" not found")
 
 	// Test getting the Tanzu active resource of a context that is not Tanzu context
 	_, err = GetTanzuContextActiveResource("test-mc")

diff --git a/test/compatibility/framework/context/context_helpers.go b/test/compatibility/framework/context/context_helpers.go
@@ -103,7 +103,7 @@ func GetContextCommand(opts ...CfgContextArgsOption) *core.Command {
 		if args.Error {
 			outputOpts = &GetContextOutputOptions{
 				RuntimeAPIVersion: args.RuntimeAPIVersion,
-				Error:             fmt.Sprintf("context %v not found", args.ContextName),
+				Error:             fmt.Sprintf("context %q not found", args.ContextName),
 			}
 		} else {
 			outputOpts = &GetContextOutputOptions{
@@ -121,7 +121,7 @@ func GetContextCommand(opts ...CfgContextArgsOption) *core.Command {
 		if args.Error {
 			outputOpts = &GetContextOutputOptions{
 				RuntimeAPIVersion: args.RuntimeAPIVersion,
-				Error:             fmt.Sprintf("context %v not found", args.ContextName),
+				Error:             fmt.Sprintf("context %q not found", args.ContextName),
 			}
 		} else {
 			outputOpts = &GetContextOutputOptions{
@@ -189,7 +189,7 @@ func DeleteContextCommand(opts ...CfgContextArgsOption) *core.Command {
 		case core.VersionLatest, core.Version102, core.Version090, core.Version0280:
 			outputOpts = &DeleteContextOutputOptions{
 				RuntimeAPIVersion: args.RuntimeAPIVersion,
-				Error:             fmt.Sprintf("context %v not found", args.ContextName),
+				Error:             fmt.Sprintf("context %q not found", args.ContextName),
 			}
 		case core.Version0254:
 			outputOpts = &DeleteContextOutputOptions{

diff --git a/test/compatibility/framework/server/server_helpers.go b/test/compatibility/framework/server/server_helpers.go
@@ -181,7 +181,7 @@ func DeleteServerCommand(opts ...CfgServerArgsOption) *core.Command {
 		case core.VersionLatest, core.Version102, core.Version090, core.Version0280, core.Version0254, core.Version0116:
 			outputOpts = &DeleteServerOutputOptions{
 				RuntimeAPIVersion: args.RuntimeAPIVersion,
-				Error:             fmt.Sprintf("context %v not found", args.ServerName),
+				Error:             fmt.Sprintf("context %q not found", args.ServerName),
 			}
 		}
 	}
@@ -221,7 +221,7 @@ func RemoveCurrentServerCommand(opts ...CfgServerArgsOption) *core.Command {
 		case core.VersionLatest, core.Version102, core.Version090, core.Version0280, core.Version0254, core.Version0116:
 			outputOpts = &RemoveCurrentServerOutputOptions{
 				RuntimeAPIVersion: args.RuntimeAPIVersion,
-				Error:             fmt.Sprintf("context %v not found", args.ServerName),
+				Error:             fmt.Sprintf("context %q not found", args.ServerName),
 			}
 		}
 	}