chore: update deps (github.com/jfrog/jfrog-client-go, google.golang.o…

…rg/protobuf, helm.sh/helm/v3, github.com/moby/moby, github.com/mholt/archiver)) (#6887)


Signed-off-by: francois.samin <francois.samin@corp.ovh.com>

.build/go.mk

@@ -1,5 +1,5 @@
 SHELL := /bin/bash
-GO_BUILD                 = GOPRIVATE="${GO_PRIVATE}" CGO_ENABLED=0 go build -a -installsuffix cgo
+GO_BUILD                 = GOPRIVATE="${GO_PRIVATE}" CGO_ENABLED=0 go build -installsuffix cgo
 GO_LIST                  = env GOPRIVATE="${GO_PRIVATE}" go list
 TEST_CMD                 = go test -v -timeout 600s -coverprofile=profile.coverprofile
 TEST_C_CMD               = go test -c -coverprofile=profile.coverprofile

.build/plugin.mk

@@ -35,15 +35,15 @@ export PLUGIN_CDS_NAME
 
 ## Prepare yml file for each os-arch
 $(CROSS_COMPILED_PLUGIN_CONF): $(GOFILES)
-	$(info *** prepare conf $@)
+	$(info *** prepare conf $@, TARGET_NAME=$(TARGET_NAME))
 	@mkdir -p $(TARGET_DIST); \
 	echo "$$PLUGIN_MANIFEST_BINARY" > $@; \
 	OS=$(call get_os_from_binary_file,$@); \
 	ARCH=$(call get_arch_from_conf_file,$@); \
 	perl -pi -e s,%os%,$$OS,g $@ ; \
 	perl -pi -e s,%arch%,$$ARCH,g $@ ; \
 	EXTENSION=""; \
-	if test "$(TARGET_NAME)" == *"windows"* ; then EXTENSION=".exe"; fi; \
+	if test "$(OS)" = "windows" ; then EXTENSION=".exe"; fi; \
 	FILENAME=$(TARGET_NAME)-$$OS-$$ARCH$$EXTENSION; \
 	perl -pi -e s,%filename%,$$FILENAME,g $@
 

contrib/grpcplugins/action/dockerPush/main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/go-units"
 	"github.com/golang/protobuf/ptypes/empty"
+	"github.com/moby/moby/api/types/registry"
 	"github.com/moby/moby/client"
 	"github.com/pkg/errors"
 
@@ -138,7 +139,7 @@ func (actPlugin *dockerPushPlugin) perform(ctx context.Context, image string, ta
 	return nil
 }
 
-func (actPlugin *dockerPushPlugin) performImage(ctx context.Context, cli *client.Client, source string, img *img, registry string, registryAuth string, tag string) (*sdk.V2WorkflowRunResult, time.Duration, error) {
+func (actPlugin *dockerPushPlugin) performImage(ctx context.Context, cli *client.Client, source string, img *img, registryURL string, registryAuth string, tag string) (*sdk.V2WorkflowRunResult, time.Duration, error) {
 	var t0 = time.Now()
 
 	// Create run result at status "pending"
@@ -199,7 +200,7 @@ func (actPlugin *dockerPushPlugin) performImage(ctx context.Context, cli *client
 			}
 		}
 
-		auth := types.AuthConfig{
+		auth := registry.AuthConfig{
 			Username:      integration.Config[sdk.ArtifactoryConfigTokenName].Value,
 			Password:      integration.Config[sdk.ArtifactoryConfigToken].Value,
 			ServerAddress: repository + "." + rtURL.Host,
@@ -259,13 +260,13 @@ func (actPlugin *dockerPushPlugin) performImage(ctx context.Context, cli *client
 
 	default:
 		// Push on the registry set as parameter
-		if registry == "" && registryAuth == "" {
+		if registryURL == "" && registryAuth == "" {
 			return nil, time.Since(t0), errors.New("wrong usage: <registry> and <registryAuth> parameters should not be both empty")
 		}
 
 		destination = img.repository + ":" + tag
-		if registry != "" {
-			destination = registry + "/" + destination
+		if registryURL != "" {
+			destination = registryURL + "/" + destination
 		}
 
 		if tag != img.tag { // if the image already has the right tag, nothing to do
@@ -284,7 +285,7 @@ func (actPlugin *dockerPushPlugin) performImage(ctx context.Context, cli *client
 		}
 
 		result.ArtifactManagerMetadata = &sdk.V2WorkflowRunResultArtifactManagerMetadata{}
-		result.ArtifactManagerMetadata.Set("registry", registry)
+		result.ArtifactManagerMetadata.Set("registry", registryURL)
 		result.ArtifactManagerMetadata.Set("name", destination)
 		result.ArtifactManagerMetadata.Set("id", img.imageID)
 	}

contrib/grpcplugins/action/plugin-archive/go.mod

@@ -2,9 +2,7 @@ module github.com/ovh/cds/contrib/grpcplugins/action/archive
 
 replace github.com/ovh/cds => ../../../../
 
-go 1.21
-
-toolchain go1.21.1
+go 1.22
 
 require (
 	github.com/golang/protobuf v1.5.3
@@ -17,10 +15,10 @@ require (
 	contrib.go.opencensus.io/exporter/jaeger v0.2.1 // indirect
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
 	dario.cat/mergo v1.0.0 // indirect
-	github.com/CycloneDX/cyclonedx-go v0.7.2 // indirect
+	github.com/CycloneDX/cyclonedx-go v0.8.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
-	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
 	github.com/aokoli/goutils v1.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -29,7 +27,7 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/creack/pty v1.1.21 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/eapache/go-resiliency v1.3.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
@@ -47,20 +45,21 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.4.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/iancoleman/orderedmap v0.2.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/jsonschema v0.7.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/jfrog/build-info-go v1.9.12 // indirect
-	github.com/jfrog/gofrog v1.3.0 // indirect
-	github.com/jfrog/jfrog-client-go v1.34.2 // indirect
+	github.com/jfrog/archiver/v3 v3.6.0 // indirect
+	github.com/jfrog/build-info-go v1.9.23 // indirect
+	github.com/jfrog/gofrog v1.6.0 // indirect
+	github.com/jfrog/jfrog-client-go v1.37.1 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/maruel/panicparse/v2 v2.3.1 // indirect
@@ -76,10 +75,10 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/ovh/cds/sdk/interpolate v0.0.0-20190319104452-71125b036b25 // indirect
 	github.com/pborman/uuid v1.2.1 // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/poy/onpar v0.3.2 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
@@ -93,8 +92,8 @@ require (
 	github.com/sguiheux/go-coverage v0.0.0-20190710153556-287b082a7197 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.1 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/cobra v1.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
@@ -108,19 +107,19 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/crypto v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/mod v0.15.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
+	golang.org/x/mod v0.16.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/term v0.17.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.18.0 // indirect
-	google.golang.org/api v0.126.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.58.3 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/tools v0.19.0 // indirect
+	google.golang.org/api v0.153.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/AlecAivazis/survey.v1 v1.7.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect