Merge branch 'develop' into scoped-var-patch-type-fix

Author: kartik-579

.github/workflows/auto-label.yml

@@ -1,4 +1,4 @@
-name: Devtron-auto-labeller
+name: Devtron-auto-labeler
 
 on:
   issue_comment:
@@ -25,11 +25,11 @@ jobs:
           ISSUE_NUMBER=$(jq -r '.issue.number // .pull_request.number' "$GITHUB_EVENT_PATH")
           COMMENT_AUTHOR=$(jq -r '.comment.user.login' "$GITHUB_EVENT_PATH")
 
-          ORG_NAME="satyam-tests"
+          ORG_NAME="devtron-labs"
 
           # Check if the person is authorized to add labels
-          curl -s -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR" > /dev/null
-          if [[ $? -ne 0 ]]; then
+          RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR")
+          if [[ "$RESPONSE" -ne 204 ]]; then
             gh issue comment "$ISSUE_NUMBER" --body "Hi @$COMMENT_AUTHOR, you must be a member of the organization '$ORG_NAME' to add or remove labels."
             echo "User '$COMMENT_AUTHOR' is not a member of the organization '$ORG_NAME'. Exiting."
             exit 1
@@ -53,7 +53,7 @@ jobs:
             fi
           fi
 
-          # Remove Label Logic
+          # Removes Label Logic
           if [[ "$COMMENT_BODY" =~ ^/remove[[:space:]](.+)$ ]]; then
             LABEL_NAME_TO_REMOVE=$(echo "$COMMENT_BODY" | sed -n 's|/remove ||p')
 
@@ -64,4 +64,4 @@ jobs:
             else
               echo "The label '$LABEL_NAME_TO_REMOVE' is not attached to issue #$ISSUE_NUMBER."
             fi
-          fi
+          fi

.github/workflows/create-release.yml

@@ -1,33 +1,70 @@
-# This workflow is used to create a github release from last tag pushed
+# This workflow is used to create tag and Release for OSS
 
 name: Create Release
 
 # Controls when the action will run. Workflow runs when manually triggered using the UI
 # or on push in charts directory of main branch.
 on:
-
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "create-release"
+
+  create-release-tag:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_TOKENS: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
+      GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
+      GIT_CONFIG_NAME: ${{ secrets.GH_SYSTEMSDT_USERNAME }}
+      GIT_USERNAME: ${{ secrets.GH_SYSTEMSDT_USERNAME }}
+      GIT_REPO: ${{ github.repository }}
+      REPO: https://github.com/devtron-labs/devtron
+      RELEASE_BRANCH: "main"
+
+    steps:
+
+      - name: Configure Git
+        run: |
+          echo $GITHUB_TOKENS > tokens.txt
+          gh auth login --with-token < tokens.txt
+          git config --global user.email "$GIT_CONFIG_EMAIL"
+          git config --global user.name "$GIT_CONFIG_NAME"
+
+      - name: Clone repository and create tag
+        run: |
+          mkdir preci && cd preci
+          gh repo clone "$REPO"
+          cd $(basename "$REPO")
+          git checkout $RELEASE_BRANCH
+          git pull origin $RELEASE_BRANCH
+          NEXT_RELEASE_VERSION=v$(curl -s https://raw.githubusercontent.com/devtron-labs/charts/refs/heads/main/charts/devtron/Chart.yaml | grep 'appVersion' | awk '{print $2}')
+          # Create and push tag
+          git tag $NEXT_RELEASE_VERSION
+          git push -f https://$GIT_USERNAME:[email protected]/$GIT_REPO $NEXT_RELEASE_VERSION
+  
   create-release:
-    # The type of runner that the job will run on
+    needs: create-release-tag
     runs-on: ubuntu-latest
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Runs series of commands to create a release
     - name: create-release
       run: |
-        RELEASE_FILE_CONTENTS=$(curl -L -s  "https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/${RELEASE_BRANCH}/manifests/release.txt" )
-        RELEASE_TYPE=$(echo $RELEASE_FILE_CONTENTS | awk '{print $1}')
         FILE_NAME=${FILE_NAME:=releasenotes.md}
         echo $RELEASE_TYPE
         echo $GITHUB_REPOSITORY
+        echo $RELEASE_BRANCH
+        version=$(curl -s https://raw.githubusercontent.com/devtron-labs/devtron/refs/heads/main/charts/devtron/Chart.yaml | grep "appVersion" | awk -F ': ' '{print $2}' )
+        if [[ "$version" == *"-rc"* ]]; then
+          RELEASE_TYPE="beta"
+        else
+          RELEASE_TYPE="minor"
+        fi
         gh repo clone $GITHUB_REPOSITORY
         cd devtron
-        if [[ "$RELEASE_TYPE" == "stable" ]]
+        if [[ "$RELEASE_TYPE" == "major" || "$RELEASE_TYPE" == "minor" || "$RELEASE_TYPE" == "patch" ]]
           then
             tag=$(git tag --sort=committerdate | tail -1)
             echo $tag
@@ -39,11 +76,9 @@ jobs:
             git config --global user.name "$GIT_CONFIG_NAME"
             rm -f $FILE_NAME
             touch $FILE_NAME
-            echo "## Bugs" > beta-releasenotes.md
-            echo "## Enhancements" >> beta-releasenotes.md
-            echo "## Documentation" >> beta-releasenotes.md
+            echo "## Enhancements" > beta-releasenotes.md
+            echo "## Bugs" >> beta-releasenotes.md
             echo "## Others" >> beta-releasenotes.md
-            echo "beta -1 $tag" > manifests/release.txt
             git add .
             git commit -am "Updated release-notes files"
             git push -f https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} release-bot
@@ -52,26 +87,29 @@ jobs:
             git checkout -b release-bot
             git config --global user.email "$GIT_CONFIG_EMAIL"
             git config --global user.name "$GIT_CONFIG_NAME"
-            echo "## Bugs" > beta-releasenotes.md
-            echo "## Enhancements" >> beta-releasenotes.md
-            echo "## Documentation" >> beta-releasenotes.md
+            echo "## Enhancements" > beta-releasenotes.md
+            echo "## Bugs" >> beta-releasenotes.md
             echo "## Others" >> beta-releasenotes.md
             git add .
             git commit -am "Created release-notes files"
             git push -f https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} release-bot
             echo "Not creating release due to beta"
         fi
       env:
