fix: kubernetes events fix for resources (#4247)

* update common-lib version with for event listing fix * common-lib version update * query fix
devtron-labs · Nov 16, 2023 · 4edd46a · 4edd46a
1 parent a67365f
commit 4edd46a
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.8.0
 	github.com/devtron-labs/authenticator v0.4.31
-	github.com/devtron-labs/common-lib v0.0.5
+	github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217
 	github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2
 	github.com/evanphx/json-patch v5.6.0+incompatible
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32

diff --git a/go.sum b/go.sum
@@ -295,6 +295,12 @@ github.com/devtron-labs/authenticator v0.4.31 h1:CEMLek3JnMuH9ULsC6BHNJr+NiyGzBd
 github.com/devtron-labs/authenticator v0.4.31/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU=
 github.com/devtron-labs/common-lib v0.0.5 h1:Y9FqAWhpdbIuRVLp75adSK55sh3H/rOt4zgPrvgLH4Q=
 github.com/devtron-labs/common-lib v0.0.5/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
+github.com/devtron-labs/common-lib v0.0.6 h1:pbFER0Op9hWQXWRlmQGF8XMctG05tj2eWhUw+lhjPS0=
+github.com/devtron-labs/common-lib v0.0.6/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
+github.com/devtron-labs/common-lib v0.0.7-0.20231116065433-cb0da4b34b69 h1:nt7l476p/gwTeJ9RxU5bJ/0fJyUkx2bdIZVnyQLwtHI=
+github.com/devtron-labs/common-lib v0.0.7-0.20231116065433-cb0da4b34b69/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
+github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217 h1:tFi7BDTVDlyQmTTKnAzEBH0cB6dCpvsC34Cl6pyiUWg=
+github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
 github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2 h1:/IEIsJTxDZ3hv8uOoCaqdWCXqcv7nCAgX9AP/v84dUY=
 github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2/go.mod h1:l85jxWHlcSo910hdUfRycL40yGzC6glE93V1sVxVPto=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

diff --git a/internal/sql/repository/CiArtifactsListingQueryBuilder.go b/internal/sql/repository/CiArtifactsListingQueryBuilder.go
@@ -10,9 +10,9 @@ const EmptyLikeRegex = "%%"
 
 func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilterOptions) string {
 	commonPaginatedQueryPart := ""
-	if listingFilterOpts.SearchString != EmptyLikeRegex {
-		commonPaginatedQueryPart = fmt.Sprintf(" cia.image LIKE '%v' ", listingFilterOpts.SearchString)
-	}
+	//if listingFilterOpts.SearchString != EmptyLikeRegex {
+	commonPaginatedQueryPart = fmt.Sprintf(" cia.image LIKE '%v' ", listingFilterOpts.SearchString)
+	//}
 	orderByClause := " ORDER BY cia.id DESC"
 	limitOffsetQueryPart := fmt.Sprintf(" LIMIT %v OFFSET %v", listingFilterOpts.Limit, listingFilterOpts.Offset)
 	finalQuery := ""

diff --git a/vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go b/vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go
diff --git a/vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go b/vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go
diff --git a/vendor/github.com/devtron-labs/common-lib/utils/k8s/commonBean/bean.go b/vendor/github.com/devtron-labs/common-lib/utils/k8s/commonBean/bean.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -349,7 +349,7 @@ github.com/devtron-labs/authenticator/jwt
 github.com/devtron-labs/authenticator/middleware
 github.com/devtron-labs/authenticator/oidc
 github.com/devtron-labs/authenticator/password
-# github.com/devtron-labs/common-lib v0.0.5
+# github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217
 ## explicit; go 1.20
 github.com/devtron-labs/common-lib/blob-storage
 github.com/devtron-labs/common-lib/pubsub-lib
@@ -872,7 +872,6 @@ github.com/robfig/cron/v3
 github.com/russross/blackfriday
 # github.com/samber/lo v1.38.1
 ## explicit; go 1.18
-github.com/samber/lo
 # github.com/satori/go.uuid v1.2.0
 ## explicit
 github.com/satori/go.uuid