nil-check-handle

api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

@@ -1588,7 +1588,7 @@ func (handler *PipelineConfigRestHandlerImpl) CancelWorkflow(w http.ResponseWrit
 		if handler.appWorkflowService.CheckCdPipelineByCiPipelineId(pipelineId) {
 			for _, envId := range environmentIds {
 				envObject := handler.enforcerUtil.GetEnvRBACNameByCiPipelineIdAndEnvId(pipelineId, envId)
-				if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, casbin.ActionUpdate, envObject); !ok {
+				if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, casbin.ActionTrigger, envObject); !ok {
 					common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
 					return
 				}

pkg/deployment/manifest/ManifestCreationService.go

@@ -853,7 +853,7 @@ func (impl *ManifestCreationServiceImpl) getArgoCdHPAResourceManifest(ctx contex
 	recv, argoErr := impl.acdClient.GetResource(newCtx, query)
 	if argoErr != nil {
 		grpcCode, errMsg := util.GetClientDetailedError(argoErr)
-		if grpcCode.IsInvalidArgumentCode() {
+		if grpcCode.IsInvalidArgumentCode() || grpcCode.IsNotFoundCode() {
 			// this is a valid case for hibernated applications, so returning nil
 			// for hibernated applications, we don't have any hpa resource manifest
 			return resourceManifest, nil
@@ -914,6 +914,11 @@ func (impl *ManifestCreationServiceImpl) autoscalingCheckBeforeTrigger(ctx conte
 		if len(resourceManifest) > 0 {
 			statusMap := resourceManifest["status"].(map[string]interface{})
 			currentReplicaVal := statusMap["currentReplicas"]
+			// currentReplicas key might not be available in manifest while k8s is calculating replica count
+			// it's a valid case so, we are not throwing error
+			if currentReplicaVal == nil {
+				return merged, err
+			}
 			currentReplicaCount, err := util4.ParseFloatNumber(currentReplicaVal)
 			if err != nil {
 				impl.logger.Errorw("error occurred while parsing replica count", "currentReplicas", currentReplicaVal, "err", err)

pkg/deployment/trigger/devtronApps/TriggerService.go

@@ -788,10 +788,10 @@ func (impl *TriggerServiceImpl) TriggerRelease(overrideRequest *bean3.ValuesOver
 	valuesOverrideResponse, builtChartPath, err := impl.manifestCreationService.BuildManifestForTrigger(overrideRequest, triggeredAt, newCtx)
 
 	if envDeploymentConfig == nil || (envDeploymentConfig != nil && envDeploymentConfig.Id == 0) {
-		envDeploymentConfig, err = impl.deploymentConfigService.GetAndMigrateConfigIfAbsentForDevtronApps(overrideRequest.AppId, overrideRequest.EnvId)
-		if err != nil {
-			impl.logger.Errorw("error in getting deployment config by appId and envId", "appId", overrideRequest.AppId, "envId", overrideRequest.EnvId, "err", err)
-			return releaseNo, err
+		envDeploymentConfig, err1 := impl.deploymentConfigService.GetAndMigrateConfigIfAbsentForDevtronApps(overrideRequest.AppId, overrideRequest.EnvId)
+		if err1 != nil {
+			impl.logger.Errorw("error in getting deployment config by appId and envId", "appId", overrideRequest.AppId, "envId", overrideRequest.EnvId, "err", err1)
+			return releaseNo, err1
 		}
 		valuesOverrideResponse.DeploymentConfig = envDeploymentConfig
 	}

pkg/pipeline/BuildPipelineConfigService.go

@@ -279,6 +279,16 @@ func (impl *CiPipelineConfigServiceImpl) patchCiPipelineUpdateSource(baseCiConfi
 		impl.logger.Errorw("error in fetching pipeline", "id", modifiedCiPipeline.Id, "err", err)
 		return nil, err
 	}
+	// updating PipelineType from db if not present in request
+	if modifiedCiPipeline.PipelineType == "" {
+		if CiPipeline.PipelineType(pipeline.PipelineType) != "" {
+			modifiedCiPipeline.PipelineType = CiPipeline.PipelineType(pipeline.PipelineType)
+		} else {
+			// updating default pipelineType if not present in request
+			modifiedCiPipeline.PipelineType = CiPipeline.DefaultPipelineType
+
+		}
+	}
 	if !modifiedCiPipeline.PipelineType.IsValidPipelineType() {
 		impl.logger.Debugw(" Invalid PipelineType", "PipelineType", modifiedCiPipeline.PipelineType)
 		errorMessage := fmt.Sprintf(CiPipeline.PIPELINE_TYPE_IS_NOT_VALID, modifiedCiPipeline.Name)

pkg/pipeline/CiService.go

@@ -167,6 +167,13 @@ func (impl *CiServiceImpl) TriggerCiPipeline(trigger types.Trigger) (int, error)
 
 	// checking if user has given run time parameters for externalCiArtifact, if given then sending git material to Ci-Runner
 	externalCiArtifact, exists := trigger.ExtraEnvironmentVariables["externalCiArtifact"]
+	// validate externalCiArtifact as docker image
+	if exists {
+		if !strings.Contains(externalCiArtifact, ":") {
+			impl.Logger.Errorw("validation error", "externalCiArtifact", externalCiArtifact)
+			return 0, fmt.Errorf("invalid image name given in externalCiArtifact")
+		}
+	}
 	if trigger.PipelineType == string(CiPipeline.CI_JOB) && len(ciMaterials) != 0 && !exists && externalCiArtifact == "" {
 		ciMaterials = []*pipelineConfig.CiPipelineMaterial{ciMaterials[0]}
 		ciMaterials[0].GitMaterial = nil
@@ -569,7 +576,7 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
 		}
 		ciBuildConfigBean = templateOverrideBean.CiBuildConfig
 		// updating args coming from ciBaseBuildConfigEntity because it is not part of Ci override
-		if ciBuildConfigBean != nil && ciBuildConfigBean.DockerBuildConfig != nil {
+		if ciBuildConfigBean != nil && ciBuildConfigBean.DockerBuildConfig != nil && ciBaseBuildConfigBean != nil && ciBaseBuildConfigBean.DockerBuildConfig != nil {
 			ciBuildConfigBean.DockerBuildConfig.Args = ciBaseBuildConfigBean.DockerBuildConfig.Args
 		}
 		templateOverride := templateOverrideBean.CiTemplateOverride

pkg/pipeline/bean/CiPipeline/CiBuildConfig.go

@@ -32,6 +32,9 @@ const PIPELINE_TYPE_IS_NOT_VALID = "PipelineType is not valid  for pipeline %s"
 
 type PipelineType string
 
+// default PipelineType
+const DefaultPipelineType = CI_BUILD
+
 const (
 	CI_BUILD  PipelineType = "CI_BUILD"
 	LINKED    PipelineType = "LINKED"