Merge pull request #6855 from devtron-labs/main-sync-27-10

sync: main sync 27 10

Author: Shivam-nagar23

App.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"github.com/devtron-labs/common-lib/middlewares"
 	pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
+	"github.com/devtron-labs/common-lib/securestore"
 	posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
 	"github.com/devtron-labs/devtron/pkg/eventProcessor"
 	"github.com/devtron-labs/devtron/pkg/eventProcessor/in"
@@ -47,6 +48,13 @@ import (
 	"go.uber.org/zap"
 )
 
+func init() {
+	err := securestore.SetEncryptionKey()
+	if err != nil {
+		log.Println("error in setting encryption key", "err", err)
+	}
+}
+
 type App struct {
 	MuxRouter     *router.MuxRouter
 	Logger        *zap.SugaredLogger

CHANGELOG/release-notes-v1.8.1.md

@@ -0,0 +1,8 @@
+## v1.8.1
+
+
+## Bugs
+- fix: unsaved changes popup showing after saving manifest ([#2922](https://github.com/devtron-labs/dashboard/pull/2922))
+
+
+

CHANGELOG/release-notes-v1.8.2.md

@@ -0,0 +1,12 @@
+## v1.8.2
+
+## Enhancements
+- feat: linked ci should have artifacts of parent ci (#6836)
+## Bugs
+- fix: clear cached reference charts for Deployment chart versions 4.18.0, 4.19.0, 1.0.0, and 1.1.0 (#6841)
+- fix: Custom chart with dependencies are not working in Devtron Applications (#6834)
+- fix: Terraform plugin fix in v1.0.1 (#6830)
+## Others
+- misc: Api specs and validations added (#6807)
+
+

Makefile

@@ -2,7 +2,7 @@
 
 all: fetch-all-env build
 
-TARGET_BRANCH?=develop
+TARGET_BRANCH?=main
 TAG?=$(shell bash -c 'git log --pretty=format:'%h' -n 1')
 FLAGS=
 ENVVAR=

api/auth/user/UserRestHandler_ent.go

@@ -25,9 +25,16 @@ func (handler UserRestHandlerImpl) checkRBACForUserCreate(token string, requestS
 					isAuthorised = handler.enforcer.Enforce(token, casbin.ResourceUser, casbin.ActionCreate, filter.Team)
 				case filter.Entity == bean2.CLUSTER_ENTITIY:
 					isAuthorised = handler.userCommonService.CheckRbacForClusterEntity(filter.Cluster, filter.Namespace, filter.Group, filter.Kind, filter.Resource, token, handler.CheckManagerAuth)
-				case filter.Entity == bean2.CHART_GROUP_ENTITY && len(roleFilters) == 1: //if only chartGroup entity is present in request then access will be judged through super-admin access
-					isAuthorised = isActionUserSuperAdmin
-				case filter.Entity == bean2.CHART_GROUP_ENTITY && len(roleFilters) > 1: //if entities apart from chartGroup entity are present, not checking chartGroup access
+				case filter.Entity == bean2.CHART_GROUP_ENTITY && len(roleFilters) == 1:
+					// If only chart group in direct permissions, but user is assigning role groups too,
+					// defer the chart group authorization to the role group check
+					if len(roleGroups) > 0 {
+						isAuthorised = true // Will be validated in role group section
+					} else {
+						isAuthorised = isActionUserSuperAdmin
+					}
+				case filter.Entity == bean2.CHART_GROUP_ENTITY && len(roleFilters) > 1:
+					// If there are other entities in addition to chart group, ignore chart group check
 					isAuthorised = true
 				default:
 					isAuthorised = false

api/helm-app/service/HelmAppService.go

@@ -965,10 +965,10 @@ func (impl *HelmAppServiceImpl) TemplateChart(ctx context.Context, templateChart
 		registryCredential = &gRPC.RegistryCredential{
 			RegistryUrl:         appStoreAppVersion.AppStore.DockerArtifactStore.RegistryURL,
 			Username:            appStoreAppVersion.AppStore.DockerArtifactStore.Username,
-			Password:            appStoreAppVersion.AppStore.DockerArtifactStore.Password,
+			Password:            appStoreAppVersion.AppStore.DockerArtifactStore.Password.String(),
 			AwsRegion:           appStoreAppVersion.AppStore.DockerArtifactStore.AWSRegion,
 			AccessKey:           appStoreAppVersion.AppStore.DockerArtifactStore.AWSAccessKeyId,
-			SecretKey:           appStoreAppVersion.AppStore.DockerArtifactStore.AWSSecretAccessKey,
+			SecretKey:           appStoreAppVersion.AppStore.DockerArtifactStore.AWSSecretAccessKey.String(),
 			RegistryType:        string(appStoreAppVersion.AppStore.DockerArtifactStore.RegistryType),
 			RepoName:            appStoreAppVersion.AppStore.Name,
 			IsPublic:            ociRegistryConfig.IsPublic,

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 1.8.0
+appVersion: 1.8.2
 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
 keywords:
   - Devtron
@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.22.96
+version: 0.22.98
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

charts/devtron/devtron-bom.yaml

@@ -15,7 +15,7 @@ global:
     PG_DATABASE: orchestrator
 extraManifests: []
 installer:
-  release: "v1.8.0"
+  release: "v1.8.2"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -41,13 +41,13 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:5196e935-690-36024"
+    image: "dashboard:b00aa204-690-36533"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:1ae65fbb-280-36074"
-    cicdImage: "devtron:1ae65fbb-434-36069"
+    image: "hyperion:261df88d-280-36531"
+    cicdImage: "devtron:261df88d-434-36530"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     podSecurityContext:
@@ -117,7 +117,7 @@ components:
       image: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:880420ac-200-36032"
+    image: "git-sensor:b82f5fdb-200-36532"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false

charts/devtron/values.yaml

@@ -42,7 +42,7 @@ nfs:
 extraManifests: []
 installer:
   repo: "devtron-labs/devtron"
-  release: "v1.8.0"
+  release: "v1.8.2"
   registry: ""
   image: inception
   tag: 473deaa4-185-21582
@@ -97,13 +97,13 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:5196e935-690-36024"
+    image: "dashboard:b00aa204-690-36533"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:1ae65fbb-280-36074"
-    cicdImage: "devtron:1ae65fbb-434-36069"
+    image: "hyperion:261df88d-280-36531"
+    cicdImage: "devtron:261df88d-434-36530"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     healthPort: 8080
@@ -200,7 +200,7 @@ components:
       volumeSize: "20Gi"
   gitsensor:
     registry: ""
-    image: "git-sensor:880420ac-200-36032"
+    image: "git-sensor:b82f5fdb-200-36532"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false

cmd/external-app/externalApp.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/devtron-labs/common-lib/securestore"
+	"log"
 	"net/http"
 	"os"
 	"time"
@@ -35,6 +37,13 @@ import (
 	"go.uber.org/zap"
 )
 
+func init() {
+	err := securestore.SetEncryptionKey()
+	if err != nil {
+		log.Println("error in setting encryption key", "err", err)
+	}
+}
+
 type App struct {
 	db             *pg.DB
 	sessionManager *authMiddleware.SessionManager