+        RELEASE_BRANCH: "main"
         GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
-        RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}
         GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
         GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
     # Send notification on discord
     - name: discord-notify
       run: |
-        RELEASE_FILE_CONTENTS=$(curl -L -s  "https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/${RELEASE_BRANCH}/manifests/release.txt" )
-        RELEASE_TYPE=$(echo $RELEASE_FILE_CONTENTS | awk '{print $1}')
-        if [[ "$RELEASE_TYPE" == "stable" ]]
+        version=$(curl -s https://raw.githubusercontent.com/devtron-labs/devtron/refs/heads/main/charts/devtron/Chart.yaml | grep "appVersion" | awk -F ': ' '{print $2}' )
+        if [[ "$version" == *"-rc"* ]]; then
+          RELEASE_TYPE="beta"
+        else
+          RELEASE_TYPE="minor"
+        fi
+        if [[ "$RELEASE_TYPE" == "major" || "$RELEASE_TYPE" == "minor" || "$RELEASE_TYPE" == "patch" ]]
         then
         sudo apt install python3 python3-pip -y
         pip install discord-webhook
@@ -84,5 +122,3 @@ jobs:
         then
         echo "Not sending notification due to beta"
         fi
-      env:
-        RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}

.gitignore

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

App.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"github.com/devtron-labs/common-lib/middlewares"
 	pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
+	posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
 	"github.com/devtron-labs/devtron/pkg/eventProcessor"
 	"github.com/devtron-labs/devtron/pkg/eventProcessor/in"
 	"log"
