Merge branch 'develop' of github.com:devtron-labs/devtron into build-worker-status

# Conflicts:
#	wire_gen.go

Author: ayu-devtron

.github/workflows/multiarch_new.yaml

@@ -41,8 +41,8 @@ jobs:
              local image="$1"
              local image_ref=$(echo $image | sed 's/:.*//')
              
-             # skipping the check for 'inception', 'postgres' , 'postgres_exporter' and 'workflow-controller' images
-             if [[ "$image_ref" == "inception" || "$image_ref" == "postgres" || "$image_ref" == "postgres_exporter" || "$image_ref" == "workflow-controller" ]]; then
+             # skipping the check for 'inception', 'postgres' , 'postgres_exporter', 'workflow-controller', 'casbin' and 'scoop' images
+             if [[ "$image_ref" == "inception" || "$image_ref" == "postgres" || "$image_ref" == "postgres_exporter" || "$image_ref" == "workflow-controller" || "$image_ref" == "casbin" || "$image_ref" == "scoop" ]]; then
                  return
              fi
             

api/restHandler/app/appList/AppListingRestHandler_ent.go

@@ -15,5 +15,5 @@ func (handler AppListingRestHandlerImpl) GetAllAppEnvsFromResourceNames(w http.R
 }
 
 func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) (AppView.AppDetailContainer, error) {
-	return AppView.AppDetailContainer{}, nil
+	return appDetail, nil
 }

cmd/external-app/wire.go

