Bump golang.org/x/sync from 0.7.0 to 0.8.0

.github/workflows/go.yml

@@ -25,7 +25,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v5.0.2
+      uses: actions/setup-go@v5
       with:
         go-version-file: ${{ github.workspace }}/go.mod
 
@@ -39,7 +39,7 @@ jobs:
       run: |
         sudo chown 999:999 testdata/ssl/server/*
         sudo chmod 600 testdata/ssl/server/*
-        docker-compose up -d
+        docker compose up -d
         make
         make test
       env:
@@ -52,5 +52,5 @@ jobs:
         go env | sort
         git status
         docker --version
-        docker-compose --version
-        docker-compose logs
+        docker compose --version
+        docker compose logs

cmd/postgres_exporter/tests/test-smoke

@@ -134,13 +134,13 @@ smoketest_postgres() {
         echo "Templating failed" 1>&2
         exit 1
     fi
-    trap "docker-compose logs; docker-compose down ; docker-compose rm -v; exit 1" EXIT INT TERM
-    local compose_cmd="POSTGRES_PASSWORD=$POSTGRES_PASSWORD docker-compose up -d --force-recreate --build"
+    trap "docker compose logs; docker compose down ; docker compose rm -v; exit 1" EXIT INT TERM
+    local compose_cmd="POSTGRES_PASSWORD=$POSTGRES_PASSWORD docker compose up -d --force-recreate --build"
     echo "Compose Cmd: $compose_cmd"
     eval "$compose_cmd"
 
-    master_container=$(docker-compose ps -q pg-master)
-    slave_container=$(docker-compose ps -q pg-slave)
+    master_container=$(docker compose ps -q pg-master)
+    slave_container=$(docker compose ps -q pg-slave)
     master_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$master_container")
     slave_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$slave_container")
     echo "Got master IP: $master_ip"
@@ -153,7 +153,7 @@ smoketest_postgres() {
         --log.level=debug --web.listen-address=:$exporter_port &
     exporter_pid=$!
     # shellcheck disable=SC2064
-    trap "docker-compose logs; docker-compose down ; docker-compose rm -v ; kill $exporter_pid; exit 1" EXIT INT TERM
+    trap "docker compose logs; docker compose down ; docker compose rm -v ; kill $exporter_pid; exit 1" EXIT INT TERM
     wait_for_exporter
 
     if ! wget -q -O - http://localhost:$exporter_port/metrics 1> "$METRICS_DIR/.metrics.replicated.$version.prom" ; then
@@ -162,8 +162,8 @@ smoketest_postgres() {
     fi
 
     kill $exporter_pid    
-    docker-compose down
-    docker-compose rm -v
+    docker compose down
+    docker compose rm -v
     trap - EXIT INT TERM
 
     cd "$old_pwd" || exit 1

docker-compose.md

@@ -1,14 +1,14 @@
 In order to start PostgreSQL with SSL support, we need to change the file permissions
 for the ssl cert and key.
 
-Please run these commands if you want to run docker-compose locally.
+Please run these commands if you want to run `docker compose` locally.
 
 sudo chown 999:999 testdata/ssl/server/*
 sudo chmod 0600 testdata/ssl/server/*
 
 Start the container:
 ```
-docker-compose up
+`docker compose` up
 ```
 
 To be able to connect from pgsql you need to own the certs

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/smartystreets/goconvey v1.8.1
 	github.com/stretchr/testify v1.9.0
 	github.com/tklauser/go-sysconf v0.3.14
-	golang.org/x/sync v0.7.0
+	golang.org/x/sync v0.8.0
 	golang.org/x/sys v0.22.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -83,8 +83,8 @@ golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 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.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=

percona_tests/Makefile

@@ -41,9 +41,9 @@ prepare-base-exporter:
 	tar -xf assets/postgres_exporter_percona.tar.gz -C assets/
 
 start-postgres-db:
-	docker-compose up -d --force-recreate --renew-anon-volumes --remove-orphans
+	docker compose up -d --force-recreate --renew-anon-volumes --remove-orphans
 
 stop-postgres-db:
-	docker-compose down
+	docker compose down
 
 prepare-env-from-repo: prepare-exporter-from-repo prepare-base-exporter start-postgres-db