Merge branch 'main' into rback-related-bug

Author: kishan789dev

.gitbook.yaml

@@ -76,4 +76,4 @@ redirects:
     user-guide/use-cases/untitled-3: user-guide/use-cases/connect-django-with-mysql-database.md
     global-configurations/api-token: user-guide/global-configurations/authorization/api-tokens.md
     user-guide/creating-application/workflow/ci-pipeline2: user-guide/creating-application/workflow/ci-pipeline.md
-
+    user-guide/clusters: user-guide/resource-browser.md

Makefile

@@ -40,17 +40,13 @@ test-unit:
 	go test ./pkg/pipeline
 
 test-integration:
-	export INTEGRATION_TEST_ENV_ID=$(docker run --env TEST_BRANCH=$TEST_BRANCH --env LATEST_HASH=$LATEST_HASH --privileged -d --name dind-test -v $PWD/tests/integrationTesting/:/tmp/ docker:dind)
-	docker exec ${INTEGRATION_TEST_ENV_ID} sh /tmp/create-test-env.sh
-	docker exec ${INTEGRATION_TEST_ENV_ID} sh /tests/integrationTesting/run-integration-test.sh
-
+	docker run --env-file=wireNilChecker.env  --privileged -d --name dind-test -v $(PWD)/:/wirenil/:ro -v $(PWD)/temp/:/tempfile docker:dind
+	docker exec dind-test sh -c "mkdir test && cp -r wirenil/* test/ && ./test/tests/integrationTesting/exportEnvsExecuteWireNilChecker.sh"
 run: build
 	./devtron
-
 .PHONY: build
 docker-build-image:  build
 	 docker build -t devtron:$(TAG) .
-
 .PHONY: build, all, wire, clean, run, set-docker-build-env, docker-build-push, devtron,
 docker-build-push: docker-build-image
 	docker tag devtron:${TAG}  ${REGISTRY}/devtron:${TAG}

WiringNilCheck.go

@@ -0,0 +1,138 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"strings"
+	"unsafe"
+)
+
+func CheckIfNilInWire() {
+	app, err := InitializeApp()
+	if err != nil {
+		log.Panic(err)
+	}
+	nilFieldsMap := make(map[string]bool)
+	checkNilFields(app, nilFieldsMap)
+	fmt.Println("NIL Fields present in impls are: ", nilFieldsMap)
+	//Writes the length of nilFieldsMap to a file (e.g., output.env) so that we can export this file's data in a pre-CI pipeline bash script and fail the pre-CI pipeline if the length of nilFieldsMap is greater than zero.
+	err = writeResultToFile(len(nilFieldsMap))
+	if err != nil {
+		return
+	}
+}
+
+func checkNilFields(obj interface{}, nilObjMap map[string]bool) {
+	val := reflect.ValueOf(obj)
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+	if val.Kind() != reflect.Struct {
+		return
+	}
+	valName := val.Type().Name()
+	for i := 0; i < val.NumField(); i++ {
+		field := val.Field(i)
+		fieldName := val.Type().Field(i).Name
+		pkgPath := val.Type().PkgPath()
+		if pkgPath != "main" && !strings.Contains(pkgPath, "devtron-labs/devtron") {
+			//package not from this repo, ignoring
+			continue
+		}
+		if skipUnnecessaryFieldsForCheck(fieldName, valName) { // skip unnecessary fileds and values
+			continue
+		}
+		if !canFieldTypeBeNil(field) { // field can not be nil, skip
+			continue
+		} else if field.IsNil() { // check if the field is nil
+			mapEntry := fmt.Sprintf("%s.%s", valName, fieldName)
+			nilObjMap[mapEntry] = true
+			continue
+		}
+		if canSkipFieldStructCheck(fieldName, valName) {
+			continue
+		}
+		if !isExported(fieldName) && !field.CanInterface() {
+			unexportedField := GetUnexportedField(field)
+			checkNilFields(unexportedField, nilObjMap)
+		} else {
+			// Recurse
+			checkNilFields(field.Interface(), nilObjMap)
+		}
+	}
+}
+
+func canFieldTypeBeNil(field reflect.Value) bool {
+	kind := field.Kind()
+	switch kind {
+	case reflect.Chan, reflect.Func, reflect.Map, reflect.Pointer, reflect.UnsafePointer,
+		reflect.Interface, reflect.Slice:
+		return true
+	default: //other types can not be nil
+		return false
+	}
+}
+
+func canSkipFieldStructCheck(fieldName, valName string) bool {
+	fieldName = strings.ToLower(fieldName)
+	valName = strings.ToLower(valName)
+	if valName == "githubclient" && (fieldName == "client" || fieldName == "gitopshelper") {
+		return true
+	}
+	for _, str := range []string{"logger", "dbconnection", "syncedenforcer"} {
+		if fieldName == str {
+			return true
+		}
+	}
+	return false
+}
+
+func skipUnnecessaryFieldsForCheck(fieldName, valName string) bool {
+	fieldName = strings.ToLower(fieldName)
+	valName = strings.ToLower(valName)
+	if valName == "cicdconfig" {
+		return true
+	}
+	fieldAndValName := map[string][]string{
+		"app":                          {"enforcerv2", "server"},
+		"gitfactory":                   {"client"},
+		"argocdconnectionmanagerimpl":  {"argocdsettings"},
+		"enforcerimpl":                 {"cache", "enforcerv2"},
+		"helmappclientimpl":            {"applicationserviceclient"},
+		"modulecronserviceimpl":        {"cron"},
+		"oteltracingserviceimpl":       {"traceprovider"},
+		"terminalaccessrepositoryimpl": {"templatescache"},
+	}
+	if _, ok := fieldAndValName[valName]; ok {
+		for _, ignoreFieldName := range fieldAndValName[valName] {
+			if ignoreFieldName == fieldName {
+				return true
+			}
+		}
+	}
+	return false
+}
+func GetUnexportedField(field reflect.Value) interface{} {
+	return reflect.NewAt(field.Type(), unsafe.Pointer(field.UnsafeAddr())).Elem().Interface()
+}
+
+func isExported(fieldName string) bool {
+	return strings.ToUpper(fieldName[0:1]) == fieldName[0:1]
+}
+
+func writeResultToFile(data int) error {
+	file, err := os.Create("/test/output.env")
+	if err != nil {
+		log.Println("Failed to create file:", err)
+		return err
+	}
+	defer file.Close()
+	_, err = file.WriteString(fmt.Sprintf("OUTPUT=%d", data))
+	if err != nil {
+		log.Println("Failed to write to file:", err)
+		return err
+	}
+	return nil
+}