@@ -31,7 +32,6 @@ import (
 	"time"
 
 	"github.com/devtron-labs/devtron/api/util"
-	"github.com/devtron-labs/devtron/client/telemetry"
 	"github.com/devtron-labs/devtron/otel"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 
@@ -55,7 +55,7 @@ type App struct {
 	EnforcerV2    *casbinv2.SyncedEnforcer
 	server        *http.Server
 	db            *pg.DB
-	posthogClient *telemetry.PosthogClient
+	posthogClient *posthogTelemetry.PosthogClient
 	// eventProcessor.CentralEventProcessor is used to register event processors
 	centralEventProcessor *eventProcessor.CentralEventProcessor // do not remove this.
 	// used for local dev only
@@ -73,7 +73,7 @@ func NewApp(router *router.MuxRouter,
 	enforcer *casbin.SyncedEnforcer,
 	db *pg.DB,
 	sessionManager2 *authMiddleware.SessionManager,
-	posthogClient *telemetry.PosthogClient,
+	posthogClient *posthogTelemetry.PosthogClient,
 	loggingMiddleware util.LoggingMiddleware,
 	centralEventProcessor *eventProcessor.CentralEventProcessor,
 	pubSubClient *pubsub.PubSubClientServiceImpl,

CHANGELOG/release-notes-v1.4.0.md

@@ -0,0 +1,20 @@
+## v1.4.0
+
+## Enhancements
+- feat: Made ng labels env driven (#6438)
+- feat: Link helm release (#6454)
+- feat: access manager (#6377)
+- feat: migrate external argo cd application (#6303)
+- feat: Dark Mode v1 (#2348)
+- feat: Dark Mode v2 (#2367)
+- feat: Dark Mode v3 (#2484)
+## Bugs
+- fix: cluster update issue (#6465)
+- fix: in CreateGrafanaDataSource (#6463)
+- fix: onboard acd app (#6457)
+- fix: prom client in chart-sync (#6442)
+- fix: incorrect gitops metrics (#6444)
+- fix: envId check in EventBuilder.go (#6436)
+- fix: createDockerRepoIfNeeded error handling (#6433)
+
+

CHANGELOG/release-notes-v1.5.0.md

@@ -0,0 +1,19 @@
+## v1.5.0
+
+## Enhancements
+- feat: Config Approval bypass v1 (for cm, cs and deployment template) (#6493)
+- feat: Licensing changes (#6474)
+## Bugs
+- fix: Added support for IAM role S3 blob client (#6521)
+- fix: Making tx independent of git sensor call (#6519)
+- fix: Sql query memory issue (#6516)
+- fix: Grafana data-source get API (#6503)
+- fix: Made triggeredBy for CI & CD uniform (#6489)
+- fix: HPA permission denied error (#6485)
+- fix: Force abort for pre/post cd  (#6475)
+- fix: Optimisation in workflow status api (#6473)
+- fix: Let user delete the container reg if the ref app was deleted (#6464)
+## Others
+- misc: Update the descriptions of env variables (#6499)
+- misc: Patch api for user attribute (#6490)
+- chore: Nil implementations fixed for user attribute in telemetry (#6497)

CHANGELOG/release-notes-v1.5.1.md

@@ -0,0 +1,6 @@
+## v1.5.1
+
+## Bugs
+- fix: stack manager page break on server api giving internal server error  (#6556)
+
+

Wire.go

@@ -22,7 +22,8 @@ package main
 import (
 	"github.com/devtron-labs/authenticator/middleware"
 	cloudProviderIdentifier "github.com/devtron-labs/common-lib/cloud-provider-identifier"
-	pubsub1 "github.com/devtron-labs/common-lib/pubsub-lib"
+	pubSub "github.com/devtron-labs/common-lib/pubsub-lib"
+	posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
 	util4 "github.com/devtron-labs/common-lib/utils/k8s"
 	"github.com/devtron-labs/devtron/api/apiToken"
 	appStoreRestHandler "github.com/devtron-labs/devtron/api/appStore"
@@ -144,6 +145,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/deploymentGroup"
 	"github.com/devtron-labs/devtron/pkg/dockerRegistry"
 	"github.com/devtron-labs/devtron/pkg/eventProcessor"
+	"github.com/devtron-labs/devtron/pkg/executor"
 	"github.com/devtron-labs/devtron/pkg/generateManifest"
 	"github.com/devtron-labs/devtron/pkg/gitops"
 	"github.com/devtron-labs/devtron/pkg/imageDigestPolicy"
@@ -152,6 +154,7 @@ import (
 	repository7 "github.com/devtron-labs/devtron/pkg/kubernetesResourceAuditLogs/repository"
 	"github.com/devtron-labs/devtron/pkg/notifier"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
+	"github.com/devtron-labs/devtron/pkg/pipeline/draftAwareConfigService"
 	"github.com/devtron-labs/devtron/pkg/pipeline/executors"
 	history3 "github.com/devtron-labs/devtron/pkg/pipeline/history"
 	repository3 "github.com/devtron-labs/devtron/pkg/pipeline/history/repository"
@@ -164,6 +167,7 @@ import (
 	resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
 	"github.com/devtron-labs/devtron/pkg/resourceQualifiers"
 	"github.com/devtron-labs/devtron/pkg/sql"
+	"github.com/devtron-labs/devtron/pkg/ucid"
 	util3 "github.com/devtron-labs/devtron/pkg/util"
 	"github.com/devtron-labs/devtron/pkg/variables"
 	"github.com/devtron-labs/devtron/pkg/variables/parsers"
@@ -218,7 +222,7 @@ func InitializeApp() (*App, error) {
 		userResource.UserResourceWireSet,
 		policyGovernance.PolicyGovernanceWireSet,
 		resourceScan.ScanningResultWireSet,
-
+		executor.ExecutorWireSet,
 		// -------wireset end ----------
 		// -------
 		gitSensor.GetConfig,
@@ -477,9 +481,6 @@ func InitializeApp() (*App, error) {
 		util.IntValidator,
 		types.GetCiCdConfig,
 
-		pipeline.NewWorkflowServiceImpl,
-		wire.Bind(new(pipeline.WorkflowService), new(*pipeline.WorkflowServiceImpl)),
-
 		pipeline.NewCiServiceImpl,
 		wire.Bind(new(pipeline.CiService), new(*pipeline.CiServiceImpl)),
 
@@ -500,7 +501,7 @@ func InitializeApp() (*App, error) {
 		pipeline.NewCiLogServiceImpl,
 		wire.Bind(new(pipeline.CiLogService), new(*pipeline.CiLogServiceImpl)),
 
-		pubsub1.NewPubSubClientServiceImpl,
+		pubSub.NewPubSubClientServiceImpl,
 
 		rbac.NewEnforcerUtilImpl,
 		wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
@@ -531,6 +532,9 @@ func InitializeApp() (*App, error) {
 		chartConfig.NewConfigMapRepositoryImpl,
 		wire.Bind(new(chartConfig.ConfigMapRepository), new(*chartConfig.ConfigMapRepositoryImpl)),
 
+		draftAwareConfigService.NewDraftAwareResourceServiceImpl,
+		wire.Bind(new(draftAwareConfigService.DraftAwareConfigService), new(*draftAwareConfigService.DraftAwareConfigServiceImpl)),
+
 		config.WireSet,
 
 		infraConfig.WireSet,
@@ -692,7 +696,8 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(router.TelemetryRouter), new(*router.TelemetryRouterImpl)),
 		restHandler.NewTelemetryRestHandlerImpl,
 		wire.Bind(new(restHandler.TelemetryRestHandler), new(*restHandler.TelemetryRestHandlerImpl)),
-		telemetry.NewPosthogClient,
+		posthogTelemetry.NewPosthogClient,
+		ucid.WireSet,
 
 		cloudProviderIdentifier.NewProviderIdentifierServiceImpl,
 		wire.Bind(new(cloudProviderIdentifier.ProviderIdentifierService), new(*cloudProviderIdentifier.ProviderIdentifierServiceImpl)),

api/appStore/deployment/AppStoreDeploymentRestHandler.go

@@ -539,6 +539,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateProjectHelmApp(w http.Res
 		if err != nil {
 			handler.Logger.Errorw("error in decoding app id", "err", err)
 			common.WriteJsonResp(w, err, "error in decoding app id", http.StatusBadRequest)
+			return
 		}
 		// this rbac object checks that whether user have permission to change current project.
 		rbacObjectForCurrentProject, rbacObjectForCurrentProject2 := handler.enforcerUtilHelm.GetHelmObjectByClusterIdNamespaceAndAppName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
@@ -555,6 +556,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateProjectHelmApp(w http.Res
 		if err != nil {
 			handler.Logger.Errorw("service err, InstalledAppId", "err", err, "InstalledAppId", request.InstalledAppId)
 			common.WriteJsonResp(w, fmt.Errorf("Unable to fetch installed app details"), nil, http.StatusBadRequest)
+			return
 		}
 		if installedApp.IsVirtualEnvironment {
 			rbacObjectForCurrentProject, _ := handler.enforcerUtilHelm.GetAppRBACNameByInstalledAppId(request.InstalledAppId)
@@ -580,8 +582,10 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateProjectHelmApp(w http.Res
 	if err != nil {
 		handler.Logger.Errorw("error in updating project for helm apps", "err", err)
 		common.WriteJsonResp(w, err, "error in updating project", http.StatusBadRequest)
+		return
 	} else {
 		handler.Logger.Errorw("Helm App project update")
 		common.WriteJsonResp(w, nil, "Project Updated", http.StatusOK)
+		return
 	}
 }

api/appStore/deployment/CommonDeploymentRestHandler.go

@@ -268,6 +268,7 @@ func (handler *CommonDeploymentRestHandlerImpl) RollbackApplication(w http.Respo
 	appOfferingMode, installedAppDto, err := handler.getAppOfferingMode(installedAppId, *request.HAppId)
 	if err != nil {
 		common.WriteJsonResp(w, err, "bad request", http.StatusBadRequest)
+		return
 	}
 	installedAppDto.UserId = userId
 	//rbac block starts from here