fix(kumactl) extracted the current mesh from --mesh option

app/kumactl/cmd/delete/delete.go

@@ -29,25 +29,30 @@ func NewDeleteCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
 			var resourceType model.ResourceType
 			switch resourceTypeArg {
 			case "mesh":
-				resourceType = model.ResourceType(mesh.MeshType)
+				resourceType = mesh.MeshType
 			case "dataplane":
-				resourceType = model.ResourceType(mesh.DataplaneType)
+				resourceType = mesh.DataplaneType
 			case "proxytemplate":
-				resourceType = model.ResourceType(mesh.ProxyTemplateType)
+				resourceType = mesh.ProxyTemplateType
 			case "traffic-log":
-				resourceType = model.ResourceType(mesh.TrafficLogType)
+				resourceType = mesh.TrafficLogType
 			case "traffic-permission":
-				resourceType = model.ResourceType(mesh.TrafficPermissionType)
+				resourceType = mesh.TrafficPermissionType
 
 			default:
 				return errors.Errorf("unknown resource type: %s. Allowed types: mesh, dataplane, proxytemplate, traffic-log, traffic-permission", resourceTypeArg)
 			}
 
+			currentMesh := pctx.CurrentMesh()
+			if resourceType == mesh.MeshType {
+				currentMesh = name
+			}
+
 			if resource, err = registry.Global().NewObject(resourceType); err != nil {
 				return err
 			}
 
-			if err := deleteResource(name, resource, resourceType, rs); err != nil {
+			if err := deleteResource(name, currentMesh, resource, resourceType, rs); err != nil {
 				return err
 			}
 
@@ -59,16 +64,16 @@ func NewDeleteCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
 	return cmd
 }
 