api/appStore/InstalledAppRestHandler.go

@@ -26,6 +26,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/deploymentTypeChange"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/resource"
+	util3 "github.com/devtron-labs/devtron/pkg/appStore/util"
 	"github.com/devtron-labs/devtron/pkg/bean"
 	"net/http"
 	"strconv"
@@ -603,6 +604,10 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledApp(w htt
 		common.WriteJsonResp(w, err, "App not found in database", http.StatusBadRequest)
 		return
 	}
+	if util3.IsExternalChartStoreApp(installedApp.App.DisplayName) {
+		//this is external app case where app_name is a unique identifier, and we want to fetch resource based on display_name
+		handler.installedAppService.ChangeAppNameToDisplayNameForInstalledApp(installedApp)
+	}
 
 	appDetail, err := handler.installedAppService.FindAppDetailsForAppstoreApplication(installedAppId, envId)
 	if err != nil {
@@ -724,6 +729,10 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
 		common.WriteJsonResp(w, err, "App not found in database", http.StatusBadRequest)
 		return
 	}
+	if util3.IsExternalChartStoreApp(installedApp.App.DisplayName) {
+		//this is external app case where app_name is a unique identifier, and we want to fetch resource based on display_name
+		handler.installedAppService.ChangeAppNameToDisplayNameForInstalledApp(installedApp)
+	}
 	if installedApp.Environment.IsVirtualEnvironment {
 		common.WriteJsonResp(w, nil, nil, http.StatusOK)
 		return

api/appStore/deployment/CommonDeploymentRestHandler.go

@@ -93,7 +93,8 @@ func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppI
 			err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "invalid app id"}
 			return appOfferingMode, installedAppDto, err
 		}
-		installedAppDto, err = handler.installedAppService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
+		uniqueAppName := appIdentifier.GetUniqueAppNameIdentifier()
+		installedAppDto, err = handler.installedAppService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, uniqueAppName)
 		if err != nil {
 			err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "unable to find app in database"}
 			return appOfferingMode, installedAppDto, err

api/auth/user/UserRestHandler.go

