Fix to deployTargetsbyPlugin for model.Application

Signed-off-by: Yoshiki Fujikane <ffjlabo@gmail.com>

Author: ffjlabo

pkg/app/pipectl/cmd/migrate/database.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/pipe-cd/pipecd/pkg/app/server/service/apiservice"
 	"github.com/pipe-cd/pipecd/pkg/cli"
+	"github.com/pipe-cd/pipecd/pkg/model"
 )
 
 type database struct {
@@ -87,11 +88,34 @@ func (c *database) migrateApplication(ctx context.Context, client apiservice.Cli
 	// Migrate database for the application.
 	if _, err := client.UpdateApplicationDeployTargets(ctx, &apiservice.UpdateApplicationDeployTargetsRequest{
 		ApplicationId: appID,
-		DeployTargets: []string{provider},
+		DeployTargetsByPlugin: map[string]*model.DeployTargets{
+			convertApplicationKindToPluginName(app.Application.Kind): {
+				DeployTargets: []string{provider},
+			},
+		},
 	}); err != nil {
 		logger.Error("failed to update application deploy targets", zap.Error(err), zap.String("application", appID))
 		return err
 	}
 
 	return nil
 }
+
+// NOTE: Convention for Application plugins migration
+// The plugins name for this migration task are defined based on the Application Kind
+// Eg: KubernetesApp -> kubernetes | ECSApp -> ecs | ...
+func convertApplicationKindToPluginName(k model.ApplicationKind) string {
+	switch k {
+	case model.ApplicationKind_KUBERNETES:
+		return "kubernetes"
+	case model.ApplicationKind_CLOUDRUN:
+		return "cloudrun"
+	case model.ApplicationKind_ECS:
+		return "ecs"
+	case model.ApplicationKind_LAMBDA:
+		return "lambda"
+	case model.ApplicationKind_TERRAFORM:
+		return "terraform"
+	}
+	return "" // Unexpected
+}

pkg/app/piped/trigger/deployment.go

@@ -95,7 +95,7 @@ func buildDeployment(
 		GitPath:                   app.GitPath,
 		CloudProvider:             app.CloudProvider,
 		PlatformProvider:          app.PlatformProvider,
-		DeployTargets:             app.DeployTargets,
+		DeployTargetsByPlugin:     app.DeployTargetsByPlugin,
 		Labels:                    app.Labels,
 		Status:                    model.DeploymentStatus_DEPLOYMENT_PENDING,
 		StatusReason:              "The deployment is waiting to be planned",

pkg/app/pipedv1/trigger/deployment.go

@@ -95,7 +95,7 @@ func buildDeployment(
 		GitPath:                   app.GitPath,
 		CloudProvider:             app.CloudProvider,
 		PlatformProvider:          app.PlatformProvider,
-		DeployTargets:             app.DeployTargets,
+		DeployTargetsByPlugin:     app.DeployTargetsByPlugin,
 		Labels:                    app.Labels,
 		Status:                    model.DeploymentStatus_DEPLOYMENT_PENDING,
 		StatusReason:              "The deployment is waiting to be planned",

pkg/app/server/grpcapi/api.go

@@ -47,7 +47,7 @@ type apiApplicationStore interface {
 	Disable(ctx context.Context, id string) error
 	UpdateConfigFilename(ctx context.Context, id, filename string) error
 	UpdateConfiguration(ctx context.Context, id, pipedID, platformProvider, configFilename string) error
-	UpdateDeployTargets(ctx context.Context, id string, targets []string) error
+	UpdateDeployTargets(ctx context.Context, id string, dp map[string]*model.DeployTargets) error
 }
 
 type apiDeploymentStore interface {
@@ -478,7 +478,7 @@ func (a *API) UpdateApplicationDeployTargets(ctx context.Context, req *apiservic
 		a.logger.Warn("requested application does not belong to your project", zap.String("applicationID", app.Id), zap.String("requestProjectID", key.ProjectId), zap.String("applicationProjectID", app.ProjectId))
 		return nil, status.Error(codes.PermissionDenied, fmt.Sprintf("requested application %s does not belong to your project", req.GetApplicationId()))
 	}
-	if err := a.applicationStore.UpdateDeployTargets(ctx, req.GetApplicationId(), req.GetDeployTargets()); err != nil {
+	if err := a.applicationStore.UpdateDeployTargets(ctx, req.GetApplicationId(), req.GetDeployTargetsByPlugin()); err != nil {
 		return nil, gRPCStoreError(err, fmt.Sprintf("failed to update application %s deploy targets", req.ApplicationId))
 	}
 	return &apiservice.UpdateApplicationDeployTargetsResponse{}, nil

pkg/app/server/service/apiservice/service.pb.go

@@ -183,7 +183,7 @@ message RenameApplicationConfigFileResponse {
 
 message UpdateApplicationDeployTargetsRequest {
     string application_id = 1 [(validate.rules).string.min_len = 1];
-    repeated string deploy_targets = 2 [(validate.rules).repeated = {min_items: 1}];
+    map<string, model.DeployTargets> deploy_targets_by_plugin = 2 [(validate.rules).map.min_pairs = 1];
 }
 
 message UpdateApplicationDeployTargetsResponse {}

pkg/app/server/service/apiservice/service.pb.validate.go

@@ -86,6 +86,16 @@ func (a *Application) IsOutOfSync() bool {
 	return a.SyncState.Status == ApplicationSyncStatus_OUT_OF_SYNC
 }
 
+func (a *Application) GetDeployTargets() []string {
+	var deployTargets []string
+	for _, t := range a.DeployTargetsByPlugin {
+		for _, v := range t.GetDeployTargets() {
+			deployTargets = append(deployTargets, v)
+		}
+	}
+	return deployTargets
+}
+
 func (a *Application) SetUpdatedAt(t int64) {
 	a.UpdatedAt = t
 }

pkg/app/server/service/apiservice/service.proto

@@ -32,10 +32,8 @@ export class Application extends jspb.Message {
   getPlatformProvider(): string;
   setPlatformProvider(value: string): Application;
 
-  getDeployTargetsList(): Array<string>;
-  setDeployTargetsList(value: Array<string>): Application;
-  clearDeployTargetsList(): Application;
-  addDeployTargets(value: string, index?: number): Application;
+  getDeployTargetsByPluginMap(): jspb.Map<string, pkg_model_deployment_pb.DeployTargets>;
+  clearDeployTargetsByPluginMap(): Application;
 
   getDescription(): string;
   setDescription(value: string): Application;
@@ -94,7 +92,7 @@ export namespace Application {
     gitPath?: pkg_model_common_pb.ApplicationGitPath.AsObject,
     cloudProvider: string,
     platformProvider: string,
-    deployTargetsList: Array<string>,
+    deployTargetsByPluginMap: Array<[string, pkg_model_deployment_pb.DeployTargets.AsObject]>,
     description: string,
     labelsMap: Array<[string, string]>,
     mostRecentlySuccessfulDeployment?: ApplicationDeploymentReference.AsObject,