Releasebot global image v2

.github/CODEOWNERS

@@ -11,6 +11,7 @@ scripts/devtron-reference-helm-charts @prakarsh-dt @pawan-mehta-dt @nishant-d
 
 #Migration scripts
 scripts/sql @prakarsh-dt @vikramdevtron @kripanshdevtron @nishant-d
+scripts/utilities @prakarsh-dt @nishant-d @pawan-mehta-dt
 
 #Github Specific
 .github/ @prakarsh-dt @nishant-d @pawan-mehta-dt

.github/ISSUE_TEMPLATE/pager-duty.yaml

@@ -18,15 +18,66 @@ body:
       description: "A clear and concise description of what the bug is."
       placeholder: "It bugs out when ..."
   - type: dropdown
-    id: criticality
+    id: affected-areas
     attributes:
-      label: "Criticality"
-      description: "How critical is the issue? Please include the impact in the  "
+      label: "Affected areas"
+      description: "What areas of Devtron are impacted by the issue?"
       options:
-        - P0 - Critical/Blocking
-        - P1 - High
-        - P2 - Medium
-        - P3 - Low
+        - Devtron dashboard completely down 
+        - Login issues 
+        - RBAC Issues 
+        - CI 
+        - CD 
+        - App creation 
+        - Deployment from Chart store 
+        - Security features 
+        - CI/CD Plugins 
+        - Other CRITICAL functionality 
+        - Other NON-CRITICAL functionality
+  - type: dropdown
+    id: additional-affected-areas
+    attributes:
+      label: "Additional affected areas"
+      description: "Are there any additional affected areas?"
+      options:
+        - Devtron dashboard completely down 
+        - Login issues 
+        - RBAC Issues 
+        - CI 
+        - CD 
+        - App creation 
+        - Deployment from Chart store 
+        - Security features
+        - CI/CD Plugins 
+        - Other CRITICAL functionality 
+        - Other NON-CRITICAL functionality 
+  - type: dropdown
+    id: prod-environment
+    attributes:
+      label: "Prod/Non-prod environments?"
+      description: "Is the issue affecting Prod environments?"
+      options:
+        - Prod 
+        - Non-prod 
+  - type: dropdown
+    id: user-unblocked
+    attributes:
+      label: "Is User unblocked?"
+      description: "Is the User unblocked?"
+      options:
+        - 'Yes' 
+        - 'No'
+  - type: dropdown
+    id: user-unblocked-reason
+    attributes:
+      label: "How was the user un-blocked?"
+      description: "If the user was unblocked. How was the user un-blocked?"
+      options:
+        - TEMPORARILY - By disabling a CRITICAL functionality 
+        - TEMPORARILY - By disabling a NON-CRITICAL functionality 
+        - TEMPORARILY - By doing some changes from the backend/DB 
+        - PERMANENTLY - By giving a workaround (From outside Devtron) 
+        - PERMANENTLY - By giving a workaround (Within Devtron) 
   - type: textarea
     id: impact
     validations:
@@ -91,14 +142,6 @@ body:
         - Something Else
     validations:
       required: true
-  - type: textarea
-    id: environment
-    validations:
-      required: false
-    attributes:
-      label: "🧱 Your Environment"
-      description: "Is your environment customized in any way? Provide your Browser version as well."
-      placeholder: "I use XYZ for ..."
   - type: textarea
     id: solution
     validations:

.github/workflows/github_pagerduty_score_calculation.yml

@@ -0,0 +1,27 @@
+name: Issue Created
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  extract-issue-body:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x' 
+
+      - name: Check if pager-duty template is used
+        if: ${{ contains(github.event.issue.labels.*.name, 'pager-duty') && contains(github.event.issue.labels.*.name, 'bug') }}
+        run: |
+          echo "Issue was created using pager-duty template"
+          python3 scripts/utilities/github_pagerduty_issue_score_calculation.py
+        env:
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          ISSUE_BODY: ${{ github.event.issue.body }}
+          GITHUB_TOKEN: ${{ github.token }}
+          PAGERDUTY_SCORE_THRESHOLD: ${{ vars.PAGERDUTY_SCORE_THRESHOLD }}

App.go