@@ -80,8 +80,8 @@ import (
 	"github.com/devtron-labs/devtron/pkg/kubernetesResourceAuditLogs"
 	repository2 "github.com/devtron-labs/devtron/pkg/kubernetesResourceAuditLogs/repository"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
-	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
-	security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/repository"
+	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/scanTool"
+	security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/scanTool/repository"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	util2 "github.com/devtron-labs/devtron/pkg/util"
 	util3 "github.com/devtron-labs/devtron/util"
@@ -130,6 +130,7 @@ func InitializeApp() (*App, error) {
 		telemetry.NewPosthogClient,
 		delete2.NewDeleteServiceImpl,
 		gitMaterial.GitMaterialWireSet,
+		scanTool.ScanToolWireSet,
 
 		sql.NewTransactionUtilImpl,
 
@@ -221,9 +222,6 @@ func InitializeApp() (*App, error) {
 		kubernetesResourceAuditLogs.Newk8sResourceHistoryServiceImpl,
 		wire.Bind(new(kubernetesResourceAuditLogs.K8sResourceHistoryService), new(*kubernetesResourceAuditLogs.K8sResourceHistoryServiceImpl)),
 
-		imageScanning.NewScanToolMetadataServiceImpl,
-		wire.Bind(new(imageScanning.ScanToolMetadataService), new(*imageScanning.ScanToolMetadataServiceImpl)),
-
 		security2.NewScanToolMetadataRepositoryImpl,
 		wire.Bind(new(security2.ScanToolMetadataRepository), new(*security2.ScanToolMetadataRepositoryImpl)),
 

cmd/external-app/wire_gen.go

@@ -17,210 +17,9 @@
 package main
 
 import (
-	"encoding/json"
-	"errors"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"log"
-	"os"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"strings"
-	"text/template"
+	"github.com/devtron-labs/common-lib/fetchAllEnv"
 )
 
-type EnvField struct {
-	Env            string
-	EnvType        string
-	EnvValue       string
-	EnvDescription string
-	Example        string
-	Deprecated     string
-}
-
-type CategoryField struct {
-	Category string
-	Fields   []EnvField
-}
-
-const (
-	categoryCommentStructPrefix = "CATEGORY="
-	defaultCategory             = "DEVTRON"
-	deprecatedDefaultValue      = "false"
-
-	envFieldTypeTag               = "env"
-	envDefaultFieldTypeTag        = "envDefault"
-	envDescriptionFieldTypeTag    = "description"
-	envPossibleValuesFieldTypeTag = "example"
-	envDeprecatedFieldTypeTag     = "deprecated"
-	MARKDOWN_FILENAME             = "env_gen.md"
-	MARKDOWN_JSON_FILENAME        = "env_gen.json"
-)
-
-const MarkdownTemplate = `
-{{range . }}
-## {{ .Category }} Related Environment Variables
-| Key   | Type     | Default Value     | Description       | Example       | Deprecated       |
-|-------|----------|-------------------|-------------------|-----------------------|------------------|
-{{range .Fields }} | {{ .Env }} | {{ .EnvType }} |{{ .EnvValue }} | {{ .EnvDescription }} | {{ .Example }} | {{ .Deprecated }} |
-{{end}}
-{{end}}`
-
 func main() {
-	WalkThroughProject()
-	return
-}
-
-func WalkThroughProject() {
-	categoryFieldsMap := make(map[string][]EnvField)
-	uniqueKeys := make(map[string]bool)
-	err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !info.IsDir() && strings.HasSuffix(path, ".go") {
-			err = processGoFile(path, categoryFieldsMap, uniqueKeys)
-			if err != nil {
-				log.Println("error in processing go file", err)
-				return err
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return
-	}
-	writeToFile(categoryFieldsMap)
-}
-
-func processGoFile(filePath string, categoryFieldsMap map[string][]EnvField, uniqueKeys map[string]bool) error {
-	fset := token.NewFileSet()
-	node, err := parser.ParseFile(fset, filePath, nil, parser.ParseComments)
-	if err != nil {
-		log.Println("error parsing file:", err)
-		return err
-	}
-	ast.Inspect(node, func(n ast.Node) bool {
-		if genDecl, ok := n.(*ast.GenDecl); ok {
-			// checking if type declaration, one of [func, map, struct, array, channel, interface]
-			if genDecl.Tok == token.TYPE {
-				for _, spec := range genDecl.Specs {
-					if typeSpec, ok := spec.(*ast.TypeSpec); ok {
-						// only checking struct type declarations
-						if structType, ok2 := typeSpec.Type.(*ast.StructType); ok2 {
-							allFields := make([]EnvField, 0, len(structType.Fields.List))
-							for _, field := range structType.Fields.List {
-								if field.Tag != nil {
-									envField := getEnvKeyAndValue(field)
-									envKey := envField.Env
-									if len(envKey) == 0 || uniqueKeys[envKey] {
-										continue
-									}
-									allFields = append(allFields, envField)
-									uniqueKeys[envKey] = true
-								}
-							}
-							if len(allFields) > 0 {
-								category := getCategoryForAStruct(genDecl)
-								categoryFieldsMap[category] = append(categoryFieldsMap[category], allFields...)
-							}
-						}
-					}
-				}
-			}
-		}
-		return true
-	})
-	return nil
-}
-
-func getEnvKeyAndValue(field *ast.Field) EnvField {
-	tag := reflect.StructTag(strings.Trim(field.Tag.Value, "`")) // remove surrounding backticks
-
-	envKey := addReadmeTableDelimiterEscapeChar(tag.Get(envFieldTypeTag))
-	envValue := addReadmeTableDelimiterEscapeChar(tag.Get(envDefaultFieldTypeTag))
-	envDescription := addReadmeTableDelimiterEscapeChar(tag.Get(envDescriptionFieldTypeTag))
-	envPossibleValues := addReadmeTableDelimiterEscapeChar(tag.Get(envPossibleValuesFieldTypeTag))
-	envDeprecated := addReadmeTableDelimiterEscapeChar(tag.Get(envDeprecatedFieldTypeTag))
-	// check if there exist any value provided in env for this field
-	if value, ok := os.LookupEnv(envKey); ok {
-		envValue = value
-	}
-	env := EnvField{
-		Env:            envKey,
-		EnvValue:       envValue,
-		EnvDescription: envDescription,
-		Example:        envPossibleValues,
-		Deprecated:     envDeprecated,
-	}
-	if indent, ok := field.Type.(*ast.Ident); ok && indent != nil {
-		env.EnvType = indent.Name
-	}
-	if len(envDeprecated) == 0 {
-		env.Deprecated = deprecatedDefaultValue
-	}
-	return env
-}
-
-func getCategoryForAStruct(genDecl *ast.GenDecl) string {
-	category := defaultCategory
-	if genDecl.Doc != nil {
-		commentTexts := strings.Split(genDecl.Doc.Text(), "\n")
-		for _, comment := range commentTexts {
-			commentText := strings.TrimPrefix(strings.ReplaceAll(comment, " ", ""), "//") // this can happen if comment group is in /* */
-			if strings.HasPrefix(commentText, categoryCommentStructPrefix) {
-				categories := strings.Split(strings.TrimPrefix(commentText, categoryCommentStructPrefix), ",")
-				if len(categories) > 0 && len(categories[0]) > 0 { //only supporting one category as of now
-					category = categories[0] //overriding category
-					break
-				}
-			}
-		}
-	}
-	return category
-}
-
-func addReadmeTableDelimiterEscapeChar(s string) string {
-	return strings.ReplaceAll(s, "|", `\|`)
-}
-
-func writeToFile(categoryFieldsMap map[string][]EnvField) {
-	cfs := make([]CategoryField, 0, len(categoryFieldsMap))
-	for category, allFields := range categoryFieldsMap {
-		sort.Slice(allFields, func(i, j int) bool {
-			return allFields[i].Env < allFields[j].Env
-		})
-
-		cfs = append(cfs, CategoryField{
-			Category: category,
-			Fields:   allFields,
-		})
-	}
-	sort.Slice(cfs, func(i, j int) bool {
-		return cfs[i].Category < cfs[j].Category
-	})
-	file, err := os.Create(MARKDOWN_FILENAME)
-	if err != nil && !errors.Is(err, os.ErrExist) {
-		panic(err)
-	}
-	defer file.Close()
-	tmpl, err := template.New("markdown").Parse(MarkdownTemplate)
-	if err != nil {
-		panic(err)
-	}
-	err = tmpl.Execute(file, cfs)
-	if err != nil {
-		panic(err)
-	}
-	cfsMarshaled, err := json.Marshal(cfs)
-	if err != nil {
-		log.Println("error marshalling category fields:", err)
-		panic(err)
-	}
-	err = os.WriteFile(MARKDOWN_JSON_FILENAME, cfsMarshaled, 0644)
-	if err != nil {
-		panic(err)
-	}
+	fetchAllEnv.FetchEnvAndWriteToFile()
 }

fetchAllEnv/fetchAllEnv.go

@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250117064214-73c2e66ce2d7
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122110043-4d939279c70a
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 	k8s.io/api => k8s.io/api v0.29.7

go.mod

@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250117064214-73c2e66ce2d7 h1:Z29616pM3W6fcDvFsiX6JTWz2lYvdZdqzIRBfBwnK1U=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250117064214-73c2e66ce2d7/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122110043-4d939279c70a h1:kDemKb2wGKXaRjRqWuu7FIGcfeacoW0kH9yzpSDTWN8=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122110043-4d939279c70a/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f h1:8nYP02cYX/9e3H8YfBV4b8hP4WwbGY/dUMNu+N9cH1Q=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

go.sum

@@ -308,10 +308,10 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 
 	// if any pipeline found get the latest deployment time
 	if len(pipelineIds) > 0 {
-		query := impl.appListingRepositoryQueryBuilder.BuildAppListingQueryLastDeploymentTimeV2(pipelineIds)
+		query, queryParams := impl.appListingRepositoryQueryBuilder.BuildAppListingQueryLastDeploymentTimeV2(pipelineIds)
 		impl.Logger.Debugw("basic app detail query: ", query)
 		start := time.Now()
-		_, err := impl.dbConnection.Query(&lastDeployedTimeDTO, query)
+		_, err := impl.dbConnection.Query(&lastDeployedTimeDTO, query, queryParams...)
 		middleware.AppListingDuration.WithLabelValues("buildAppListingQueryLastDeploymentTime", "devtron").Observe(time.Since(start).Seconds())
 		if err != nil {
 			impl.Logger.Errorw("error in getting latest deployment time for given pipelines", "err", err, "pipelines", pipelineIds, "query", query)

internal/sql/repository/AppListingRepository.go

@@ -362,8 +362,8 @@ func (impl CiArtifactRepositoryImpl) GetArtifactsByCDPipelineV3(listingFilterOpt
 	artifactsResp := make([]*CiArtifactWithExtraData, 0, listingFilterOpts.Limit)
 	var artifacts []*CiArtifact
 	totalCount := 0
-	finalQuery := BuildQueryForParentTypeCIOrWebhook(*listingFilterOpts)
-	_, err := impl.dbConnection.Query(&artifactsResp, finalQuery)
+	finalQuery, finalQueryParams := BuildQueryForParentTypeCIOrWebhook(*listingFilterOpts)
+	_, err := impl.dbConnection.Query(&artifactsResp, finalQuery, finalQueryParams...)
 	if err != nil {
 		return nil, totalCount, err
 	}

internal/sql/repository/CiArtifactRepository.go

@@ -20,24 +20,28 @@ import (
 	"fmt"
 	"github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
+	"github.com/go-pg/pg"
 )
 
 const EmptyLikeRegex = "%%"
 
-func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilterOptions) string {
-	commonPaginatedQueryPart := fmt.Sprintf(" cia.image LIKE '%v'", listingFilterOpts.SearchString)
+func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilterOptions) (string, []interface{}) {
+	commonPaginatedQueryPart, commonPaginatedQueryParams := " cia.image LIKE ?", []interface{}{listingFilterOpts.SearchString}
 	orderByClause := " ORDER BY cia.id DESC"
-	limitOffsetQueryPart := fmt.Sprintf(" LIMIT %v OFFSET %v", listingFilterOpts.Limit, listingFilterOpts.Offset)
+	limitOffsetQueryPart, limitOffsetQueryParams := fmt.Sprintf(" LIMIT ? OFFSET ?"), []interface{}{listingFilterOpts.Limit, listingFilterOpts.Offset}
 	finalQuery := ""
+	var finalQueryParams []interface{}
+	var remainingQueryParams []interface{}
 	if listingFilterOpts.ParentStageType == bean.CI_WORKFLOW_TYPE {
 		selectQuery := " SELECT cia.* "
 		remainingQuery := " FROM ci_artifact cia" +
 			" INNER JOIN ci_pipeline cp ON (cp.id=cia.pipeline_id or (cp.id=cia.component_id and cia.data_source='post_ci' ) )" +
-			" INNER JOIN pipeline p ON (p.ci_pipeline_id = cp.id and p.id=%v )" +
+			" INNER JOIN pipeline p ON (p.ci_pipeline_id = cp.id and p.id=? )" +
 			" WHERE "
-		remainingQuery = fmt.Sprintf(remainingQuery, listingFilterOpts.PipelineId)
+		remainingQueryParams = []interface{}{listingFilterOpts.PipelineId}
 		if len(listingFilterOpts.ExcludeArtifactIds) > 0 {
-			remainingQuery += fmt.Sprintf("cia.id NOT IN (%s) AND ", helper.GetCommaSepratedString(listingFilterOpts.ExcludeArtifactIds))
+			remainingQuery += "cia.id NOT IN (?) AND "
+			remainingQueryParams = append(remainingQueryParams, pg.In(listingFilterOpts.ExcludeArtifactIds))
 		}
 
 		countQuery := " SELECT count(cia.id)  as total_count"
@@ -47,19 +51,24 @@ func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilt
 	} else if listingFilterOpts.ParentStageType == bean.WEBHOOK_WORKFLOW_TYPE {
 		selectQuery := " SELECT cia.* "
 		remainingQuery := " FROM ci_artifact cia " +
-			" WHERE cia.external_ci_pipeline_id = %v AND "
-		remainingQuery = fmt.Sprintf(remainingQuery, listingFilterOpts.ParentId)
+			" WHERE cia.external_ci_pipeline_id = ? AND "
+		remainingQueryParams = []interface{}{listingFilterOpts.ParentId}
 		if len(listingFilterOpts.ExcludeArtifactIds) > 0 {
-			remainingQuery += fmt.Sprintf("cia.id NOT IN (%s) AND ", helper.GetCommaSepratedString(listingFilterOpts.ExcludeArtifactIds))
+			remainingQuery += "cia.id NOT IN (?) AND "
+			remainingQueryParams = append(remainingQueryParams, pg.In(listingFilterOpts.ExcludeArtifactIds))
 		}
 
 		countQuery := " SELECT count(cia.id)  as total_count"
 		totalCountQuery := countQuery + remainingQuery + commonPaginatedQueryPart
 		selectQuery = fmt.Sprintf("%s,(%s) ", selectQuery, totalCountQuery)
 		finalQuery = selectQuery + remainingQuery + commonPaginatedQueryPart + orderByClause + limitOffsetQueryPart
-
 	}
-	return finalQuery
+	finalQueryParams = append(finalQueryParams, remainingQueryParams...)
+	finalQueryParams = append(finalQueryParams, commonPaginatedQueryParams...)
+	finalQueryParams = append(finalQueryParams, remainingQueryParams...)
+	finalQueryParams = append(finalQueryParams, commonPaginatedQueryParams...)
+	finalQueryParams = append(finalQueryParams, limitOffsetQueryParams...)
+	return finalQuery, finalQueryParams
 }
 
 func BuildQueryForArtifactsForCdStage(listingFilterOptions bean.ArtifactsListFilterOptions) string {