-func deleteResource(name string, resource model.Resource, resourceType model.ResourceType, rs store.ResourceStore) error {
-	getOptions := store.GetByKey(model.DefaultNamespace, name, name)
+func deleteResource(name string, currentMesh string, resource model.Resource, resourceType model.ResourceType, rs store.ResourceStore) error {
+	getOptions := store.GetByKey(model.DefaultNamespace, name, currentMesh)
 	if err := rs.Get(context.Background(), resource, getOptions); err != nil {
 		if store.IsResourceNotFound(err) {
 			return errors.Errorf("there is no %s with name %q", resourceType, name)
 		}
 		return errors.Wrapf(err, "failed to get %s with the name %q", resourceType, name)
 	}
 
-	deleteOptions := store.DeleteByKey(model.DefaultNamespace, name, name)
+	deleteOptions := store.DeleteByKey(model.DefaultNamespace, name, currentMesh)
 	if err := rs.Delete(context.Background(), resource, deleteOptions); err != nil {
 		return errors.Wrapf(err, "failed to delete %s with the name %q", resourceType, name)
 	}

app/kumactl/cmd/delete/delete_dataplane_test.go

@@ -26,8 +26,8 @@ var _ = Describe("kumactl delete dataplane", func() {
 			{
 				Meta: &test_model.ResourceMeta{
 					Namespace: "default",
-					Mesh:      "Mesh1",
-					Name:      "Mesh1",
+					Mesh:      "demo",
+					Name:      "web-01",
 				},
 				Spec: mesh_proto.Dataplane{
 					Networking: &mesh_proto.Dataplane_Networking{
@@ -53,8 +53,8 @@ var _ = Describe("kumactl delete dataplane", func() {
 			{
 				Meta: &test_model.ResourceMeta{
 					Namespace: "default",
-					Mesh:      "Mesh2",
-					Name:      "Mesh2",
+					Mesh:      "demo1",
+					Name:      "web-02",
 				},
 				Spec: mesh_proto.Dataplane{
 					Networking: &mesh_proto.Dataplane_Networking{
@@ -129,7 +129,7 @@ var _ = Describe("kumactl delete dataplane", func() {
 			// given
 			rootCmd.SetArgs([]string{
 				"--config-file", filepath.Join("..", "testdata", "sample-kumactl.config.yaml"),
-				"delete", "dataplane", "Mesh2"})
+				"delete", "dataplane", "web-01", "--mesh", "demo"})
 
 			// when
 			err := rootCmd.Execute()
@@ -145,7 +145,7 @@ var _ = Describe("kumactl delete dataplane", func() {
 			// and
 			Expect(errbuf.String()).To(BeEmpty())
 			// and
-			Expect(outbuf.String()).To(Equal("deleted Dataplane \"Mesh2\"\n"))
+			Expect(outbuf.String()).To(Equal("deleted Dataplane \"web-01\"\n"))
 		})
 	})
 })

app/kumactl/cmd/delete/delete_proxytemplate_test.go

@@ -29,23 +29,23 @@ var _ = Describe("kumactl delete proxytemplates", func() {
 			{
 				Meta: &test_model.ResourceMeta{
 					Namespace: "default",
-					Mesh:      "custom-template",
+					Mesh:      "Mesh1",
 					Name:      "custom-template",
 				},
 				Spec: mesh_proto.ProxyTemplate{},
 			},
 			{
 				Meta: &test_model.ResourceMeta{
 					Namespace: "default",
-					Mesh:      "another-template",
+					Mesh:      "Mesh2",
 					Name:      "another-template",
 				},
 				Spec: mesh_proto.ProxyTemplate{},
 			},
 			{
 				Meta: &test_model.ResourceMeta{
 					Namespace: "default",
-					Mesh:      "simple-template",
+					Mesh:      "Mesh3",
 					Name:      "simple-template",
 				},
 				Spec: mesh_proto.ProxyTemplate{},
@@ -110,7 +110,7 @@ var _ = Describe("kumactl delete proxytemplates", func() {
 			// given
 			rootCmd.SetArgs([]string{
 				"--config-file", filepath.Join("..", "testdata", "sample-kumactl.config.yaml"),
-				"delete", "proxytemplate", "custom-template"})
+				"delete", "proxytemplate", "custom-template", "--mesh", "Mesh1"})
 
 			// when
 			err := rootCmd.Execute()

app/kumactl/cmd/delete/delete_trafficlog_test.go

@@ -51,7 +51,7 @@ var _ = Describe("kumactl delete trafficlog", func() {
 				},
 			},
 			Meta: &test_model.ResourceMeta{
-				Mesh:      "web1-to-backend1",
+				Mesh:      "Mesh1",
 				Name:      "web1-to-backend1",
 				Namespace: "default",
 			},
@@ -83,7 +83,7 @@ var _ = Describe("kumactl delete trafficlog", func() {
 				},
 			},
 			Meta: &test_model.ResourceMeta{
-				Mesh:      "web2-to-backend2",
+				Mesh:      "Mesh2",
 				Name:      "web2-to-backend2",
 				Namespace: "default",
 			},
@@ -148,7 +148,7 @@ var _ = Describe("kumactl delete trafficlog", func() {
 				// given
 				rootCmd.SetArgs([]string{
 					"--config-file", filepath.Join("..", "testdata", "sample-kumactl.config.yaml"),
-					"delete", "traffic-log", "web1-to-backend1"})
+					"delete", "traffic-log", "web1-to-backend1", "--mesh", "Mesh1"})
 
 				// when
 				err := rootCmd.Execute()

app/kumactl/cmd/delete/delete_trafficpermission_test.go

@@ -48,7 +48,7 @@ var _ = Describe("kumactl delete traffic permission", func() {
 				},
 			},
 			Meta: &test_model.ResourceMeta{
-				Mesh:      "web1-to-backend1",
+				Mesh:      "Mesh1",
 				Name:      "web1-to-backend1",
 				Namespace: "default",
 			},
@@ -77,7 +77,7 @@ var _ = Describe("kumactl delete traffic permission", func() {
 				},
 			},
 			Meta: &test_model.ResourceMeta{
-				Mesh:      "web2-to-backend2",
+				Mesh:      "Mesh2",
 				Name:      "web2-to-backend2",
 				Namespace: "default",
 			},
@@ -140,7 +140,7 @@ var _ = Describe("kumactl delete traffic permission", func() {
 			// given
 			rootCmd.SetArgs([]string{
 				"--config-file", filepath.Join("..", "testdata", "sample-kumactl.config.yaml"),
-				"delete", "traffic-permission", "web2-to-backend2"})
+				"delete", "traffic-permission", "web2-to-backend2", "--mesh", "Mesh2"})
 
 			// when
 			err := rootCmd.Execute()