Skip to content

Commit a64f02f

Browse files
Bump golang.org/x/sync from 0.7.0 to 0.8.0 (#252)
* Bump golang.org/x/sync from 0.7.0 to 0.8.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.7.0 to 0.8.0. - [Commits](golang/sync@v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: deprecated docker compose syntax --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Demidoff <alexander.demidoff@percona.com>
1 parent 21233cc commit a64f02f

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

.github/workflows/go.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@v4
2626

2727
- name: Set up Go
28-
uses: actions/setup-go@v5.0.2
28+
uses: actions/setup-go@v5
2929
with:
3030
go-version-file: ${{ github.workspace }}/go.mod
3131

@@ -39,7 +39,7 @@ jobs:
3939
run: |
4040
sudo chown 999:999 testdata/ssl/server/*
4141
sudo chmod 600 testdata/ssl/server/*
42-
docker-compose up -d
42+
docker compose up -d
4343
make
4444
make test
4545
env:
@@ -52,5 +52,5 @@ jobs:
5252
go env | sort
5353
git status
5454
docker --version
55-
docker-compose --version
56-
docker-compose logs
55+
docker compose --version
56+
docker compose logs

cmd/postgres_exporter/tests/test-smoke

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ smoketest_postgres() {
134134
echo "Templating failed" 1>&2
135135
exit 1
136136
fi
137-
trap "docker-compose logs; docker-compose down ; docker-compose rm -v; exit 1" EXIT INT TERM
138-
local compose_cmd="POSTGRES_PASSWORD=$POSTGRES_PASSWORD docker-compose up -d --force-recreate --build"
137+
trap "docker compose logs; docker compose down ; docker compose rm -v; exit 1" EXIT INT TERM
138+
local compose_cmd="POSTGRES_PASSWORD=$POSTGRES_PASSWORD docker compose up -d --force-recreate --build"
139139
echo "Compose Cmd: $compose_cmd"
140140
eval "$compose_cmd"
141141

142-
master_container=$(docker-compose ps -q pg-master)
143-
slave_container=$(docker-compose ps -q pg-slave)
142+
master_container=$(docker compose ps -q pg-master)
143+
slave_container=$(docker compose ps -q pg-slave)
144144
master_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$master_container")
145145
slave_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$slave_container")
146146
echo "Got master IP: $master_ip"
@@ -153,7 +153,7 @@ smoketest_postgres() {
153153
--log.level=debug --web.listen-address=:$exporter_port &
154154
exporter_pid=$!
155155
# shellcheck disable=SC2064
156-
trap "docker-compose logs; docker-compose down ; docker-compose rm -v ; kill $exporter_pid; exit 1" EXIT INT TERM
156+
trap "docker compose logs; docker compose down ; docker compose rm -v ; kill $exporter_pid; exit 1" EXIT INT TERM
157157
wait_for_exporter
158158

159159
if ! wget -q -O - http://localhost:$exporter_port/metrics 1> "$METRICS_DIR/.metrics.replicated.$version.prom" ; then
@@ -162,8 +162,8 @@ smoketest_postgres() {
162162
fi
163163

164164
kill $exporter_pid
165-
docker-compose down
166-
docker-compose rm -v
165+
docker compose down
166+
docker compose rm -v
167167
trap - EXIT INT TERM
168168

169169
cd "$old_pwd" || exit 1

docker-compose.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
In order to start PostgreSQL with SSL support, we need to change the file permissions
22
for the ssl cert and key.
33

4-
Please run these commands if you want to run docker-compose locally.
4+
Please run these commands if you want to run `docker compose` locally.
55

66
sudo chown 999:999 testdata/ssl/server/*
77
sudo chmod 0600 testdata/ssl/server/*
88

99
Start the container:
1010
```
11-
docker-compose up
11+
`docker compose` up
1212
```
1313

1414
To be able to connect from pgsql you need to own the certs

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/smartystreets/goconvey v1.8.1
1818
github.com/stretchr/testify v1.9.0
1919
github.com/tklauser/go-sysconf v0.3.14
20-
golang.org/x/sync v0.7.0
20+
golang.org/x/sync v0.8.0
2121
golang.org/x/sys v0.22.0
2222
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
2323
gopkg.in/yaml.v2 v2.4.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
8383
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
8484
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
8585
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
86-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
87-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
86+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
87+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
8888
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
8989
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
9090
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=

percona_tests/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ prepare-base-exporter:
4141
tar -xf assets/postgres_exporter_percona.tar.gz -C assets/
4242

4343
start-postgres-db:
44-
docker-compose up -d --force-recreate --renew-anon-volumes --remove-orphans
44+
docker compose up -d --force-recreate --renew-anon-volumes --remove-orphans
4545

4646
stop-postgres-db:
47-
docker-compose down
47+
docker compose down
4848

4949
prepare-env-from-repo: prepare-exporter-from-repo prepare-base-exporter start-postgres-db

0 commit comments

Comments
 (0)