@@ -191,7 +191,7 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 	}
 	//RBAC enforcer Ends
 
-	res, err := handler.userService.CreateUser(&userInfo, token, handler.CheckManagerAuth)
+	res, restrictedGroups, err := handler.userService.CreateUser(&userInfo, token, handler.CheckManagerAuth)
 	if err != nil {
 		handler.logger.Errorw("service err, CreateUser", "err", err, "payload", userInfo)
 		if _, ok := err.(*util.ApiError); ok {
@@ -203,7 +203,22 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 		return
 	}
 
-	common.WriteJsonResp(w, err, res, http.StatusOK)
+	if len(restrictedGroups) == 0 {
+		common.WriteJsonResp(w, err, res, http.StatusOK)
+	} else {
+		errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin := helper.CreateErrorMessageForUserRoleGroups(restrictedGroups)
+
+		if len(restrictedGroups) != len(userInfo.UserRoleGroup) {
+			// warning
+			message := fmt.Errorf("User permissions added partially. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
+			common.WriteJsonResp(w, message, nil, http.StatusExpectationFailed)
+
+		} else {
+			//error
+			message := fmt.Errorf("Permission could not be added. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
+			common.WriteJsonResp(w, message, nil, http.StatusBadRequest)
+		}
+	}
 }
 
 func (handler UserRestHandlerImpl) UpdateUser(w http.ResponseWriter, r *http.Request) {
@@ -252,16 +267,16 @@ func (handler UserRestHandlerImpl) UpdateUser(w http.ResponseWriter, r *http.Req
 	if len(restrictedGroups) == 0 {
 		common.WriteJsonResp(w, err, res, http.StatusOK)
 	} else {
-		groups := strings.Join(restrictedGroups, ", ")
+		errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin := helper.CreateErrorMessageForUserRoleGroups(restrictedGroups)
 
 		if rolesChanged || groupsModified {
 			// warning
-			message := fmt.Errorf("User permissions updated partially. Group(s): " + groups + " could not be added/removed. You do not have manager permission for some or all projects in these groups.")
+			message := fmt.Errorf("User permissions updated partially. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
 			common.WriteJsonResp(w, message, nil, http.StatusExpectationFailed)
 
 		} else {
 			//error
-			message := fmt.Errorf("Permission could not be added/removed: You do not have manager permission for some or all projects in group(s): " + groups + ".")
+			message := fmt.Errorf("Permission could not be added/removed. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
 			common.WriteJsonResp(w, message, nil, http.StatusBadRequest)
 		}
 	}

api/bean/UserRequest.go

@@ -131,6 +131,11 @@ type RoleGroupListingResponse struct {
 	TotalCount int          `json:"totalCount"`
 }
 
+type RestrictedGroup struct {
+	Group                   string
+	HasSuperAdminPermission bool
+}
+
 type ListingRequest struct {
 	SearchKey  string         `json:"searchKey"`
 	SortOrder  bean.SortOrder `json:"sortOrder"`

api/helm-app/HelmAppRestHandler.go

@@ -224,15 +224,15 @@ func (handler *HelmAppRestHandlerImpl) GetReleaseInfo(w http.ResponseWriter, r *
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	installedApp, err := handler.installedAppService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
+	installedAppVersionDto, err := handler.installedAppService.GetReleaseInfo(appIdentifier)
 	if err != nil {
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
 
 	res := &bean.ReleaseAndInstalledAppInfo{
 		ReleaseInfo:      releaseInfo,
-		InstalledAppInfo: bean.ConvertToInstalledAppInfo(installedApp),
+		InstalledAppInfo: bean.ConvertToInstalledAppInfo(installedAppVersionDto),
 	}
 
 	common.WriteJsonResp(w, err, res, http.StatusOK)

api/helm-app/HelmAppRouter.go

@@ -29,6 +29,7 @@ func (impl *HelmAppRouterImpl) InitAppListRouter(helmRouter *mux.Router) {
 	helmRouter.Path("/hibernate").HandlerFunc(impl.helmAppRestHandler.Hibernate).Methods("POST")
 	helmRouter.Path("/unhibernate").HandlerFunc(impl.helmAppRestHandler.UnHibernate).Methods("POST")
 
+	// GetReleaseInfo used only for external apps
 	helmRouter.Path("/release-info").Queries("appId", "{appId}").
 		HandlerFunc(impl.helmAppRestHandler.GetReleaseInfo).Methods("GET")