From 70c68929d8d963c0bd17390c76e366d4339f56b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:10:43 +0000 Subject: [PATCH 1/8] chore(deps): update anchore/sbom-action action to v0.15.2 (#823) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fc8c919..54b9cae 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -49,7 +49,7 @@ jobs: with: go-version: '1.21' - name: Download Syft - uses: anchore/sbom-action/download-syft@5ecf649a417b8ae17dc8383dc32d46c03f2312df # v0.15.1 + uses: anchore/sbom-action/download-syft@719133684c7d294116626d1344fe64f0d2ff3e9e # v0.15.2 - name: Run GoReleaser uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5 with: @@ -104,7 +104,7 @@ jobs: cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_TAG }} - name: Generate SBOM - uses: anchore/sbom-action@5ecf649a417b8ae17dc8383dc32d46c03f2312df # v0.15.1 + uses: anchore/sbom-action@719133684c7d294116626d1344fe64f0d2ff3e9e # v0.15.2 with: image: ${{ env.IMAGE_TAG }} artifact-name: sbom-${{ env.IMAGE_NAME }} From 035348d8a0d290ac26b42425945eaafe038cedc5 Mon Sep 17 00:00:00 2001 From: Bartlomiej Plotka Date: Wed, 3 Jan 2024 17:59:28 +0100 Subject: [PATCH 2/8] fix: no explain case, improved readability. (#825) Signed-off-by: bwplotka --- cmd/analyze/analyze.go | 17 +++++-- pkg/analysis/analysis.go | 98 +++++++++++++++++++++------------------- pkg/analysis/output.go | 8 +++- pkg/server/analyze.go | 6 ++- 4 files changed, 73 insertions(+), 56 deletions(-) diff --git a/cmd/analyze/analyze.go b/cmd/analyze/analyze.go index 9f202d2..ba5d469 100644 --- a/cmd/analyze/analyze.go +++ b/cmd/analyze/analyze.go @@ -44,9 +44,17 @@ var AnalyzeCmd = &cobra.Command{ provide you with a list of issues that need to be resolved`, Run: func(cmd *cobra.Command, args []string) { - // AnalysisResult configuration - config, err := analysis.NewAnalysis(backend, - language, filters, namespace, nocache, explain, maxConcurrency, withDoc) + // Create analysis configuration first. + config, err := analysis.NewAnalysis( + backend, + language, + filters, + namespace, + nocache, + explain, + maxConcurrency, + withDoc, + ) if err != nil { color.Red("Error: %v", err) os.Exit(1) @@ -55,8 +63,7 @@ var AnalyzeCmd = &cobra.Command{ config.RunAnalysis() if explain { - err := config.GetAIResults(output, anonymize) - if err != nil { + if err := config.GetAIResults(output, anonymize); err != nil { color.Red("Error: %v", err) os.Exit(1) } diff --git a/pkg/analysis/analysis.go b/pkg/analysis/analysis.go index eea5476..6f23ea4 100644 --- a/pkg/analysis/analysis.go +++ b/pkg/analysis/analysis.go @@ -17,12 +17,10 @@ import ( "context" "errors" "fmt" - "os" "reflect" "strings" "sync" - "github.com/fatih/color" openapi_v2 "github.com/google/gnostic/openapiv2" "github.com/k8sgpt-ai/k8sgpt/pkg/ai" "github.com/k8sgpt-ai/k8sgpt/pkg/analyzer" @@ -65,17 +63,56 @@ type JsonOutput struct { Results []common.Result `json:"results"` } -func NewAnalysis(backend string, language string, filters []string, namespace string, noCache bool, explain bool, maxConcurrency int, withDoc bool) (*Analysis, error) { - var configAI ai.AIConfiguration - err := viper.UnmarshalKey("ai", &configAI) +func NewAnalysis( + backend string, + language string, + filters []string, + namespace string, + noCache bool, + explain bool, + maxConcurrency int, + withDoc bool, +) (*Analysis, error) { + // Get kubernetes client from viper. + kubecontext := viper.GetString("kubecontext") + kubeconfig := viper.GetString("kubeconfig") + client, err := kubernetes.NewClient(kubecontext, kubeconfig) if err != nil { - color.Red("Error: %v", err) - os.Exit(1) + return nil, fmt.Errorf("initialising kubernetes client: %w", err) } - if len(configAI.Providers) == 0 && explain { - color.Red("Error: AI provider not specified in configuration. Please run k8sgpt auth") - os.Exit(1) + // Load remote cache if it is configured. + cache, err := cache.GetCacheConfiguration() + if err != nil { + return nil, err + } + + if noCache { + cache.DisableCache() + } + + a := &Analysis{ + Context: context.Background(), + Filters: filters, + Client: client, + Namespace: namespace, + Cache: cache, + Explain: explain, + MaxConcurrency: maxConcurrency, + WithDoc: withDoc, + } + if !explain { + // Return early if AI use was not requested. + return a, nil + } + + var configAI ai.AIConfiguration + if err := viper.UnmarshalKey("ai", &configAI); err != nil { + return nil, err + } + + if len(configAI.Providers) == 0 { + return nil, errors.New("AI provider not specified in configuration. Please run k8sgpt auth") } // Backend string will have high priority than a default provider @@ -93,49 +130,16 @@ func NewAnalysis(backend string, language string, filters []string, namespace st } if aiProvider.Name == "" { - color.Red("Error: AI provider %s not specified in configuration. Please run k8sgpt auth", backend) - return nil, errors.New("AI provider not specified in configuration") + return nil, fmt.Errorf("AI provider %s not specified in configuration. Please run k8sgpt auth", backend) } aiClient := ai.NewClient(aiProvider.Name) if err := aiClient.Configure(&aiProvider, language); err != nil { - color.Red("Error: %v", err) return nil, err } - - ctx := context.Background() - // Get kubernetes client from viper - - kubecontext := viper.GetString("kubecontext") - kubeconfig := viper.GetString("kubeconfig") - client, err := kubernetes.NewClient(kubecontext, kubeconfig) - if err != nil { - color.Red("Error initialising kubernetes client: %v", err) - return nil, err - } - - // load remote cache if it is configured - cache, err := cache.GetCacheConfiguration() - if err != nil { - return nil, err - } - - if noCache { - cache.DisableCache() - } - - return &Analysis{ - Context: ctx, - Filters: filters, - Client: client, - AIClient: aiClient, - Namespace: namespace, - Cache: cache, - Explain: explain, - MaxConcurrency: maxConcurrency, - AnalysisAIProvider: backend, - WithDoc: withDoc, - }, nil + a.AIClient = aiClient + a.AnalysisAIProvider = aiProvider.Name + return a, nil } func (a *Analysis) RunAnalysis() { diff --git a/pkg/analysis/output.go b/pkg/analysis/output.go index f65503d..b638b93 100644 --- a/pkg/analysis/output.go +++ b/pkg/analysis/output.go @@ -58,8 +58,12 @@ func (a *Analysis) jsonOutput() ([]byte, error) { func (a *Analysis) textOutput() ([]byte, error) { var output strings.Builder - // Print the AI provider used for this analysis - output.WriteString(fmt.Sprintf("AI Provider: %s\n", color.YellowString(a.AnalysisAIProvider))) + // Print the AI provider used for this analysis (if explain was enabled). + if a.Explain { + output.WriteString(fmt.Sprintf("AI Provider: %s\n", color.YellowString(a.AnalysisAIProvider))) + } else { + output.WriteString(fmt.Sprintf("AI Provider: %s\n", color.YellowString("AI not used; --explain not set"))) + } if len(a.Errors) != 0 { output.WriteString("\n") diff --git a/pkg/server/analyze.go b/pkg/server/analyze.go index 204f6ba..5c93d01 100644 --- a/pkg/server/analyze.go +++ b/pkg/server/analyze.go @@ -9,8 +9,8 @@ import ( ) func (h *handler) Analyze(ctx context.Context, i *schemav1.AnalyzeRequest) ( - *schemav1.AnalyzeResponse, - error, + *schemav1.AnalyzeResponse, + error, ) { if i.Output == "" { i.Output = "json" @@ -34,6 +34,8 @@ func (h *handler) Analyze(ctx context.Context, i *schemav1.AnalyzeRequest) ( int(i.MaxConcurrency), false, // Kubernetes Doc disabled in server mode ) + config.Context = ctx // Replace context for correct timeouts. + if err != nil { return &schemav1.AnalyzeResponse{}, err } From 4314804ca7e782f5149dc2078ba9c859edc4688a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 06:48:12 +0100 Subject: [PATCH 3/8] fix(deps): update module github.com/sashabaranov/go-openai to v1.17.10 (#824) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ed99418..fc574ce 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/fatih/color v1.16.0 github.com/magiconair/properties v1.8.7 github.com/mittwald/go-helm-client v0.12.5 - github.com/sashabaranov/go-openai v1.17.9 + github.com/sashabaranov/go-openai v1.17.10 github.com/schollz/progressbar/v3 v3.14.1 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 diff --git a/go.sum b/go.sum index 29bf647..b60d007 100644 --- a/go.sum +++ b/go.sum @@ -1266,8 +1266,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= -github.com/sashabaranov/go-openai v1.17.9 h1:QEoBiGKWW68W79YIfXWEFZ7l5cEgZBV4/Ow3uy+5hNY= -github.com/sashabaranov/go-openai v1.17.9/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.17.10 h1:ybvWN+d/rgEK/64U6dsjnOQ9AUya2wBoJKj3Wuaonqo= +github.com/sashabaranov/go-openai v1.17.10/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/schollz/progressbar/v3 v3.14.1 h1:VD+MJPCr4s3wdhTc7OEJ/Z3dAeBzJ7yKH/P4lC5yRTI= github.com/schollz/progressbar/v3 v3.14.1/go.mod h1:Zc9xXneTzWXF81TGoqL71u0sBPjULtEHYtj/WVgVy8E= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= From 526e22f88b8de15eceb10965b045ef0366ff2d6c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 08:48:08 +0000 Subject: [PATCH 4/8] fix(deps): update module github.com/aws/aws-sdk-go to v1.49.14 (#822) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fc574ce..ae861a9 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( cloud.google.com/go/storage v1.36.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 - github.com/aws/aws-sdk-go v1.49.12 + github.com/aws/aws-sdk-go v1.49.14 github.com/cohere-ai/cohere-go v0.2.0 github.com/olekukonko/tablewriter v0.0.5 google.golang.org/api v0.154.0 diff --git a/go.sum b/go.sum index b60d007..71e755c 100644 --- a/go.sum +++ b/go.sum @@ -695,8 +695,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/aws/aws-sdk-go v1.49.12 h1:SbGHDdMjtuTL8zpRXKjvIvQHLt9cCqcxcHoJps23WxI= -github.com/aws/aws-sdk-go v1.49.12/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.49.14 h1:AZ7wfESxXuqQElXRnDCaohJSUSaf2s7c2uPB7g5js/w= +github.com/aws/aws-sdk-go v1.49.14/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= From a77426593d7f3a8cfa810336ff08a2266db7fb4f Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Thu, 4 Jan 2024 16:47:39 +0000 Subject: [PATCH 5/8] chore: remove code cov (#832) Signed-off-by: Alex Jones --- .github/workflows/test.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0542331..bc4194f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -23,11 +23,5 @@ jobs: with: go-version: ${{ env.GO_VERSION }} - - name: Run coverage - run: go test ./... -race -coverprofile=coverage.out -covermode=atomic - - name: Upload coverage to Codecov - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3 - - # - name: Fmt Test - # run: fmtFiles=$(make fmt); if [ "$fmtFiles" != "" ];then exit 1; fi - + - name: Run test + run: go test ./... From a7e9b486bad7c2d62878e470a755d1fef3803680 Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Thu, 4 Jan 2024 17:03:32 +0000 Subject: [PATCH 6/8] chore: lint fixes (#833) * chore: added basic server startup test Signed-off-by: Alex Jones * chore: refactored wg.add move Signed-off-by: Alex Jones --------- Signed-off-by: Alex Jones --- cmd/cache/cache.go | 5 ++++- pkg/cache/cache.go | 4 ++-- pkg/cache/s3_based.go | 4 ++-- pkg/server/server_test.go | 7 ++++--- pkg/util/util.go | 5 ++++- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cmd/cache/cache.go b/cmd/cache/cache.go index c7418db..27042aa 100644 --- a/cmd/cache/cache.go +++ b/cmd/cache/cache.go @@ -28,7 +28,10 @@ var CacheCmd = &cobra.Command{ Short: "For working with the cache the results of an analysis", Long: `Cache commands allow you to add a remote cache, list the contents of the cache, and remove items from the cache.`, Run: func(cmd *cobra.Command, args []string) { - cmd.Help() + err := cmd.Help() + if err != nil { + panic(err) + } }, } diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index dcb0b0b..90006ca 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -93,9 +93,9 @@ func GetCacheConfiguration() (ICache, error) { cache = &FileBasedCache{} } - cache.Configure(cacheInfo) + err_config := cache.Configure(cacheInfo) - return cache, nil + return cache, err_config } func AddRemoteCache(cacheInfo CacheProvider) error { diff --git a/pkg/cache/s3_based.go b/pkg/cache/s3_based.go index 19e4f46..91c998d 100644 --- a/pkg/cache/s3_based.go +++ b/pkg/cache/s3_based.go @@ -90,9 +90,9 @@ func (s *S3Cache) Load(key string) (string, error) { } buf := new(bytes.Buffer) - buf.ReadFrom(result.Body) + _, err_read := buf.ReadFrom(result.Body) result.Body.Close() - return buf.String(), nil + return buf.String(), err_read } func (s *S3Cache) List() ([]CacheObjectDetails, error) { diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go index 98d9743..ef76f83 100644 --- a/pkg/server/server_test.go +++ b/pkg/server/server_test.go @@ -1,12 +1,13 @@ package server import ( - "github.com/fatih/color" - "github.com/stretchr/testify/assert" - "go.uber.org/zap" "os" "sync" "testing" + + "github.com/fatih/color" + "github.com/stretchr/testify/assert" + "go.uber.org/zap" ) func TestServerInit(t *testing.T) { diff --git a/pkg/util/util.go b/pkg/util/util.go index 9ad38ac..76c0fef 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -154,7 +154,10 @@ func SliceDiff(source, dest []string) []string { func MaskString(input string) string { key := make([]byte, len(input)) result := make([]rune, len(input)) - rand.Read(key) + _, err := rand.Read(key) + if err != nil { + panic(err) + } for i := range result { result[i] = anonymizePattern[int(key[i])%len(anonymizePattern)] } From 4de989c803ee43a02d75112d1b3a54daee3dd9af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 19:56:11 +0100 Subject: [PATCH 7/8] fix(deps): update module golang.org/x/term to v0.16.0 (#831) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ae861a9..0b11e5e 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 - golang.org/x/term v0.15.0 + golang.org/x/term v0.16.0 helm.sh/helm/v3 v3.13.3 k8s.io/api v0.28.4 k8s.io/apimachinery v0.28.4 @@ -197,7 +197,7 @@ require ( golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.15.0 // indirect golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect diff --git a/go.sum b/go.sum index 71e755c..9ff6725 100644 --- a/go.sum +++ b/go.sum @@ -1642,8 +1642,8 @@ golang.org/x/sys v0.4.0/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.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -1651,8 +1651,8 @@ golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= 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= From 105a239d94384f4096c01d9978564040773ab56e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 06:16:07 +0100 Subject: [PATCH 8/8] fix(deps): update module google.golang.org/api to v0.155.0 (#836) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 0b11e5e..252c7e1 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go v1.49.14 github.com/cohere-ai/cohere-go v0.2.0 github.com/olekukonko/tablewriter v0.0.5 - google.golang.org/api v0.154.0 + google.golang.org/api v0.155.0 sigs.k8s.io/controller-runtime v0.16.3 sigs.k8s.io/gateway-api v1.0.0 ) @@ -70,9 +70,9 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect - google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect + google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect ) @@ -125,7 +125,7 @@ require ( github.com/google/go-containerregistry v0.16.1 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/google/uuid v1.4.0 // indirect + github.com/google/uuid v1.5.0 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect diff --git a/go.sum b/go.sum index 9ff6725..17d001c 100644 --- a/go.sum +++ b/go.sum @@ -993,8 +993,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -1819,8 +1819,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.154.0 h1:X7QkVKZBskztmpPKWQXgjJRPA2dJYrL6r+sYPRLj050= -google.golang.org/api v0.154.0/go.mod h1:qhSMkM85hgqiokIYsrRyKxrjfBeIhgl4Z2JmeRkYylc= +google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA= +google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1963,16 +1963,16 @@ google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY= google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= -google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= -google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8= google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:2yNACc1O40tTnrsbk9Cv6oxiW8pxI/pXj0wRtdlYmgY= -google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI= +google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 h1:EWIeHfGuUf00zrVZGEgYFxok7plSAXBGcH7NNdMAWvA= +google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=