Merge pull request #239 from devtron-labs/release-candidate-v0.34.0

sync: Release candidate v0.34.0

Author: vikramdevtron

authenticator/go.mod

@@ -7,7 +7,7 @@ toolchain go1.22.6
 require (
 	github.com/caarlos0/env/v6 v6.7.2
 	github.com/coreos/go-oidc/v3 v3.11.0
-	github.com/golang-jwt/jwt/v4 v4.5.1
+	github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
 	github.com/sirupsen/logrus v1.8.1

authenticator/go.sum

@@ -97,8 +97,8 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
-github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=

authenticator/vendor/github.com/golang-jwt/jwt/v4/parser.go

@@ -19,7 +19,7 @@ github.com/go-logr/logr
 ## explicit; go 1.15
 github.com/gogo/protobuf/proto
 github.com/gogo/protobuf/sortkeys
-# github.com/golang-jwt/jwt/v4 v4.5.1
+# github.com/golang-jwt/jwt/v4 v4.5.2
 ## explicit; go 1.16
 github.com/golang-jwt/jwt/v4
 # github.com/golang/protobuf v1.5.3

authenticator/vendor/modules.txt

@@ -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-20250415183144-214ff7e2424f
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425061517-45edc2765147
 	helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
 )
 

chart-sync/go.mod

@@ -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-20250415183144-214ff7e2424f h1:o8eUXiQxP6k8liKkIwdOVjibZvd+jNvz3U0jqyqXdr8=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250415183144-214ff7e2424f/go.mod h1:ceFKgQ2qm40PR95g5Xp2EClq7nDBKFTcglJ0JdsgClA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425061517-45edc2765147 h1:g8ry9IOQzcrX4bkzE/jTCRlixarb0FzTt64w8qNd2wA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425061517-45edc2765147/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
 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/go.sum

@@ -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/internals/sql/DockerArtifactStoreRepository.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
 }