Merge branch 'main' into Copacetic

Author: ashokdevtron

.gitbook.yaml

@@ -126,4 +126,5 @@ redirects:
     user-guide/creating-application/workflow/ci-pipeline2: user-guide/creating-application/workflow/ci-pipeline.md
     user-guide/clusters: user-guide/resource-browser.md
     usage/clusters: user-guide/resource-browser.md
-    global-configurations/authorization/sso-login/okta: user-guide/global-configurations/authorization/sso/okta.md
+    global-configurations/authorization/sso-login/okta: user-guide/global-configurations/authorization/sso/okta.md
+    usage/applications/creating-application/ci-pipeline/ci-build-pre-post-plugins: user-guide/creating-application/workflow/ci-build-pre-post-plugins.md

.github/workflows/azure-devops-issue-sync.yml

@@ -4,4 +4,3 @@
 .env
 /cmd/external-app/devtron-ea
 devtron
-/vendor/github.com/argoproj/argo-cd/assets

.gitignore

@@ -75,8 +75,10 @@ import (
 	"github.com/devtron-labs/devtron/cel"
 	"github.com/devtron-labs/devtron/client/argocdServer"
 	"github.com/devtron-labs/devtron/client/argocdServer/application"
+	"github.com/devtron-labs/devtron/client/argocdServer/certificate"
 	cluster2 "github.com/devtron-labs/devtron/client/argocdServer/cluster"
 	"github.com/devtron-labs/devtron/client/argocdServer/connection"
+	repocreds "github.com/devtron-labs/devtron/client/argocdServer/repocreds"
 	repository2 "github.com/devtron-labs/devtron/client/argocdServer/repository"
 	session2 "github.com/devtron-labs/devtron/client/argocdServer/session"
 	"github.com/devtron-labs/devtron/client/cron"
@@ -973,6 +975,9 @@ func InitializeApp() (*App, error) {
 		imageDigestPolicy.NewImageDigestPolicyServiceImpl,
 		wire.Bind(new(imageDigestPolicy.ImageDigestPolicyService), new(*imageDigestPolicy.ImageDigestPolicyServiceImpl)),
 
+		certificate.NewServiceClientImpl,
+		wire.Bind(new(certificate.Client), new(*certificate.ServiceClientImpl)),
+
 		appStoreRestHandler.AppStoreWireSet,
 
 		cel.NewCELServiceImpl,
@@ -983,6 +988,9 @@ func InitializeApp() (*App, error) {
 
 		common.NewDeploymentConfigServiceImpl,
 		wire.Bind(new(common.DeploymentConfigService), new(*common.DeploymentConfigServiceImpl)),
+
+		repocreds.NewServiceClientImpl,
+		wire.Bind(new(repocreds.ServiceClient), new(*repocreds.ServiceClientImpl)),
 	)
 	return &App{}, nil
 }

Wire.go

@@ -16,21 +16,30 @@
 
 package gitOps
 
-import "time"
+import (
+	"github.com/devtron-labs/devtron/api/bean"
+	"time"
+)
 
 type GitOpsConfigDto struct {
-	Id                    int    `json:"id,omitempty"`
-	Provider              string `json:"provider" validate:"oneof=GITLAB GITHUB AZURE_DEVOPS BITBUCKET_CLOUD"`
-	Username              string `json:"username"`
-	Token                 string `json:"token"`
-	GitLabGroupId         string `json:"gitLabGroupId"`
-	GitHubOrgId           string `json:"gitHubOrgId"`
-	Host                  string `json:"host"`
-	Active                bool   `json:"active"`
-	AzureProjectName      string `json:"azureProjectName"`
-	BitBucketWorkspaceId  string `json:"bitBucketWorkspaceId"`
-	BitBucketProjectKey   string `json:"bitBucketProjectKey"`
-	AllowCustomRepository bool   `json:"allowCustomRepository"`
+	Id                    int             `json:"id,omitempty"`
+	Provider              string          `json:"provider" validate:"oneof=GITLAB GITHUB AZURE_DEVOPS BITBUCKET_CLOUD"`
+	Username              string          `json:"username"`
+	Token                 string          `json:"token"`
+	GitLabGroupId         string          `json:"gitLabGroupId"`
+	GitHubOrgId           string          `json:"gitHubOrgId"`
+	Host                  string          `json:"host"`
+	Active                bool            `json:"active"`
+	AzureProjectName      string          `json:"azureProjectName"`
+	BitBucketWorkspaceId  string          `json:"bitBucketWorkspaceId"`
+	BitBucketProjectKey   string          `json:"bitBucketProjectKey"`
+	AllowCustomRepository bool            `json:"allowCustomRepository"`
+	EnableTLSVerification bool            `json:"enableTLSVerification"`
+	TLSConfig             *bean.TLSConfig `json:"tlsConfig"`
+
+	IsCADataPresent      bool `json:"isCADataPresent"`
+	IsTLSCertDataPresent bool `json:"isTLSCertDataPresent"`
+	IsTLSKeyDataPresent  bool `json:"isTLSKeyDataPresent"`
 
 	// TODO refactoring: create different struct for internal fields
 	GitRepoName string `json:"-"`

api/bean/gitOps/GitOpsConfig.go

@@ -0,0 +1,7 @@
+package bean
+
+type TLSConfig struct {
+	CaData      string `json:"caData"`
+	TLSCertData string `json:"tlsCertData"`
+	TLSKeyData  string `json:"tlsKeyData"`
+}