Rename deploysource's revision to commit_hash (#5450)

* Rename deploysource's revision to commit_hash Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> * Fix the failed test Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> --------- Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]>
pipe-cd · Dec 25, 2024 · 437d26f · 437d26f
1 parent d66440b
commit 437d26f
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 72 deletions.
diff --git a/pkg/app/pipedv1/deploysource/deploysource.go b/pkg/app/pipedv1/deploysource/deploysource.go
@@ -40,7 +40,7 @@ type DeploySource struct {
 func (d *DeploySource) ToPluginDeploySource() *deployment.DeploymentSource {
 	return &deployment.DeploymentSource{
 		ApplicationDirectory:      d.AppDir,
-		Revision:                  d.Revision,
+		CommitHash:                d.Revision,
 		ApplicationConfig:         d.ApplicationConfig,
 		ApplicationConfigFilename: d.ApplicationConfigFilename,
 	}

diff --git a/pkg/app/pipedv1/plugin/kubernetes/deployment/server.go b/pkg/app/pipedv1/plugin/kubernetes/deployment/server.go
@@ -189,7 +189,7 @@ func (a *DeploymentService) loadManifests(ctx context.Context, deploy *model.Dep
 	manifests, err := a.loader.LoadManifests(ctx, provider.LoaderInput{
 		PipedID:          deploy.GetPipedId(),
 		AppID:            deploy.GetApplicationId(),
-		CommitHash:       deploymentSource.GetRevision(),
+		CommitHash:       deploymentSource.GetCommitHash(),
 		AppName:          deploy.GetApplicationName(),
 		AppDir:           deploymentSource.GetApplicationDirectory(),
 		ConfigFilename:   deploymentSource.GetApplicationConfigFilename(),

diff --git a/pkg/app/pipedv1/plugin/kubernetes/deployment/server_test.go b/pkg/app/pipedv1/plugin/kubernetes/deployment/server_test.go
@@ -138,7 +138,7 @@ func TestDeploymentService_executeK8sSyncStage(t *testing.T) {
 			RunningDeploymentSource: nil,
 			TargetDeploymentSource: &deployment.DeploymentSource{
 				ApplicationDirectory:      filepath.Join(examplesDir(), "kubernetes", "simple"),
-				Revision:                  "0123456789",
+				CommitHash:                "0123456789",
 				ApplicationConfig:         cfg,
 				ApplicationConfigFilename: "app.pipecd.yaml",
 			},

diff --git a/pkg/plugin/api/v1alpha1/deployment/api.pb.go b/pkg/plugin/api/v1alpha1/deployment/api.pb.go
diff --git a/pkg/plugin/api/v1alpha1/deployment/api.pb.validate.go b/pkg/plugin/api/v1alpha1/deployment/api.pb.validate.go
diff --git a/pkg/plugin/api/v1alpha1/deployment/api.proto b/pkg/plugin/api/v1alpha1/deployment/api.proto
@@ -139,8 +139,8 @@ message ExecutePluginInput {
 message DeploymentSource {
   // The application directory where the source code is located.
   string application_directory = 1;
-  // The git commit revision of the source code.
-  string revision = 2;
+  // The git commit hash of the source code.
+  string commit_hash = 2;
   // The configuration of the application which is specific for plugins.
   bytes application_config = 3;
   // The filename of the application configuration file.