Fixed ECR bug (#834)

* ecr rconfig update bug

* removed redundant arg

* review changes

Author: kartik-579

internal/util/EcrService.go

@@ -28,7 +28,7 @@ import (
 )
 
 //FIXME: this code is temp
-func CreateEcrRepo(repoName string, RegistryURL string, reg string, accessKey string, secretKey string) error {
+func CreateEcrRepo(repoName string, reg string, accessKey string, secretKey string) error {
 	region := reg
 	credentials := credentials.NewStaticCredentials(accessKey, secretKey, "")
 	svc := ecr.New(session.New(&aws.Config{

pkg/pipeline/PipelineBuilder.go

@@ -510,6 +510,21 @@ func (impl PipelineBuilderImpl) UpdateCiTemplate(updateRequest *bean.CiConfigReq
 		return nil, err
 	}
 
+	var repo string
+	if updateRequest.DockerRepository != "" {
+		repo = updateRequest.DockerRepository
+	} else {
+		repo = originalCiConf.DockerRepository
+	}
+
+	if dockerArtifaceStore.RegistryType == repository.REGISTRYTYPE_ECR {
+		err := impl.createEcrRepo(repo, dockerArtifaceStore.AWSRegion, dockerArtifaceStore.AWSAccessKeyId, dockerArtifaceStore.AWSSecretAccessKey)
+		if err != nil {
+			impl.logger.Errorw("ecr repo creation failed while updating ci template", "repo", repo, "err", err)
+			return nil, err
+		}
+	}
+
 	originalCiConf.AfterDockerBuild = updateRequest.AfterDockerBuild
 	originalCiConf.BeforeDockerBuild = updateRequest.BeforeDockerBuild
 	originalCiConf.DockerBuildConfig = updateRequest.DockerBuildConfig
@@ -581,17 +596,10 @@ func (impl PipelineBuilderImpl) CreateCiPipeline(createRequest *bean.CiConfigReq
 	}
 
 	if store.RegistryType == repository.REGISTRYTYPE_ECR {
-		impl.logger.Debugw("attempting repo creation ", "repo", repo)
-		err := util.CreateEcrRepo(repo, createRequest.DockerRepository, store.AWSRegion, store.AWSAccessKeyId,
-			store.AWSSecretAccessKey)
+		err := impl.createEcrRepo(repo, store.AWSRegion, store.AWSAccessKeyId, store.AWSSecretAccessKey)
 		if err != nil {
-			if errors.IsAlreadyExists(err) {
-				impl.logger.Warnw("this repo already exists!!, skipping repo creation", "repo", repo)
-			} else {
-				impl.logger.Errorw("ecr repo creation failed, it might be due to authorization or any other external "+
-					"dependency. please create repo manually before triggering ci", "repo", repo, "err", err)
-				return nil, err
-			}
+			impl.logger.Errorw("ecr repo creation failed while creating ci pipeline", "repo", repo, "err", err)
+			return nil, err
 		}
 	}
 	createRequest.DockerRepository = repo
@@ -648,6 +656,21 @@ func (impl PipelineBuilderImpl) CreateCiPipeline(createRequest *bean.CiConfigReq
 	return createRes, nil
 }
 
+func (impl PipelineBuilderImpl) createEcrRepo(dockerRepository, AWSRegion, AWSAccessKeyId, AWSSecretAccessKey string) error {
+	impl.logger.Debugw("attempting ecr repo creation ", "repo", dockerRepository)
+	err := util.CreateEcrRepo(dockerRepository, AWSRegion, AWSAccessKeyId, AWSSecretAccessKey)
+	if err != nil {
+		if errors.IsAlreadyExists(err) {
+			impl.logger.Warnw("this repo already exists!!, skipping repo creation", "repo", dockerRepository)
+		} else {
+			impl.logger.Errorw("ecr repo creation failed, it might be due to authorization or any other external "+
+				"dependency. please create repo manually before triggering ci", "repo", dockerRepository, "err", err)
+			return err
+		}
+	}
+	return nil
+}
+
 func (impl PipelineBuilderImpl) getGitMaterialsForApp(appId int) ([]*bean.GitMaterial, error) {
 	materials, err := impl.materialRepo.FindByAppId(appId)
 	if err != nil {