use latest versions of workflow

mittwald · Feb 12, 2025 · 1f01cc3 · 1f01cc3
1 parent ab2243c
commit 1f01cc3
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 37 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -5,14 +5,14 @@ on: [push]
 jobs:
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
-        go-version: "1.20"
+        go-version: "1.23"
 
     - name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v2
@@ -23,12 +23,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
-        go-version: "1.20"
+        go-version: "1.23"
 
     - name: Install restic
       run: |
@@ -40,33 +40,29 @@ jobs:
 
     - name: install redis-cli
       run: |
-        curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
-        sudo chmod 644 /usr/share/keyrings/redis-archive-keyring.gpg
-        echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
         sudo apt-get update
-        sudo apt-get install redis-tools=5:7.0.15-1build2
+        sudo apt-get install redis-tools -y
         redis-cli --version
 
     - name: install mongodb
       run: |
-        sudo apt-get install gnupg curl
+        sudo apt-get install gnupg curl -y
         curl -fsSL https://pgp.mongodb.com/server-7.0.asc | \
           sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \
           --dearmor
         echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list
         sudo apt-get update
-        sudo apt-get install mongodb-org-tools
+        sudo apt-get install mongodb-org-tools -y
 
     - name: install postgresql
       run: |
         sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
         curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
         sudo apt update
-        sudo apt install postgresql-client-17
+        sudo apt install postgresql-client-17 -y
 
     - name: install mariadb
-      run: sudo apt install mariadb-client
-
+      run: sudo apt install mariadb-client -y
 
     - name: Test
       run: go test -v ./...

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -8,14 +8,14 @@ on:
 jobs:
   build:
     name: Build and release image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.23"
 
       - run: docker login -u "${{ secrets.QUAY_IO_USER }}" -p "${{ secrets.QUAY_IO_TOKEN }}" quay.io
 

diff --git a/Makefile b/Makefile
@@ -29,15 +29,15 @@ lintci:
     -v $(CURDIR):/app \
     -w /app \
 	-e GOLANGCI_ADDITIONAL_YML=/app/build/ci/.golangci.yml \
-	quay.io/mittwald/golangci-lint:0.0.29 \
+	quay.io/mittwald/golangci-lint:0.0.37 \
 		golangci-lint run -v --fix  ./...
 
 lint:
 	docker run --rm \
 		-v $(shell go env GOPATH):/go \
 		-v ${CURDIR}:/app -w /app \
 		-e GOLANGCI_ADDITIONAL_YML=/app/build/ci/.golangci.yml \
-		quay.io/mittwald/golangci-lint:0.0.29 \
+		quay.io/mittwald/golangci-lint:0.0.37 \
 			golangci-lint run -v --fix  ./...
 
 goreleaser:

diff --git a/build/ci/.golangci.yml b/build/ci/.golangci.yml
@@ -8,6 +8,10 @@ run:
 linters:
   disable:
     - forcetypeassert
+    - perfsprint
+    - intrange
+    - musttag
+    - mnd
 
 linters-settings:
   cyclop:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/mittwald/brudi
 
