Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
5c389d63d8 Bump golang.org/x/oauth2 from 0.33.0 to 0.34.0
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.33.0 to 0.34.0.
- [Commits](https://github.com/golang/oauth2/compare/v0.33.0...v0.34.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-08 21:02:13 +00:00
4 changed files with 9 additions and 24 deletions

2
go.mod
View File

@@ -22,7 +22,7 @@ require (
github.com/robfig/cron/v3 v3.0.1
github.com/studio-b12/gowebdav v0.11.0
golang.org/x/crypto v0.45.0
golang.org/x/oauth2 v0.33.0
golang.org/x/oauth2 v0.34.0
golang.org/x/sync v0.18.0
google.golang.org/api v0.256.0
mvdan.cc/sh/v3 v3.12.0

4
go.sum
View File

@@ -486,8 +486,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

View File

@@ -10,15 +10,6 @@ services:
volumes:
- minio_backup_data:/data
rustfs:
image: rustfs/rustfs:1.0.0-alpha.71
volumes:
- rustfs_backup_data:/data
environment:
RUSTFS_ACCESS_KEY: test
RUSTFS_SECRET_KEY: GMusLtUmILge2by+z890kQ
entrypoint: /bin/ash -c 'mkdir -p /data/backup && /entrypoint.sh'
backup:
image: offen/docker-volume-backup:${TEST_VERSION:-canary}
hostname: hostnametoken
@@ -28,7 +19,7 @@ services:
environment:
AWS_ACCESS_KEY_ID: test
AWS_SECRET_ACCESS_KEY: GMusLtUmILge2by+z890kQ
AWS_ENDPOINT: rustfs:9000
AWS_ENDPOINT: minio:9000
AWS_ENDPOINT_PROTO: http
AWS_S3_BUCKET_NAME: backup
BACKUP_FILENAME_EXPAND: 'true'
@@ -52,5 +43,3 @@ volumes:
minio_backup_data:
name: minio_backup_data
app_data:
rustfs_backup_data:
name: rustfs_backup_data

View File

@@ -13,14 +13,10 @@ docker compose exec backup backup
sleep 5
# expect_running_containers "3"
expect_running_containers "3"
docker run --rm \
-v rustfs_backup_data:/minio_data \
alpine \
ash -c 'ls -lah /minio_data && ls -lah /minio_data/backup'
docker run --rm \
-v rustfs_backup_data:/minio_data \
-v minio_backup_data:/minio_data \
alpine \
ash -c 'tar -xvf /minio_data/backup/test-hostnametoken.tar.gz -C /tmp && test -f /tmp/backup/app_data/offen.db'
@@ -34,7 +30,7 @@ sleep 5
docker compose exec backup backup
docker run --rm \
-v rustfs_backup_data:/minio_data \
-v minio_backup_data:/minio_data \
alpine \
ash -c '[ $(find /minio_data/backup/ -type f | wc -l) = "1" ]'
@@ -50,7 +46,7 @@ info "Create first backup with no prune"
docker compose exec backup backup
docker run --rm \
-v rustfs_backup_data:/minio_data \
-v minio_backup_data:/minio_data \
alpine \
ash -c 'touch -d@$(( $(date +%s) - 1209600 )) /minio_data/backup/test-hostnametoken-old.tar.gz'
@@ -58,7 +54,7 @@ info "Create second backup and prune"
docker compose exec backup backup
docker run --rm \
-v rustfs_backup_data:/minio_data \
-v minio_backup_data:/minio_data \
alpine \
ash -c 'test ! -f /minio_data/backup/test-hostnametoken-old.tar.gz && test -f /minio_data/backup/test-hostnametoken.tar.gz'