@@ -35,7 +35,6 @@ import (
 
 	"github.com/casbin/casbin"
 	authMiddleware "github.com/devtron-labs/authenticator/middleware"
-	pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
 	"github.com/devtron-labs/devtron/api/router"
 	"github.com/devtron-labs/devtron/api/sse"
 	"github.com/devtron-labs/devtron/internal/middleware"
@@ -52,7 +51,6 @@ type App struct {
 	Enforcer              *casbin.SyncedEnforcer
 	server                *http.Server
 	db                    *pg.DB
-	pubsubClient          *pubsub.PubSubClientServiceImpl
 	posthogClient         *telemetry.PosthogClient
 	centralEventProcessor *eventProcessor.CentralEventProcessor
 	// used for local dev only
@@ -67,7 +65,6 @@ func NewApp(router *router.MuxRouter,
 	sse *sse.SSE,
 	enforcer *casbin.SyncedEnforcer,
 	db *pg.DB,
-	pubsubClient *pubsub.PubSubClientServiceImpl,
 	sessionManager2 *authMiddleware.SessionManager,
 	posthogClient *telemetry.PosthogClient,
 	loggingMiddleware util.LoggingMiddleware,
@@ -81,7 +78,6 @@ func NewApp(router *router.MuxRouter,
 		SSE:                   sse,
 		Enforcer:              enforcer,
 		db:                    db,
-		pubsubClient:          pubsubClient,
 		serveTls:              false,
 		sessionManager2:       sessionManager2,
 		posthogClient:         posthogClient,

Wire.go

@@ -66,7 +66,6 @@ import (
 	status3 "github.com/devtron-labs/devtron/api/router/app/pipeline/status"
 	trigger2 "github.com/devtron-labs/devtron/api/router/app/pipeline/trigger"
 	workflow2 "github.com/devtron-labs/devtron/api/router/app/workflow"
-	"github.com/devtron-labs/devtron/api/router/pubsub"
 	"github.com/devtron-labs/devtron/api/server"
 	"github.com/devtron-labs/devtron/api/sse"
 	"github.com/devtron-labs/devtron/api/team"
@@ -491,12 +490,6 @@ func InitializeApp() (*App, error) {
 
 		pubsub1.NewPubSubClientServiceImpl,
 
-		pubsub.NewGitWebhookHandler,
-		wire.Bind(new(pubsub.GitWebhookHandler), new(*pubsub.GitWebhookHandlerImpl)),
-
-		pubsub.NewApplicationStatusHandlerImpl,
-		wire.Bind(new(pubsub.ApplicationStatusHandler), new(*pubsub.ApplicationStatusHandlerImpl)),
-
 		rbac.NewEnforcerUtilImpl,
 		wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
 
@@ -966,8 +959,6 @@ func InitializeApp() (*App, error) {
 		pipeline.NewPluginInputVariableParserImpl,
 		wire.Bind(new(pipeline.PluginInputVariableParser), new(*pipeline.PluginInputVariableParserImpl)),
 
-		pipeline.NewPipelineConfigListenerServiceImpl,
-		wire.Bind(new(pipeline.PipelineConfigListenerService), new(*pipeline.PipelineConfigListenerServiceImpl)),
 		cron2.NewCronLoggerImpl,
 
 		imageDigestPolicy.NewImageDigestPolicyServiceImpl,

api/appbean/AppDetail.go

@@ -5,6 +5,7 @@ import (
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/pipeline/bean"
+	"github.com/devtron-labs/devtron/pkg/pipeline/bean/CiPipeline"
 )
 
 type AppDetail struct {
@@ -45,11 +46,11 @@ type GitMaterial struct {
 }
 
 type DockerConfig struct {
-	DockerRegistry    string                  `json:"dockerRegistry" validate:"required"`
-	DockerRepository  string                  `json:"dockerRepository" validate:"required"`
-	CiBuildConfig     *bean.CiBuildConfigBean `json:"ciBuildConfig"`
-	DockerBuildConfig *DockerBuildConfig      `json:"dockerBuildConfig,omitempty"` // Deprecated, should use CiBuildConfig for development
-	CheckoutPath      string                  `json:"checkoutPath"`
+	DockerRegistry    string                        `json:"dockerRegistry" validate:"required"`
+	DockerRepository  string                        `json:"dockerRepository" validate:"required"`
+	CiBuildConfig     *CiPipeline.CiBuildConfigBean `json:"ciBuildConfig"`
+	DockerBuildConfig *DockerBuildConfig            `json:"dockerBuildConfig,omitempty"` // Deprecated, should use CiBuildConfig for development
+	CheckoutPath      string                        `json:"checkoutPath"`
 }
 
 type DockerBuildConfig struct {

api/auth/user/UserRestHandler.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	util2 "github.com/devtron-labs/devtron/api/auth/user/util"
 	"github.com/devtron-labs/devtron/pkg/auth/user/helper"
 	"github.com/gorilla/schema"
 	"net/http"
@@ -110,6 +111,23 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 	userInfo.UserId = userId
 	handler.logger.Infow("request payload, CreateUser", "payload", userInfo)
 
+	// struct Validations
+	handler.logger.Infow("request payload, CreateUser ", "payload", userInfo)
+	err = handler.validator.Struct(userInfo)
+	if err != nil {
+		handler.logger.Errorw("validation err, CreateUser", "err", err, "payload", userInfo)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	// Doing this as api is not compatible with previous release of dashboard, groups has been migrated to userRoleGroups
+	isGroupsPresent := util2.IsGroupsPresent(userInfo.Groups)
+	if isGroupsPresent {
+		handler.logger.Errorw("validation error , createUser ", "err", err, "payload", userInfo)
+		err := &util.ApiError{Code: "406", HttpStatusCode: 406, UserMessage: "Not compatible with request", InternalMessage: "Not compatible with the request payload, as groups has been migrated to userRoleGroups"}
+		common.WriteJsonResp(w, err, nil, http.StatusNotAcceptable)
+		return
+	}
+
 	// RBAC enforcer applying
 	token := r.Header.Get("token")
 	isActionUserSuperAdmin := false
@@ -143,8 +161,8 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 	}
 
 	// auth check inside groups
-	if len(userInfo.Groups) > 0 {
-		groupRoles, err := handler.roleGroupService.FetchRolesForGroups(userInfo.Groups)
+	if len(userInfo.UserRoleGroup) > 0 {
+		groupRoles, err := handler.roleGroupService.FetchRolesForUserRoleGroups(userInfo.UserRoleGroup)
 		if err != nil && err != pg.ErrNoRows {
 			handler.logger.Errorw("service err, UpdateUser", "err", err, "payload", userInfo)
 			common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
@@ -173,14 +191,6 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 	}
 	//RBAC enforcer Ends
 
-	handler.logger.Infow("request payload, CreateUser ", "payload", userInfo)
-	err = handler.validator.Struct(userInfo)
-	if err != nil {
-		handler.logger.Errorw("validation err, CreateUser", "err", err, "payload", userInfo)
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-
 	res, err := handler.userService.CreateUser(&userInfo, token, handler.CheckManagerAuth)
 	if err != nil {
 		handler.logger.Errorw("service err, CreateUser", "err", err, "payload", userInfo)
@@ -222,6 +232,14 @@ func (handler UserRestHandlerImpl) UpdateUser(w http.ResponseWriter, r *http.Req
 		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 		return
 	}
+	// Doing this as api is not compatible with previous release of dashboard,groups has been migrated to userRoleGroups
+	isGroupsPresent := util2.IsGroupsPresent(userInfo.Groups)
+	if isGroupsPresent {
+		handler.logger.Errorw("validation error , createUser ", "err", err, "payload", userInfo)
+		err := &util.ApiError{Code: "406", HttpStatusCode: 406, UserMessage: "Not compatible with request, please update to latest version", InternalMessage: "Not compatible with the request payload, as groups has been migrated to userRoleGroups"}
+		common.WriteJsonResp(w, err, nil, http.StatusNotAcceptable)
+		return
+	}
 
 	res, rolesChanged, groupsModified, restrictedGroups, err := handler.userService.UpdateUser(&userInfo, token, handler.CheckManagerAuth)
 
@@ -327,10 +345,10 @@ func (handler UserRestHandlerImpl) GetAllV2(w http.ResponseWriter, r *http.Reque
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}
@@ -397,10 +415,10 @@ func (handler UserRestHandlerImpl) GetAll(w http.ResponseWriter, r *http.Request
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}
@@ -784,10 +802,10 @@ func (handler UserRestHandlerImpl) FetchRoleGroupsV2(w http.ResponseWriter, r *h
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}
@@ -855,10 +873,10 @@ func (handler UserRestHandlerImpl) FetchRoleGroups(w http.ResponseWriter, r *htt
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}

api/auth/user/util/util.go

@@ -0,0 +1,8 @@
+package util
+
+func IsGroupsPresent(groups []string) bool {
+	if len(groups) > 0 {
+		return true
+	}
+	return false
+}