From 808487d1039c9e68518f3136c24cf21e71e307e0 Mon Sep 17 00:00:00 2001 From: UJESH2K Date: Thu, 23 Oct 2025 04:43:30 +0530 Subject: [PATCH 01/21] Fix JWT module version and checksum issue Signed-off-by: UJESH2K Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .../api/handlers/grpc/grpc_handler.go | 2 +- .../api/middleware/jwt_middlware.go | 2 +- .../api/middleware/jwt_middlware_test.go | 2 +- .../authentication/api/mocks/rest_mocks.go | 2 +- chaoscenter/authentication/go.mod | 17 +++++------ chaoscenter/authentication/go.sum | 30 +++++-------------- .../pkg/services/session_service.go | 2 +- .../authentication/pkg/utils/common.go | 2 +- chaoscenter/event-tracker/go.mod | 2 ++ chaoscenter/graphql/server/go.mod | 2 +- chaoscenter/graphql/server/go.sum | 4 +-- .../authorization/authorization_fuzz_test.go | 2 +- .../server/pkg/authorization/user_jwt.go | 2 +- .../chaos_experiment/handler/handler_test.go | 2 +- .../pkg/chaos_infrastructure/cluster_jwt.go | 2 +- .../handler/fuzz_tests/handler_fuzz_test.go | 2 +- .../pkg/environment/test/handler_test.go | 2 +- .../graphql/server/pkg/gitops/gitops.go | 2 +- .../upgrade-agents/control-plane/go.mod | 3 +- 19 files changed, 35 insertions(+), 49 deletions(-) diff --git a/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go b/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go index 231e9f28a29..09993c4fabf 100644 --- a/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go +++ b/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go @@ -10,7 +10,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" ) func (s *ServerGrpc) ValidateRequest(ctx context.Context, diff --git a/chaoscenter/authentication/api/middleware/jwt_middlware.go b/chaoscenter/authentication/api/middleware/jwt_middlware.go index 786c2bd0b9c..1b461e88991 100644 --- a/chaoscenter/authentication/api/middleware/jwt_middlware.go +++ b/chaoscenter/authentication/api/middleware/jwt_middlware.go @@ -2,7 +2,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils" diff --git a/chaoscenter/authentication/api/middleware/jwt_middlware_test.go b/chaoscenter/authentication/api/middleware/jwt_middlware_test.go index 021acc8ff9e..10a5cc5dc84 100644 --- a/chaoscenter/authentication/api/middleware/jwt_middlware_test.go +++ b/chaoscenter/authentication/api/middleware/jwt_middlware_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/gin-gonic/gin" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/litmuschaos/litmus/chaoscenter/authentication/api/middleware" "github.com/litmuschaos/litmus/chaoscenter/authentication/api/mocks" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils" diff --git a/chaoscenter/authentication/api/mocks/rest_mocks.go b/chaoscenter/authentication/api/mocks/rest_mocks.go index f2830ad90b3..1100ef61bf7 100644 --- a/chaoscenter/authentication/api/mocks/rest_mocks.go +++ b/chaoscenter/authentication/api/mocks/rest_mocks.go @@ -5,7 +5,7 @@ import ( "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/authConfig" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities" "github.com/stretchr/testify/mock" "go.mongodb.org/mongo-driver/bson" diff --git a/chaoscenter/authentication/go.mod b/chaoscenter/authentication/go.mod index 5b7a0d4b88c..e09162229fb 100644 --- a/chaoscenter/authentication/go.mod +++ b/chaoscenter/authentication/go.mod @@ -5,13 +5,12 @@ go 1.22.0 require ( github.com/coreos/go-oidc/v3 v3.1.0 github.com/gin-gonic/gin v1.10.0 - github.com/golang-jwt/jwt v3.2.2+incompatible + github.com/golang-jwt/jwt/v4 v4.5.2 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 - github.com/swaggo/swag v1.16.3 go.mongodb.org/mongo-driver v1.17.1 golang.org/x/crypto v0.31.0 golang.org/x/oauth2 v0.21.0 @@ -20,7 +19,6 @@ require ( ) require ( - github.com/KyleBanks/depth v1.2.1 // indirect github.com/bytedance/sonic v1.11.6 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/cloudwego/base64x v0.1.4 // indirect @@ -28,21 +26,16 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-openapi/jsonpointer v0.21.0 // indirect - github.com/go-openapi/jsonreference v0.21.0 // indirect - github.com/go-openapi/spec v0.21.0 // indirect - github.com/go-openapi/swag v0.23.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.0 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect - github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -62,8 +55,12 @@ require ( golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.0 + +replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.5.2 diff --git a/chaoscenter/authentication/go.sum b/chaoscenter/authentication/go.sum index 2b3ba537a77..ee41c4117c5 100644 --- a/chaoscenter/authentication/go.sum +++ b/chaoscenter/authentication/go.sum @@ -1,6 +1,4 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= -github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= @@ -11,6 +9,7 @@ github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/coreos/go-oidc/v3 v3.1.0 h1:6avEvcdvTa1qYsOZ6I5PRkSYHzpTNWgKYmaJfaYbrRw= github.com/coreos/go-oidc/v3 v3.1.0/go.mod h1:rEJ/idjfUyfkBit1eI1fvyr+64/g9dcKpAm8MJMesvo= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -21,14 +20,6 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= -github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= -github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= -github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= -github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= -github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= -github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= -github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= -github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -39,8 +30,8 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= @@ -52,8 +43,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= @@ -64,14 +53,15 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -83,9 +73,11 @@ github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= @@ -104,8 +96,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg= -github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= @@ -129,8 +119,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -169,8 +157,6 @@ golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/chaoscenter/authentication/pkg/services/session_service.go b/chaoscenter/authentication/pkg/services/session_service.go index d2643fa48e6..80a512aa8f1 100644 --- a/chaoscenter/authentication/pkg/services/session_service.go +++ b/chaoscenter/authentication/pkg/services/session_service.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils" log "github.com/sirupsen/logrus" diff --git a/chaoscenter/authentication/pkg/utils/common.go b/chaoscenter/authentication/pkg/utils/common.go index 95124c2954d..6f728ffeab5 100644 --- a/chaoscenter/authentication/pkg/utils/common.go +++ b/chaoscenter/authentication/pkg/utils/common.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/sirupsen/logrus" ) diff --git a/chaoscenter/event-tracker/go.mod b/chaoscenter/event-tracker/go.mod index 963d169387f..c93dd7dab94 100644 --- a/chaoscenter/event-tracker/go.mod +++ b/chaoscenter/event-tracker/go.mod @@ -74,3 +74,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) + +replace github.com/form3tech-oss/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2 diff --git a/chaoscenter/graphql/server/go.mod b/chaoscenter/graphql/server/go.mod index f2a5f1c083a..3170cfd0572 100644 --- a/chaoscenter/graphql/server/go.mod +++ b/chaoscenter/graphql/server/go.mod @@ -9,7 +9,7 @@ require ( github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 github.com/gin-gonic/gin v1.10.0 github.com/go-git/go-git/v5 v5.13.0 - github.com/golang-jwt/jwt v3.2.2+incompatible + github.com/golang-jwt/jwt/v4 v4.5.2 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/jinzhu/copier v0.4.0 diff --git a/chaoscenter/graphql/server/go.sum b/chaoscenter/graphql/server/go.sum index 0aa5c10eb85..778f5ed7766 100644 --- a/chaoscenter/graphql/server/go.sum +++ b/chaoscenter/graphql/server/go.sum @@ -495,8 +495,8 @@ github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-migrate/migrate/v4 v4.6.2/go.mod h1:JYi6reN3+Z734VZ0akNuyOJNcrg45ZL7LDBMW3WGJL0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= diff --git a/chaoscenter/graphql/server/pkg/authorization/authorization_fuzz_test.go b/chaoscenter/graphql/server/pkg/authorization/authorization_fuzz_test.go index 2df965d780e..9f2ba0c895a 100644 --- a/chaoscenter/graphql/server/pkg/authorization/authorization_fuzz_test.go +++ b/chaoscenter/graphql/server/pkg/authorization/authorization_fuzz_test.go @@ -6,7 +6,7 @@ import ( "time" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" ) // generateExpiredFakeJWTToken generates a fake JWT token with expiration time set to the past diff --git a/chaoscenter/graphql/server/pkg/authorization/user_jwt.go b/chaoscenter/graphql/server/pkg/authorization/user_jwt.go index 500dbf3ab15..2bdf5c87c59 100644 --- a/chaoscenter/graphql/server/pkg/authorization/user_jwt.go +++ b/chaoscenter/graphql/server/pkg/authorization/user_jwt.go @@ -9,7 +9,7 @@ import ( "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/authConfig" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" ) // UserValidateJWT validates the cluster jwt diff --git a/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go b/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go index e11e8d6d38d..59df8457b8f 100644 --- a/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go +++ b/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go @@ -8,7 +8,7 @@ import ( dbProbeMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/probe/model/mocks" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/graph/model" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/authorization" diff --git a/chaoscenter/graphql/server/pkg/chaos_infrastructure/cluster_jwt.go b/chaoscenter/graphql/server/pkg/chaos_infrastructure/cluster_jwt.go index bb001e80c44..f734c4e6b69 100644 --- a/chaoscenter/graphql/server/pkg/chaos_infrastructure/cluster_jwt.go +++ b/chaoscenter/graphql/server/pkg/chaos_infrastructure/cluster_jwt.go @@ -8,7 +8,7 @@ import ( "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/authConfig" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" ) // InfraCreateJWT generates jwt used in chaos_infra registration diff --git a/chaoscenter/graphql/server/pkg/environment/handler/fuzz_tests/handler_fuzz_test.go b/chaoscenter/graphql/server/pkg/environment/handler/fuzz_tests/handler_fuzz_test.go index 183edb37f97..b92d53a1a88 100644 --- a/chaoscenter/graphql/server/pkg/environment/handler/fuzz_tests/handler_fuzz_test.go +++ b/chaoscenter/graphql/server/pkg/environment/handler/fuzz_tests/handler_fuzz_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" dbOperationsEnvironment "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/environments" dbMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/mocks" diff --git a/chaoscenter/graphql/server/pkg/environment/test/handler_test.go b/chaoscenter/graphql/server/pkg/environment/test/handler_test.go index 9b1ac42dc8d..13aa4f0cf9a 100644 --- a/chaoscenter/graphql/server/pkg/environment/test/handler_test.go +++ b/chaoscenter/graphql/server/pkg/environment/test/handler_test.go @@ -7,7 +7,7 @@ import ( "go.mongodb.org/mongo-driver/mongo" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/graph/model" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/authorization" diff --git a/chaoscenter/graphql/server/pkg/gitops/gitops.go b/chaoscenter/graphql/server/pkg/gitops/gitops.go index 8065ace8c30..c028adb4ab4 100644 --- a/chaoscenter/graphql/server/pkg/gitops/gitops.go +++ b/chaoscenter/graphql/server/pkg/gitops/gitops.go @@ -20,7 +20,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/go-git/go-git/v5/plumbing/transport/ssh" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/graph/model" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/authorization" "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/gitops" diff --git a/chaoscenter/upgrade-agents/control-plane/go.mod b/chaoscenter/upgrade-agents/control-plane/go.mod index bd6a4c2dc9a..cab61f7c214 100644 --- a/chaoscenter/upgrade-agents/control-plane/go.mod +++ b/chaoscenter/upgrade-agents/control-plane/go.mod @@ -1,6 +1,7 @@ module github.com/litmuschaos/litmus/chaoscenter/upgrader-agents/control-plane -go 1.22 +go 1.23.0 + toolchain go1.23.7 require ( From fae9ab2ea284b369b885be41cc76b2fffd7f927e Mon Sep 17 00:00:00 2001 From: Gurupriyan D A <105513686+thisis-gp@users.noreply.github.com> Date: Thu, 23 Oct 2025 15:52:41 +0530 Subject: [PATCH 02/21] docs: add missing GCP experiments to documentation table (#5239) Signed-off-by: Gurupriyan D A Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- mkdocs/docs/experiments/categories/contents.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mkdocs/docs/experiments/categories/contents.md b/mkdocs/docs/experiments/categories/contents.md index 03560773db9..9bfd86a93f3 100644 --- a/mkdocs/docs/experiments/categories/contents.md +++ b/mkdocs/docs/experiments/categories/contents.md @@ -288,6 +288,16 @@ Following Platform Chaos experiments are available: Detach the gcp disk gcp-vm-disk-loss + + GCP VM Instance Stop By Label + Stop the GCP VM instance by label + gcp-vm-instance-stop-by-label + + + GCP VM Disk Loss By Label + Detach the GCP disk by label + gcp-vm-disk-loss-by-label + ### Azure From 6b14a65b6539fa8a7cf68f3d7d616f4d2c92bd34 Mon Sep 17 00:00:00 2001 From: Seneviratne N S Date: Thu, 23 Oct 2025 19:18:40 +0530 Subject: [PATCH 03/21] docs: Add AWS SSM Chaos experiments to AWS experiments table (#5240) * docs: Add AWS SSM Chaos experiments to AWS experiments table Add AWS SSM Chaos By ID and AWS SSM Chaos By Tag experiments Fixes #5237 Signed-off-by: Coder-pro1 * Fix AWS SSM Chaos links in contents.md Signed-off-by: Seneviratne N S --------- Signed-off-by: Coder-pro1 Signed-off-by: Seneviratne N S Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- mkdocs/docs/experiments/categories/contents.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mkdocs/docs/experiments/categories/contents.md b/mkdocs/docs/experiments/categories/contents.md index 9bfd86a93f3..cd27b851c04 100644 --- a/mkdocs/docs/experiments/categories/contents.md +++ b/mkdocs/docs/experiments/categories/contents.md @@ -268,6 +268,16 @@ Following Platform Chaos experiments are available: Detach the EBS volume matched by volume tag ebs-loss-by-tag + + AWS SSM Chaos By ID + Disrupt the state of infrastructure resources by ID + aws-ssm-chaos-by-id + + + AWS SSM Chaos By Tag + Disrupt the state of infrastructure resources by tags + aws-ssm-chaos-by-tag + ### GCP From 10bf8515fdff1019314e76d4d71ae54110691028 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Fri, 24 Oct 2025 03:39:19 +0530 Subject: [PATCH 04/21] Update go.mod Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- chaoscenter/upgrade-agents/control-plane/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chaoscenter/upgrade-agents/control-plane/go.mod b/chaoscenter/upgrade-agents/control-plane/go.mod index cab61f7c214..931ab0a7410 100644 --- a/chaoscenter/upgrade-agents/control-plane/go.mod +++ b/chaoscenter/upgrade-agents/control-plane/go.mod @@ -1,6 +1,6 @@ module github.com/litmuschaos/litmus/chaoscenter/upgrader-agents/control-plane -go 1.23.0 +go 1.24.0 toolchain go1.23.7 From fccf9d2068fc0b7974fc1c2d6decc3809781cb1b Mon Sep 17 00:00:00 2001 From: Vedant Shrotria Date: Fri, 24 Oct 2025 12:04:23 +0530 Subject: [PATCH 05/21] Updated Runner Type for Ubuntu to latest under github-pages build pipeline (#5249) * Added fixes Signed-off-by: git * Added fixes Signed-off-by: git --------- Signed-off-by: git Co-authored-by: git Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .github/workflows/e2e.yml | 2 +- .github/workflows/gh-pages.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 9c09e85fd1c..ea2e641a3bc 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -84,7 +84,7 @@ jobs: tests: if: contains(github.event.comment.html_url, '/pull/') && startsWith(github.event.comment.body, '/run-e2e') needs: [docker-build-image] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Checkout litmus-E2E Repository uses: actions/checkout@v4 diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml index 318e355ad3a..74086ac15b5 100644 --- a/.github/workflows/gh-pages.yaml +++ b/.github/workflows/gh-pages.yaml @@ -7,11 +7,11 @@ on: jobs: deploy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v6 with: python-version: 3.x - name: build docs From f8b1614dc247a73dd9e35d66d3287be4d63cb4e5 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Fri, 24 Oct 2025 12:22:03 +0530 Subject: [PATCH 06/21] Fix: Patch CVE-2024-45337 (crypto/ssh Authorization Bypass) and stabilize controller-runtime envtest failure (#5244) * Fix: resolved vulnerability issues in server Signed-off-by: UJESH2K * changed goversion to 1.24.0 in every file Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --------- Signed-off-by: UJESH2K Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Co-authored-by: Vedant Shrotria Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- chaoscenter/authentication/Dockerfile | 2 +- chaoscenter/authentication/go.mod | 11 +++++-- chaoscenter/authentication/go.sum | 20 ++++++------ chaoscenter/event-tracker/Dockerfile | 2 +- chaoscenter/event-tracker/go.mod | 12 +++---- chaoscenter/event-tracker/go.sum | 24 +++++++------- chaoscenter/graphql/server/Dockerfile | 2 +- chaoscenter/graphql/server/go.mod | 18 +++++------ chaoscenter/graphql/server/go.sum | 32 +++++++++---------- .../pkg/chaos_infrastructure/infra_utils.go | 4 +-- .../server/pkg/chaoshub/handler/handler.go | 2 +- .../graphql/server/pkg/chaoshub/service.go | 3 +- chaoscenter/graphql/server/utils/misc.go | 2 +- chaoscenter/subscriber/Dockerfile | 2 +- chaoscenter/subscriber/go.mod | 10 +++--- chaoscenter/subscriber/go.sum | 12 +++---- chaoscenter/subscriber/pkg/k8s/operations.go | 8 ++--- .../upgrade-agents/control-plane/go.mod | 14 ++++---- .../upgrade-agents/control-plane/go.sum | 24 +++++++------- 20 files changed, 106 insertions(+), 100 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83a0918f8f4..2b9d1757845 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" # By default, the go version is v1.15 in runner. + go-version: "1.24.0" # By default, the go version is v1.15 in runner. - name: Check Golang imports order uses: Jerome1337/goimports-action@v1.0.3 diff --git a/chaoscenter/authentication/Dockerfile b/chaoscenter/authentication/Dockerfile index c074a9bdf04..aa6b45827d8 100644 --- a/chaoscenter/authentication/Dockerfile +++ b/chaoscenter/authentication/Dockerfile @@ -1,5 +1,5 @@ # BUILD STAGE -FROM golang:1.22 AS builder +FROM golang:1.24.0 AS builder ARG TARGETOS=linux ARG TARGETARCH diff --git a/chaoscenter/authentication/go.mod b/chaoscenter/authentication/go.mod index e09162229fb..b47168971d6 100644 --- a/chaoscenter/authentication/go.mod +++ b/chaoscenter/authentication/go.mod @@ -1,6 +1,6 @@ module github.com/litmuschaos/litmus/chaoscenter/authentication -go 1.22.0 +go 1.24.0 require ( github.com/coreos/go-oidc/v3 v3.1.0 @@ -12,7 +12,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 go.mongodb.org/mongo-driver v1.17.1 - golang.org/x/crypto v0.31.0 + golang.org/x/crypto v0.43.0 golang.org/x/oauth2 v0.21.0 google.golang.org/grpc v1.66.2 google.golang.org/protobuf v1.34.2 @@ -51,10 +51,17 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect golang.org/x/arch v0.8.0 // indirect +<<<<<<< HEAD golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect +======= + golang.org/x/net v0.45.0 // indirect + golang.org/x/sync v0.17.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/text v0.30.0 // indirect +>>>>>>> 4d1b6b15 (Fix: Patch CVE-2024-45337 (crypto/ssh Authorization Bypass) and stabilize controller-runtime envtest failure (#5244)) google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect diff --git a/chaoscenter/authentication/go.sum b/chaoscenter/authentication/go.sum index ee41c4117c5..f46490a5a4c 100644 --- a/chaoscenter/authentication/go.sum +++ b/chaoscenter/authentication/go.sum @@ -116,8 +116,8 @@ golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -125,16 +125,16 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= +golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -144,16 +144,16 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/chaoscenter/event-tracker/Dockerfile b/chaoscenter/event-tracker/Dockerfile index bee216f4929..61c9c2aa830 100644 --- a/chaoscenter/event-tracker/Dockerfile +++ b/chaoscenter/event-tracker/Dockerfile @@ -1,5 +1,5 @@ # BUILD STAGE -FROM golang:1.22 AS builder +FROM golang:1.24.0 AS builder LABEL maintainer="LitmusChaos" diff --git a/chaoscenter/event-tracker/go.mod b/chaoscenter/event-tracker/go.mod index c93dd7dab94..01e8bc4cf03 100644 --- a/chaoscenter/event-tracker/go.mod +++ b/chaoscenter/event-tracker/go.mod @@ -1,6 +1,6 @@ module github.com/litmuschaos/litmus/chaoscenter/event-tracker -go 1.22 +go 1.24.0 require ( github.com/jmespath/go-jmespath v0.4.0 @@ -52,12 +52,12 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.24.0 // indirect + golang.org/x/crypto v0.43.0 // indirect + golang.org/x/net v0.45.0 // indirect golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/term v0.36.0 // indirect + golang.org/x/text v0.30.0 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/chaoscenter/event-tracker/go.sum b/chaoscenter/event-tracker/go.sum index 3de9f2cd218..9d4e3ca60f6 100644 --- a/chaoscenter/event-tracker/go.sum +++ b/chaoscenter/event-tracker/go.sum @@ -453,8 +453,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -521,8 +521,8 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= +golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -586,13 +586,13 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -600,8 +600,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -649,8 +649,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/chaoscenter/graphql/server/Dockerfile b/chaoscenter/graphql/server/Dockerfile index 0c356be4a62..54d3480cbae 100644 --- a/chaoscenter/graphql/server/Dockerfile +++ b/chaoscenter/graphql/server/Dockerfile @@ -1,5 +1,5 @@ # BUILD STAGE -FROM golang:1.22 AS builder +FROM golang:1.24.0 AS builder LABEL maintainer="LitmusChaos" diff --git a/chaoscenter/graphql/server/go.mod b/chaoscenter/graphql/server/go.mod index 3170cfd0572..90ccc7c3a05 100644 --- a/chaoscenter/graphql/server/go.mod +++ b/chaoscenter/graphql/server/go.mod @@ -1,6 +1,6 @@ module github.com/litmuschaos/litmus/chaoscenter/graphql/server -go 1.22.0 +go 1.24.0 require ( github.com/99designs/gqlgen v0.17.49 @@ -24,7 +24,7 @@ require ( github.com/tidwall/sjson v1.2.5 github.com/vektah/gqlparser/v2 v2.5.16 go.mongodb.org/mongo-driver v1.16.1 - golang.org/x/crypto v0.31.0 + golang.org/x/crypto v0.43.0 google.golang.org/grpc v1.64.1 google.golang.org/protobuf v1.34.2 gopkg.in/yaml.v2 v2.4.0 @@ -99,15 +99,15 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.33.0 // indirect + golang.org/x/mod v0.28.0 // indirect + golang.org/x/net v0.45.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/sync v0.17.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/term v0.36.0 // indirect + golang.org/x/text v0.30.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/tools v0.22.0 // indirect + golang.org/x/tools v0.37.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/chaoscenter/graphql/server/go.sum b/chaoscenter/graphql/server/go.sum index 778f5ed7766..70539dec56e 100644 --- a/chaoscenter/graphql/server/go.sum +++ b/chaoscenter/graphql/server/go.sum @@ -1254,8 +1254,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1297,8 +1297,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1366,8 +1366,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= +golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1397,8 +1397,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1493,14 +1493,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1514,8 +1514,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1608,8 +1608,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/chaoscenter/graphql/server/pkg/chaos_infrastructure/infra_utils.go b/chaoscenter/graphql/server/pkg/chaos_infrastructure/infra_utils.go index d489046d0d1..0fc723a31b9 100644 --- a/chaoscenter/graphql/server/pkg/chaos_infrastructure/infra_utils.go +++ b/chaoscenter/graphql/server/pkg/chaos_infrastructure/infra_utils.go @@ -96,11 +96,11 @@ func ManifestParser(infra dbChaosInfra.ChaosInfra, rootPath string, config *Subs // Checking if the agent namespace does not exist and its scope of installation is not namespaced if !*infra.InfraNsExists && infra.InfraScope != "namespace" { - generatedYAML = append(generatedYAML, fmt.Sprintf(namespaceConfig)) + generatedYAML = append(generatedYAML, fmt.Sprintf("%v", namespaceConfig)) } if !*infra.InfraSaExists { - generatedYAML = append(generatedYAML, fmt.Sprintf(serviceAccountStr)) + generatedYAML = append(generatedYAML, fmt.Sprintf("%v", serviceAccountStr)) } // File operations diff --git a/chaoscenter/graphql/server/pkg/chaoshub/handler/handler.go b/chaoscenter/graphql/server/pkg/chaoshub/handler/handler.go index a62fcffd18b..cf966c8e67b 100644 --- a/chaoscenter/graphql/server/pkg/chaoshub/handler/handler.go +++ b/chaoscenter/graphql/server/pkg/chaoshub/handler/handler.go @@ -179,7 +179,7 @@ func DownloadRemoteHub(hubDetails model.CreateRemoteChaosHub, projectID string) defer download.Body.Close() if download.StatusCode != http.StatusOK { - return fmt.Errorf("err: " + download.Status) + return fmt.Errorf("err: %v", download.Status) } //validate the content length (in bytes) diff --git a/chaoscenter/graphql/server/pkg/chaoshub/service.go b/chaoscenter/graphql/server/pkg/chaoshub/service.go index 53f46cc975f..fed03284b8c 100644 --- a/chaoscenter/graphql/server/pkg/chaoshub/service.go +++ b/chaoscenter/graphql/server/pkg/chaoshub/service.go @@ -189,7 +189,8 @@ func (c *chaosHubService) AddRemoteChaosHub(ctx context.Context, chaosHub model. err = handler.DownloadRemoteHub(chaosHub, projectID) if err != nil { - err = fmt.Errorf("Hub configurations saved successfully. Failed to connect the remote repo: " + err.Error()) + err = fmt.Errorf("Hub configurations saved successfully. Failed to connect the remote repo: %v", err) + log.Error(err) return nil, err } diff --git a/chaoscenter/graphql/server/utils/misc.go b/chaoscenter/graphql/server/utils/misc.go index 46151e875b5..d44fa08cd33 100644 --- a/chaoscenter/graphql/server/utils/misc.go +++ b/chaoscenter/graphql/server/utils/misc.go @@ -133,7 +133,7 @@ func StringPtrToString(val *string) string { func ParseGRPCError(err error) error { if strings.HasPrefix(err.Error(), GRPCErrorPrefix) { grpcErr := strings.TrimPrefix(err.Error(), GRPCErrorPrefix) - return fmt.Errorf(grpcErr) + return fmt.Errorf("%v", grpcErr) } return err } diff --git a/chaoscenter/subscriber/Dockerfile b/chaoscenter/subscriber/Dockerfile index 20753cfe238..388fea5e60c 100644 --- a/chaoscenter/subscriber/Dockerfile +++ b/chaoscenter/subscriber/Dockerfile @@ -1,5 +1,5 @@ # BUILD STAGE -FROM golang:1.22 AS builder +FROM golang:1.24.0 AS builder LABEL maintainer="LitmusChaos" diff --git a/chaoscenter/subscriber/go.mod b/chaoscenter/subscriber/go.mod index 89ab15247b1..418992804fb 100644 --- a/chaoscenter/subscriber/go.mod +++ b/chaoscenter/subscriber/go.mod @@ -1,6 +1,6 @@ module subscriber -go 1.22 +go 1.24.0 require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 @@ -43,11 +43,11 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/net v0.24.0 // indirect + golang.org/x/net v0.45.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/term v0.36.0 // indirect + golang.org/x/text v0.30.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect diff --git a/chaoscenter/subscriber/go.sum b/chaoscenter/subscriber/go.sum index 1fb42ed20f7..4d15a244c04 100644 --- a/chaoscenter/subscriber/go.sum +++ b/chaoscenter/subscriber/go.sum @@ -323,8 +323,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= +golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -373,14 +373,14 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/chaoscenter/subscriber/pkg/k8s/operations.go b/chaoscenter/subscriber/pkg/k8s/operations.go index 378215f425e..9dd848a4477 100644 --- a/chaoscenter/subscriber/pkg/k8s/operations.go +++ b/chaoscenter/subscriber/pkg/k8s/operations.go @@ -226,7 +226,7 @@ func applyRequest(requestType string, obj *unstructured.Unstructured) (*unstruct if k8s_errors.IsNotFound(err) { // This doesnt ever happen even if it is already deleted or not found - logrus.Info("%v not found ", obj.GetName()) + logrus.Infof("%v not found ", obj.GetName()) return nil, nil } if err != nil { @@ -249,7 +249,7 @@ func applyRequest(requestType string, obj *unstructured.Unstructured) (*unstruct if k8s_errors.IsNotFound(err) { fmt.Println(obj) // This doesnt ever happen even if it is already deleted or not found - logrus.Info("%v not found ", obj.GetName()) + logrus.Infof("%v not found ", obj.GetName()) return nil, nil } logrus.Info("successfully deleted for kind: ", obj.GetKind(), ", resource name: ", obj.GetName(), ", and namespace: ", obj.GetNamespace()) @@ -260,7 +260,7 @@ func applyRequest(requestType string, obj *unstructured.Unstructured) (*unstruct if k8s_errors.IsNotFound(err) { // This doesnt ever happen even if it is already deleted or not found - logrus.Info("%v not found ", obj.GetName()) + logrus.Infof("%v not found ", obj.GetName()) return nil, nil } logrus.Info("successfully deleted for kind: ", obj.GetKind(), ", resource labels: ", objLabels, ", and namespace: ", obj.GetNamespace()) @@ -276,7 +276,7 @@ func applyRequest(requestType string, obj *unstructured.Unstructured) (*unstruct response, err := dr.Get(ctx, obj.GetName(), metav1.GetOptions{}) if k8s_errors.IsNotFound(err) { // This doesnt ever happen even if it is already deleted or not found - logrus.Info("%v not found", obj.GetName()) + logrus.Infof("%v not found", obj.GetName()) return nil, nil } if err != nil { diff --git a/chaoscenter/upgrade-agents/control-plane/go.mod b/chaoscenter/upgrade-agents/control-plane/go.mod index 931ab0a7410..67afafa0503 100644 --- a/chaoscenter/upgrade-agents/control-plane/go.mod +++ b/chaoscenter/upgrade-agents/control-plane/go.mod @@ -2,8 +2,6 @@ module github.com/litmuschaos/litmus/chaoscenter/upgrader-agents/control-plane go 1.24.0 -toolchain go1.23.7 - require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/sirupsen/logrus v1.4.2 @@ -13,8 +11,8 @@ require ( require ( github.com/jessevdk/go-flags v1.5.0 // indirect github.com/montanaflynn/stats v0.7.1 // indirect - golang.org/x/net v0.36.0 // indirect - golang.org/x/term v0.29.0 // indirect + golang.org/x/net v0.45.0 // indirect + golang.org/x/term v0.36.0 // indirect gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) @@ -29,8 +27,8 @@ require ( github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - golang.org/x/crypto v0.35.0 // indirect - golang.org/x/sync v0.11.0 // indirect - golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.22.0 // indirect + golang.org/x/crypto v0.43.0 // indirect + golang.org/x/sync v0.17.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/text v0.30.0 // indirect ) diff --git a/chaoscenter/upgrade-agents/control-plane/go.sum b/chaoscenter/upgrade-agents/control-plane/go.sum index 27b7330604b..086f1ed75cc 100644 --- a/chaoscenter/upgrade-agents/control-plane/go.sum +++ b/chaoscenter/upgrade-agents/control-plane/go.sum @@ -67,21 +67,21 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= -golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= -golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= +golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= +golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= -golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -91,19 +91,19 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= -golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= -golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From 80704bf5bb329f361c6d7ff91f55def2aaa2ca29 Mon Sep 17 00:00:00 2001 From: Devank Gupta Date: Fri, 24 Oct 2025 16:26:17 +0530 Subject: [PATCH 07/21] fix(UI): update delete command in Disable Chaos Infrastructure popup (#5253) (#5261) - Corrected command syntax to use commas between resources. - Kept namespace dynamic using ${chaosInfrastructureNamespace}. - Verified in UI. Signed-off-by: Devank Gupta Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .../KubernetesChaosInfrastructureTable.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chaoscenter/web/src/views/KubernetesChaosInfrastructureTable/KubernetesChaosInfrastructureTable.tsx b/chaoscenter/web/src/views/KubernetesChaosInfrastructureTable/KubernetesChaosInfrastructureTable.tsx index 62af7347c12..6524c79d0c1 100644 --- a/chaoscenter/web/src/views/KubernetesChaosInfrastructureTable/KubernetesChaosInfrastructureTable.tsx +++ b/chaoscenter/web/src/views/KubernetesChaosInfrastructureTable/KubernetesChaosInfrastructureTable.tsx @@ -75,9 +75,11 @@ export function RenderChaosInfrastructureOptions({ + + {chaosInfrastructureScope === InfraScope.NAMESPACE && ( From b0a2fdde60af1e6c69e4b925c3a864aab8a423f1 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Sun, 26 Oct 2025 10:58:15 +0530 Subject: [PATCH 08/21] fix(security): upgrade golang.org/x/oauth2 to v0.27.0 to resolve CVE-2025-22868 (#5233) * fix(security): upgrade golang.org/x/oauth2 to v0.27.0 to resolve CVE-2025-22868 Signed-off-by: UJESH2K Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * chore: update Go version to 1.24.0 in go.mod, Dockerfile, and CI workflow Signed-off-by: UJESH2K Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * fix: use stable golang:1.24.0-bookworm base image in Dockerfile Signed-off-by: UJESH2K Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * 1.25 go version Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * golang.org/x/crypto v0.35.0 go version Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * golang.org/x/crypto v0.35.0 go version and 1.24 Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * changed docker Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * changed docker Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Temporary commit before rebase Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Changed trivy to v2 and authentication goversion to 1.24.0 Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Revert Trivy v2 change Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * changed build.yml from 1.24 to 1.24.0 Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * removed trivy version mismatch Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * go mod tidy Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --------- Signed-off-by: UJESH2K Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .github/workflows/build.yml | 11 ++++++++--- chaoscenter/authentication/Dockerfile | 7 +++++-- chaoscenter/authentication/go.mod | 2 +- chaoscenter/authentication/go.sum | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b9d1757845..5adb8ba3d53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,7 +99,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" # By default, the go version is v1.15 in runner. + go-version: "1.24.0" # By default, the go version is v1.15 in runner. - name: Backend unit tests shell: bash run: | @@ -148,7 +148,8 @@ jobs: exit-code: '1' ignore-unfixed: true vuln-type: 'os,library' - severity: 'CRITICAL,HIGH' + severity: 'CRITICAL,HIGH' + docker-build-authentication-server: runs-on: ubuntu-latest @@ -176,7 +177,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - + docker-build-subscriber: runs-on: ubuntu-latest needs: @@ -203,6 +204,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' + docker-build-frontend: runs-on: ubuntu-latest @@ -233,6 +235,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' + docker-build-event-tracker: runs-on: ubuntu-latest @@ -260,6 +263,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' + docker-build-dex-server: runs-on: ubuntu-latest @@ -286,3 +290,4 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' + diff --git a/chaoscenter/authentication/Dockerfile b/chaoscenter/authentication/Dockerfile index aa6b45827d8..19e211928c0 100644 --- a/chaoscenter/authentication/Dockerfile +++ b/chaoscenter/authentication/Dockerfile @@ -14,7 +14,7 @@ RUN go env RUN CGO_ENABLED=0 go build -o /output/server -v ./api/ -# Packaging stage +# PACKAGING STAGE # Use RedHat UBI minimal image as base FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 @@ -22,6 +22,9 @@ LABEL maintainer="LitmusChaos" ENV APP_DIR="/litmus" +# Ensure base packages (including libxslt) are patched +RUN microdnf -y update && microdnf clean all + COPY --from=builder /output/server $APP_DIR/ RUN chown 65534:0 $APP_DIR/server && chmod 755 $APP_DIR/server @@ -30,4 +33,4 @@ USER 65534 CMD ["./server"] -EXPOSE 3000 \ No newline at end of file +EXPOSE 3000 diff --git a/chaoscenter/authentication/go.mod b/chaoscenter/authentication/go.mod index b47168971d6..156a42902ea 100644 --- a/chaoscenter/authentication/go.mod +++ b/chaoscenter/authentication/go.mod @@ -13,7 +13,7 @@ require ( github.com/stretchr/testify v1.9.0 go.mongodb.org/mongo-driver v1.17.1 golang.org/x/crypto v0.43.0 - golang.org/x/oauth2 v0.21.0 + golang.org/x/oauth2 v0.27.0 google.golang.org/grpc v1.66.2 google.golang.org/protobuf v1.34.2 ) diff --git a/chaoscenter/authentication/go.sum b/chaoscenter/authentication/go.sum index f46490a5a4c..976111406c5 100644 --- a/chaoscenter/authentication/go.sum +++ b/chaoscenter/authentication/go.sum @@ -128,8 +128,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= +golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 56ccf639a59e620d6b00d53932008cbfcfda6138 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Mon, 27 Oct 2025 12:16:19 +0530 Subject: [PATCH 09/21] Update go.mod Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- chaoscenter/event-tracker/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chaoscenter/event-tracker/go.mod b/chaoscenter/event-tracker/go.mod index 01e8bc4cf03..54bbcfe0b9a 100644 --- a/chaoscenter/event-tracker/go.mod +++ b/chaoscenter/event-tracker/go.mod @@ -75,4 +75,4 @@ require ( sigs.k8s.io/yaml v1.2.0 // indirect ) -replace github.com/form3tech-oss/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2 + From 757b48ecb98fb165edf29c68c2440769100d7c66 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Mon, 27 Oct 2025 12:17:51 +0530 Subject: [PATCH 10/21] Update go.mod Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- chaoscenter/authentication/go.mod | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chaoscenter/authentication/go.mod b/chaoscenter/authentication/go.mod index 156a42902ea..7092b87da2a 100644 --- a/chaoscenter/authentication/go.mod +++ b/chaoscenter/authentication/go.mod @@ -67,7 +67,3 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -replace github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.0 - -replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.5.2 From 6080acee0757fad28ab5e1dc606e30b71a3de365 Mon Sep 17 00:00:00 2001 From: Vidhit T S Date: Mon, 27 Oct 2025 15:06:02 +0530 Subject: [PATCH 11/21] fixed name issue (#5250) Signed-off-by: VIDHITTS Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .../components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx b/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx index 17ef5072c3d..08fe1d5e047 100644 --- a/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx +++ b/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx @@ -1,15 +1,21 @@ import { Breadcrumbs, BreadcrumbsProps } from '@harnessio/uicore'; import React from 'react'; +import { useAppStore } from '@context'; interface LitmusBreadCrumbsProps extends BreadcrumbsProps { baseUrl?: string; } export default function LitmusBreadCrumbs({ baseUrl, ...rest }: LitmusBreadCrumbsProps): React.ReactElement { + const { projectName } = useAppStore(); + return ( ); } From cf29f6335c8db6fdf532a10cebf2aa3f7fc618e1 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:10:36 +0530 Subject: [PATCH 12/21] Fix CVE-2025-22869: Go runtime Denial of Service vulnerability (#5236) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix[5200]: Namespace Compromise via hostPID (#5201) * fix: hostPID set to false Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> * fix: hostPID set to false Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> --------- Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * fix: Potential Denial of Service via unrestricted CPU/memory and root user execution (#5203) * fix: hostPID set to false Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> * fix: hostPID set to false Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> * fix: Potential Denial of Service via unrestricted CPU/memory and root user execution Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> * fix: Potential Denial of Service via unrestricted CPU/memory and root user execution Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> * fix: Potential Denial of Service via unrestricted CPU/memory and root user execution Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> --------- Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * fix: [5167]: updated probe fetching logic in a fault (#5199) * feat: [5167]: updated probe fetching logic in a fault Signed-off-by: Amit Kumar Das * feat: [5167]: fixed go fmt Signed-off-by: Amit Kumar Das --------- Signed-off-by: Amit Kumar Das Co-authored-by: Shubham Chaudhary Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Update Polices (#5186) * update: governance Signed-off-by: PriteshKiri * update: code of conduct Signed-off-by: PriteshKiri * update: contribution guide Signed-off-by: PriteshKiri * chore: updated community meetings content in Readme Signed-off-by: PriteshKiri * fix: community meeting form link Signed-off-by: PriteshKiri --------- Signed-off-by: PriteshKiri Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Removes hardcoded namespaces for K8s manifests (#5223) Signed-off-by: Bartlomiej Gmerek Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Ensure SERVER_ADDR includes scheme on re-download manifestFix server addr (#5213) * Ensure SERVER_ADDR includes scheme on re-download manifest Signed-off-by: UJESH2K * Ensure SERVER_ADDR includes scheme on re-download manifest Signed-off-by: UJESH2K --------- Signed-off-by: UJESH2K Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Co-authored-by: Vedant Shrotria Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * fix: resolve missing experiment pod logs issue (#5207) Fixed missing experiment pod logs by updating relevant entities and components. Updated workflowRun entity, CustomStepLog controller, and ExperimentRunDetailsPanel to properly handle and display experiment pod logs. Signed-off-by: Harshit Panchbhai Co-authored-by: Amit Kumar Das Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Added fixes (#5227) Co-authored-by: git Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * chore(3.22.0): Add the installation manifest for 3.22.0 version (#5229) Signed-off-by: Shubham Chaudhary Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Fixed conversion issues and added formatting improvements Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * changed all go version to 1.24.0 Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Delete test-chaoscenter-mods.ps1 Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Delete test-chaoscenter-mods.ps1​ Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> * Update Dockerfile Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --------- Signed-off-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Signed-off-by: Amit Kumar Das Signed-off-by: PriteshKiri Signed-off-by: Bartlomiej Gmerek Signed-off-by: UJESH2K Signed-off-by: Harshit Panchbhai Signed-off-by: Shubham Chaudhary Co-authored-by: zyue110026 <98426905+zyue110026@users.noreply.github.com> Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Co-authored-by: Amit Kumar Das Co-authored-by: Shubham Chaudhary Co-authored-by: Bartlomiej Gmerek <42570669+Gmerold@users.noreply.github.com> Co-authored-by: Vedant Shrotria Co-authored-by: harshit12339 <37114289+harshit12339@users.noreply.github.com> Co-authored-by: git Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- chaoscenter/upgrade-agents/control-plane/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chaoscenter/upgrade-agents/control-plane/Dockerfile b/chaoscenter/upgrade-agents/control-plane/Dockerfile index 89f5b605ecd..95883ea75b0 100644 --- a/chaoscenter/upgrade-agents/control-plane/Dockerfile +++ b/chaoscenter/upgrade-agents/control-plane/Dockerfile @@ -1,5 +1,5 @@ # BUILD STAGE -FROM golang:1.22 AS builder +FROM golang:1.24 AS builder LABEL maintainer="LitmusChaos" From 814894d8111b0c36e442b222a3e0b307e9e1d7cb Mon Sep 17 00:00:00 2001 From: Umesh Pal <127204670+72umesh@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:11:50 +0530 Subject: [PATCH 13/21] docs: update footer year of experiment docs to 2025 (#5277) (#5279) Signed-off-by: Umesh Kumar Pal Co-authored-by: Vedant Shrotria Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- mkdocs/overrides/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs/overrides/partials/footer.html b/mkdocs/overrides/partials/footer.html index fc463ded0c5..28eaf3244bf 100644 --- a/mkdocs/overrides/partials/footer.html +++ b/mkdocs/overrides/partials/footer.html @@ -61,7 +61,7 @@
-

Copyright © 2021 LitmusChaos Authors. All rights reserved.

+

Copyright © 2025 LitmusChaos Authors. All rights reserved.

From 8f5f20577097722310570ab7543d50f5825b7768 Mon Sep 17 00:00:00 2001 From: Umesh Pal <127204670+72umesh@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:12:18 +0530 Subject: [PATCH 14/21] fix: update FAQ and Troubleshooting headings (#5263) (#5276) Signed-off-by: Umesh Kumar Pal Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Co-authored-by: Vedant Shrotria Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- mkdocs/overrides/home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs/overrides/home.html b/mkdocs/overrides/home.html index 93cb291651b..8d35428d2c2 100644 --- a/mkdocs/overrides/home.html +++ b/mkdocs/overrides/home.html @@ -152,7 +152,7 @@

faqs
-

FAQs

 +

FAQs

All common Frequently Asked Questions curated in one place

@@ -161,7 +161,7 @@

troubleshooting
-

Troubleshooting

 +

Troubleshooting

Know more about troubleshooting of common issues

From 1866c6df5bef5616220efd9215094694ab0db191 Mon Sep 17 00:00:00 2001 From: khushi1310 <89256629+khushi1310@users.noreply.github.com> Date: Mon, 27 Oct 2025 16:01:59 +0530 Subject: [PATCH 15/21] fix: Allow chaos probes with same name across different projects (#5241) * Refactor MongoDB index creation for ChaosProbeCollection Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> * fix-Cannot reuse probe name after deletion Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> * Update Go base image version to 1.24.6 Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> * Update Go version to 1.24 Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> * reverting go version Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> * reverting go version Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> --------- Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Co-authored-by: Sarthak Jain Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- chaoscenter/graphql/server/Dockerfile | 2 +- .../graphql/server/pkg/database/mongodb/init.go | 12 +++++------- .../graphql/server/pkg/probe/handler/handler.go | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/chaoscenter/graphql/server/Dockerfile b/chaoscenter/graphql/server/Dockerfile index 54d3480cbae..ab8938e74b5 100644 --- a/chaoscenter/graphql/server/Dockerfile +++ b/chaoscenter/graphql/server/Dockerfile @@ -34,4 +34,4 @@ USER 65534 CMD ["./server"] -EXPOSE 8080 \ No newline at end of file +EXPOSE 8080 diff --git a/chaoscenter/graphql/server/pkg/database/mongodb/init.go b/chaoscenter/graphql/server/pkg/database/mongodb/init.go index 58203a2cb55..0dac047f637 100644 --- a/chaoscenter/graphql/server/pkg/database/mongodb/init.go +++ b/chaoscenter/graphql/server/pkg/database/mongodb/init.go @@ -298,16 +298,14 @@ func (m *MongoClient) initAllCollection() { m.ChaosProbeCollection = m.Database.Collection(Collections[ChaosProbeCollection]) _, err = m.ChaosProbeCollection.Indexes().CreateMany(backgroundContext, []mongo.IndexModel{ - { - Keys: bson.M{ - "name": 1, - }, - Options: options.Index().SetUnique(true), - }, { Keys: bson.D{ - {"project_id", 1}, + {Key: "name", Value: 1}, + {Key: "project_id", Value: 1}, }, + Options: options.Index().SetUnique(true).SetPartialFilterExpression(bson.D{{ + Key: "is_removed", Value: false, + }}), }, }) if err != nil { diff --git a/chaoscenter/graphql/server/pkg/probe/handler/handler.go b/chaoscenter/graphql/server/pkg/probe/handler/handler.go index 559e57e7ba0..26f2e0ba2d6 100644 --- a/chaoscenter/graphql/server/pkg/probe/handler/handler.go +++ b/chaoscenter/graphql/server/pkg/probe/handler/handler.go @@ -709,6 +709,7 @@ func (p *probeService) ValidateUniqueProbe(ctx context.Context, probeName, proje query := bson.D{ {"name", probeName}, {"project_id", bson.D{{"$eq", projectID}}}, + {"is_removed", false}, } isUnique, err := p.probeOperator.IsProbeUnique(ctx, query) From cf59bc84dad0521ddbf0bbb24bf69a61010d7346 Mon Sep 17 00:00:00 2001 From: khushi1310 <89256629+khushi1310@users.noreply.github.com> Date: Mon, 27 Oct 2025 21:52:01 +0530 Subject: [PATCH 16/21] Show tick icon for completed experiments update (#5260) * Update StatusHeatMap.tsx Signed-off-by: khushi Tiwari Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> * Update StatusHeatMap.module.scss Signed-off-by: khushi Tiwari Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> --------- Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Co-authored-by: Vedant Shrotria Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .../web/src/components/StatusHeatMap/StatusHeatMap.module.scss | 2 +- chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.tsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.module.scss b/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.module.scss index 03b3d0b0e6d..f87646f542e 100644 --- a/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.module.scss +++ b/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.module.scss @@ -14,7 +14,7 @@ justify-content: center; &[data-state='completed'] { - background-color: var(--green-500); + background-color: var(--green-50); &:hover, &:focus { box-shadow: var(--white) 0px 0px 0px 1px, var(--green-100) 0px 0px 0px 2px; diff --git a/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.tsx b/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.tsx index f810a2199e0..e3607fb99e1 100644 --- a/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.tsx +++ b/chaoscenter/web/src/components/StatusHeatMap/StatusHeatMap.tsx @@ -36,7 +36,6 @@ export function StatusHeatMap(props: StatusHeatMapProps): React.ReactElement { function hideIconForStatus(experimentRunStatus: ExperimentRunStatus): boolean { switch (experimentRunStatus) { - case ExperimentRunStatus.COMPLETED: case ExperimentRunStatus.COMPLETED_WITH_PROBE_FAILURE: case ExperimentRunStatus.COMPLETED_WITH_ERROR: case ExperimentRunStatus.NA: From d379a316fb656265d8ee4081e5a0f3987c9091c7 Mon Sep 17 00:00:00 2001 From: khushi1310 <89256629+khushi1310@users.noreply.github.com> Date: Mon, 27 Oct 2025 21:59:57 +0530 Subject: [PATCH 17/21] fixed_issue (#5259) Signed-off-by: khushi1310 <89256629+khushi1310@users.noreply.github.com> Co-authored-by: Pritesh Kiri <77957844+PriteshKiri@users.noreply.github.com> Co-authored-by: Vedant Shrotria Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .../pkg/chaos_experiment/handler/handler.go | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go b/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go index 658d40622ef..42bdc4a93f5 100644 --- a/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go +++ b/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go @@ -83,10 +83,10 @@ func (c *ChaosExperimentHandler) SaveChaosExperiment(ctx context.Context, reques "experimentId": request.ID, } - // Check if the workflow_name exists under same project + // Check if the experiment exists under same project wfDetails, err := c.chaosExperimentOperator.GetExperiment(ctx, bson.D{ {"experiment_id", request.ID}, - {"tags", request.Tags}, + {"project_id", projectID}, {"is_removed", false}, }) if err != nil && err != mongo.ErrNoDocuments { @@ -160,12 +160,25 @@ func (c *ChaosExperimentHandler) CreateChaosExperiment(ctx context.Context, requ var revID = uuid.New().String() - // Check if the experiment_name exists under same project - err := c.validateDuplicateExperimentName(ctx, projectID, request.ExperimentName) + // Fetch the existing experiment to check if name has changed + existingExperiment, err := c.chaosExperimentOperator.GetExperiment(ctx, bson.D{ + {"experiment_id", *request.ExperimentID}, + {"project_id", projectID}, + {"is_removed", false}, + }) + if err != nil { return nil, err } + // Check if the experiment_name exists under same project only if name has changed + if existingExperiment.Name != request.ExperimentName { + err = c.validateDuplicateExperimentName(ctx, projectID, request.ExperimentName) + if err != nil { + return nil, err + } + } + newRequest, wfType, err := c.chaosExperimentService.ProcessExperiment(ctx, request, projectID, revID) if err != nil { return nil, err From d3b0c831079b8b09fc2b5a050fa680c0e94e4302 Mon Sep 17 00:00:00 2001 From: Amit Kumar Das Date: Tue, 28 Oct 2025 11:02:11 +0530 Subject: [PATCH 18/21] fix: [4998]: added tolerations in chaos engine spec when configured from advanced options (#5271) Signed-off-by: Amit Kumar Das Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .../experiment/KubernetesYamlService.ts | 60 ++++++++++++++++--- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/chaoscenter/web/src/services/experiment/KubernetesYamlService.ts b/chaoscenter/web/src/services/experiment/KubernetesYamlService.ts index 56f5d802c3b..dd0b6afbd44 100644 --- a/chaoscenter/web/src/services/experiment/KubernetesYamlService.ts +++ b/chaoscenter/web/src/services/experiment/KubernetesYamlService.ts @@ -363,21 +363,31 @@ export class KubernetesYamlService extends ExperimentYamlService { if (!experiment) return; experiment.unsavedChanges = true; - const [, , spec] = this.getTemplatesAndSteps(experiment?.manifest as KubernetesExperimentManifest); + const [templates, , spec] = this.getTemplatesAndSteps(experiment?.manifest as KubernetesExperimentManifest); + + toleration = { + effect: toleration.effect ? toleration.effect : 'NoExecute', + key: toleration.key ?? '', + operator: toleration.operator ? toleration.operator : 'Equal', + value: toleration.value ?? '' + }; if (spec && !remove) { - spec.tolerations = [ - { - effect: toleration.effect ? toleration.effect : 'NoExecute', - key: toleration.key ?? '', - operator: toleration.operator ? toleration.operator : 'Equal', - value: toleration.value ?? '' - } - ]; + spec.tolerations = [toleration]; } else { delete spec?.tolerations; } + templates?.map(template => { + if (template.inputs?.artifacts?.[0]?.raw?.data) { + const chaosEngineCR = parse(template.inputs.artifacts[0].raw.data ?? '') as ChaosEngine; + if (chaosEngineCR.kind === 'ChaosEngine') { + const updatedEngineCR = this.updateTolerationInChaosEngine(chaosEngineCR, toleration, remove); + template.inputs.artifacts[0].raw.data = yamlStringify(updatedEngineCR); + } + } + }); + await store.put({ ...experiment }, key); await tx.done; } catch (_) { @@ -385,6 +395,38 @@ export class KubernetesYamlService extends ExperimentYamlService { } } + private updateTolerationInChaosEngine( + manifest: ChaosEngine | undefined, + tolerations: WorkflowToleration, + remove: boolean + ): ChaosEngine | undefined { + if (!manifest?.spec) return; + + if (remove) { + if (manifest.spec?.components?.runner?.tolerations) { + delete manifest.spec?.components?.runner?.tolerations; + } + if (manifest.spec?.experiments[0].spec.components?.tolerations) { + delete manifest.spec?.experiments[0].spec.components?.tolerations; + } + return manifest; + } + + manifest.spec.components = { + ...manifest.spec.components, + runner: { + ...manifest.spec.components?.runner, + tolerations: tolerations + } + }; + manifest.spec.experiments[0].spec.components = { + ...manifest.spec.experiments[0].spec.components, + tolerations: tolerations + }; + + return manifest; + } + async convertToNonCronExperiment(key: ChaosObjectStoresPrimaryKeys['experiments']): Promise { try { const tx = (await this.db).transaction(ChaosObjectStoreNameMap.EXPERIMENTS, 'readwrite'); From a93c4951f9443ed0e5b66b2ffc858a56ae664f1b Mon Sep 17 00:00:00 2001 From: Devank Gupta Date: Tue, 28 Oct 2025 13:10:11 +0530 Subject: [PATCH 19/21] fix(UI): update delete command in Disable Chaos Infrastructure popup (#5253) (#5274) - Corrected command syntax to use commas between resources. - Kept namespace dynamic using ${chaosInfrastructureNamespace}. - Verified in UI. Signed-off-by: Devank Gupta Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- .../LitmusBreadCrumbs/LitmusBreadCrumbs.tsx | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx b/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx index 08fe1d5e047..d14cdac46ab 100644 --- a/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx +++ b/chaoscenter/web/src/components/LitmusBreadCrumbs/LitmusBreadCrumbs.tsx @@ -9,13 +9,18 @@ interface LitmusBreadCrumbsProps extends BreadcrumbsProps { export default function LitmusBreadCrumbs({ baseUrl, ...rest }: LitmusBreadCrumbsProps): React.ReactElement { const { projectName } = useAppStore(); - return ( - + const combinedLinks = [ + { + label: projectName || 'My Project', + url: '/', + iconProps: { name: 'chaos-litmuschaos' as any } // cast to 'any' to avoid TS type issue + }, + ...(rest.links || []) + ]; + + const validLinks = combinedLinks.filter( + link => link && typeof link.label === 'string' && link.label.trim() !== '' ); + + return ; } From 8a2e7edcfaf9935f34125861f070da86985522c1 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Tue, 28 Oct 2025 13:19:54 +0000 Subject: [PATCH 20/21] go mod tidy to all Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- chaoscenter/authentication/go.sum | 4 ++-- chaoscenter/event-tracker/go.mod | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/chaoscenter/authentication/go.sum b/chaoscenter/authentication/go.sum index 976111406c5..29be5af9e0c 100644 --- a/chaoscenter/authentication/go.sum +++ b/chaoscenter/authentication/go.sum @@ -30,8 +30,8 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= diff --git a/chaoscenter/event-tracker/go.mod b/chaoscenter/event-tracker/go.mod index 54bbcfe0b9a..8cdb1ed75d4 100644 --- a/chaoscenter/event-tracker/go.mod +++ b/chaoscenter/event-tracker/go.mod @@ -74,5 +74,3 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) - - From 79c49bbc0090733f6a80d6f2401fa977fe640e88 Mon Sep 17 00:00:00 2001 From: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> Date: Tue, 28 Oct 2025 19:50:56 +0000 Subject: [PATCH 21/21] resolving conflicts Signed-off-by: UJESH KUMAR YADAV <154934631+UJESH2K@users.noreply.github.com> --- chaoscenter/authentication/go.mod | 7 ------- 1 file changed, 7 deletions(-) diff --git a/chaoscenter/authentication/go.mod b/chaoscenter/authentication/go.mod index 7092b87da2a..dcd77a43d90 100644 --- a/chaoscenter/authentication/go.mod +++ b/chaoscenter/authentication/go.mod @@ -51,17 +51,10 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect golang.org/x/arch v0.8.0 // indirect -<<<<<<< HEAD - golang.org/x/net v0.33.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/text v0.21.0 // indirect -======= golang.org/x/net v0.45.0 // indirect golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.37.0 // indirect golang.org/x/text v0.30.0 // indirect ->>>>>>> 4d1b6b15 (Fix: Patch CVE-2024-45337 (crypto/ssh Authorization Bypass) and stabilize controller-runtime envtest failure (#5244)) google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect