Replace Tags with Labels to idendify applications/deployments

pkg/app/api/grpcapi/api.go

@@ -118,7 +118,6 @@ func (a *API) AddApplication(ctx context.Context, req *apiservice.AddApplication
 		Kind:          req.Kind,
 		CloudProvider: req.CloudProvider,
 		Description:   req.Description,
-		Tags:          req.Tags,
 	}
 	err = a.applicationStore.AddApplication(ctx, &app)
 	if errors.Is(err, datastore.ErrAlreadyExists) {

pkg/app/api/grpcapi/web_api.go

@@ -637,7 +637,6 @@ func (a *WebAPI) AddApplication(ctx context.Context, req *webservice.AddApplicat
 		Kind:          req.Kind,
 		CloudProvider: req.CloudProvider,
 		Description:   req.Description,
-		Tags:          req.Tags,
 	}
 	err = a.applicationStore.AddApplication(ctx, &app)
 	if errors.Is(err, datastore.ErrAlreadyExists) {
@@ -647,6 +646,7 @@ func (a *WebAPI) AddApplication(ctx context.Context, req *webservice.AddApplicat
 		a.logger.Error("failed to create application", zap.Error(err))
 		return nil, status.Error(codes.Internal, "Failed to create application")
 	}
+	// TODO: Create a command to send an application information defined in the application config
 
 	return &webservice.AddApplicationResponse{
 		ApplicationId: app.Id,
@@ -660,7 +660,6 @@ func (a *WebAPI) UpdateApplication(ctx context.Context, req *webservice.UpdateAp
 		app.PipedId = req.PipedId
 		app.Kind = req.Kind
 		app.CloudProvider = req.CloudProvider
-		app.Tags = req.Tags
 		return nil
 	}
 
@@ -861,15 +860,16 @@ func (a *WebAPI) ListApplications(ctx context.Context, req *webservice.ListAppli
 		return nil, status.Error(codes.Internal, "Failed to get applications")
 	}
 
-	if len(req.Options.Tags) == 0 {
+	if len(req.Options.Labels) == 0 {
 		return &webservice.ListApplicationsResponse{
 			Applications: apps,
 		}, nil
 	}
 
+	// NOTE: Filtering by labels is done by the application-side because we need to create composite indexes for every combination in the filter.
 	filtered := make([]*model.Application, 0, len(apps))
 	for _, a := range apps {
-		if a.ContainTags(req.Options.Tags) {
+		if a.ContainLabels(req.Options.Labels) {
 			filtered = append(filtered, a)
 		}
 	}
@@ -1071,20 +1071,21 @@ func (a *WebAPI) ListDeployments(ctx context.Context, req *webservice.ListDeploy
 		a.logger.Error("failed to get deployments", zap.Error(err))
 		return nil, status.Error(codes.Internal, "Failed to get deployments")
 	}
-	tags := req.Options.Tags
-	if len(tags) == 0 || len(deployments) == 0 {
+	labels := req.Options.Labels
+	if len(labels) == 0 || len(deployments) == 0 {
 		return &webservice.ListDeploymentsResponse{
 			Deployments: deployments,
 			Cursor:      cursor,
 		}, nil
 	}
 
-	// Start filtering them by tags.
-	// NOTE: For document-oriented databases, it's hard to look for deployments that have all the tags we specified.
+	// Start filtering them by labels.
+	//
+	// NOTE: Filtering by labels is done by the application-side because we need to create composite indexes for every combination in the filter.
 	// We don't want to depend on any other search engine, that's why it filters here.
 	filtered := make([]*model.Deployment, 0, len(deployments))
 	for _, d := range deployments {
-		if d.ContainTags(tags) {
+		if d.ContainLabels(labels) {
 			filtered = append(filtered, d)
 		}
 	}
@@ -1109,7 +1110,7 @@ func (a *WebAPI) ListDeployments(ctx context.Context, req *webservice.ListDeploy
 			break
 		}
 		for _, d := range deployments {
-			if d.ContainTags(tags) {
+			if d.ContainLabels(labels) {
 				filtered = append(filtered, d)
 			}
 		}

pkg/app/api/service/apiservice/service.proto

@@ -55,7 +55,6 @@ message AddApplicationRequest {
     model.ApplicationKind kind = 5 [(validate.rules).enum.defined_only = true];
     string cloud_provider = 6 [(validate.rules).string.min_len = 1];
     string description = 7;
-    repeated string tags = 8;
 }
 
 message AddApplicationResponse {
@@ -84,7 +83,7 @@ message ListApplicationsRequest {
     string env_id = 3;
     bool disabled = 4;
     string env_name = 5;
-    // TODO: Enable to filter by tags
+    // TODO: Enable to filter by labels
     string cursor = 10;
 }
 

pkg/app/api/service/pipedservice/service.proto

@@ -161,6 +161,8 @@ service PipedService {
 
     // GetDesiredVersion returns the desired version of the given Piped.
     rpc GetDesiredVersion(GetDesiredVersionRequest) returns (GetDesiredVersionResponse) {}
+
+    // TODO: Add an rpc to update application info based on one defined in the application config
 }
 
 enum ListOrder {

pkg/app/api/service/webservice/service.proto

@@ -227,7 +227,6 @@ message AddApplicationRequest {
     model.ApplicationKind kind = 5 [(validate.rules).enum.defined_only = true];
     string cloud_provider = 6 [(validate.rules).string.min_len = 1];
     string description = 7;
-    repeated string tags = 8;
 }
 
 message AddApplicationResponse {
@@ -241,7 +240,6 @@ message UpdateApplicationRequest {
     string piped_id = 4 [(validate.rules).string.min_len = 1];
     model.ApplicationKind kind = 6 [(validate.rules).enum.defined_only = true];
     string cloud_provider = 7 [(validate.rules).string.min_len = 1];
-    repeated string tags = 8;
 }
 
 message UpdateApplicationResponse {
@@ -283,7 +281,7 @@ message ListApplicationsRequest {
         repeated model.ApplicationSyncStatus sync_statuses = 3;
         repeated string env_ids = 4;
         string name = 5;
-        repeated string tags = 6;
+        map<string, string> labels = 6;
     }
     Options options = 1;
 }
@@ -327,7 +325,7 @@ message ListDeploymentsRequest {
         repeated string application_ids = 3;
         repeated string env_ids = 4;
         string application_name = 5;
-        repeated string tags = 6;
+        map<string, string> labels = 6;
     }
     Options options = 1;
     int32 page_size = 2;

pkg/app/pipectl/cmd/application/add.go

@@ -34,7 +34,6 @@ type add struct {
 	pipedID       string
 	cloudProvider string
 	description   string
-	tags          []string
 
 	repoID         string
 	appDir         string

pkg/app/piped/trigger/deployment.go

@@ -172,7 +172,7 @@ func buildDeployment(
 		},
 		GitPath:       app.GitPath,
 		CloudProvider: app.CloudProvider,
-		Tags:          app.Tags,
+		Labels:        app.Labels,
 		Status:        model.DeploymentStatus_DEPLOYMENT_PENDING,
 		StatusReason:  "The deployment is waiting to be planned",
 		Metadata:      metadata,

pkg/app/web/src/__fixtures__/dummy-application.ts

@@ -39,7 +39,7 @@ export const dummyApplication: Application.AsObject = {
   pipedId: dummyPiped.id,
   projectId: "project-1",
   description: "",
-  tagsList: [],
+  labelsMap: [],
   mostRecentlySuccessfulDeployment: {
     deploymentId: "deployment-1",
     completedAt: 0,

pkg/app/web/src/__fixtures__/dummy-deployment.ts

@@ -23,7 +23,7 @@ export const dummyDeployment: Deployment.AsObject = {
   trigger: dummyTrigger,
   version: "0.0.0",
   cloudProvider: "kube-1",
-  tagsList: [],
+  labelsMap: [],
   createdAt: createdAt.unix(),
   updatedAt: completedAt.unix(),
   completedAt: completedAt.unix(),

pkg/app/web/src/components/application-form/index.tsx

@@ -156,7 +156,6 @@ export interface ApplicationFormValue {
     remote: string;
     branch: string;
   };
-  tagsList: string[],
 }
 
 export type ApplicationFormProps = FormikProps<ApplicationFormValue> & {
@@ -178,7 +177,6 @@ export const emptyFormValues: ApplicationFormValue = {
     remote: "",
     branch: "",
   },
-  tagsList: [],
 };
 
 export const ApplicationForm: FC<ApplicationFormProps> = memo(

pkg/app/web/src/components/applications-page/add-application-drawer/index.test.tsx

@@ -82,7 +82,6 @@ describe("AddApplicationDrawer", () => {
                   remote: "[email protected]:pipe-cd/debug.git",
                 },
                 repoPath: "path",
-                tagsList: [],
               },
             }),
           },

pkg/app/web/src/components/applications-page/edit-application-drawer/index.tsx

@@ -42,7 +42,6 @@ export const EditApplicationDrawer: FC<EditApplicationDrawerProps> = memo(
             repo: app.gitPath?.repo || { id: "", remote: "", branch: "" },
             configFilename: app.gitPath?.configFilename || "",
             cloudProvider: app.cloudProvider,
-            tagsList: app.tagsList,
           }
         : emptyFormValues,
       validationSchema,

pkg/app/web/src/components/deployments-detail-page/pipeline/index.stories.tsx

@@ -27,7 +27,7 @@ const fakeDeployment: Deployment.AsObject = {
   },
   version: "0.0.1",
   cloudProvider: "",
-  tagsList: [],
+  labelsMap: [],
   trigger: {
     commit: {
       hash: "3808585b46f1e90196d7ffe8dd04c807a251febc",

pkg/app/web/src/modules/applications/index.ts

@@ -55,7 +55,7 @@ export const fetchApplications = createAsyncThunk<
       enabled: options.activeStatus
         ? { value: options.activeStatus === "enabled" }
         : undefined,
-      tagsList: [], // TODO: Specify tags for ListApplications
+      labelsMap: [], // TODO: Specify labels for ListApplications
     },
   });
   return applicationsList as Application.AsObject[];
@@ -71,7 +71,7 @@ export const fetchApplicationsByEnv = createAsyncThunk<
       kindsList: [],
       name: "",
       syncStatusesList: [],
-      tagsList: [],
+      labelsMap: [],
     },
   });
   return applicationsList as Application.AsObject[];
@@ -108,7 +108,6 @@ export const addApplication = createAsyncThunk<
     configFilename?: string;
     kind: ApplicationKind;
     cloudProvider: string;
-    tagsList: string[];
   }
 >(`${MODULE_NAME}/add`, async (props) => {
   const { applicationId } = await applicationsAPI.addApplication({
@@ -125,7 +124,6 @@ export const addApplication = createAsyncThunk<
     cloudProvider: props.cloudProvider,
     kind: props.kind,
     description: "",
-    tagsList: props.tagsList,
   });
 
   return applicationId;

pkg/app/web/src/modules/deployments/index.ts

@@ -102,7 +102,7 @@ const convertFilterOptions = (
     statusesList: options.status
       ? [parseInt(options.status, 10) as DeploymentStatus]
       : [],
-    tagsList: [], // TODO: Specify tags for ListDeployments
+    labelsMap: [], // TODO: Specify labels for ListDeployments
   };
 };
 

pkg/app/web/src/modules/update-application/index.ts

@@ -28,7 +28,6 @@ export const updateApplication = createAsyncThunk<
     configFilename?: string;
     kind: ApplicationKind;
     cloudProvider: string;
-    tagsList: string[];
   }
 >(`${MODULE_NAME}/update`, async (values) => {
   await applicationAPI.updateApplication({
@@ -38,7 +37,6 @@ export const updateApplication = createAsyncThunk<
     pipedId: values.pipedId,
     cloudProvider: values.cloudProvider,
     kind: values.kind,
-    tagsList: values.tagsList,
   });
 });
 

pkg/model/application.go

@@ -50,17 +50,18 @@ func MakeApplicationURL(baseURL, applicationID string) string {
 	return fmt.Sprintf("%s/applications/%s", strings.TrimSuffix(baseURL, "/"), applicationID)
 }
 
-// ContainTags checks if it has all the given tags.
-func (d *Application) ContainTags(tags []string) bool {
-	if len(d.Tags) < len(tags) {
+// ContainLabels checks if it has all the given labels.
+func (a *Application) ContainLabels(labels map[string]string) bool {
+	if len(a.Labels) < len(labels) {
 		return false
 	}
-	tagMap := make(map[string]struct{}, len(d.Tags))
-	for i := range d.Tags {
-		tagMap[d.Tags[i]] = struct{}{}
-	}
-	for _, tag := range tags {
-		if _, ok := tagMap[tag]; !ok {
+
+	for k, v := range labels {
+		value, ok := a.Labels[k]
+		if !ok {
+			return false
+		}
+		if value != v {
 			return false
 		}
 	}

pkg/model/application.proto

@@ -42,8 +42,8 @@ message Application {
     string cloud_provider = 8 [(validate.rules).string.min_len = 1];
     // Additional description about application.
     string description = 9;
-    // Custom attributes for filtering.
-    repeated string tags = 10;
+    // Custom attributes to identify applications.
+    map<string, string> labels = 10;
 
     // Basic information about the most recently successful deployment.
     // This also shows information about current running workloads.

pkg/model/application_test.go

@@ -48,35 +48,51 @@ func TestMakeApplicationURL(t *testing.T) {
 	}
 }
 
-func TestApplication_ContainTags(t *testing.T) {
+func TestApplication_ContainLabels(t *testing.T) {
 	testcases := []struct {
-		name string
-		app  *Application
-		tags []string
-		want bool
+		name   string
+		app    *Application
+		labels map[string]string
+		want   bool
 	}{
 		{
 			name: "all given tags aren't contained",
-			app:  &Application{Tags: []string{"foo"}},
-			tags: []string{"foo", "bar"},
+			app:  &Application{Labels: map[string]string{"key1": "value1"}},
+			labels: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+			},
 			want: false,
 		},
 		{
-			name: "a tag is contained",
-			app:  &Application{Tags: []string{"foo", "bar"}},
-			tags: []string{"foo"},
+			name: "a label is contained",
+			app: &Application{Labels: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+			}},
+			labels: map[string]string{
+				"key1": "value1",
+			},
 			want: true,
 		},
 		{
 			name: "all tags are contained",
-			app:  &Application{Tags: []string{"foo", "bar", "baz"}},
-			tags: []string{"baz", "foo", "bar"},
+			app: &Application{Labels: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+				"key3": "value3",
+			}},
+			labels: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+				"key3": "value3",
+			},
 			want: true,
 		},
 	}
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := tc.app.ContainTags(tc.tags)
+			got := tc.app.ContainLabels(tc.labels)
 			assert.Equal(t, tc.want, got)
 		})
 	}