-go 1.20
+go 1.23
 
 require (
 	github.com/docker/go-connections v0.4.0

diff --git a/go.sum b/go.sum
@@ -37,13 +37,15 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/Microsoft/hcsshim v0.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek=
+github.com/Microsoft/hcsshim v0.10.0-rc.8/go.mod h1:OEthFdQv/AD2RAdzR6Mm1N1KPCztGKDurW1Z8b8VGMM=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -62,7 +64,9 @@ github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoY
 github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
+github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -81,6 +85,7 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
+github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
@@ -91,6 +96,7 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -196,9 +202,11 @@ github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
 github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
@@ -246,6 +254,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -468,6 +477,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=
+golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -623,6 +633,7 @@ google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

diff --git a/pkg/source/mongodump/cli.go b/pkg/source/mongodump/cli.go
@@ -11,7 +11,7 @@ type Options struct {
 
 type Flags struct {
 	URI                          string `flag:"--uri="`
-	Host                         string `flag:"--host=" validate:"min=1"`
+	Host                         string `flag:"--host="                         validate:"min=1"`
 	SslCAFile                    string `flag:"--sslCAFile="`
 	SslPEMKeyFile                string `flag:"--sslPEMKeyFile="`
 	SslPEMKeyPassword            string `flag:"--sslPEMKeyPassword="`

diff --git a/pkg/source/mongorestore/cli.go b/pkg/source/mongorestore/cli.go
@@ -11,7 +11,7 @@ type Options struct {
 
 type Flags struct {
 	URI                              string `flag:"--uri="`
-	Host                             string `flag:"--host=" validate:"min=1"`
+	Host                             string `flag:"--host="                             validate:"min=1"`
 	SslCAFile                        string `flag:"--sslCAFile="`
 	SslPEMKeyFile                    string `flag:"--sslPEMKeyFile="`
 	SslPEMKeyPassword                string `flag:"--sslPEMKeyPassword="`
@@ -40,7 +40,7 @@ type Flags struct {
 	NumInsertionWorkersPerCollection int    `flag:"--numInsertionWorkersPerCollection="`
 	NumParallelCollections           int    `flag:"--numParallelCollections="`
 	Ssl                              bool   `flag:"--ssl"`
-	SslFIPSMode                      bool   `flag:"	--sslFIPSMode"`
+	SslFIPSMode                      bool   `flag:"\t--sslFIPSMode"`
 	TlSInsecure                      bool   `flag:"--tlsInsecure"`
 	ForceTableScan                   bool   `flag:"--forceTableScan"`
 	Objcheck                         bool   `flag:"--objcheck"`

diff --git a/pkg/source/mysqldump/cli.go b/pkg/source/mysqldump/cli.go
@@ -24,7 +24,7 @@ type Flags struct {
 	FieldsEscapedBy            string   `flag:"--fields-escaped-by="`
 	FieldsOptionallyEnclosedBy string   `flag:"--fields-optionally-enclosed-by="`
 	FieldsTerminatedBy         string   `flag:"--fields-terminated-by="`
-	Host                       string   `flag:"--host=" validate:"min=1"`
+	Host                       string   `flag:"--host="                              validate:"min=1"`
 	IgnoreError                string   `flag:"--ignore-error="`
 	IgnoreTable                string   `flag:"--ignore-table="`
 	LinesTerminatedBy          string   `flag:"--lines-terminated-by="`
@@ -36,7 +36,7 @@ type Flags struct {
 	Password                   string   `flag:"--password="`
 	PluginDir                  string   `flag:"--plugin-dir="`
 	Protocol                   string   `flag:"--protocol="`
-	ResultFile                 string   `flag:"--result-file=" validate:"min=1"`
+	ResultFile                 string   `flag:"--result-file="                       validate:"min=1"`
 	ServerPublicKeyPath        string   `flag:"--server-public-key-path="`
 	SharedMemoryBaseName       string   `flag:"--shared-memory-base-name="`
 	ShowCreateSkipSecondary    string   `flag:"--show-create-skip-secondary-engine="`

diff --git a/pkg/source/mysqlrestore/cli.go b/pkg/source/mysqlrestore/cli.go
@@ -24,7 +24,7 @@ type Flags struct {
 	Delimiter              string `flag:"--delimiter="`
 	DNSSrvName             string `flag:"--dns-srv-name"`
 	Execute                string `flag:"--execute="`
-	Host                   string `flag:"--host=" validate:"min=1"`
+	Host                   string `flag:"--host="                    validate:"min=1"`
 	InitCommand            string `flag:"--init-command="`
 	LoadDataLocalDir       string `flag:"--load-data-local-dir="`
 	LoginPath              string `flag:"--login-path="`

diff --git a/pkg/source/pgdump/cli.go b/pkg/source/pgdump/cli.go
@@ -27,7 +27,7 @@ type Flags struct {
 	Username         string `flag:"--username="`
 	// unfortunately pg_dump has no cli-option to specify the password
 	// therefore we have to workaround by setting the corresponding password env-var
-	Password                   string `flag:"-" env:"PGPASSWORD"`
+	Password                   string `env:"PGPASSWORD"                       flag:"-"`
 	Role                       string `flag:"--role="`
 	Jobs                       int    `flag:"--jobs="`
 	Compress                   int    `flag:"--compress="`

diff --git a/pkg/source/pgrestore/cli.go b/pkg/source/pgrestore/cli.go
@@ -23,7 +23,7 @@ type Flags struct {
 	LockWaitTimeout string `flag:"--lock-wait-timeout="`
 	// unfortunately pg_restore has no cli-option to specify the password
 	// therefore we have to workaround by setting the corresponding password env-var
-	Password                   string `flag:"-" env:"PGPASSWORD"`
+	Password                   string `env:"PGPASSWORD"                       flag:"-"`
 	Role                       string `flag:"--role="`
 	Schema                     string `flag:"--schema="`
 	Section                    string `flag:"--section="`

diff --git a/pkg/source/psql/cli.go b/pkg/source/psql/cli.go
@@ -16,10 +16,10 @@ type Flags struct {
 	Dbname              string `flag:"--dbname="`
 	FieldSeparator      string `flag:"--field-separator="`
 	File                string `flag:"--file="`
-	Host                string `flag:"--host=" validate:"min=1"`
+	Host                string `flag:"--host="                 validate:"min=1"`
 	LogFile             string `flag:"--log-file="`
 	Output              string `flag:"--output="`
-	Password            string `flag:"-" env:"PGPASSWORD"`
+	Password            string `env:"PGPASSWORD"               flag:"-"`
 	Pset                string `flag:"--pset="`
 	RecordSeparator     string `flag:"--record-separator="`
 	Set                 string `flag:"--set="`

diff --git a/pkg/source/redisdump/cli.go b/pkg/source/redisdump/cli.go
@@ -14,11 +14,11 @@ type Flags struct {
 	Cluster          string `flag:"--cluster="`
 	Delimiter        string `flag:"-d"`
 	Eval             string `flag:"--eval="`
-	Host             string `flag:"-h" validate:"min=1"`
+	Host             string `flag:"-h"                   validate:"min=1"`
 	LruTest          string `flag:"--lru-test="`
 	Password         string `flag:"-a"`
 	Pattern          string `flag:"--pattern="`
-	Rdb              string `flag:"--rdb" validate:"min=1"`
+	Rdb              string `flag:"--rdb"                validate:"min=1"`
 	Socket           string `flag:"-s"`
 	URI              string `flag:"-u"`
 	DatabaseNumber   int    `flag:"-n"`

diff --git a/pkg/source/tar/cli.go b/pkg/source/tar/cli.go
@@ -12,7 +12,7 @@ type Options struct {
 
 type Flags struct {
 	Target          string   `flag:"-C"`
-	File            string   `flag:"-f" validate:"min=1"`
+	File            string   `flag:"-f"                  validate:"min=1"`
 	Warning         []string `flag:"--warning"`
 	Exclude         []string `flag:"--exclude"`
 	StripComponents int      `flag:"--strip-components="`

diff --git a/pkg/source/tarrestore/cli.go b/pkg/source/tarrestore/cli.go
@@ -12,7 +12,7 @@ type Options struct {
 
 type Flags struct {
 	Target          string   `flag:"-C"`
-	File            string   `flag:"-f" validate:"min=1"`
+	File            string   `flag:"-f"                  validate:"min=1"`
 	Warning         []string `flag:"--warning"`
 	Exclude         []string `flag:"--exclude"`
 	StripComponents int      `flag:"--strip-components="`