Bump golang.org/x/crypto from 0.20.0 to 0.31.0 (#196)

* Bump golang.org/x/crypto from 0.20.0 to 0.31.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.20.0 to 0.31.0. - [Commits](golang/crypto@v0.20.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * use "docker compose" instead of old "docker-compose" command --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Medeiros <[email protected]>
hellofresh · Feb 26, 2025 · 6716ef0 · 6716ef0
1 parent 74007af
commit 6716ef0
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 46 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -41,16 +41,8 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install docker-compose v2
-        shell: bash
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release -R docker/compose download -p docker-compose-linux-x86_64
-          mv -f docker-compose-linux-x86_64 docker-compose
-          sudo mv /usr/local/bin/docker-compose /usr/local/bin/docker-compose-v2
-          sudo install docker-compose /usr/local/bin/
-          docker-compose --version
+      - name: Install docker compose
+        uses: docker/setup-compose-action@v1
 
       - run: task test
 

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -18,45 +18,45 @@ tasks:
   test-deps-up:
     summary: Starts test dependencies
     preconditions:
-      - sh: docker-compose version --short | grep '^2'
-        msg: 'docker-compose v2 is expected to be installed'
+      - sh: docker compose version --short | grep '^2'
+        msg: 'docker compose v2 is expected to be installed'
     cmds:
-      - cmd: docker-compose up --detach --wait
+      - cmd: docker compose up --detach --wait
 
   test-deps-down:
     summary: Stops test dependencies
     cmds:
-      - cmd: docker-compose down -v
+      - cmd: docker compose down -v
 
   test-run:
-    summary: Runs tests, must have dependencies running in the docker-compose
+    summary: Runs tests, must have dependencies running in the docker compose
     cmds:
       - cmd: go test {{if .RACE}} -race {{end}} -timeout 2m -cover -coverprofile=coverage.txt -covermode=atomic ./...
     vars:
       PG_PQ_HOST:
-        sh: docker-compose port pg-pq 5432
+        sh: docker compose port pg-pq 5432
       PG_PGX4_HOST:
-        sh: docker-compose port pg-pgx4 5432
+        sh: docker compose port pg-pgx4 5432
       PG_PGX5_HOST:
-        sh: docker-compose port pg-pgx5 5432
+        sh: docker compose port pg-pgx5 5432
       RABBIT_HOST_AMQP:
-        sh: docker-compose port rabbit 5672
+        sh: docker compose port rabbit 5672
       RABBIT_HOST_HTTP:
-        sh: docker-compose port rabbit 15672
+        sh: docker compose port rabbit 15672
       REDIS_HOST:
-        sh: docker-compose port redis 6379
+        sh: docker compose port redis 6379
       MONGO_HOST:
-        sh: docker-compose port mongo 27017
+        sh: docker compose port mongo 27017
       MYSQL_HOST:
-        sh: docker-compose port mysql 3306
+        sh: docker compose port mysql 3306
       MEMCACHED_HOST:
-        sh: docker-compose port memcached 11211
+        sh: docker compose port memcached 11211
       INFLUX_HOST:
-        sh: docker-compose port influxdb 8086
+        sh: docker compose port influxdb 8086
       CASSANDRA_HOST:
-        sh: docker-compose port cassandra 9042
+        sh: docker compose port cassandra 9042
       NATS_HOST:
-        sh: docker-compose port nats 4222
+        sh: docker compose port nats 4222
 
     env:
       CGO_ENABLED: '{{if .RACE}}1{{else}}0{{end}}'

diff --git a/checks/cassandra/check_test.go b/checks/cassandra/check_test.go
@@ -71,7 +71,7 @@ func getHosts(t *testing.T) []string {
 	host, ok := os.LookupEnv(HOST)
 	require.True(t, ok, fmt.Sprintf("Host is: %s", host))
 
-	// "docker-compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
+	// "docker compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
 	host = strings.Replace(host, "0.0.0.0:", "127.0.0.1:", 1)
 
 	return []string{host}

diff --git a/checks/mongo/check_test.go b/checks/mongo/check_test.go
@@ -26,7 +26,7 @@ func getDSN(t *testing.T) string {
 	mongoDSN, ok := os.LookupEnv(mgDSNEnv)
 	require.True(t, ok)
 
-	// "docker-compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
+	// "docker compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
 	mongoDSN = strings.Replace(mongoDSN, "0.0.0.0:", "127.0.0.1:", 1)
 
 	return mongoDSN

diff --git a/checks/mysql/check_test.go b/checks/mysql/check_test.go
@@ -73,7 +73,7 @@ func getDSN(t *testing.T) string {
 	mysqlDSN, ok := os.LookupEnv(mysqlDSNEnv)
 	require.True(t, ok)
 
-	// "docker-compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
+	// "docker compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
 	mysqlDSN = strings.Replace(mysqlDSN, "0.0.0.0:", "127.0.0.1:", 1)
 
 	return mysqlDSN

diff --git a/checks/postgres/check_test.go b/checks/postgres/check_test.go
@@ -70,7 +70,7 @@ func getDSN(t *testing.T) string {
 	pgDSN, ok := os.LookupEnv(pgDSNEnv)
 	require.True(t, ok)
 
-	// "docker-compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
+	// "docker compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
 	pgDSN = strings.Replace(pgDSN, "0.0.0.0:", "127.0.0.1:", 1)
 
 	return pgDSN

diff --git a/checks/rabbitmq/aliveness_check_test.go b/checks/rabbitmq/aliveness_check_test.go
@@ -28,7 +28,7 @@ func getURL(t *testing.T) string {
 	httpURL, ok := os.LookupEnv(httpURLEnv)
 	require.True(t, ok)
 
-	// "docker-compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
+	// "docker compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
 	httpURL = strings.Replace(httpURL, "0.0.0.0:", "127.0.0.1:", 1)
 
 	return httpURL

diff --git a/checks/rabbitmq/check_test.go b/checks/rabbitmq/check_test.go
@@ -38,7 +38,7 @@ func getDSN(t *testing.T) string {
 	mqDSN, ok := os.LookupEnv(mqDSNEnv)
 	require.True(t, ok)
 
-	// "docker-compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
+	// "docker compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
 	mqDSN = strings.Replace(mqDSN, "0.0.0.0:", "127.0.0.1:", 1)
 
 	return mqDSN

diff --git a/checks/redis/check_test.go b/checks/redis/check_test.go
@@ -26,7 +26,7 @@ func getDSN(t *testing.T) string {
 	redisDSN, ok := os.LookupEnv(rdDSNEnv)
 	require.True(t, ok)
 
-	// "docker-compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
+	// "docker compose port <service> <port>" returns 0.0.0.0:XXXX locally, change it to local port
 	redisDSN = strings.Replace(redisDSN, "0.0.0.0:", "127.0.0.1:", 1)
 
 	return redisDSN

diff --git a/go.mod b/go.mod
@@ -51,11 +51,11 @@ 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.20.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/text v0.14.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
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect

diff --git a/go.sum b/go.sum
@@ -213,8 +213,8 @@ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
-golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
+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/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
@@ -229,8 +229,8 @@ golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 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.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+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/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -245,8 +245,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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/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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -257,8 +257,8 @@ golang.org/x/text v0.3.4/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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=