Merge pull request #229 from devtron-labs/fix-ng-changes

fix: issues in helm apps and git provide

Author: iamayushm

chart-sync/go.mod

@@ -5,7 +5,7 @@ go 1.22.4
 toolchain go1.22.6
 
 replace (
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250411063529-1a2b1d8fd3f1
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250421050508-c7b75d20165c
 	helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
 )
 

chart-sync/go.sum

@@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250411063529-1a2b1d8fd3f1 h1:L1qUpgnm8nMGwL2lKvFoRGYTxBm3xXFiqv6wmXNTnuY=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250411063529-1a2b1d8fd3f1/go.mod h1:ceFKgQ2qm40PR95g5Xp2EClq7nDBKFTcglJ0JdsgClA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250421050508-c7b75d20165c h1:OfO2hSC6BAf7+7SURwCEMHf0NHOekYIK+Dn9NM68A1s=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250421050508-c7b75d20165c/go.mod h1:ceFKgQ2qm40PR95g5Xp2EClq7nDBKFTcglJ0JdsgClA=
 github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY=
 github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=

chart-sync/internals/sql/DockerArtifactStoreRepository.go

@@ -57,6 +57,7 @@ type DockerArtifactStore struct {
 	Cert                     string       `sql:"cert" json:"cert,omitempty"`
 	Active                   bool         `sql:"active,notnull" json:"active"`
 	RemoteConnectionConfigId int          `sql:"remote_connection_config_id"`
+	CredentialsType          string       `sql:"credentials_type,notnull"`
 	OCIRegistryConfig        []*OCIRegistryConfig
 	RemoteConnectionConfig   *RemoteConnectionConfig
 	AuditLog

chart-sync/pkg/registry/adapter.go

@@ -46,5 +46,6 @@ func NewToRegistryConfig(store *sql.DockerArtifactStore) (*registry.Configuratio
 		RegistryType:              string(store.RegistryType),
 		IsPublicRegistry:          store.OCIRegistryConfig[0].IsPublic,
 		RemoteConnectionConfig:    remoteConnectionConfig,
+		CredentialsType:           store.CredentialsType,
 	}, nil
 }

chart-sync/vendor/github.com/devtron-labs/common-lib/constants/InternalErrorCode.go

@@ -93,8 +93,9 @@ github.com/containerd/platforms
 # github.com/davecgh/go-spew v1.1.1
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250411063529-1a2b1d8fd3f1
+# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250421050508-c7b75d20165c
 ## explicit; go 1.21
+github.com/devtron-labs/common-lib/constants
 github.com/devtron-labs/common-lib/fetchAllEnv
 github.com/devtron-labs/common-lib/git-manager/util
 github.com/devtron-labs/common-lib/helmLib/registry
@@ -790,4 +791,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250411063529-1a2b1d8fd3f1
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250421050508-c7b75d20165c