Change type definition for DeployTargetsByPlugin

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/plugin/kubernetes/deployment/rollback.go

@@ -73,7 +73,13 @@ func (a *DeploymentService) executeK8sRollbackStage(ctx context.Context, lp logp
 	}
 
 	// Get the deploy target config.
-	deployTargetConfig, err := kubeconfig.FindDeployTarget(a.pluginConfig, input.GetDeployment().GetDeployTargets()[0]) // TODO: check if there is a deploy target
+	targets, err := input.GetDeployment().GetDeployTargets(a.pluginConfig.Name)
+	if err != nil {
+		lp.Errorf("Failed while finding deploy target config (%v)", err)
+		return model.StageStatus_STAGE_FAILURE
+	}
+
+	deployTargetConfig, err := kubeconfig.FindDeployTarget(a.pluginConfig, targets[0]) // TODO: consider multiple targets
 	if err != nil {
 		lp.Errorf("Failed while unmarshalling deploy target config (%v)", err)
 		return model.StageStatus_STAGE_FAILURE

pkg/app/pipedv1/plugin/kubernetes/deployment/sync.go

@@ -73,7 +73,12 @@ func (a *DeploymentService) executeK8sSyncStage(ctx context.Context, lp logpersi
 	}
 
 	// Get the deploy target config.
-	deployTargetConfig, err := kubeconfig.FindDeployTarget(a.pluginConfig, input.GetDeployment().GetDeployTargets()[0]) // TODO: check if there is a deploy target
+	targets, err := input.GetDeployment().GetDeployTargets(a.pluginConfig.Name)
+	if err != nil {
+		lp.Errorf("Failed while finding deploy target config (%v)", err)
+		return model.StageStatus_STAGE_FAILURE
+	}
+	deployTargetConfig, err := kubeconfig.FindDeployTarget(a.pluginConfig, targets[0]) // TODO: consider multiple targets
 	if err != nil {
 		lp.Errorf("Failed while unmarshalling deploy target config (%v)", err)
 		return model.StageStatus_STAGE_FAILURE

pkg/app/pipedv1/plugin/kubernetes/deployment/sync_test.go

@@ -52,7 +52,11 @@ func TestDeploymentService_executeK8sSyncStage(t *testing.T) {
 			Deployment: &model.Deployment{
 				PipedId:       "piped-id",
 				ApplicationId: "app-id",
-				DeployTargets: []string{"default"},
+				DeployTargetsByPlugin: map[string]*model.DeployTargets{
+					"kubernetes": {
+						DeployTargets: []string{"default"},
+					},
+				},
 			},
 			Stage: &model.PipelineStage{
 				Id:   "stage-id",
@@ -125,7 +129,11 @@ func TestDeploymentService_executeK8sSyncStage_withInputNamespace(t *testing.T)
 			Deployment: &model.Deployment{
 				PipedId:       "piped-id",
 				ApplicationId: "app-id",
-				DeployTargets: []string{"default"},
+				DeployTargetsByPlugin: map[string]*model.DeployTargets{
+					"kubernetes": {
+						DeployTargets: []string{"default"},
+					},
+				},
 			},
 			Stage: &model.PipelineStage{
 				Id:   "stage-id",
@@ -199,7 +207,11 @@ func TestDeploymentService_executeK8sSyncStage_withPrune(t *testing.T) {
 				Deployment: &model.Deployment{
 					PipedId:       "piped-id",
 					ApplicationId: "app-id",
-					DeployTargets: []string{"default"},
+					DeployTargetsByPlugin: map[string]*model.DeployTargets{
+						"kubernetes": {
+							DeployTargets: []string{"default"},
+						},
+					},
 				},
 				Stage: &model.PipelineStage{
 					Id:   "stage-id",
@@ -255,7 +267,11 @@ func TestDeploymentService_executeK8sSyncStage_withPrune(t *testing.T) {
 				Deployment: &model.Deployment{
 					PipedId:       "piped-id",
 					ApplicationId: "app-id",
-					DeployTargets: []string{"default"},
+					DeployTargetsByPlugin: map[string]*model.DeployTargets{
+						"kubernetes": {
+							DeployTargets: []string{"default"},
+						},
+					},
 				},
 				Stage: &model.PipelineStage{
 					Id:   "stage-id",
@@ -314,7 +330,11 @@ func TestDeploymentService_executeK8sSyncStage_withPrune_changesNamespace(t *tes
 				Deployment: &model.Deployment{
 					PipedId:       "piped-id",
 					ApplicationId: "app-id",
-					DeployTargets: []string{"default"},
+					DeployTargetsByPlugin: map[string]*model.DeployTargets{
+						"kubernetes": {
+							DeployTargets: []string{"default"},
+						},
+					},
 				},
 				Stage: &model.PipelineStage{
 					Id:   "stage-id",
@@ -367,7 +387,11 @@ func TestDeploymentService_executeK8sSyncStage_withPrune_changesNamespace(t *tes
 				Deployment: &model.Deployment{
 					PipedId:       "piped-id",
 					ApplicationId: "app-id",
-					DeployTargets: []string{"default"},
+					DeployTargetsByPlugin: map[string]*model.DeployTargets{
+						"kubernetes": {
+							DeployTargets: []string{"default"},
+						},
+					},
 				},
 				Stage: &model.PipelineStage{
 					Id:   "stage-id",
@@ -443,7 +467,11 @@ func TestDeploymentService_executeK8sSyncStage_withPrune_clusterScoped(t *testin
 				Deployment: &model.Deployment{
 					PipedId:       "piped-id",
 					ApplicationId: "prepare-app-id",
-					DeployTargets: []string{"default"},
+					DeployTargetsByPlugin: map[string]*model.DeployTargets{
+						"kubernetes": {
+							DeployTargets: []string{"default"},
+						},
+					},
 				},
 				Stage: &model.PipelineStage{
 					Id:   "stage-id",
@@ -481,7 +509,11 @@ func TestDeploymentService_executeK8sSyncStage_withPrune_clusterScoped(t *testin
 				Deployment: &model.Deployment{
 					PipedId:       "piped-id",
 					ApplicationId: "app-id",
-					DeployTargets: []string{"default"},
+					DeployTargetsByPlugin: map[string]*model.DeployTargets{
+						"kubernetes": {
+							DeployTargets: []string{"default"},
+						},
+					},
 				},
 				Stage: &model.PipelineStage{
 					Id:   "stage-id",
@@ -527,7 +559,11 @@ func TestDeploymentService_executeK8sSyncStage_withPrune_clusterScoped(t *testin
 				Deployment: &model.Deployment{
 					PipedId:       "piped-id",
 					ApplicationId: "app-id",
-					DeployTargets: []string{"default"},
+					DeployTargetsByPlugin: map[string]*model.DeployTargets{
+						"kubernetes": {
+							DeployTargets: []string{"default"},
+						},
+					},
 				},
 				Stage: &model.PipelineStage{
 					Id:   "stage-id",

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