Merge branch 'develop' into notifier-refac

# Conflicts:
#	env_gen.json

Author: prkhrkat

.gitignore

@@ -4,3 +4,5 @@
 .env
 /cmd/external-app/devtron-ea
 devtron
+
+.qodo

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

@@ -30,6 +30,7 @@ import (
 	"golang.org/x/exp/maps"
 	"io"
 	"net/http"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -1479,10 +1480,12 @@ func (handler *PipelineConfigRestHandlerImpl) ValidateGitMaterialUrl(gitProvider
 		return false, err
 	}
 	if gitProvider.AuthMode == constants.AUTH_MODE_SSH {
-		hasPrefixResult := strings.HasPrefix(url, SSH_URL_PREFIX)
+		// this regex is used to generic ssh providers like gogs where format is <user>@<host>:<org>/<repo>.git
+		var scpLikeSSHRegex = regexp.MustCompile(`^[\w-]+@[\w.-]+:[\w./-]+\.git$`)
+		hasPrefixResult := strings.HasPrefix(url, SSH_URL_PREFIX) || scpLikeSSHRegex.MatchString(url)
 		return hasPrefixResult, nil
 	}
-	hasPrefixResult := strings.HasPrefix(url, HTTPS_URL_PREFIX)
+	hasPrefixResult := strings.HasPrefix(url, HTTPS_URL_PREFIX) || strings.HasPrefix(url, HTTP_URL_PREFIX)
 	return hasPrefixResult, nil
 }
 

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

@@ -31,8 +31,8 @@ import (
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deployedAppMetrics"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/chartRef"
-	"github.com/devtron-labs/devtron/pkg/pipeline/draftAwareConfigService"
 	validator2 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/validator"
+	"github.com/devtron-labs/devtron/pkg/pipeline/draftAwareConfigService"
 	security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
 	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/read"
 	read3 "github.com/devtron-labs/devtron/pkg/team/read"
@@ -225,6 +225,7 @@ const (
 	devtron             = "DEVTRON"
 	SSH_URL_PREFIX      = "git@"
 	HTTPS_URL_PREFIX    = "https://"
+	HTTP_URL_PREFIX     = "http://"
 	argoWFLogIdentifier = "argo=true"
 )
 

env_gen.json

@@ -433,6 +433,7 @@ type ChartRepoSearch struct {
 	ChartId                      int    `json:"chartId"`
 	ChartName                    string `json:"chartName"`
 	ChartRepoId                  int    `json:"chartRepoId"`
+	DockerArtifactStoreId        string `json:"DockerArtifactStoreId"`
 	ChartRepoName                string `json:"chartRepoName"`
 	Version                      string `json:"version"`
 	Deprecated                   bool   `json:"deprecated"`

pkg/appStore/bean/bean.go

@@ -273,7 +273,7 @@ func (impl *AppStoreApplicationVersionRepositoryImpl) SearchAppStoreChartByName(
 	var chartRepos []*appStoreBean.ChartRepoSearch
 	//for chart repos, created (derived through index.yaml) column of app_store_application_version is used for finding latest version and for oci repo id is used (because created is null)
 	queryTemp := `select asv.id as app_store_application_version_id, asv.version, asv.deprecated, aps.id as chart_id, 
-					aps.name as chart_name, chr.id as chart_repo_id, chr.name as chart_repo_name 
+					aps.name as chart_name, chr.id as chart_repo_id, chr.name as chart_repo_name , das.id as docker_artifact_store_id 
 					from app_store_application_version asv 
 					inner join app_store aps on asv.app_store_id = aps.id 
 					left join chart_repo chr on aps.chart_repo_id = chr.id 

pkg/appStore/discover/repository/AppStoreApplicationVersionRepository.go

@@ -130,5 +130,10 @@ func (impl *AppStoreServiceImpl) SearchAppStoreChartByName(chartName string) ([]
 	if err != nil && !util.IsErrNoRows(err) {
 		return nil, err
 	}
+	for _, appStore := range appStoreApplications {
+		if len(appStore.ChartRepoName) == 0 && len(appStore.DockerArtifactStoreId) != 0 {
+			appStore.ChartRepoName = appStore.DockerArtifactStoreId
+		}
+	}
 	return appStoreApplications, nil
 }

pkg/appStore/discover/service/AppStoreService.go

@@ -29,6 +29,7 @@ import (
 	openapi2 "github.com/devtron-labs/devtron/api/openapi/openapiClient"
 	"github.com/devtron-labs/devtron/client/argocdServer"
 	"github.com/devtron-labs/devtron/internal/sql/repository/app"
+	repository2 "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/timelineStatus"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/cdWorkflow"
 	"github.com/devtron-labs/devtron/internal/util"
@@ -90,6 +91,7 @@ type AppStoreDeploymentServiceImpl struct {
 	deletePostProcessor                  DeletePostProcessor
 	appStoreValidator                    AppStoreValidator
 	deploymentConfigService              common.DeploymentConfigService
+	OCIRegistryConfigRepository          repository2.OCIRegistryConfigRepository
 }
 
 func NewAppStoreDeploymentServiceImpl(logger *zap.SugaredLogger,
@@ -109,7 +111,7 @@ func NewAppStoreDeploymentServiceImpl(logger *zap.SugaredLogger,
 	gitOpsConfigReadService config.GitOpsConfigReadService, deletePostProcessor DeletePostProcessor,
 	appStoreValidator AppStoreValidator,
 	deploymentConfigService common.DeploymentConfigService,
-) *AppStoreDeploymentServiceImpl {
+	OCIRegistryConfigRepository repository2.OCIRegistryConfigRepository) *AppStoreDeploymentServiceImpl {
 
 	return &AppStoreDeploymentServiceImpl{
 		logger:                               logger,
@@ -130,6 +132,7 @@ func NewAppStoreDeploymentServiceImpl(logger *zap.SugaredLogger,
 		deletePostProcessor:                  deletePostProcessor,
 		appStoreValidator:                    appStoreValidator,
 		deploymentConfigService:              deploymentConfigService,
+		OCIRegistryConfigRepository:          OCIRegistryConfigRepository,
 	}
 }
 
@@ -951,7 +954,49 @@ func (impl *AppStoreDeploymentServiceImpl) linkHelmApplicationToChartStore(insta
 	}
 
 	// STEP-2 update APP with chart info
-	chartRepoInfo := appStoreAppVersion.AppStore.ChartRepo
+	//TODO: below code is duplicated
+	var IsOCIRepo bool
+	var registryCredential *bean4.RegistryCredential
+	var chartRepository *bean4.ChartRepository
+	dockerRegistryId := appStoreAppVersion.AppStore.DockerArtifactStoreId
+	if dockerRegistryId != "" {
+		ociRegistryConfigs, err := impl.OCIRegistryConfigRepository.FindByDockerRegistryId(dockerRegistryId)
+		if err != nil {
+			impl.logger.Errorw("error in fetching oci registry config", "err", err)
+			return nil, err
+		}
+		var ociRegistryConfig *repository2.OCIRegistryConfig
+		for _, config := range ociRegistryConfigs {
+			if config.RepositoryAction == repository2.STORAGE_ACTION_TYPE_PULL || config.RepositoryAction == repository2.STORAGE_ACTION_TYPE_PULL_AND_PUSH {
+				ociRegistryConfig = config
+				break
+			}
+		}
+		IsOCIRepo = true
+		registryCredential = &bean4.RegistryCredential{
+			RegistryUrl:         appStoreAppVersion.AppStore.DockerArtifactStore.RegistryURL,
+			Username:            appStoreAppVersion.AppStore.DockerArtifactStore.Username,
+			Password:            appStoreAppVersion.AppStore.DockerArtifactStore.Password,
+			AwsRegion:           appStoreAppVersion.AppStore.DockerArtifactStore.AWSRegion,
+			AccessKey:           appStoreAppVersion.AppStore.DockerArtifactStore.AWSAccessKeyId,
+			SecretKey:           appStoreAppVersion.AppStore.DockerArtifactStore.AWSSecretAccessKey,
+			RegistryType:        string(appStoreAppVersion.AppStore.DockerArtifactStore.RegistryType),
+			RepoName:            appStoreAppVersion.AppStore.Name,
+			IsPublic:            ociRegistryConfig.IsPublic,
+			Connection:          appStoreAppVersion.AppStore.DockerArtifactStore.Connection,
+			RegistryName:        appStoreAppVersion.AppStore.DockerArtifactStore.Id,
+			RegistryCertificate: appStoreAppVersion.AppStore.DockerArtifactStore.Cert,
+		}
+	} else {
+		chartRepository = &bean4.ChartRepository{
+			Name:                    appStoreAppVersion.AppStore.ChartRepo.Name,
+			Url:                     appStoreAppVersion.AppStore.ChartRepo.Url,
+			Username:                appStoreAppVersion.AppStore.ChartRepo.UserName,
+			Password:                appStoreAppVersion.AppStore.ChartRepo.Password,
+			AllowInsecureConnection: appStoreAppVersion.AppStore.ChartRepo.AllowInsecureConnection,
+		}
+	}
+
 	updateReleaseRequest := &bean3.UpdateApplicationWithChartInfoRequestDto{
 		InstallReleaseRequest: &bean4.InstallReleaseRequest{
 			ValuesYaml:   installAppVersionRequest.ValuesOverrideYaml,
@@ -961,18 +1006,14 @@ func (impl *AppStoreDeploymentServiceImpl) linkHelmApplicationToChartStore(insta
 				ReleaseNamespace: installAppVersionRequest.Namespace,
 				ReleaseName:      installAppVersionRequest.DisplayName,
 			},
+			RegistryCredential:         registryCredential,
+			ChartRepository:            chartRepository,
+			IsOCIRepo:                  IsOCIRepo,
+			InstallAppVersionHistoryId: 0,
 		},
 		SourceAppType: bean3.SOURCE_HELM_APP,
 	}
-	if chartRepoInfo != nil {
-		updateReleaseRequest.ChartRepository = &bean4.ChartRepository{
-			Name:                    chartRepoInfo.Name,
-			Url:                     chartRepoInfo.Url,
-			Username:                chartRepoInfo.UserName,
-			Password:                chartRepoInfo.Password,
-			AllowInsecureConnection: chartRepoInfo.AllowInsecureConnection,
-		}
-	}
+
 	res, err := impl.helmAppService.UpdateApplicationWithChartInfo(ctx, installAppVersionRequest.ClusterId, updateReleaseRequest)
 	if err != nil {
 		return nil, err

pkg/appStore/installedApp/service/AppStoreDeploymentService.go

@@ -109,6 +109,8 @@ func (impl *WebhookNotificationServiceImpl) GetWebhookVariables() (map[string]be
 		"devtronCiPipelineId":       beans.DevtronCiPipelineId,
 		"devtronCdPipelineId":       beans.DevtronCdPipelineId,
 		"devtronTriggeredByEmail":   beans.DevtronTriggeredByEmail,
+		"devtronPipelineType":       beans.DevtronPipelineType,
+		"devtronBuildGitCommitHash": beans.DevtronBuildGitCommitHash,
 		"eventType":                 beans.EventType,
 	}
 
@@ -119,7 +121,7 @@ func (impl *WebhookNotificationServiceImpl) FetchAllWebhookNotificationConfig()
 	var responseDto []*beans.WebhookConfigDto
 	webhookConfigs, err := impl.webhookRepository.FindAll()
 	if err != nil && !util.IsErrNoRows(err) {
-		impl.logger.Errorw("cannot find all webhoook config", "err", err)
+		impl.logger.Errorw("cannot find all webhook config", "err", err)
 		return []*beans.WebhookConfigDto{}, err
 	}
 	for _, webhookConfig := range webhookConfigs {

pkg/notifier/WebhookNotificationService.go

@@ -23,6 +23,8 @@ const (
 	DevtronCiPipelineId       WebhookVariable = "{{devtronCiPipelineId}}"
 	DevtronCdPipelineId       WebhookVariable = "{{devtronCdPipelineId}}"
 	DevtronTriggeredByEmail   WebhookVariable = "{{devtronTriggeredByEmail}}"
+	DevtronBuildGitCommitHash WebhookVariable = "{{devtronBuildGitCommitHash}}"
+	DevtronPipelineType       WebhookVariable = "{{devtronPipelineType}}"
 	EventType                 WebhookVariable = "{{eventType}}"
 )