hash
stringlengths 40
40
| date
stringdate 2019-01-29 11:49:07
2025-03-22 03:23:55
| author
stringclasses 79
values | commit_message
stringlengths 14
85
| is_merge
bool 1
class | git_diff
stringlengths 210
1.63M
| type
stringclasses 8
values | masked_commit_message
stringlengths 8
79
|
|---|---|---|---|---|---|---|---|
724227ba8bf3e89a628793dd4a920d9c9372c5aa
|
2022-01-14 21:55:30
|
Tom Payne
|
feat: Add chezmoi.io/get install URL
| false
|
diff --git a/assets/chezmoi.io/.gitignore b/assets/chezmoi.io/.gitignore
index 76145d0a493..aba8e262584 100644
--- a/assets/chezmoi.io/.gitignore
+++ b/assets/chezmoi.io/.gitignore
@@ -1,5 +1,7 @@
/.hugo_build.lock
/content/docs
!/content/docs/menu
+/content/get
+/content/get.ps1
/public
/resources
diff --git a/assets/chezmoi.io/Makefile b/assets/chezmoi.io/Makefile
index c76faba781d..3fb40926ad2 100644
--- a/assets/chezmoi.io/Makefile
+++ b/assets/chezmoi.io/Makefile
@@ -1,13 +1,13 @@
.PHONY: website
-website: content-docs
+website: content
./make-gh-pages.sh
.PHONY: serve
-serve:
+serve: content
hugo serve
-.PHONY: content-docs
-content-docs: \
+.PHONY: content
+content: \
content/docs/architecture.md \
content/docs/changes.md \
content/docs/comparison.md \
@@ -20,7 +20,9 @@ content-docs: \
content/docs/reference.md \
content/docs/related.md \
content/docs/security.md \
- content/docs/templating.md
+ content/docs/templating.md \
+ content/get \
+ content/get.ps1
content/docs/architecture.md: ../../docs/ARCHITECTURE.md ../../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
go run ../../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Architecture" -longtitle="Architecture" < $< > $@ || ( rm -f $@ ; false )
@@ -60,3 +62,9 @@ content/docs/security.md: ../../docs/SECURITY.md ../../internal/cmds/generate-ch
content/docs/templating.md: ../../docs/TEMPLATING.md ../../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
go run ../../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Templating" -longtitle="Templating Guide" < $< > $@ || ( rm -f $@ ; false )
+
+content/get: ../scripts/install.sh
+ cp $< $@ || ( rm -f $@ ; false )
+
+content/get.ps1: ../scripts/install.ps1
+ cp $< $@ || ( rm -f $@ ; false )
diff --git a/internal/cmds/lint-whitespace/main.go b/internal/cmds/lint-whitespace/main.go
index 8b387883b28..29e34b894db 100644
--- a/internal/cmds/lint-whitespace/main.go
+++ b/internal/cmds/lint-whitespace/main.go
@@ -20,6 +20,7 @@ var (
regexp.MustCompile(`\A\.idea\z`),
regexp.MustCompile(`\A\.vagrant\z`),
regexp.MustCompile(`\A\.vscode/settings\.json\z`),
+ regexp.MustCompile(`\Aassets/chezmoi\.io/content/get\.ps1\z`),
regexp.MustCompile(`\Aassets/chezmoi\.io/public\z`),
regexp.MustCompile(`\Aassets/chezmoi\.io/resources\z`),
regexp.MustCompile(`\Aassets/chezmoi\.io/themes/book\z`),
|
feat
|
Add chezmoi.io/get install URL
|
ed35d1c3c5b46bdcae42619a7c83631fb6151c40
|
2024-11-02 03:56:35
|
Tom Payne
|
chore: Fix finalization in tests
| false
|
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
index d308270ee71..5e3c2fc52ee 100644
--- a/internal/cmd/config.go
+++ b/internal/cmd/config.go
@@ -1248,6 +1248,8 @@ func (c *Config) execute(args []string) error {
if err != nil {
return err
}
+ defer c.finalize()
+
rootCmd.SetArgs(args)
return rootCmd.Execute()
@@ -1642,8 +1644,6 @@ func (c *Config) newRootCmd() (*cobra.Command, error) {
SilenceUsage: true,
}
- cobra.OnFinalize(c.finalizeRootCmd)
-
persistentFlags := rootCmd.PersistentFlags()
persistentFlags.Var(&c.CacheDirAbsPath, "cache", "Set cache directory")
@@ -1901,8 +1901,8 @@ func (c *Config) persistentPostRunRootE(cmd *cobra.Command, args []string) error
return nil
}
-// finalizeRootCmd cleans up.
-func (c *Config) finalizeRootCmd() {
+// finalize cleans up.
+func (c *Config) finalize() {
if c.persistentState != nil {
if err := c.persistentState.Close(); err != nil {
c.errorf("error: failed to close persistent state: %v\n", err)
|
chore
|
Fix finalization in tests
|
3e5f0c84ef5880e6d464b72f4b4f6a701c7293ee
|
2024-02-22 23:51:50
|
Tom Payne
|
docs: Fix type of .chezmoi.kernel and .chezmoi.osRelease variables
| false
|
diff --git a/assets/chezmoi.io/docs/reference/templates/variables.md b/assets/chezmoi.io/docs/reference/templates/variables.md
index ca5339824a1..26438cba637 100644
--- a/assets/chezmoi.io/docs/reference/templates/variables.md
+++ b/assets/chezmoi.io/docs/reference/templates/variables.md
@@ -15,9 +15,9 @@ chezmoi provides the following automatically-populated variables:
| `.chezmoi.group` | string | The group of the user running chezmoi |
| `.chezmoi.homeDir` | string | The home directory of the user running chezmoi |
| `.chezmoi.hostname` | string | The hostname of the machine chezmoi is running on, up to the first `.` |
-| `.chezmoi.kernel` | string | Contains information from `/proc/sys/kernel`. Linux only, useful for detecting specific kernels (e.g. Microsoft's WSL kernel) |
+| `.chezmoi.kernel` | object | Contains information from `/proc/sys/kernel`. Linux only, useful for detecting specific kernels (e.g. Microsoft's WSL kernel) |
| `.chezmoi.os` | string | Operating system, e.g. `darwin`, `linux`, etc. as returned by [runtime.GOOS](https://pkg.go.dev/runtime?tab=doc#pkg-constants) |
-| `.chezmoi.osRelease` | string | The information from `/etc/os-release`, Linux only, run `chezmoi data` to see its output |
+| `.chezmoi.osRelease` | object | The information from `/etc/os-release`, Linux only, run `chezmoi data` to see its output |
| `.chezmoi.pathListSeparator` | string | The path list separator, typically `;` on Windows and `:` on other systems. Used to separate paths in environment variables. ie `/bin:/sbin:/usr/bin` |
| `.chezmoi.pathSeparator` | string | The path separator, typically `\` on windows and `/` on unix. Used to separate files and directories in a path. ie `c:\see\dos\run` |
| `.chezmoi.sourceDir` | string | The source directory |
|
docs
|
Fix type of .chezmoi.kernel and .chezmoi.osRelease variables
|
bda1e81689c36f3ddc25e5d1aea177a9a448aced
|
2024-05-21 03:01:18
|
Tom Payne
|
chore: Move off deprecated macos-11 GitHub Action runners
| false
|
diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
index b0c1b5f782c..50a18cdcee0 100644
--- a/.github/workflows/installer.yml
+++ b/.github/workflows/installer.yml
@@ -45,7 +45,7 @@ jobs:
if: ${{ needs.changes.outputs.sh == 'true' }}
strategy:
matrix:
- os: [macos-11, ubuntu-20.04, windows-2022]
+ os: [macos-12, ubuntu-20.04, windows-2022]
needs: changes
runs-on: ${{ matrix.os }}
env:
@@ -68,7 +68,7 @@ jobs:
if: ${{ needs.changes.outputs.ps1 == 'true' }}
strategy:
matrix:
- os: [macos-11, ubuntu-20.04, windows-2022]
+ os: [macos-12, ubuntu-20.04, windows-2022]
needs: changes
runs-on: ${{ matrix.os }}
env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6ee35943114..993695dd9b4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -103,7 +103,7 @@ jobs:
test-macos:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- runs-on: macos-11
+ runs-on: macos-12
permissions:
contents: read
steps:
|
chore
|
Move off deprecated macos-11 GitHub Action runners
|
15e8a40cc2f562df9fb23c033846d9989ecfd14c
|
2023-02-27 21:35:16
|
Nate Childers
|
docs: Correct configuration file syntax for edit.args
| false
|
diff --git a/assets/chezmoi.io/docs/reference/configuration-file/editor.md b/assets/chezmoi.io/docs/reference/configuration-file/editor.md
index fc3eb268fb6..2259462bf8c 100644
--- a/assets/chezmoi.io/docs/reference/configuration-file/editor.md
+++ b/assets/chezmoi.io/docs/reference/configuration-file/editor.md
@@ -6,7 +6,7 @@ environment variable. If none are set then chezmoi falls back to `notepad.exe`
on Windows systems and `vi` on non-Windows systems.
When the `edit.command` configuration variable is used, extra arguments can be
-passed to the editor with the `editor.args` configuration variable.
+passed to the editor with the `edit.args` configuration variable.
chezmoi will emit a warning if the editor returns in less than
`edit.minDuration` (default `1s`). To disable this warning, set
|
docs
|
Correct configuration file syntax for edit.args
|
2e9163e2e0057889c1d1f565f1ee52e6e33613bb
|
2022-11-06 01:08:56
|
Tom Payne
|
chore: Allow edit-config command to edit invalid config files
| false
|
diff --git a/pkg/cmd/editconfigcmd.go b/pkg/cmd/editconfigcmd.go
index e655819fe4f..3d3821ec9c2 100644
--- a/pkg/cmd/editconfigcmd.go
+++ b/pkg/cmd/editconfigcmd.go
@@ -13,9 +13,10 @@ func (c *Config) newEditConfigCmd() *cobra.Command {
Args: cobra.NoArgs,
RunE: c.runEditConfigCmd,
Annotations: map[string]string{
- modifiesConfigFile: "true",
- requiresConfigDirectory: "true",
- runsCommands: "true",
+ doesNotRequireValidConfig: "true",
+ modifiesConfigFile: "true",
+ requiresConfigDirectory: "true",
+ runsCommands: "true",
},
}
|
chore
|
Allow edit-config command to edit invalid config files
|
ea8d95d031f62769117b4bb1796e4d58557d72cb
|
2024-09-10 04:04:21
|
Tom Payne
|
docs: Add Stack Overflow to social media links
| false
|
diff --git a/assets/chezmoi.io/docs/links/social-media.md b/assets/chezmoi.io/docs/links/social-media.md
index 0d3ef1bdbaf..3cff9b62d1d 100644
--- a/assets/chezmoi.io/docs/links/social-media.md
+++ b/assets/chezmoi.io/docs/links/social-media.md
@@ -1,11 +1,11 @@
# Social media
-| Platform | Search term |
-| ----------- | -------------------------------------------------------------------------------------------------------------------------- |
-| Hacker News | [`chezmoi`](https://hn.algolia.com/?dateRange=all&page=0&prefix=false&query=chezmoi&sort=byDate&type=comment) |
-| LinkedIn | [`chezmoi dotfiles`](https://www.linkedin.com/search/results/all/?keywords=chezmoi%20dotfiles&origin=GLOBAL_SEARCH_HEADER) |
-| Reddit | [`chezmoi`](https://www.reddit.com/search/?q=chezmoi&sort=new) |
-| Twitter | [`chezmoi dotfiles`](https://twitter.com/search?q=chezmoi%20dotfiles&f=live) |
-| Twitter | [`chezmoi.io`](https://twitter.com/search?q=chezmoi.io&f=live) |
-| YouTube | [`chezmoi dotfiles`](https://www.youtube.com/results?search_query=chezmoi+dotfiles) |
-
+| Platform | Search term |
+| -------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| Hacker News | [`chezmoi`](https://hn.algolia.com/?dateRange=all&page=0&prefix=false&query=chezmoi&sort=byDate&type=comment) |
+| LinkedIn | [`chezmoi dotfiles`](https://www.linkedin.com/search/results/all/?keywords=chezmoi%20dotfiles&origin=GLOBAL_SEARCH_HEADER) |
+| Reddit | [`chezmoi`](https://www.reddit.com/search/?q=chezmoi&sort=new) |
+| Stack Overflow | [`chezmoi`](https://stackoverflow.com/questions/tagged/chezmoi)
+| Twitter | [`chezmoi dotfiles`](https://twitter.com/search?q=chezmoi%20dotfiles&f=live) |
+| Twitter | [`chezmoi.io`](https://twitter.com/search?q=chezmoi.io&f=live) |
+| YouTube | [`chezmoi dotfiles`](https://www.youtube.com/results?search_query=chezmoi+dotfiles) |
|
docs
|
Add Stack Overflow to social media links
|
1d5a3c5ab9a80811ef1efa419135074c7295e1a1
|
2024-11-19 22:41:06
|
mohamedhany01
|
docs: Add Youtube video info
| false
|
diff --git a/assets/chezmoi.io/docs/links/videos.md.yaml b/assets/chezmoi.io/docs/links/videos.md.yaml
index 936f596b009..234565d46c6 100644
--- a/assets/chezmoi.io/docs/links/videos.md.yaml
+++ b/assets/chezmoi.io/docs/links/videos.md.yaml
@@ -57,3 +57,8 @@ videos:
version: 2.47.1
title: Automating Development Environments with Ansible & Chezmoi
url: https://www.youtube.com/watch?v=P4nI1VhoN2Y
+- date: '2024-11-18'
+ version: 2.54.0
+ lang: AR
+ title: 'Chezmoi, Dotfiles, Workflow, Templates and Encryption | Arabic شرح'
+ url: https://www.youtube.com/watch?v=Jrrd2dHYBmY
|
docs
|
Add Youtube video info
|
57a66c747273cf5da6bb68202b38427eb90606bf
|
2024-03-01 04:34:08
|
Tom Payne
|
chore: Update GitHub Actions
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7bbf9a88787..efba0ab04df 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -302,7 +302,7 @@ jobs:
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: ${{ env.GO_VERSION }}
- - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+ - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
chore
|
Update GitHub Actions
|
80d7918630f17a5a0827ffb218e16dbb596f3bac
|
2024-05-31 05:52:21
|
Tom Payne
|
chore: Update tools
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 54fa2b025c9..544d515f92d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,14 +11,14 @@ on:
schedule:
- cron: 32 2 * * *
env:
- ACTIONLINT_VERSION: 1.7.0 # https://github.com/rhysd/actionlint/releases
+ ACTIONLINT_VERSION: 1.7.1 # https://github.com/rhysd/actionlint/releases
AGE_VERSION: 1.1.1 # https://github.com/FiloSottile/age/releases
CHOCOLATEY_VERSION: 2.2.2 # https://github.com/chocolatey/choco/releases
EDITORCONFIG_CHECKER_VERSION: 3.0.1 # https://github.com/editorconfig-checker/editorconfig-checker/releases
FIND_TYPOS_VERSION: 0.0.3 # https://github.com/twpayne/find-typos/tags
GO_VERSION: 1.22.3 # https://go.dev/doc/devel/release
GOFUMPT_VERSION: 0.6.0 # https://github.com/mvdan/gofumpt/releases
- GOLANGCI_LINT_VERSION: 1.58.2 # https://github.com/golangci/golangci-lint/releases
+ GOLANGCI_LINT_VERSION: 1.59.0 # https://github.com/golangci/golangci-lint/releases
GOLINES_VERSION: 0.12.2 # https://github.com/segmentio/golines/releases
GORELEASER_VERSION: 1.26.2 # https://github.com/goreleaser/goreleaser/releases
GOVERSIONINFO_VERSION: 1.4.0 # https://github.com/josephspurrier/goversioninfo/releases
diff --git a/.golangci.yml b/.golangci.yml
index fbcad75a484..ceccae9289e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -98,7 +98,6 @@ linters:
- ireturn
- lll
- maintidx
- - maligned
- musttag
- nakedret
- nestif
@@ -113,8 +112,6 @@ linters:
- wsl
linters-settings:
- errcheck:
- ignore: '' # https://github.com/golangci/golangci-lint/issues/4733#issuecomment-2120389981
forbidigo:
forbid:
- ^archive/zip\.
|
chore
|
Update tools
|
a72315371c60f6b8a515446d2f859358d1d09946
|
2021-12-03 05:37:06
|
Tom Payne
|
chore: Add GitHub Action to lock closed issues
| false
|
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
new file mode 100644
index 00000000000..5d2dd767c34
--- /dev/null
+++ b/.github/workflows/lock.yml
@@ -0,0 +1,23 @@
+name: 'Lock Threads'
+
+on:
+ schedule:
+ - cron: '0 0 * * *'
+ workflow_dispatch:
+
+permissions:
+ issues: write
+
+concurrency:
+ group: lock
+
+jobs:
+ action:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: dessant/lock-threads@v3
+ with:
+ issue-inactive-days: '7'
+ issue-lock-reason: 'resolved'
+ process-only: 'issues'
+ log-output: true
|
chore
|
Add GitHub Action to lock closed issues
|
8794987fa3d0afd66cfdab39a653c446559b3fcf
|
2022-07-01 13:04:05
|
dependabot[bot]
|
chore(deps): bump github.com/google/gops from 0.3.23 to 0.3.24
| false
|
diff --git a/go.mod b/go.mod
index a79fe0e67fa..6427803ff3d 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
github.com/coreos/go-semver v0.3.0
github.com/go-git/go-git/v5 v5.4.2
github.com/google/go-github/v45 v45.2.0
- github.com/google/gops v0.3.23
+ github.com/google/gops v0.3.24
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/mitchellh/mapstructure v1.5.0
diff --git a/go.sum b/go.sum
index 9d231efda54..947cfea1712 100644
--- a/go.sum
+++ b/go.sum
@@ -28,47 +28,36 @@ cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+Y
cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y=
cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712DPA=
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
-cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc=
cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.6.1 h1:8rBq3zRjnHx8UtBvaOWqBB1xq9jH6/wltfQLlTMh2Fw=
cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1 h1:ukjixP1wl0LpnZ6LWtZJ0mX5tBmjp1f8Sqer8Z2OMUU=
cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0 h1:6RRlFMv1omScs6iq2hfE3IvgE+l6RfJPampq8UZc5TU=
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/age v1.0.0 h1:V6q14n0mqYU3qKFkZ6oOaF9oXneOviS3ubXsSVBRSzc=
filippo.io/age v1.0.0/go.mod h1:PaX+Si/Sd5G8LgfCwldsSba3H1DDQZhIhFGkhbHaBq8=
-filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -86,8 +75,6 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
github.com/ProtonMail/go-crypto v0.0.0-20220517143526-88bb52951d5b h1:lcbBNuQhppsc7A5gjdHmdlqUqJfgGMylBdGyDs0j7G8=
github.com/ProtonMail/go-crypto v0.0.0-20220517143526-88bb52951d5b/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
-github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
@@ -104,7 +91,6 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo=
github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -122,25 +108,19 @@ github.com/bradenhilton/cityhash v1.0.0 h1:1QauDCwfxwIGwO2jBTJdEBqXgfCusAgQOSgdl
github.com/bradenhilton/cityhash v1.0.0/go.mod h1:Wmb8yW1egA9ulrsRX4mxfYx5zq4nBWOCZ+j63oK6uz8=
github.com/bradenhilton/mozillainstallhash v1.0.0 h1:QL9byVGb4FrVOI7MubnME3uPNj5R78tqYQPlxuBmXMw=
github.com/bradenhilton/mozillainstallhash v1.0.0/go.mod h1:yVD0OX1izZHYl1lBm2UDojyE/k0xIqKJK78k+tdWV+k=
-github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/charmbracelet/glamour v0.5.0 h1:wu15ykPdB7X6chxugG/NNfDUbyyrCLV9XBalj5wdu3g=
github.com/charmbracelet/glamour v0.5.0/go.mod h1:9ZRtG19AUIzcTm7FGLGbq3D5WKQ5UyZBbQsMQN0XIqc=
-github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 h1:cqQfy1jclcSy/FwLjemeg3SR1yaINm74aQyupQ0Bl8M=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@@ -151,12 +131,9 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U=
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
@@ -174,19 +151,15 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad h1:EmNYJhPYy0pOFjCx2PrgtaBXmee0iUX9hLlxE1xHOJE=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
-github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
@@ -205,10 +178,8 @@ github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2Su
github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
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 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -216,23 +187,18 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1 h1:4dntyT+x6QTOSCIrgczbQ+ockAEha0cfxD5Wi0iCzjY=
-github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -287,12 +253,10 @@ github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMe
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gops v0.3.23 h1:OjsHRINl5FiIyTc8jivIg4UN0GY6Nh32SL8KRbl8GQo=
-github.com/google/gops v0.3.23/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8=
-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
+github.com/google/gops v0.3.24 h1:JwwsSS4AFp0l9+AH6pLD8FIHIH3x313zLDxfJFs9aGI=
+github.com/google/gops v0.3.24/go.mod h1:8A7ebAm0id9K3H0uOggeRVGxszSvnlURun9mg3GdYDw=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60=
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -304,7 +268,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2 h1:LR89qFljJ48s990kEKGsk213yIJDPI4205OKOzbURK8=
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -326,9 +289,7 @@ github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pf
github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
-github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
@@ -336,25 +297,20 @@ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJr
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/consul/api v1.12.0 h1:k3y1FYv6nuKyNTqj6w9gXOx5r5CfLj/k/euUeBXj1OY=
github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=
github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -362,7 +318,6 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -370,13 +325,11 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
-github.com/hashicorp/serf v0.9.7 h1:hkdgbqizGQHuU5IPqYM1JdSMV8nKfpuOnZYXssk9muY=
github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
@@ -387,32 +340,25 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 h1:WjT3fLi9n8YWh/Ih8Q1LHAPsTqGddPcHqscN+PJ3i68=
github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -420,13 +366,13 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
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/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
@@ -471,11 +417,9 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/muesli/combinator v0.3.0 h1:SZDuRzzwmVPLkbOzbhGzBTwd5+Y6aFN4UusOW2azrNA=
github.com/muesli/combinator v0.3.0/go.mod h1:ttPegJX0DPQaGDtJKMInIP6Vfp5pN8RX7QntFCcpy18=
@@ -486,7 +430,6 @@ github.com/muesli/termenv v0.12.0 h1:KuQRUE3PgxRFWhq4gHvZtPSLCGDqM5q/cYr1pZ39ytc
github.com/muesli/termenv v0.12.0/go.mod h1:WCCv32tusQ/EEZ5S8oUIIrC/nIuBcxCVqlN4Xfkv+7A=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
@@ -505,12 +448,12 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
@@ -518,7 +461,6 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP
github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -538,21 +480,17 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
-github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4=
github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo=
github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.6.0 h1:REOEXCs/NFY/1jOCEouMuT4zEniE5YoXbvpC5X/TLF8=
github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/shirou/gopsutil/v3 v3.21.9 h1:Vn4MUz2uXhqLSiCbGFRc0DILbMVLAY92DSkT8bsYrHg=
-github.com/shirou/gopsutil/v3 v3.21.9/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
+github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -560,7 +498,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
@@ -593,10 +530,8 @@ github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs=
github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo=
-github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
-github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
-github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
-github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/twpayne/go-pinentry v0.2.0 h1:hS5NEJiilop9xP9pBX/1NYduzDlGGMdg1KamTBTrOWw=
github.com/twpayne/go-pinentry v0.2.0/go.mod h1:r6buhMwARxnnL0VRBqfd1tE6Fadk1kfP00GRMutEspY=
@@ -613,7 +548,6 @@ github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
github.com/xanzy/ssh-agent v0.3.1 h1:AmzO1SSWxw73zxFZPRwaMN1MohDw8UyHnmuxyceTEGo=
github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w=
-github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -626,17 +560,14 @@ github.com/yuin/goldmark v1.4.12 h1:6hffw6vALvEDqJ19dOJvJKOoAOKe4NDaTqvd2sktGN0=
github.com/yuin/goldmark v1.4.12/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=
github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
github.com/zalando/go-keyring v0.2.1 h1:MBRN/Z8H4U5wEKXiD67YbDAr5cj/DOStmSga70/2qKc=
github.com/zalando/go-keyring v0.2.1/go.mod h1:g63M2PPn0w5vjmEbwAX3ib5I+41zdm4esSETOn9Y6Dw=
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc=
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
-go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg=
go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.4 h1:Dcx3/MYyfKcPNLpR4VVQUP5KgYrBeJtktBwEKkw08Ao=
go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
-go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4=
go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -644,7 +575,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -654,7 +584,6 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -682,10 +611,8 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -697,11 +624,9 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
@@ -710,7 +635,6 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -846,6 +770,7 @@ golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -870,11 +795,9 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -908,7 +831,6 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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=
@@ -959,7 +881,6 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -972,7 +893,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -1012,7 +932,6 @@ google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc
google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
-google.golang.org/api v0.81.0 h1:o8WF5AvfidafWbFjsRyupxyEQJNUWxLZJCK5NXrxZZ8=
google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1099,7 +1018,6 @@ google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I=
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1130,7 +1048,6 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -1162,7 +1079,6 @@ gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -1184,20 +1100,14 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
-mvdan.cc/editorconfig v0.2.0 h1:XL+7ys6ls/RKrkUNFQvEwIvNHh+JKx8Mj1pUV5wQxQE=
mvdan.cc/editorconfig v0.2.0/go.mod h1:lvnnD3BNdBYkhq+B4uBuFFKatfp02eB6HixDvEz91C0=
mvdan.cc/sh/v3 v3.5.1 h1:hmP3UOw4f+EYexsJjFxvU38+kn+V/s2CclXHanIBkmQ=
mvdan.cc/sh/v3 v3.5.1/go.mod h1:1JcoyAKm1lZw/2bZje/iYKWicU/KMd0rsyJeKHnsK4E=
-rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/goversion v1.2.0 h1:SPn+NLTiAG7w30IRK/DKp1BjvpWabYgxlLp/+kx5J8w=
rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=
-rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
chore
|
bump github.com/google/gops from 0.3.23 to 0.3.24
|
90289ee8da06de7a5f851c0d9499d02fc367660b
|
2021-02-06 18:04:12
|
Tom Payne
|
docs: Add comparison guide
| false
|
diff --git a/README.md b/README.md
index d1b287e18af..d521d5f2e04 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,6 @@ Manage your dotfiles across multiple diverse machines, securely.
* [Declarative and robust](#declarative-and-robust)
* [Fast and easy to use](#fast-and-easy-to-use)
* [I already have a system to manage my dotfiles, why should I use chezmoi?](#i-already-have-a-system-to-manage-my-dotfiles-why-should-i-use-chezmoi)
- * [...if coping with differences between machines requires special care](#if-coping-with-differences-between-machines-requires-special-care)
- * [...if you need to think for a moment before giving anyone access to your dotfiles](#if-you-need-to-think-for-a-moment-before-giving-anyone-access-to-your-dotfiles)
- * [...if your needs are outgrowing your current tool](#if-your-needs-are-outgrowing-your-current-tool)
- * [...if setting up your dotfiles requires more than two short commands](#if-setting-up-your-dotfiles-requires-more-than-two-short-commands)
* [How do people use chezmoi?](#how-do-people-use-chezmoi)
* [Dotfile repos using chezmoi](#dotfile-repos-using-chezmoi)
* [People talking about chezmoi](#people-talking-about-chezmoi)
@@ -31,7 +27,8 @@ tasks, and there's both documentation on [templating](docs/TEMPLATING.md) and
[frequently asked questions](docs/FAQ.md) for specific questions. You can browse
other people's dotfiles that use chezmoi [on
GitHub](https://github.com/topics/chezmoi?o=desc&s=updated) and [on
-GitLab](https://gitlab.com/search?search=chezmoi). For a full description of
+GitLab](https://gitlab.com/search?search=chezmoi), and see how chezmoi [compares
+to other dotfile managers](docs/COMPARISON.md). For a full description of
chezmoi, consult the [reference](docs/REFERENCE.md).
## What does chezmoi do and why should I use it?
@@ -110,70 +107,7 @@ single command, and automatically commit and push changes.
## I already have a system to manage my dotfiles, why should I use chezmoi?
-If you're using any of the following methods:
-
-* A custom shell script.
-* An existing dotfile manager like
- [homeshick](https://github.com/andsens/homeshick),
- [homesick](https://github.com/technicalpickles/homesick),
- [rcm](https://github.com/thoughtbot/rcm), [GNU
- Stow](https://www.gnu.org/software/stow/), or [yadm](https://yadm.io/).
-* A [bare git repo](https://www.atlassian.com/git/tutorials/dotfiles).
-
-Then you've probably run into at least one of the following problems.
-
-### ...if coping with differences between machines requires special care
-
-If you want to synchronize your dotfiles across multiple operating systems or
-distributions, then you may need to manually perform extra steps to cope with
-differences from machine to machine. You might need to run different commands on
-different machines, maintain separate per-machine files or branches (with the
-associated hassle of merging, rebasing, or copying each change), or hope that
-your custom logic handles the differences correctly.
-
-chezmoi uses a single source of truth (a single branch) and a single command
-that works on every machine. Individual files can be templates to handle machine
-to machine differences, if needed.
-
-### ...if you need to think for a moment before giving anyone access to your dotfiles
-
-If your system stores secrets in plain text, then you must be very careful about
-where you clone your dotfiles. If you clone them on your work machine then
-anyone with access to your work machine (e.g. your IT department) will have
-access to your home secrets. If you clone it on your home machine then you risk
-leaking work secrets.
-
-With chezmoi you can store secrets in your password manager or encrypt them, and
-even store passwords in different ways on different machines. You can clone your
-dotfiles repository anywhere, and even make your dotfiles repo public, without
-leaving personal secrets on your work machine or work secrets on your personal
-machine.
-
-### ...if your needs are outgrowing your current tool
-
-If your system was written by you for your personal use, then it probably has
-the minimum functionality that you needed when you wrote it. If you need more
-functionality then you have to implement it yourself.
-
-chezmoi includes a huge range of battle-tested functionality out-of-the-box,
-including dry-run and diff modes, script execution, conflict resolution, Windows
-support, and much, much more. chezmoi is [used by thousands of
-people](https://github.com/twpayne/chezmoi/stargazers), so it is likely that
-when you hit the limits of your existing dotfile management system, chezmoi
-already has a tried-and-tested solution ready for you to use.
-
-### ...if setting up your dotfiles requires more than two short commands
-
-If your system is written in a scripting language like Python, Perl, or Ruby,
-then you also need to install a compatible version of that language's runtime
-before you can use your system.
-
-chezmoi is distributed as a single stand-alone statically-linked binary with no
-dependencies that you can simply copy onto your machine and run. chezmoi
-provides one-line installs, pre-built binaries, packages for Linux and BSD
-distributions, Homebrew formulae, Scoop and Chocolatey support on Windows, and a
-initial config file generation mechanism to make installing your dotfiles on a
-new machine as painless as possible.
+Read the [comparison of chezmoi to other dotfile managers](docs/COMPARISON.md).
## How do people use chezmoi?
@@ -197,6 +131,7 @@ Read what [people have said about chezmoi](docs/MEDIA.md).
* [FAQ](docs/FAQ.md) for questions that aren't answered elsewhere.
* [Changes](docs/CHANGES.md) for non-backwards compatible changes.
* [Reference](docs/REFERENCE.md) for a complete description of chezmoi.
+* [Comparison guide](docs/COMPARISON.md) for a comparison with other dotfile managers.
* [Contributing](docs/CONTRIBUTING.md) for people looking to contribute to or
package chezmoi.
diff --git a/chezmoi.io/Makefile b/chezmoi.io/Makefile
index 11c718879dd..47c63a65c87 100644
--- a/chezmoi.io/Makefile
+++ b/chezmoi.io/Makefile
@@ -5,6 +5,7 @@ website: content-docs
.PHONY: content-docs
content-docs: \
content/docs/changes.md \
+ content/docs/comparison.md \
content/docs/contributing.md \
content/docs/faq.md \
content/docs/how-to.md \
@@ -17,6 +18,9 @@ content-docs: \
content/docs/changes.md: ../docs/CHANGES.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Changes" -longtitle="Changes" < $< > $@ || ( rm -f $@ ; false )
+content/docs/comparison.md: ../docs/COMPARISON.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
+ go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Comparison" -longtitle="Comparison Guide" < $< > $@ || ( rm -f $@ ; false )
+
content/docs/contributing.md: ../docs/CONTRIBUTING.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Contributing" -longtitle="Contributing Guide" < $< > $@ || ( rm -f $@ ; false )
diff --git a/chezmoi.io/content/_index.md b/chezmoi.io/content/_index.md
index f8d67767f50..64fdf7f1b61 100644
--- a/chezmoi.io/content/_index.md
+++ b/chezmoi.io/content/_index.md
@@ -15,7 +15,8 @@ tasks, and there's both documentation on [templating](/docs/templating/) and
[frequently asked questions](/docs/faq/) for specific questions. You can browse
other people's dotfiles that use chezmoi [on
GitHub](https://github.com/topics/chezmoi?o=desc&s=updated) and [on
-GitLab](https://gitlab.com/search?search=chezmoi). For a full description of
+GitLab](https://gitlab.com/search?search=chezmoi), and see how chezmoi [compares
+to other dotfile managers](/docs/comparison/). For a full description of
chezmoi, consult the [reference](/docs/reference/).
## What does chezmoi do and why should I use it?
@@ -94,70 +95,7 @@ single command, and automatically commit and push changes.
## I already have a system to manage my dotfiles, why should I use chezmoi?
-If you're using any of the following methods:
-
-* A custom shell script.
-* An existing dotfile manager like
- [homeshick](https://github.com/andsens/homeshick),
- [homesick](https://github.com/technicalpickles/homesick),
- [rcm](https://github.com/thoughtbot/rcm), [GNU
- Stow](https://www.gnu.org/software/stow/), or [yadm](https://yadm.io/).
-* A [bare git repo](https://www.atlassian.com/git/tutorials/dotfiles).
-
-Then you've probably run into at least one of the following problems.
-
-### ...if coping with differences between machines requires special care
-
-If you want to synchronize your dotfiles across multiple operating systems or
-distributions, then you may need to manually perform extra steps to cope with
-differences from machine to machine. You might need to run different commands on
-different machines, maintain separate per-machine files or branches (with the
-associated hassle of merging, rebasing, or copying each change), or hope that
-your custom logic handles the differences correctly.
-
-chezmoi uses a single source of truth (a single branch) and a single command
-that works on every machine. Individual files can be templates to handle machine
-to machine differences, if needed.
-
-### ...if you need to think for a moment before giving anyone access to your dotfiles
-
-If your system stores secrets in plain text, then you must be very careful about
-where you clone your dotfiles. If you clone them on your work machine then
-anyone with access to your work machine (e.g. your IT department) will have
-access to your home secrets. If you clone it on your home machine then you risk
-leaking work secrets.
-
-With chezmoi you can store secrets in your password manager or encrypt them, and
-even store passwords in different ways on different machines. You can clone your
-dotfiles repository anywhere, and even make your dotfiles repo public, without
-leaving personal secrets on your work machine or work secrets on your personal
-machine.
-
-### ...if your needs are outgrowing your current tool
-
-If your system was written by you for your personal use, then it probably has
-the minimum functionality that you needed when you wrote it. If you need more
-functionality then you have to implement it yourself.
-
-chezmoi includes a huge range of battle-tested functionality out-of-the-box,
-including dry-run and diff modes, script execution, conflict resolution, Windows
-support, and much, much more. chezmoi is [used by thousands of
-people](https://github.com/twpayne/chezmoi/stargazers), so it is likely that
-when you hit the limits of your existing dotfile management system, chezmoi
-already has a tried-and-tested solution ready for you to use.
-
-### ...if setting up your dotfiles requires more than two short commands
-
-If your system is written in a scripting language like Python, Perl, or Ruby,
-then you also need to install a compatible version of that language's runtime
-before you can use your system.
-
-chezmoi is distributed as a single stand-alone statically-linked binary with no
-dependencies that you can simply copy onto your machine and run. chezmoi
-provides one-line installs, pre-built binaries, packages for Linux and BSD
-distributions, Homebrew formulae, Scoop and Chocolatey support on Windows, and a
-initial config file generation mechanism to make installing your dotfiles on a
-new machine as painless as possible.
+Read the [comparison of chezmoi to other dotfile managers](/docs/comparison/).
## How do people use chezmoi?
@@ -181,6 +119,7 @@ Read what [people have said about chezmoi](docs/MEDIA.md).
* [FAQ](/docs/faq/) for questions that aren't answered elsewhere.
* [Changes](/docs/changes/) for non-backwards compatible changes.
* [Reference](/docs/reference/) for a complete description of chezmoi.
+* [Comparison guide](docs/comparison/) for a comparison with other dotfile managers.
* [Contributing](/docs/contributing/) for people looking to contribute to or
package chezmoi.
diff --git a/chezmoi.io/content/docs/menu/index.md b/chezmoi.io/content/docs/menu/index.md
index a861b74ea7c..6303d248264 100644
--- a/chezmoi.io/content/docs/menu/index.md
+++ b/chezmoi.io/content/docs/menu/index.md
@@ -10,5 +10,6 @@ headless = true
- [Changes]({{< relref "/docs/changes.md" >}})
- [Reference]({{< relref "/docs/reference.md" >}})
- [Media]({{< relref "/docs/media.md" >}})
+- [Comparison]({{< relref "/docs/comparison.md" >}})
- [Contributing]({{< relref "/docs/contributing.md" >}})
- [GitHub](https://github.com/twpayne/chezmoi)
diff --git a/chezmoi2/cmd/docs.gen.go b/chezmoi2/cmd/docs.gen.go
index e94c09e8a26..408ab3c1cc2 100644
--- a/chezmoi2/cmd/docs.gen.go
+++ b/chezmoi2/cmd/docs.gen.go
@@ -34,6 +34,122 @@ func init() {
"\n" +
"Support for the `gpgRecipient` config variable will be removed in version 2.0.0.\n" +
"\n")
+ assets["docs/COMPARISON.md"] = []byte("" +
+ "# chezmoi Comparison guide\n" +
+ "\n" +
+ "<!--- toc --->\n" +
+ "* [Comparison table](#comparison-table)\n" +
+ "* [I already have a system to manage my dotfiles, why should I use chezmoi?](#i-already-have-a-system-to-manage-my-dotfiles-why-should-i-use-chezmoi)\n" +
+ " * [...if coping with differences between machines requires special care](#if-coping-with-differences-between-machines-requires-special-care)\n" +
+ " * [...if you need to think for a moment before giving anyone access to your dotfiles](#if-you-need-to-think-for-a-moment-before-giving-anyone-access-to-your-dotfiles)\n" +
+ " * [...if your needs are outgrowing your current tool](#if-your-needs-are-outgrowing-your-current-tool)\n" +
+ " * [...if setting up your dotfiles requires more than two short commands](#if-setting-up-your-dotfiles-requires-more-than-two-short-commands)\n" +
+ "\n" +
+ "## Comparison table\n" +
+ "\n" +
+ "[chezmoi]: https://chezmoi.io/\n" +
+ "[dotbot]: https://github.com/anishathalye/dotbot\n" +
+ "[rcm]: https://github.com/thoughtbot/rcm\n" +
+ "[homesick]: https://github.com/technicalpickles/homesick\n" +
+ "[yadm]: https://yadm.io/\n" +
+ "[bare git]: https://www.atlassian.com/git/tutorials/dotfiles \"bare git\"\n" +
+ "\n" +
+ "| | [chezmoi] | [dotbot] | [rcm] | [homesick] | [yadm] | [bare git] |\n" +
+ "| -------------------------------------- | ------------- | ----------------- | ----------------- | ----------------- | ------------- | ---------- |\n" +
+ "| Implementation language | Go | Python | Perl | Ruby | Bash | C |\n" +
+ "| Distribution | Single binary | Python package | Multiple files | Ruby gem | Single script | n/a |\n" +
+ "| Install method | Multiple | git submodule | Multiple | Ruby gem | Multiple | n/a |\n" +
+ "| Non-root install on bare system | Yes | Difficult | Difficult | Difficult | Yes | Yes |\n" +
+ "| Windows support | Yes | No | No | No | No | Yes |\n" +
+ "| Bootstrap requirements | git | Python, git | Perl, git | Ruby, git | git | git |\n" +
+ "| Source repos | Single | Single | Multiple | Single | Single | Single |\n" +
+ "| Method | File | Symlink | File | Symlink | File | File |\n" +
+ "| Config file | Optional | Required | Optional | None | None | No |\n" +
+ "| Private files | Yes | No | No | No | No | No |\n" +
+ "| Show differences without applying | Yes | No | No | No | Yes | Yes |\n" +
+ "| Whole file encryption | Yes | No | No | No | Yes | No |\n" +
+ "| Password manager integration | Yes | No | No | No | No | No |\n" +
+ "| Machine-to-machine file differences | Templates | Alternative files | Alternative files | Alternative files | Templates | Manual |\n" +
+ "| Custom variables in templates | Yes | n/a | n/a | n/a | No | No |\n" +
+ "| Executable files | Yes | Yes | Yes | Yes | No | Yes |\n" +
+ "| File creation with initial contents | Yes | No | No | No | No | No |\n" +
+ "| File removal | Yes | Manual | No | No | No | No |\n" +
+ "| Directory creation | Yes | Yes | Yes | No | No | Yes |\n" +
+ "| Run scripts | Yes | Yes | Yes | No | No | No |\n" +
+ "| Run once scripts | Yes | No | No | No | Manual | No |\n" +
+ "| Machine-to-machine symlink differences | Yes | No | No | No | Yes | No |\n" +
+ "| Shell completion | Yes | No | No | No | Yes | Yes |\n" +
+ "| Archive import | Yes | No | No | No | No | No |\n" +
+ "| Archive export | Yes | No | No | No | No | Yes |\n" +
+ "\n" +
+ "## I already have a system to manage my dotfiles, why should I use chezmoi?\n" +
+ "\n" +
+ "If you're using any of the following methods:\n" +
+ "\n" +
+ "* A custom shell script.\n" +
+ "* An existing dotfile manager like\n" +
+ " [homeshick](https://github.com/andsens/homeshick),\n" +
+ " [homesick](https://github.com/technicalpickles/homesick),\n" +
+ " [rcm](https://github.com/thoughtbot/rcm), [GNU\n" +
+ " Stow](https://www.gnu.org/software/stow/), or [yadm](https://yadm.io/).\n" +
+ "* A [bare git repo](https://www.atlassian.com/git/tutorials/dotfiles).\n" +
+ "\n" +
+ "Then you've probably run into at least one of the following problems.\n" +
+ "\n" +
+ "### ...if coping with differences between machines requires special care\n" +
+ "\n" +
+ "If you want to synchronize your dotfiles across multiple operating systems or\n" +
+ "distributions, then you may need to manually perform extra steps to cope with\n" +
+ "differences from machine to machine. You might need to run different commands on\n" +
+ "different machines, maintain separate per-machine files or branches (with the\n" +
+ "associated hassle of merging, rebasing, or copying each change), or hope that\n" +
+ "your custom logic handles the differences correctly.\n" +
+ "\n" +
+ "chezmoi uses a single source of truth (a single branch) and a single command\n" +
+ "that works on every machine. Individual files can be templates to handle machine\n" +
+ "to machine differences, if needed.\n" +
+ "\n" +
+ "### ...if you need to think for a moment before giving anyone access to your dotfiles\n" +
+ "\n" +
+ "If your system stores secrets in plain text, then you must be very careful about\n" +
+ "where you clone your dotfiles. If you clone them on your work machine then\n" +
+ "anyone with access to your work machine (e.g. your IT department) will have\n" +
+ "access to your home secrets. If you clone it on your home machine then you risk\n" +
+ "leaking work secrets.\n" +
+ "\n" +
+ "With chezmoi you can store secrets in your password manager or encrypt them, and\n" +
+ "even store passwords in different ways on different machines. You can clone your\n" +
+ "dotfiles repository anywhere, and even make your dotfiles repo public, without\n" +
+ "leaving personal secrets on your work machine or work secrets on your personal\n" +
+ "machine.\n" +
+ "\n" +
+ "### ...if your needs are outgrowing your current tool\n" +
+ "\n" +
+ "If your system was written by you for your personal use, then it probably has\n" +
+ "the minimum functionality that you needed when you wrote it. If you need more\n" +
+ "functionality then you have to implement it yourself.\n" +
+ "\n" +
+ "chezmoi includes a huge range of battle-tested functionality out-of-the-box,\n" +
+ "including dry-run and diff modes, script execution, conflict resolution, Windows\n" +
+ "support, and much, much more. chezmoi is [used by thousands of\n" +
+ "people](https://github.com/twpayne/chezmoi/stargazers), so it is likely that\n" +
+ "when you hit the limits of your existing dotfile management system, chezmoi\n" +
+ "already has a tried-and-tested solution ready for you to use.\n" +
+ "\n" +
+ "### ...if setting up your dotfiles requires more than two short commands\n" +
+ "\n" +
+ "If your system is written in a scripting language like Python, Perl, or Ruby,\n" +
+ "then you also need to install a compatible version of that language's runtime\n" +
+ "before you can use your system.\n" +
+ "\n" +
+ "chezmoi is distributed as a single stand-alone statically-linked binary with no\n" +
+ "dependencies that you can simply copy onto your machine and run. chezmoi\n" +
+ "provides one-line installs, pre-built binaries, packages for Linux and BSD\n" +
+ "distributions, Homebrew formulae, Scoop and Chocolatey support on Windows, and a\n" +
+ "initial config file generation mechanism to make installing your dotfiles on a\n" +
+ "new machine as painless as possible.\n" +
+ "\n" +
+ "\n")
assets["docs/CONTRIBUTING.md"] = []byte("" +
"# chezmoi Contributing Guide\n" +
"\n" +
diff --git a/chezmoi2/main.go b/chezmoi2/main.go
index 8ad6775fc61..bad585fa657 100644
--- a/chezmoi2/main.go
+++ b/chezmoi2/main.go
@@ -1,4 +1,4 @@
-//go:generate go run ../internal/cmd/generate-assets -o cmd/docs.gen.go -tags=!noembeddocs -trimprefix=../ ../docs/CHANGES.md ../docs/CONTRIBUTING.md ../docs/FAQ.md ../docs/HOWTO.md ../docs/INSTALL.md ../docs/MEDIA.md ../docs/QUICKSTART.md
+//go:generate go run ../internal/cmd/generate-assets -o cmd/docs.gen.go -tags=!noembeddocs -trimprefix=../ ../docs/CHANGES.md ../docs/COMPARISON.md ../docs/CONTRIBUTING.md ../docs/FAQ.md ../docs/HOWTO.md ../docs/INSTALL.md ../docs/MEDIA.md ../docs/QUICKSTART.md
//go:generate go run ../internal/cmd/generate-assets -o cmd/reference.gen.go -tags=!noembeddocs docs/REFERENCE.md
//go:generate go run ../internal/cmd/generate-assets -o cmd/templates.gen.go -trimprefix=../ ../assets/templates/COMMIT_MESSAGE.tmpl
//go:generate go run ../internal/cmd/generate-helps -o cmd/helps.gen.go -i docs/REFERENCE.md
diff --git a/cmd/docs.gen.go b/cmd/docs.gen.go
index 782a30663b7..67e5e2fff9f 100644
--- a/cmd/docs.gen.go
+++ b/cmd/docs.gen.go
@@ -34,6 +34,122 @@ func init() {
"\n" +
"Support for the `gpgRecipient` config variable will be removed in version 2.0.0.\n" +
"\n")
+ assets["docs/COMPARISON.md"] = []byte("" +
+ "# chezmoi Comparison guide\n" +
+ "\n" +
+ "<!--- toc --->\n" +
+ "* [Comparison table](#comparison-table)\n" +
+ "* [I already have a system to manage my dotfiles, why should I use chezmoi?](#i-already-have-a-system-to-manage-my-dotfiles-why-should-i-use-chezmoi)\n" +
+ " * [...if coping with differences between machines requires special care](#if-coping-with-differences-between-machines-requires-special-care)\n" +
+ " * [...if you need to think for a moment before giving anyone access to your dotfiles](#if-you-need-to-think-for-a-moment-before-giving-anyone-access-to-your-dotfiles)\n" +
+ " * [...if your needs are outgrowing your current tool](#if-your-needs-are-outgrowing-your-current-tool)\n" +
+ " * [...if setting up your dotfiles requires more than two short commands](#if-setting-up-your-dotfiles-requires-more-than-two-short-commands)\n" +
+ "\n" +
+ "## Comparison table\n" +
+ "\n" +
+ "[chezmoi]: https://chezmoi.io/\n" +
+ "[dotbot]: https://github.com/anishathalye/dotbot\n" +
+ "[rcm]: https://github.com/thoughtbot/rcm\n" +
+ "[homesick]: https://github.com/technicalpickles/homesick\n" +
+ "[yadm]: https://yadm.io/\n" +
+ "[bare git]: https://www.atlassian.com/git/tutorials/dotfiles \"bare git\"\n" +
+ "\n" +
+ "| | [chezmoi] | [dotbot] | [rcm] | [homesick] | [yadm] | [bare git] |\n" +
+ "| -------------------------------------- | ------------- | ----------------- | ----------------- | ----------------- | ------------- | ---------- |\n" +
+ "| Implementation language | Go | Python | Perl | Ruby | Bash | C |\n" +
+ "| Distribution | Single binary | Python package | Multiple files | Ruby gem | Single script | n/a |\n" +
+ "| Install method | Multiple | git submodule | Multiple | Ruby gem | Multiple | n/a |\n" +
+ "| Non-root install on bare system | Yes | Difficult | Difficult | Difficult | Yes | Yes |\n" +
+ "| Windows support | Yes | No | No | No | No | Yes |\n" +
+ "| Bootstrap requirements | git | Python, git | Perl, git | Ruby, git | git | git |\n" +
+ "| Source repos | Single | Single | Multiple | Single | Single | Single |\n" +
+ "| Method | File | Symlink | File | Symlink | File | File |\n" +
+ "| Config file | Optional | Required | Optional | None | None | No |\n" +
+ "| Private files | Yes | No | No | No | No | No |\n" +
+ "| Show differences without applying | Yes | No | No | No | Yes | Yes |\n" +
+ "| Whole file encryption | Yes | No | No | No | Yes | No |\n" +
+ "| Password manager integration | Yes | No | No | No | No | No |\n" +
+ "| Machine-to-machine file differences | Templates | Alternative files | Alternative files | Alternative files | Templates | Manual |\n" +
+ "| Custom variables in templates | Yes | n/a | n/a | n/a | No | No |\n" +
+ "| Executable files | Yes | Yes | Yes | Yes | No | Yes |\n" +
+ "| File creation with initial contents | Yes | No | No | No | No | No |\n" +
+ "| File removal | Yes | Manual | No | No | No | No |\n" +
+ "| Directory creation | Yes | Yes | Yes | No | No | Yes |\n" +
+ "| Run scripts | Yes | Yes | Yes | No | No | No |\n" +
+ "| Run once scripts | Yes | No | No | No | Manual | No |\n" +
+ "| Machine-to-machine symlink differences | Yes | No | No | No | Yes | No |\n" +
+ "| Shell completion | Yes | No | No | No | Yes | Yes |\n" +
+ "| Archive import | Yes | No | No | No | No | No |\n" +
+ "| Archive export | Yes | No | No | No | No | Yes |\n" +
+ "\n" +
+ "## I already have a system to manage my dotfiles, why should I use chezmoi?\n" +
+ "\n" +
+ "If you're using any of the following methods:\n" +
+ "\n" +
+ "* A custom shell script.\n" +
+ "* An existing dotfile manager like\n" +
+ " [homeshick](https://github.com/andsens/homeshick),\n" +
+ " [homesick](https://github.com/technicalpickles/homesick),\n" +
+ " [rcm](https://github.com/thoughtbot/rcm), [GNU\n" +
+ " Stow](https://www.gnu.org/software/stow/), or [yadm](https://yadm.io/).\n" +
+ "* A [bare git repo](https://www.atlassian.com/git/tutorials/dotfiles).\n" +
+ "\n" +
+ "Then you've probably run into at least one of the following problems.\n" +
+ "\n" +
+ "### ...if coping with differences between machines requires special care\n" +
+ "\n" +
+ "If you want to synchronize your dotfiles across multiple operating systems or\n" +
+ "distributions, then you may need to manually perform extra steps to cope with\n" +
+ "differences from machine to machine. You might need to run different commands on\n" +
+ "different machines, maintain separate per-machine files or branches (with the\n" +
+ "associated hassle of merging, rebasing, or copying each change), or hope that\n" +
+ "your custom logic handles the differences correctly.\n" +
+ "\n" +
+ "chezmoi uses a single source of truth (a single branch) and a single command\n" +
+ "that works on every machine. Individual files can be templates to handle machine\n" +
+ "to machine differences, if needed.\n" +
+ "\n" +
+ "### ...if you need to think for a moment before giving anyone access to your dotfiles\n" +
+ "\n" +
+ "If your system stores secrets in plain text, then you must be very careful about\n" +
+ "where you clone your dotfiles. If you clone them on your work machine then\n" +
+ "anyone with access to your work machine (e.g. your IT department) will have\n" +
+ "access to your home secrets. If you clone it on your home machine then you risk\n" +
+ "leaking work secrets.\n" +
+ "\n" +
+ "With chezmoi you can store secrets in your password manager or encrypt them, and\n" +
+ "even store passwords in different ways on different machines. You can clone your\n" +
+ "dotfiles repository anywhere, and even make your dotfiles repo public, without\n" +
+ "leaving personal secrets on your work machine or work secrets on your personal\n" +
+ "machine.\n" +
+ "\n" +
+ "### ...if your needs are outgrowing your current tool\n" +
+ "\n" +
+ "If your system was written by you for your personal use, then it probably has\n" +
+ "the minimum functionality that you needed when you wrote it. If you need more\n" +
+ "functionality then you have to implement it yourself.\n" +
+ "\n" +
+ "chezmoi includes a huge range of battle-tested functionality out-of-the-box,\n" +
+ "including dry-run and diff modes, script execution, conflict resolution, Windows\n" +
+ "support, and much, much more. chezmoi is [used by thousands of\n" +
+ "people](https://github.com/twpayne/chezmoi/stargazers), so it is likely that\n" +
+ "when you hit the limits of your existing dotfile management system, chezmoi\n" +
+ "already has a tried-and-tested solution ready for you to use.\n" +
+ "\n" +
+ "### ...if setting up your dotfiles requires more than two short commands\n" +
+ "\n" +
+ "If your system is written in a scripting language like Python, Perl, or Ruby,\n" +
+ "then you also need to install a compatible version of that language's runtime\n" +
+ "before you can use your system.\n" +
+ "\n" +
+ "chezmoi is distributed as a single stand-alone statically-linked binary with no\n" +
+ "dependencies that you can simply copy onto your machine and run. chezmoi\n" +
+ "provides one-line installs, pre-built binaries, packages for Linux and BSD\n" +
+ "distributions, Homebrew formulae, Scoop and Chocolatey support on Windows, and a\n" +
+ "initial config file generation mechanism to make installing your dotfiles on a\n" +
+ "new machine as painless as possible.\n" +
+ "\n" +
+ "\n")
assets["docs/CONTRIBUTING.md"] = []byte("" +
"# chezmoi Contributing Guide\n" +
"\n" +
diff --git a/docs/COMPARISON.md b/docs/COMPARISON.md
new file mode 100644
index 00000000000..54a1bbe5b9a
--- /dev/null
+++ b/docs/COMPARISON.md
@@ -0,0 +1,114 @@
+# chezmoi Comparison guide
+
+<!--- toc --->
+* [Comparison table](#comparison-table)
+* [I already have a system to manage my dotfiles, why should I use chezmoi?](#i-already-have-a-system-to-manage-my-dotfiles-why-should-i-use-chezmoi)
+ * [...if coping with differences between machines requires special care](#if-coping-with-differences-between-machines-requires-special-care)
+ * [...if you need to think for a moment before giving anyone access to your dotfiles](#if-you-need-to-think-for-a-moment-before-giving-anyone-access-to-your-dotfiles)
+ * [...if your needs are outgrowing your current tool](#if-your-needs-are-outgrowing-your-current-tool)
+ * [...if setting up your dotfiles requires more than two short commands](#if-setting-up-your-dotfiles-requires-more-than-two-short-commands)
+
+## Comparison table
+
+[chezmoi]: https://chezmoi.io/
+[dotbot]: https://github.com/anishathalye/dotbot
+[rcm]: https://github.com/thoughtbot/rcm
+[homesick]: https://github.com/technicalpickles/homesick
+[yadm]: https://yadm.io/
+[bare git]: https://www.atlassian.com/git/tutorials/dotfiles "bare git"
+
+| | [chezmoi] | [dotbot] | [rcm] | [homesick] | [yadm] | [bare git] |
+| -------------------------------------- | ------------- | ----------------- | ----------------- | ----------------- | ------------- | ---------- |
+| Implementation language | Go | Python | Perl | Ruby | Bash | C |
+| Distribution | Single binary | Python package | Multiple files | Ruby gem | Single script | n/a |
+| Install method | Multiple | git submodule | Multiple | Ruby gem | Multiple | n/a |
+| Non-root install on bare system | Yes | Difficult | Difficult | Difficult | Yes | Yes |
+| Windows support | Yes | No | No | No | No | Yes |
+| Bootstrap requirements | git | Python, git | Perl, git | Ruby, git | git | git |
+| Source repos | Single | Single | Multiple | Single | Single | Single |
+| Method | File | Symlink | File | Symlink | File | File |
+| Config file | Optional | Required | Optional | None | None | No |
+| Private files | Yes | No | No | No | No | No |
+| Show differences without applying | Yes | No | No | No | Yes | Yes |
+| Whole file encryption | Yes | No | No | No | Yes | No |
+| Password manager integration | Yes | No | No | No | No | No |
+| Machine-to-machine file differences | Templates | Alternative files | Alternative files | Alternative files | Templates | Manual |
+| Custom variables in templates | Yes | n/a | n/a | n/a | No | No |
+| Executable files | Yes | Yes | Yes | Yes | No | Yes |
+| File creation with initial contents | Yes | No | No | No | No | No |
+| File removal | Yes | Manual | No | No | No | No |
+| Directory creation | Yes | Yes | Yes | No | No | Yes |
+| Run scripts | Yes | Yes | Yes | No | No | No |
+| Run once scripts | Yes | No | No | No | Manual | No |
+| Machine-to-machine symlink differences | Yes | No | No | No | Yes | No |
+| Shell completion | Yes | No | No | No | Yes | Yes |
+| Archive import | Yes | No | No | No | No | No |
+| Archive export | Yes | No | No | No | No | Yes |
+
+## I already have a system to manage my dotfiles, why should I use chezmoi?
+
+If you're using any of the following methods:
+
+* A custom shell script.
+* An existing dotfile manager like
+ [homeshick](https://github.com/andsens/homeshick),
+ [homesick](https://github.com/technicalpickles/homesick),
+ [rcm](https://github.com/thoughtbot/rcm), [GNU
+ Stow](https://www.gnu.org/software/stow/), or [yadm](https://yadm.io/).
+* A [bare git repo](https://www.atlassian.com/git/tutorials/dotfiles).
+
+Then you've probably run into at least one of the following problems.
+
+### ...if coping with differences between machines requires special care
+
+If you want to synchronize your dotfiles across multiple operating systems or
+distributions, then you may need to manually perform extra steps to cope with
+differences from machine to machine. You might need to run different commands on
+different machines, maintain separate per-machine files or branches (with the
+associated hassle of merging, rebasing, or copying each change), or hope that
+your custom logic handles the differences correctly.
+
+chezmoi uses a single source of truth (a single branch) and a single command
+that works on every machine. Individual files can be templates to handle machine
+to machine differences, if needed.
+
+### ...if you need to think for a moment before giving anyone access to your dotfiles
+
+If your system stores secrets in plain text, then you must be very careful about
+where you clone your dotfiles. If you clone them on your work machine then
+anyone with access to your work machine (e.g. your IT department) will have
+access to your home secrets. If you clone it on your home machine then you risk
+leaking work secrets.
+
+With chezmoi you can store secrets in your password manager or encrypt them, and
+even store passwords in different ways on different machines. You can clone your
+dotfiles repository anywhere, and even make your dotfiles repo public, without
+leaving personal secrets on your work machine or work secrets on your personal
+machine.
+
+### ...if your needs are outgrowing your current tool
+
+If your system was written by you for your personal use, then it probably has
+the minimum functionality that you needed when you wrote it. If you need more
+functionality then you have to implement it yourself.
+
+chezmoi includes a huge range of battle-tested functionality out-of-the-box,
+including dry-run and diff modes, script execution, conflict resolution, Windows
+support, and much, much more. chezmoi is [used by thousands of
+people](https://github.com/twpayne/chezmoi/stargazers), so it is likely that
+when you hit the limits of your existing dotfile management system, chezmoi
+already has a tried-and-tested solution ready for you to use.
+
+### ...if setting up your dotfiles requires more than two short commands
+
+If your system is written in a scripting language like Python, Perl, or Ruby,
+then you also need to install a compatible version of that language's runtime
+before you can use your system.
+
+chezmoi is distributed as a single stand-alone statically-linked binary with no
+dependencies that you can simply copy onto your machine and run. chezmoi
+provides one-line installs, pre-built binaries, packages for Linux and BSD
+distributions, Homebrew formulae, Scoop and Chocolatey support on Windows, and a
+initial config file generation mechanism to make installing your dotfiles on a
+new machine as painless as possible.
+
diff --git a/main.go b/main.go
index 36db9bf7ce0..d40624946f3 100644
--- a/main.go
+++ b/main.go
@@ -1,4 +1,4 @@
-//go:generate go run ./internal/cmd/generate-assets -o cmd/docs.gen.go -tags=!noembeddocs docs/CHANGES.md docs/CONTRIBUTING.md docs/FAQ.md docs/HOWTO.md docs/INSTALL.md docs/MEDIA.md docs/QUICKSTART.md docs/REFERENCE.md docs/TEMPLATING.md
+//go:generate go run ./internal/cmd/generate-assets -o cmd/docs.gen.go -tags=!noembeddocs docs/CHANGES.md docs/COMPARISON.md docs/CONTRIBUTING.md docs/FAQ.md docs/HOWTO.md docs/INSTALL.md docs/MEDIA.md docs/QUICKSTART.md docs/REFERENCE.md docs/TEMPLATING.md
//go:generate go run ./internal/cmd/generate-assets -o cmd/templates.gen.go assets/templates/COMMIT_MESSAGE.tmpl
//go:generate go run ./internal/cmd/generate-helps -o cmd/helps.gen.go -i docs/REFERENCE.md
//go:generate go run . completion bash -o completions/chezmoi-completion.bash
|
docs
|
Add comparison guide
|
5f14f1065a99be4ca7cf9fceaa37d52a662022c2
|
2023-09-26 16:23:55
|
N3WK1D
|
docs: Added an example for promptChoiceOnce
| false
|
diff --git a/assets/chezmoi.io/docs/reference/templates/init-functions/promptChoiceOnce.md b/assets/chezmoi.io/docs/reference/templates/init-functions/promptChoiceOnce.md
index 10585af5412..fd5aacde936 100644
--- a/assets/chezmoi.io/docs/reference/templates/init-functions/promptChoiceOnce.md
+++ b/assets/chezmoi.io/docs/reference/templates/init-functions/promptChoiceOnce.md
@@ -3,3 +3,12 @@
`promptChoiceOnce` returns the value of *map* at *path* if it exists and is a
string, otherwise it prompts the user for one of *choices* with *prompt* and an
optional *default* using `promptChoice`.
+
+!!! example
+
+ ```
+ {{- $choices := list "desktop" "laptop" "server" "termux" -}}
+ {{- $hosttype := promptChoiceOnce . "hosttype" "What type of host are you on" $choices -}}
+ [data]
+ hosttype = {{- $hosttype | quote -}}
+ ```
|
docs
|
Added an example for promptChoiceOnce
|
24c0ea2e1cc9585f7f33a2d276717a44f38ec603
|
2024-01-16 13:43:25
|
Tom Payne
|
feat: Promote Doppler template functions to stable
| false
|
diff --git a/assets/chezmoi.io/docs/reference/templates/doppler-functions/index.md b/assets/chezmoi.io/docs/reference/templates/doppler-functions/index.md
index 5b389e5fb89..825c8eac680 100644
--- a/assets/chezmoi.io/docs/reference/templates/doppler-functions/index.md
+++ b/assets/chezmoi.io/docs/reference/templates/doppler-functions/index.md
@@ -3,7 +3,3 @@
chezmoi includes support for [Doppler](https://www.doppler.com) using the `doppler`
CLI to expose data through the `doppler` and `dopplerProjectJson`
template functions.
-
-!!! warning
-
- Doppler is in beta and chezmoi's interface to it may change.
diff --git a/assets/chezmoi.io/docs/user-guide/password-managers/doppler.md b/assets/chezmoi.io/docs/user-guide/password-managers/doppler.md
index 62823ac8fe6..c2c97fbfef3 100644
--- a/assets/chezmoi.io/docs/user-guide/password-managers/doppler.md
+++ b/assets/chezmoi.io/docs/user-guide/password-managers/doppler.md
@@ -4,11 +4,6 @@ chezmoi includes support for [Doppler](https://www.doppler.com) using the `doppl
CLI to expose data through the `doppler` and `dopplerProjectJson`
template functions.
-!!! warning
-
- Doppler is in beta and chezmoi's interface to it may change.
- Note: Doppler only supports secrets in the `UPPER_SNAKE_CASE` format.
-
Log in using:
```console
|
feat
|
Promote Doppler template functions to stable
|
04f2b5fc7bfe68a32e0f23f4439f7f897e09dd7a
|
2022-09-28 02:24:56
|
Tom Payne
|
chore: Add check for keepassxc-cli version in keepassxcAttachment
| false
|
diff --git a/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/keepassxcAttachment.md b/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/keepassxcAttachment.md
index a1d174137fe..cb45d8f83c3 100644
--- a/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/keepassxcAttachment.md
+++ b/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/keepassxcAttachment.md
@@ -3,6 +3,10 @@
`keepassxcAttachment` returns the attachment with *name* of *entry* using
`keepassxc-cli`.
+!!! info
+
+ `keepassxcAttachment` requires `keepassxc-cli` version 2.7.0 or later.
+
!!! example
```
diff --git a/pkg/cmd/keepassxctemplatefuncs.go b/pkg/cmd/keepassxctemplatefuncs.go
index 47f419c9524..9be1a854e72 100644
--- a/pkg/cmd/keepassxctemplatefuncs.go
+++ b/pkg/cmd/keepassxctemplatefuncs.go
@@ -33,10 +33,19 @@ type keepassxcConfig struct {
var (
keepassxcPairRx = regexp.MustCompile(`^([A-Z]\w*):\s*(.*)$`)
+ keepassxcHasAttachmentExportVersion = semver.Version{Major: 2, Minor: 7, Patch: 0}
keepassxcNeedShowProtectedArgVersion = semver.Version{Major: 2, Minor: 5, Patch: 1}
)
func (c *Config) keepassxcAttachmentTemplateFunc(entry, name string) string {
+ version, err := c.keepassxcVersion()
+ if err != nil {
+ panic(err)
+ }
+ if version.Compare(keepassxcHasAttachmentExportVersion) < 0 {
+ panic(fmt.Sprintf("keepassxc-cli version %s required, found %s", keepassxcHasAttachmentExportVersion, version))
+ }
+
if data, ok := c.Keepassxc.attachmentCache[entry][name]; ok {
return data
}
diff --git a/pkg/cmd/testdata/scripts/keepassxc.txtar b/pkg/cmd/testdata/scripts/keepassxc.txtar
index 14c5d3aa800..583ef409da6 100644
--- a/pkg/cmd/testdata/scripts/keepassxc.txtar
+++ b/pkg/cmd/testdata/scripts/keepassxc.txtar
@@ -21,7 +21,7 @@ stdout examplelogin/examplepassword$
case "$*" in
"--version")
- echo "2.5.4"
+ echo "2.7.0"
;;
"attachment-export --stdout --quiet /secrets.kdbx example.com attachment")
echo "# contents of attachment"
@@ -45,7 +45,7 @@ esac
-- bin/keepass-test.cmd --
@echo off
IF "%*" == "--version" (
- echo 2.5.4
+ echo 2.7.0
) ELSE IF "%*" == "attachment-export --stdout --quiet C:/secrets.kdbx example.com attachment" (
echo.# contents of attachment
) ELSE IF "%*" == "show --quiet --show-protected C:/secrets.kdbx example.com" (
|
chore
|
Add check for keepassxc-cli version in keepassxcAttachment
|
82e5c670c293dc765327155365c9b8152bed28cb
|
2025-01-09 00:09:18
|
Tom Payne
|
feat: Add builtin mode for gopass
| false
|
diff --git a/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml b/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
index 1e68751bc2a..84c870aa4be 100644
--- a/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
+++ b/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
@@ -235,6 +235,8 @@ sections:
command:
default: '`gopass`'
description: gopass CLI command
+ mode:
+ description: See [gopass functions](../templates/gopass-functions/index.md)
gpg:
args:
type: '[]string'
diff --git a/assets/chezmoi.io/docs/reference/templates/gopass-functions/index.md b/assets/chezmoi.io/docs/reference/templates/gopass-functions/index.md
index 3bf811d62fb..b5f5e09fe50 100644
--- a/assets/chezmoi.io/docs/reference/templates/gopass-functions/index.md
+++ b/assets/chezmoi.io/docs/reference/templates/gopass-functions/index.md
@@ -1,4 +1,16 @@
# gopass functions
The `gopass*` template functions return data stored in
-[gopass](https://www.gopass.pw/) using the gopass CLI (`gopass`).
+[gopass](https://www.gopass.pw/) using the gopass CLI (`gopass`) or builtin
+code.
+
+By default, chezmoi will use the gopass CLI (`gopass`). Depending on your gopass
+configuration, you may have to enter your passphrase once for each secret.
+
+When setting `gopass.mode` to `builtin`, chezmoi use builtin code to access the
+goapass database and caches your passphrase in plaintext in memory until chezmoi
+terminates.
+
+!!! warning
+
+ Using the builtin code is experimental and may be removed.
diff --git a/go.mod b/go.mod
index fe548e863cf..3ad700eaebd 100644
--- a/go.mod
+++ b/go.mod
@@ -23,6 +23,7 @@ require (
github.com/go-git/go-git/v5 v5.13.1
github.com/google/go-github/v68 v68.0.0
github.com/google/renameio/v2 v2.0.0
+ github.com/gopasspw/gopass v1.15.15
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/itchyny/gojq v0.12.17
github.com/klauspost/compress v1.17.11
@@ -64,6 +65,7 @@ require (
require (
al.essio.dev/pkg/shellescape v1.5.1 // indirect
dario.cat/mergo v1.0.1 // indirect
+ filippo.io/edwards25519 v1.1.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
@@ -89,21 +91,26 @@ require (
github.com/aws/smithy-go v1.22.1 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
+ github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bradenhilton/cityhash v1.0.0 // indirect
+ github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b // indirect
github.com/charmbracelet/harmonica v0.2.0 // indirect
github.com/charmbracelet/lipgloss v1.0.0 // indirect
github.com/charmbracelet/x/ansi v0.6.0 // indirect
github.com/charmbracelet/x/term v0.2.1 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/creack/pty/v2 v2.0.0-20231209135443-03db72c7b76c // indirect
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
github.com/danieljoos/wincred v1.2.2 // indirect
github.com/dlclark/regexp2 v1.11.4 // indirect
+ github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect
github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/extism/go-sdk v1.6.1 // indirect
+ github.com/fatih/color v1.18.0 // indirect
github.com/fatih/semgroup v1.3.0 // indirect
github.com/gitleaks/go-gitdiff v0.9.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -113,10 +120,13 @@ require (
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/btree v1.1.3 // indirect
+ github.com/google/go-cmp v0.6.0 // indirect
+ github.com/google/go-github/v61 v61.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/css v1.0.1 // indirect
github.com/h2non/filetype v1.1.3 // indirect
+ github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
@@ -137,10 +147,12 @@ require (
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
+ github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.1 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/rivo/uniseg v0.4.7 // indirect
+ github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
@@ -153,9 +165,12 @@ require (
github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
github.com/tetratelabs/wazero v1.8.2 // indirect
github.com/tobischo/argon2 v0.1.0 // indirect
+ github.com/twpayne/go-pinentry v0.3.0 // indirect
+ github.com/urfave/cli/v2 v2.27.5 // indirect
github.com/wasilibs/go-re2 v1.8.0 // indirect
github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
+ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/yuin/goldmark v1.7.8 // indirect
github.com/yuin/goldmark-emoji v1.0.4 // indirect
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
diff --git a/go.sum b/go.sum
index dcd653515f3..e92d61aa4c4 100644
--- a/go.sum
+++ b/go.sum
@@ -16,6 +16,8 @@ cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMI
cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s=
cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w=
cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
+code.rocketnine.space/tslocum/cbind v0.1.5 h1:i6NkeLLNPNMS4NWNi3302Ay3zSU6MrqOT+yJskiodxE=
+code.rocketnine.space/tslocum/cbind v0.1.5/go.mod h1:LtfqJTzM7qhg88nAvNhx+VnTjZ0SXBJtxBObbfBWo/M=
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
filippo.io/age v1.2.1 h1:X0TZjehAZylOIj4DubWYU1vWQxv9bJpo+Uu2/LGhi1o=
@@ -42,6 +44,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5g
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/BobuSumisu/aho-corasick v1.0.3 h1:uuf+JHwU9CHP2Vx+wAy6jcksJThhJS9ehR8a+4nPE9g=
github.com/BobuSumisu/aho-corasick v1.0.3/go.mod h1:hm4jLcvZKI2vRF2WDU1N4p/jpWtpOzp3nLmi9AzX/XE=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -105,14 +109,20 @@ github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWp
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4=
+github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
github.com/bradenhilton/cityhash v1.0.0 h1:1QauDCwfxwIGwO2jBTJdEBqXgfCusAgQOSgdl4RsTMI=
github.com/bradenhilton/cityhash v1.0.0/go.mod h1:Wmb8yW1egA9ulrsRX4mxfYx5zq4nBWOCZ+j63oK6uz8=
github.com/bradenhilton/mozillainstallhash v1.0.1 h1:JVAVsItiWlLoudJX4L+tIuml+hoxjlzCwkhlENi9yS4=
github.com/bradenhilton/mozillainstallhash v1.0.1/go.mod h1:J6cA36kUZrgaTkDl2bHRqI+4i2UKO1ImDB1P1x1PyOA=
github.com/bwesterb/go-ristretto v1.2.3 h1:1w53tCkGhCQ5djbat3+MH0BAQ5Kfgbt56UZQ/JMzngw=
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b h1:2K3B6Xm7/lnhOugeGB3nIk50bZ9zhuJvXCEfUuL68ik=
+github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod h1:4rP9T6iHCuPAIDKdNaZfTuuqSIoQQvFctNWIAUI1rlg=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -139,10 +149,11 @@ github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
-github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
+github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
github.com/creack/pty/v2 v2.0.0-20231209135443-03db72c7b76c h1:5l8y/PgjeX1aUyZxXabtAf2ahCYQaqWzlFzQgU16o0U=
github.com/creack/pty/v2 v2.0.0-20231209135443-03db72c7b76c/go.mod h1:1gZ4PfMDNcYx8FxDdnF/6HYP327cTeB/ru6UdoWVQvw=
github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
@@ -167,12 +178,14 @@ github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ
github.com/elazarl/goproxy v1.2.3/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64=
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/ergochat/readline v0.1.3 h1:/DytGTmwdUJcLAe3k3VJgowh5vNnsdifYT6uVaf4pSo=
+github.com/ergochat/readline v0.1.3/go.mod h1:o3ux9QLHLm77bq7hDB21UTm6HlV2++IPDMfIfKDuOgY=
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
github.com/extism/go-sdk v1.6.1 h1:gkbkG5KzYKrv8mLggw5ojg/JulXfEbLIRVhbw9Ot7S0=
github.com/extism/go-sdk v1.6.1/go.mod h1:yRolc4PvIUQ9J/BBB3QZ5EY1MtXAN2jqBGDGR3Sk54M=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
github.com/fatih/semgroup v1.3.0 h1:pTEnmcEze/BUf4UmVn9f1ZT1OckkBTNRV9w9k/I2/y4=
github.com/fatih/semgroup v1.3.0/go.mod h1:thVp+PGZMO9KJ+k96oNGJo06hWgsKOWxTfYfx5R2VaE=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -181,6 +194,12 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
+github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
+github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
+github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg=
+github.com/gen2brain/shm v0.1.1 h1:1cTVA5qcsUFixnDHl14TmRoxgfWEEZlTezpUj1vm5uQ=
+github.com/gen2brain/shm v0.1.1/go.mod h1:UgIcVtvmOu+aCJpqJX7GOtiN7X2ct+TKLg4RTxwPIUA=
github.com/gitleaks/go-gitdiff v0.9.1 h1:ni6z6/3i9ODT685OLCTf+s/ERlWUNWQF4x1pvoNICw0=
github.com/gitleaks/go-gitdiff v0.9.1/go.mod h1:pKz0X4YzCKZs30BL+weqBIG7mx0jl4tF1uXV9ZyNvrA=
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
@@ -206,6 +225,8 @@ github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/gokyle/twofactor v1.0.1 h1:uRhvx0S4Hb82RPIDALnf7QxbmPL49LyyaCkJDpWx+Ek=
+github.com/gokyle/twofactor v1.0.1/go.mod h1:4gxzH1eaE/F3Pct/sCDNOylP0ClofUO5j4XZN9tKtLE=
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
@@ -216,9 +237,12 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go=
+github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY=
github.com/google/go-github/v68 v68.0.0 h1:ZW57zeNZiXTdQ16qrDiZ0k6XucrxZ2CGmoTvcCyQG6s=
github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLOEqTUCbnRIcx68=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -237,6 +261,10 @@ github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/
github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4=
github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 h1:zC34cGQu69FG7qzJ3WiKW244WfhDC3xxYMeNOX2gtUQ=
github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
+github.com/gopasspw/gopass v1.15.15 h1:7s8nmiWLaL2oqbd05Wv6QpqJ7eUASC4XUG2wHEgB328=
+github.com/gopasspw/gopass v1.15.15/go.mod h1:WfOPlAM2S1Uqi9jSt9B8e5+HICaO/bdyJG4Bn86ROT0=
+github.com/gopasspw/gopass-hibp v1.15.14 h1:2FoUREfJNQTV0Thrnl9WABjODDGpCqaI1s9vMzYLly8=
+github.com/gopasspw/gopass-hibp v1.15.14/go.mod h1:xVz4578yPIX+RQQwG0l5VDaE9s+9eMyHzVOcN1NvelI=
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
@@ -263,6 +291,8 @@ github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5O
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
@@ -283,18 +313,34 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4=
+github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jsimonetti/pwscheme v0.0.0-20220922140336-67a4d090f150 h1:ta6N7DaOQEACq28cLa0iRqXIbchByN9Lfll08CT2GBc=
+github.com/jsimonetti/pwscheme v0.0.0-20220922140336-67a4d090f150/go.mod h1:SiNTKDgjKQORnazFVHXhpny7UtU0iJOqtxd7R7sCfDI=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jwalton/gchalk v1.3.0 h1:uTfAaNexN8r0I9bioRTksuT8VGjrPs9YIXR1PQbtX/Q=
+github.com/jwalton/gchalk v1.3.0/go.mod h1:ytRlj60R9f7r53IAElbpq4lVuPOPNg2J4tJcCxtFqr8=
+github.com/jwalton/go-supportscolor v1.2.0 h1:g6Ha4u7Vm3LIsQ5wmeBpS4gazu0UP1DRDE8y6bre4H8=
+github.com/jwalton/go-supportscolor v1.2.0/go.mod h1:hFVUAZV2cWg+WFFC4v8pT2X/S2qUUBYMioBD9AINXGs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/kbinani/screenshot v0.0.0-20240820160931-a8a2c5d0e191 h1:5UHVWNX1qrIbNw7OpKbxe5bHkhHRk3xRKztMjERuCsU=
+github.com/kbinani/screenshot v0.0.0-20240820160931-a8a2c5d0e191/go.mod h1:Pmpz2BLf55auQZ67u3rvyI2vAQvNetkK/4zYUmpauZQ=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6 h1:IsMZxCuZqKuao2vNdfD82fjjgPLfyHLpR41Z88viRWs=
github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6/go.mod h1:3VeWNIJaW+O5xpRQbPp0Ybqu1vJd/pm7s2F473HRrkw=
+github.com/kjk/lzmadec v0.0.0-20210713164611-19ac3ee91a71 h1:TYp9Fj0apeZMWentXRaFM6B0ixdFefrlgY8n8XYEz1s=
+github.com/kjk/lzmadec v0.0.0-20210713164611-19ac3ee91a71/go.mod h1:2zRkQCuw/eK6cqkYAeNqyBU7JKa2Gcq40BZ9GSJbmfE=
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -311,8 +357,14 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb h1:w1g9wNDIE/pHSTmAaUhv4TZQuPBS6GV3mMz5hkgziIU=
github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4=
+github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
+github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/makiuchi-d/gozxing v0.1.1 h1:xxqijhoedi+/lZlhINteGbywIrewVdVv2wl9r5O9S1I=
+github.com/makiuchi-d/gozxing v0.1.1/go.mod h1:eRIHbOjX7QWxLIDJoQuMLhuXg9LAuw6znsUtRkNw9DU=
+github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20231122080842-e51aa57005ca h1:jV6vw7U2RoS1sI7f6f12/wsCwMjADZ/xUxi/lhUqjV8=
+github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20231122080842-e51aa57005ca/go.mod h1:IKRlPM0t4ZmK9YZ33QZ2hB1DcSY8WnQedKRDyYeNRp4=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -324,12 +376,16 @@ github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+Ei
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-tty v0.0.7 h1:KJ486B6qI8+wBO7kQxYgmmEFDaFEE96JMBQ7h400N8Q=
+github.com/mattn/go-tty v0.0.7/go.mod h1:f2i5ZOvXBU/tCABmLmOfzLz9azMo5wdAaElRNnJKr+k=
github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
+github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
@@ -348,6 +404,8 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
github.com/muesli/combinator v0.3.0 h1:SZDuRzzwmVPLkbOzbhGzBTwd5+Y6aFN4UusOW2azrNA=
github.com/muesli/combinator v0.3.0/go.mod h1:ttPegJX0DPQaGDtJKMInIP6Vfp5pN8RX7QntFCcpy18=
+github.com/muesli/crunchy v0.4.0 h1:qdiml8gywULHBsztiSAf6rrE6EyuNasNKZ104mAaahM=
+github.com/muesli/crunchy v0.4.0/go.mod h1:9k4x6xdSbb7WwtAVy0iDjaiDjIk6Wa5AgUIqp+HqOpU=
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a h1:2MaM6YC3mGu54x+RKAA6JiFFHlHDY1UbkxqppT7wYOg=
@@ -358,6 +416,12 @@ github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA=
+github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8=
+github.com/noborus/guesswidth v0.4.0 h1:+PPh+Z+GM4mKmVrhYR4lpjeyBuLMSVo2arM+VErdHIc=
+github.com/noborus/guesswidth v0.4.0/go.mod h1:ghA6uh9RcK+uSmaDDmBMj/tRZ3BSpspDP6DMF5Xk3bc=
+github.com/noborus/ov v0.37.0 h1:I8+5OmV+yC71OrDtY1dfO2UmZrSQ7ERDTSo6M2Gbie0=
+github.com/noborus/ov v0.37.0/go.mod h1:cac6+F9N4F0rBKu4jWKiqH0n2lJGiNQpO2OYNQTttmA=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
@@ -366,10 +430,13 @@ github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNH
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
github.com/pjbgf/sha1cd v0.3.1 h1:Dh2GYdpJnO84lIw0LJwTFXjcNbasP/bklicSznyAaPI=
github.com/pjbgf/sha1cd v0.3.1/go.mod h1:Y8t7jSB/dEI/lQE04A1HVKteqjj9bX5O4+Cex0TCu8s=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo=
@@ -377,6 +444,8 @@ github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Q
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg=
+github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
@@ -401,6 +470,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
+github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e h1:HFUDYOpUVZ0oTXeZy2A59Lkf69SsOF03Lg1GsI3Xh9o=
+github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
@@ -410,6 +481,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
+github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
+github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
@@ -424,6 +497,7 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
@@ -431,6 +505,7 @@ github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -450,6 +525,8 @@ github.com/tobischo/gokeepasslib/v3 v3.6.1 h1:AShQlTypdM19glj0UUePQcUi56qQyeFI5N
github.com/tobischo/gokeepasslib/v3 v3.6.1/go.mod h1:B31dx/dj0egameQrNtuoOx9RnwxnYaZR4kXaahRuZN8=
github.com/twpayne/go-expect v0.0.2-0.20241130000624-916db2914efd h1:/ekqcdG89euFEeFfuFYGF2An2AwsaJHnYxVwW8hqvcw=
github.com/twpayne/go-expect v0.0.2-0.20241130000624-916db2914efd/go.mod h1:Z1PlEHxKw23bid0pq2RhO4NMScxckEhBXZLebwJpjrk=
+github.com/twpayne/go-pinentry v0.3.0 h1:Rr+fEOZXmeItOb4thjeVaBWJKB9Xa/eojolycyF/26c=
+github.com/twpayne/go-pinentry v0.3.0/go.mod h1:iOIZD+9np/2V24OdCGos7Y1/xX90wc6VEAZsgb+r9D4=
github.com/twpayne/go-pinentry/v4 v4.0.0 h1:8WcNa+UDVRzz7y9OEEU/nRMX+UGFPCAvl5XsqWRxTY4=
github.com/twpayne/go-pinentry/v4 v4.0.0/go.mod h1:aXvy+awVXqdH+GS0ddQ7AKHZ3tXM6fJ2NK+e16p47PI=
github.com/twpayne/go-shell v0.5.0 h1:Mgd2GReIHdsCRT9OqYCh/ywf7x9r9cJhsZMIqKSVjIU=
@@ -462,12 +539,18 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
+github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
+github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
github.com/wasilibs/go-re2 v1.8.0 h1:6wpqZ31vdoJRSOM41bWEd1AbSmRe161yQkTzoihqwEg=
github.com/wasilibs/go-re2 v1.8.0/go.mod h1:RjA3Y/yW6xFL8Iyz8f5sVhttLq5b5DRF8baZ7Sh+elk=
github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52 h1:OvLBa8SqJnZ6P+mjlzc2K7PM22rRUPE1x32G9DTPrC4=
github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52/go.mod h1:jMeV4Vpbi8osrE/pKUxRZkVaA0EX7NZN0A9/oRzgpgY=
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
+github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
+github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
@@ -476,6 +559,8 @@ github.com/yuin/goldmark-emoji v1.0.4 h1:vCwMkPZSNefSUnOW2ZKRUjBSD5Ok3W78IXhGxxA
github.com/yuin/goldmark-emoji v1.0.4/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=
github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
+github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
+github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
github.com/zricethezav/gitleaks/v8 v8.22.1 h1:nMzJwVMaq71wZ5n4KyRChlsSL4NbqwMfPCzdQkz2rro=
github.com/zricethezav/gitleaks/v8 v8.22.1/go.mod h1:j8lWGw/glcyisjpSfIynRvXjrsJp9AkoY+4bOz95Zak=
go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
@@ -535,6 +620,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -586,6 +672,7 @@ golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
@@ -593,8 +680,8 @@ golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
+golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
google.golang.org/api v0.171.0 h1:w174hnBPqut76FzW5Qaupt7zY8Kql6fiVjgys4f58sU=
google.golang.org/api v0.171.0/go.mod h1:Hnq5AHm4OTMt2BUVjael2CWZFD6vksJdWCWiUAmjC9o=
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
@@ -622,12 +709,17 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM=
howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
mvdan.cc/editorconfig v0.3.0 h1:D1D2wLYEYGpawWT5SpM5pRivgEgXjtEXwC9MWhEY0gQ=
mvdan.cc/editorconfig v0.3.0/go.mod h1:NcJHuDtNOTEJ6251indKiWuzK6+VcrMuLzGMLKBFupQ=
mvdan.cc/sh/v3 v3.10.0 h1:v9z7N1DLZ7owyLM/SXZQkBSXcwr2IGMm2LY2pmhVXj4=
mvdan.cc/sh/v3 v3.10.0/go.mod h1:z/mSSVyLFGZzqb3ZIKojjyqIx/xbmz/UHdCSv9HmqXY=
+rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY=
+rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs=
diff --git a/internal/cmd/gopasstemplatefuncs.go b/internal/cmd/gopasstemplatefuncs.go
index cf007d97754..60fca9f902b 100644
--- a/internal/cmd/gopasstemplatefuncs.go
+++ b/internal/cmd/gopasstemplatefuncs.go
@@ -2,15 +2,27 @@ package cmd
import (
"bytes"
+ "context"
+ "fmt"
"os"
"os/exec"
"regexp"
"github.com/coreos/go-semver/semver"
+ "github.com/gopasspw/gopass/pkg/ctxutil"
+ "github.com/gopasspw/gopass/pkg/gopass"
+ "github.com/gopasspw/gopass/pkg/gopass/api"
"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
)
+type gopassMode string
+
+const (
+ gopassModeBuiltin gopassMode = "builtin"
+ gopassModeDefault gopassMode = ""
+)
+
var (
// chezmoi uses gopass show --password which was added in
// https://github.com/gopasspw/gopass/commit/8fa13d84e3656cfc4ee6717f5f485c9e471ad996
@@ -21,9 +33,14 @@ var (
)
type gopassConfig struct {
- Command string `json:"command" mapstructure:"command" yaml:"command"`
- cache map[string]string
- rawCache map[string][]byte
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Mode gopassMode `json:"mode" mapstructure:"mode" yaml:"mode"`
+ ctx context.Context //nolint:containedctx
+ client *api.Gopass
+ clientErr error
+ passwordCache map[string][]byte
+ cache map[string]string
+ rawCache map[string][]byte
}
func (c *Config) gopassTemplateFunc(id string) string {
@@ -31,11 +48,17 @@ func (c *Config) gopassTemplateFunc(id string) string {
return password
}
- args := []string{"show", "--password", id}
- output := mustValue(c.gopassOutput(args...))
-
- passwordBytes, _, _ := bytes.Cut(output, []byte{'\n'})
- password := string(passwordBytes)
+ var password string
+ switch c.Gopass.Mode {
+ case gopassModeBuiltin:
+ password = mustValue(c.builtinGopassSecret(id, "latest")).Password()
+ case gopassModeDefault:
+ output := mustValue(c.gopassOutput("show", "--password", id))
+ passwordBytes, _, _ := bytes.Cut(output, []byte{'\n'})
+ password = string(passwordBytes)
+ default:
+ panic(fmt.Errorf("%s: invalid mode", c.Gopass.Mode))
+ }
if c.Gopass.cache == nil {
c.Gopass.cache = make(map[string]string)
@@ -50,8 +73,15 @@ func (c *Config) gopassRawTemplateFunc(id string) string {
return string(output)
}
- args := []string{"show", "--noparsing", id}
- output := mustValue(c.gopassOutput(args...))
+ var output []byte
+ switch c.Gopass.Mode {
+ case gopassModeBuiltin:
+ output = mustValue(c.builtinGopassSecret(id, "latest")).Bytes()
+ case gopassModeDefault:
+ output = mustValue(c.gopassOutput("show", "--noparsing", id))
+ default:
+ panic(fmt.Errorf("%s: invalid mode", c.Gopass.Mode))
+ }
if c.Gopass.rawCache == nil {
c.Gopass.rawCache = make(map[string][]byte)
@@ -61,6 +91,41 @@ func (c *Config) gopassRawTemplateFunc(id string) string {
return string(output)
}
+func (c *Config) builtinGopassClient() (*api.Gopass, error) {
+ if c.Gopass.ctx != nil {
+ return c.Gopass.client, c.Gopass.clientErr
+ }
+ ctx := context.Background()
+ ctx = ctxutil.WithPasswordCallback(ctx, func(filename string, confirm bool) ([]byte, error) {
+ if _, ok := c.Gopass.passwordCache[filename]; !ok {
+ password, err := c.readPassword("Passphrase for "+filename+": ", "passphrase")
+ if err != nil {
+ return nil, err
+ }
+ if c.Gopass.passwordCache == nil {
+ c.Gopass.passwordCache = make(map[string][]byte, 1)
+ }
+ c.Gopass.passwordCache[filename] = []byte(password)
+ }
+ return c.Gopass.passwordCache[filename], nil
+ })
+ c.Gopass.ctx = ctx
+ c.Gopass.client, c.Gopass.clientErr = api.New(c.Gopass.ctx)
+ return c.Gopass.client, c.Gopass.clientErr
+}
+
+func (c *Config) builtinGopassSecret(name, revision string) (gopass.Secret, error) {
+ client, err := c.builtinGopassClient()
+ if err != nil {
+ return nil, err
+ }
+ secret, err := client.Get(c.Gopass.ctx, name, revision)
+ if err != nil {
+ return nil, err
+ }
+ return secret, nil
+}
+
func (c *Config) gopassOutput(args ...string) ([]byte, error) {
name := c.Gopass.Command
cmd := exec.Command(name, args...)
|
feat
|
Add builtin mode for gopass
|
6a90b3e62dd7d11449cf8da916555bf28b9209bf
|
2024-04-27 19:34:08
|
Kiran Koirala
|
fix: Links section is broken in docs
| false
|
diff --git a/assets/chezmoi.io/docs/links/articles.md.yaml b/assets/chezmoi.io/docs/links/articles.md.yaml
index dbb4696ad75..53286764498 100644
--- a/assets/chezmoi.io/docs/links/articles.md.yaml
+++ b/assets/chezmoi.io/docs/links/articles.md.yaml
@@ -1,4 +1,4 @@
-Garticles:
+articles:
- date: '2019-01-10'
version: 0.0.11
title: 'Linux Fu: The kitchen sync'
|
fix
|
Links section is broken in docs
|
93766a4041a8704fbb17ca5f71e56ddf03bd8f04
|
2024-02-15 07:44:24
|
Tom Payne
|
chore: Tidy up --use-builtin-diff flag
| false
|
diff --git a/assets/chezmoi.io/docs/reference/command-line-flags/common.md b/assets/chezmoi.io/docs/reference/command-line-flags/common.md
index 42f36164521..f9ce24227e4 100644
--- a/assets/chezmoi.io/docs/reference/command-line-flags/common.md
+++ b/assets/chezmoi.io/docs/reference/command-line-flags/common.md
@@ -55,6 +55,11 @@ Recurse into subdirectories, `true` by default.
Interpret *targets* passed to the command as paths in the source directory
rather than the destination directory.
+## `--use-builtin-diff`
+
+Use chezmoi's builtin diff, even if the `diff.command` configuration variable
+is set.
+
## `-x`, `--exclude` *types*
Exclude target state entries of type *types*. *types* is defined as in the
diff --git a/assets/chezmoi.io/docs/reference/commands/diff.md b/assets/chezmoi.io/docs/reference/commands/diff.md
index 37d5909ec0e..ef312475dc8 100644
--- a/assets/chezmoi.io/docs/reference/commands/diff.md
+++ b/assets/chezmoi.io/docs/reference/commands/diff.md
@@ -24,11 +24,6 @@ to match the destination.
Pager to use for output.
-## `--use-builtin-diff`
-
-Use chezmoi's builtin diff, even if the `diff.command` configuration variable
-is set.
-
!!! example
```console
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
index 69c9f0a7bae..dbf4aabda0c 100644
--- a/internal/cmd/config.go
+++ b/internal/cmd/config.go
@@ -181,6 +181,7 @@ type Config struct {
refreshExternals chezmoi.RefreshExternals
sourcePath bool
templateFuncs template.FuncMap
+ useBuiltinDiff bool
// Password manager data.
gitHub gitHubData
@@ -1579,6 +1580,7 @@ func (c *Config) newRootCmd() (*cobra.Command, error) {
persistentFlags.VarP(&c.refreshExternals, "refresh-externals", "R", "Refresh external cache")
persistentFlags.Lookup("refresh-externals").NoOptDefVal = chezmoi.RefreshExternalsAlways.String()
persistentFlags.BoolVar(&c.sourcePath, "source-path", c.sourcePath, "Specify targets by source path")
+ persistentFlags.BoolVarP(&c.useBuiltinDiff, "use-builtin-diff", "", c.useBuiltinDiff, "Use builtin diff")
if err := chezmoierrors.Combine(
rootCmd.MarkPersistentFlagFilename("config"),
@@ -1657,7 +1659,7 @@ func (c *Config) newRootCmd() (*cobra.Command, error) {
// newDiffSystem returns a system that logs all changes to s to w using
// diff.command if set or the builtin git diff otherwise.
func (c *Config) newDiffSystem(s chezmoi.System, w io.Writer, dirAbsPath chezmoi.AbsPath) chezmoi.System {
- if c.Diff.useBuiltinDiff || c.Diff.Command == "" {
+ if c.useBuiltinDiff || c.Diff.Command == "" {
options := &chezmoi.GitDiffSystemOptions{
Color: c.Color.Value(c.colorAutoFunc),
Filter: chezmoi.NewEntryTypeFilter(c.Diff.include.Bits(), c.Diff.Exclude.Bits()),
diff --git a/internal/cmd/diffcmd.go b/internal/cmd/diffcmd.go
index 41fb3d4972d..8b0cf9fa084 100644
--- a/internal/cmd/diffcmd.go
+++ b/internal/cmd/diffcmd.go
@@ -16,7 +16,6 @@ type diffCmdConfig struct {
include *chezmoi.EntryTypeSet
init bool
recursive bool
- useBuiltinDiff bool
}
func (c *Config) newDiffCmd() *cobra.Command {
@@ -43,7 +42,6 @@ func (c *Config) newDiffCmd() *cobra.Command {
flags.BoolVarP(&c.Diff.recursive, "recursive", "r", c.Diff.recursive, "Recurse into subdirectories")
flags.BoolVar(&c.Diff.Reverse, "reverse", c.Diff.Reverse, "Reverse the direction of the diff")
flags.BoolVar(&c.Diff.ScriptContents, "script-contents", c.Diff.ScriptContents, "Show script contents")
- flags.BoolVarP(&c.Diff.useBuiltinDiff, "use-builtin-diff", "", c.Diff.useBuiltinDiff, "Use the builtin diff")
registerExcludeIncludeFlagCompletionFuncs(diffCmd)
diff --git a/internal/cmd/testdata/scripts/completion.txtar b/internal/cmd/testdata/scripts/completion.txtar
index e66a854eedf..d2e7de7201a 100644
--- a/internal/cmd/testdata/scripts/completion.txtar
+++ b/internal/cmd/testdata/scripts/completion.txtar
@@ -49,6 +49,7 @@ yaml
:4
-- golden/use-builtin-flags --
--use-builtin-age Use builtin age
+--use-builtin-diff Use builtin diff
--use-builtin-git Use builtin git
:4
-- golden/write-data --
|
chore
|
Tidy up --use-builtin-diff flag
|
eb1d468df8108e371f10d05a22cb07288135a7aa
|
2024-10-10 03:43:30
|
Tom Payne
|
chore: Update GitHub Actions
| false
|
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index babca12a0db..feb81861067 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -16,11 +16,11 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- name: go-version
id: go-version
run: |
echo go-version="$(awk '/GO_VERSION:/ { print $2 }' .github/workflows/main.yml | tr -d \')" >> "${GITHUB_OUTPUT}"
- - uses: golang/govulncheck-action@dd0578b371c987f96d1185abb54344b44352bd58
+ - uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee
with:
go-version-input: ${{ steps.go-version.outputs.go-version }}
diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
index 7f70f4b497d..37b8cd5f50e 100644
--- a/.github/workflows/installer.yml
+++ b/.github/workflows/installer.yml
@@ -17,7 +17,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- id: filter
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
with:
@@ -36,7 +36,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: reviewdog/action-misspell@ef8b22c1cca06c8d306fc6be302c3dab0f6ca12f
with:
locale: US
@@ -54,7 +54,7 @@ jobs:
env:
BINARY: ${{ matrix.os == 'windows-2022' && 'bin/chezmoi.exe' || 'bin/chezmoi' }}
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- name: test-${{ matrix.os }}-local
shell: bash
run: |
@@ -77,7 +77,7 @@ jobs:
env:
BINARY: ${{ matrix.os == 'windows-2022' && 'bin/chezmoi.exe' || 'bin/chezmoi' }}
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- name: test-${{ matrix.os }}-local-pwsh
shell: pwsh
run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 97a63a01c1b..c6110037f92 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- id: filter
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
with:
@@ -59,7 +59,7 @@ jobs:
permissions:
security-events: write
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
fetch-depth: 1
- uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13
@@ -71,7 +71,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: reviewdog/action-misspell@ef8b22c1cca06c8d306fc6be302c3dab0f6ca12f
with:
locale: US
@@ -83,7 +83,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -96,7 +96,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -109,7 +109,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
with:
go-version: ${{ env.GO_VERSION }}
@@ -144,7 +144,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
with:
go-version: oldstable
@@ -177,7 +177,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
fetch-depth: 0
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
@@ -204,31 +204,31 @@ jobs:
args: release --skip=sign --snapshot --timeout=1h
- name: upload-artifact-chezmoi-darwin-amd64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
+ uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
with:
name: chezmoi-darwin-amd64
path: dist/chezmoi-nocgo_darwin_amd64_v1/chezmoi
- name: upload-artifact-chezmoi-darwin-arm64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
+ uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
with:
name: chezmoi-darwin-arm64
path: dist/chezmoi-nocgo_darwin_arm64/chezmoi
- name: upload-artifact-chezmoi-linux-amd64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
+ uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
with:
name: chezmoi-linux-amd64
path: dist/chezmoi-cgo-glibc_linux_amd64_v1/chezmoi
- name: upload-artifact-chezmoi-linux-musl-amd64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
+ uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
with:
name: chezmoi-linux-amd64-musl
path: dist/chezmoi-cgo-musl_linux_amd64_v1/chezmoi
- name: upload-artifact-chezmoi-windows-amd64.exe
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
+ uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
with:
name: chezmoi-windows-amd64
path: dist/chezmoi-nocgo_windows_amd64_v1/chezmoi.exe
@@ -238,7 +238,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
fetch-depth: 0
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
@@ -280,11 +280,11 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
with:
go-version: ${{ env.GO_VERSION }}
- - uses: astral-sh/setup-uv@023eb7875fa1caa15814da58d1df7350f8fb1fd9
+ - uses: astral-sh/setup-uv@77c28f02b3322332d4a4446b3177f426da8bf086
with:
version: ${{ env.UV_VERSION }}
- name: install-website-dependencies
@@ -302,11 +302,11 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
with:
go-version: ${{ env.GO_VERSION }}
- - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+ - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -328,7 +328,7 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
fetch-depth: 0
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
@@ -384,11 +384,11 @@ jobs:
permissions:
contents: read
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
with:
go-version: stable
- - uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86
+ - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8
with:
version: v${{ env.GOLANGCI_LINT_VERSION }}
args: --timeout=5m
@@ -422,13 +422,13 @@ jobs:
run: snapcraft whoami
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
fetch-depth: 0
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
with:
go-version: ${{ env.GO_VERSION }}
- - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382
+ - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da
- name: create-syso
run: |
make create-syso
@@ -450,13 +450,13 @@ jobs:
permissions:
contents: write
steps:
- - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
fetch-depth: 0
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
with:
go-version: ${{ env.GO_VERSION }}
- - uses: astral-sh/setup-uv@023eb7875fa1caa15814da58d1df7350f8fb1fd9
+ - uses: astral-sh/setup-uv@77c28f02b3322332d4a4446b3177f426da8bf086
with:
version: ${{ env.UV_VERSION }}
- name: prepare-chezmoi.io
|
chore
|
Update GitHub Actions
|
f86521cd0b8cbff899640e8f1fd06969d12ec90b
|
2023-11-15 06:02:03
|
Tom Payne
|
chore: Handle garbage stderr output from Bitwarden CLI
| false
|
diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
index 7ea2ed6c88a..951c38de8d7 100644
--- a/internal/cmd/doctorcmd.go
+++ b/internal/cmd/doctorcmd.go
@@ -304,7 +304,7 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
ifNotSet: checkResultWarning,
ifNotExist: checkResultInfo,
versionArgs: []string{"--version"},
- versionRx: regexp.MustCompile(`^(\d+\.\d+\.\d+)`),
+ versionRx: regexp.MustCompile(`(?m)^(\d+\.\d+\.\d+)$`),
},
&binaryCheck{
name: "bitwarden-secrets-command",
diff --git a/internal/cmd/testdata/scripts/doctor_unix.txtar b/internal/cmd/testdata/scripts/doctor_unix.txtar
index 063eba696ca..ad94f54db2c 100644
--- a/internal/cmd/testdata/scripts/doctor_unix.txtar
+++ b/internal/cmd/testdata/scripts/doctor_unix.txtar
@@ -92,7 +92,9 @@ echo "(devel)"
-- bin/bw --
#!/bin/sh
-echo "1.12.1"
+echo '(node:84023) [DEP0040] DeprecationWarning: The `punycode` module is deprecated. Please use a userland alternative instead.' 1>&2
+echo '(Use `node --trace-deprecation ...` to show where the warning was created)' 1>&2
+echo "2023.10.0"
-- bin/bws --
#!/bin/sh
|
chore
|
Handle garbage stderr output from Bitwarden CLI
|
ca13b9d043b9b3c6ca413d27ebacd68c58990155
|
2022-11-19 21:32:48
|
Tom Payne
|
fix: Allow underscores in SourceHut usernames
| false
|
diff --git a/pkg/cmd/initcmd.go b/pkg/cmd/initcmd.go
index 8fb3323205f..cfebf1c92a9 100644
--- a/pkg/cmd/initcmd.go
+++ b/pkg/cmd/initcmd.go
@@ -80,13 +80,13 @@ var dotfilesRepoGuesses = []struct {
sshRepoGuessRepl: "git@$2:$3/$4.git",
},
{
- rx: regexp.MustCompile(`\Asr\.ht/~([-0-9A-Za-z]+)\z`),
+ rx: regexp.MustCompile(`\Asr\.ht/~([a-z_][a-z0-9_-]+)\z`),
httpRepoGuessRepl: "https://[email protected]/~$1/dotfiles",
httpUsernameGuessRepl: "$1",
sshRepoGuessRepl: "[email protected]:~$1/dotfiles",
},
{
- rx: regexp.MustCompile(`\Asr\.ht/~([-0-9A-Za-z]+)/([-0-9A-Za-z]+)\z`),
+ rx: regexp.MustCompile(`\Asr\.ht/~([a-z_][a-z0-9_-]+)/([-0-9A-Za-z]+)\z`),
httpRepoGuessRepl: "https://[email protected]/~$1/$2",
httpUsernameGuessRepl: "$1",
sshRepoGuessRepl: "[email protected]:~$1/$2",
diff --git a/pkg/cmd/initcmd_test.go b/pkg/cmd/initcmd_test.go
index b631dd919cd..fecbd22e10f 100644
--- a/pkg/cmd/initcmd_test.go
+++ b/pkg/cmd/initcmd_test.go
@@ -67,16 +67,16 @@ func TestGuessDotfilesRepoURL(t *testing.T) {
expectedSSHRepoURL: "[email protected]:user/dots.git",
},
{
- arg: "sr.ht/~user",
- expectedHTTPRepoURL: "https://[email protected]/~user/dotfiles",
- expectedHTTPUsername: "user",
- expectedSSHRepoURL: "[email protected]:~user/dotfiles",
+ arg: "sr.ht/~user_name",
+ expectedHTTPRepoURL: "https://[email protected]/~user_name/dotfiles",
+ expectedHTTPUsername: "user_name",
+ expectedSSHRepoURL: "[email protected]:~user_name/dotfiles",
},
{
- arg: "sr.ht/~user/dots",
- expectedHTTPRepoURL: "https://[email protected]/~user/dots",
- expectedHTTPUsername: "user",
- expectedSSHRepoURL: "[email protected]:~user/dots",
+ arg: "sr.ht/~user_name/dots",
+ expectedHTTPRepoURL: "https://[email protected]/~user_name/dots",
+ expectedHTTPUsername: "user_name",
+ expectedSSHRepoURL: "[email protected]:~user_name/dots",
},
{
arg: "user",
|
fix
|
Allow underscores in SourceHut usernames
|
95d52983666e63d032d97cf7d6a3f7d0ee8fa292
|
2022-04-08 17:04:20
|
Tom Payne
|
fix: Ignore exit status 1 from external diff commands
| false
|
diff --git a/pkg/chezmoi/externaldiffsystem.go b/pkg/chezmoi/externaldiffsystem.go
index e2d832c0df1..13c504c7d24 100644
--- a/pkg/chezmoi/externaldiffsystem.go
+++ b/pkg/chezmoi/externaldiffsystem.go
@@ -1,6 +1,7 @@
package chezmoi
import (
+ "bytes"
"errors"
"io/fs"
"os"
@@ -10,6 +11,7 @@ import (
"text/template"
vfs "github.com/twpayne/go-vfs/v4"
+ "go.uber.org/multierr"
)
// An ExternalDiffSystem is a DiffSystem that uses an external diff tool.
@@ -249,5 +251,29 @@ func (s *ExternalDiffSystem) runDiffCommand(destAbsPath, targetAbsPath AbsPath)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
- return s.system.RunIdempotentCmd(cmd)
+ err := s.system.RunIdempotentCmd(cmd)
+
+ // Swallow exit status 1 errors if the files differ as diff commands
+ // traditionally exit with code 1 in this case.
+ var exitError *exec.ExitError
+ if errors.As(err, &exitError) && exitError.ProcessState.ExitCode() == 1 {
+ destData, err2 := s.ReadFile(destAbsPath)
+ switch {
+ case errors.Is(err2, fs.ErrNotExist):
+ // Do nothing.
+ case err2 != nil:
+ return multierr.Append(err, err2)
+ }
+ targetData, err2 := s.ReadFile(targetAbsPath)
+ switch {
+ case errors.Is(err2, fs.ErrNotExist):
+ // Do nothing.
+ case err2 != nil:
+ return multierr.Append(err, err2)
+ }
+ if !bytes.Equal(destData, targetData) {
+ return nil
+ }
+ }
+ return err
}
diff --git a/pkg/cmd/testdata/scripts/diffcommand_unix.txt b/pkg/cmd/testdata/scripts/diffcommand_unix.txt
index 0a6b70fb4b3..ed322e9d781 100644
--- a/pkg/cmd/testdata/scripts/diffcommand_unix.txt
+++ b/pkg/cmd/testdata/scripts/diffcommand_unix.txt
@@ -26,6 +26,17 @@ stdout ^arg\s+${HOME@R}/\.file\s+${WORK@R}/.*/\.file$
chezmoi apply --verbose
stdout ^arg\s+${HOME@R}/\.file\s+${WORK@R}/.*/\.file$
+chhome home3/user
+
+# test that chezmoi diff ignores exit code 1 from diff.command if the files differ
+chezmoi diff
+
+chhome home4/user
+
+# test that chezmoi diff does not ignore exit code 2 from diff.command
+! chezmoi diff
+stderr 'exit status 2'
+
-- golden/diff.diff --
diff --git a/.file b/.file
index bd729e8ee3cc005444c67dc77eed60016886b5e0..b508963510528ab709627ec448026a10a64c72ef 100644
@@ -46,4 +57,15 @@ index bd729e8ee3cc005444c67dc77eed60016886b5e0..b508963510528ab709627ec448026a10
command = "echo"
args = ["arg"]
-- home2/user/.local/share/chezmoi/dot_file --
-# source
+# contents of .file
+-- home3/user/.config/chezmoi/chezmoi.toml --
+[diff]
+ command = "false"
+-- home3/user/.local/share/chezmoi/dot_file --
+# target contents of .file
+-- home4/user/.config/chezmoi/chezmoi.toml --
+[diff]
+ command = "sh"
+ args = ["-c", "exit 2"]
+-- home4/user/.local/share/chezmoi/dot_file --
+# target contents of .file
|
fix
|
Ignore exit status 1 from external diff commands
|
993b367ae80f7d45f4b913207477a448c1a8a686
|
2022-10-09 18:29:31
|
Tom Payne
|
feat: Sign release assets
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ac5b16126e4..041dc518678 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -194,7 +194,7 @@ jobs:
uses: goreleaser/goreleaser-action@ff11ca24a9b39f2d36796d1fbd7a4e39c182630a
with:
version: latest
- args: release --skip-publish --snapshot --timeout=1h
+ args: release --skip-publish --skip-sign --snapshot --timeout=1h
- name: upload-artifact-chezmoi-darwin-amd64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
@@ -396,11 +396,13 @@ jobs:
with:
cache: true
go-version: ${{ env.GO_VERSION }}
+ - uses: sigstore/cosign-installer@ced07f21fb1da67979f539bbc6304c16c0677e76
- uses: goreleaser/goreleaser-action@ff11ca24a9b39f2d36796d1fbd7a4e39c182630a
with:
version: latest
args: release --timeout=1h
env:
+ COSIGN_PWD: ${{ secrets.COSIGN_PWD }}
GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
# The following is needed because chezmoi upgrade and
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 07fa64dd42c..520229a6043 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -184,6 +184,8 @@ nfpms:
release:
extra_files:
+ - glob: ./assets/cosign/cosign.pub
+ name_template: chezmoi_cosign.pub
- glob: ./dist/chezmoi-nocgo_darwin_amd64_v1/chezmoi
name_template: chezmoi-darwin-amd64
- glob: ./dist/chezmoi-nocgo_darwin_arm64/chezmoi
@@ -206,6 +208,16 @@ scoop:
description: "Manage your dotfiles across multiple diverse machines, securely."
license: MIT
+signs:
+- cmd: cosign
+ stdin: '{{ .Env.COSIGN_PWD }}'
+ args:
+ - sign-blob
+ - '--key=assets/cosign/cosign.key'
+ - '--output-signature=${signature}'
+ - '${artifact}'
+ artifacts: checksum
+
snapcrafts:
- builds:
- chezmoi-cgo-glibc
diff --git a/Makefile b/Makefile
index 27cdc7bea29..5e46ee375e2 100644
--- a/Makefile
+++ b/Makefile
@@ -143,5 +143,6 @@ test-release:
goreleaser release \
--rm-dist \
--skip-publish \
+ --skip-sign \
--snapshot \
${GORELEASER_FLAGS}
diff --git a/assets/chezmoi.io/docs/developer/releases.md b/assets/chezmoi.io/docs/developer/releases.md
index 69ac4dc71f1..de1f75d4c59 100644
--- a/assets/chezmoi.io/docs/developer/releases.md
+++ b/assets/chezmoi.io/docs/developer/releases.md
@@ -61,3 +61,33 @@ Release](https://github.com/twpayne/chezmoi/releases), and deploys the
chezmoi is in [Scoop](https://scoop.sh/)'s Main bucket. Scoop's automation
will automatically detect new releases within a few hours.
+
+## Signing
+
+chezmoi uses [GoReleaser's support for
+signing](https://goreleaser.com/customization/sign/) to sign the checksums of
+its release assets with [cosign](https://github.com/sigstore/cosign).
+
+Details:
+
+* The cosign private key was generated with cosign v1.12.1 on a private
+ recently-installed Ubuntu 22.04.1 system with a single user and all available
+ updates applied.
+
+* The private key uses a long (more than 32 character) password generated
+ locally by a password manager.
+
+* The password-protected private key is stored in chezmoi's public GitHub repo.
+
+* The private key's password is stored as a [GitHub Actions
+ secret](https://docs.github.com/en/actions/security-guides/encrypted-secrets)
+ and only available to the `release` step of `release` job of the `main`
+ workflow.
+
+* The cosign public key is included in the release assets and also uploaded to
+ [`https://chezmoi.io/cosign.pub`](https://chezmoi.io/cosign.pub). Since
+ [`https://chezmoi.io`](https://chezmoi.io) is served by [GitHub
+ pages](https://pages.github.com/), it probably has equivalent security to
+ [chezmoi's GitHub Releases
+ page](https://github.com/twpayne/chezmoi/releases), which is also managed by
+ GitHub.
diff --git a/assets/chezmoi.io/docs/hooks.py b/assets/chezmoi.io/docs/hooks.py
index d021f7aea77..d96bfa1fcff 100644
--- a/assets/chezmoi.io/docs/hooks.py
+++ b/assets/chezmoi.io/docs/hooks.py
@@ -47,3 +47,6 @@ def on_post_build(config, **kwargs):
# copy installation scripts
utils.copy_file('../scripts/install.sh', os.path.join(site_dir, 'get'))
utils.copy_file('../scripts/install.ps1', os.path.join(site_dir, 'get.ps1'))
+
+ # copy cosign.pub
+ utils.copy_file('../cosign/cosign.pub', os.path.join(site_dir, 'cosign.pub'))
diff --git a/assets/chezmoi.io/docs/install.md.tmpl b/assets/chezmoi.io/docs/install.md.tmpl
index 4bee59c5eb8..d3a189818d1 100644
--- a/assets/chezmoi.io/docs/install.md.tmpl
+++ b/assets/chezmoi.io/docs/install.md.tmpl
@@ -230,3 +230,56 @@ $ git clone https://github.com/twpayne/chezmoi.git
$ cd chezmoi
$ make install-from-git-working-copy
```
+
+## Verify your download
+
+chezmoi's release process signs the SHA256 checksums of [all released
+assets](https://github.com/twpayne/chezmoi/releases/tag/v{{ $version }}) with
+[cosign](https://github.com/SigStore/cosign).
+
+To verify an asset that you have downloaded:
+
+Download the [checksum
+file](https://github.com/twpayne/chezmoi/releases/download/v{{ $version
+}}/chezmoi_{{ $version }}_checksums.txt), [checksum file
+signature](https://github.com/twpayne/chezmoi/releases/download/v{{ $version
+}}/chezmoi_{{ $version }}_checksums.txt.sig), and [public signing
+key](https://github.com/twpayne/chezmoi/releases/download/v{{ $version
+}}/chezmoi_cosign.pub).
+
+ ```console
+ $ curl --location --remote-name-all \
+ https://github.com/twpayne/chezmoi/releases/download/v{{ $version }}/chezmoi_{{ $version }}_checksums.txt \
+ https://github.com/twpayne/chezmoi/releases/download/v{{ $version }}/chezmoi_{{ $version }}_checksums.txt.sig \
+ https://github.com/twpayne/chezmoi/releases/download/v{{ $version }}/chezmoi_cosign.pub
+ ```
+
+Verify the signature of the checksum file with cosign.
+
+ ```console
+ $ cosign verify-blob --key=chezmoi_cosign.pub \
+ --signature=chezmoi_{{ $version }}_checksums.txt.sig \
+ chezmoi_{{ $version }}_checksums.txt
+ ```
+
+!!! important
+
+ cosign should print `Verified OK`
+
+Verify the that the SHA256 sum of your downloads match the SHA256 sum in the
+verified checksum file. All your downloads must be in the current directory.
+
+=== "Linux"
+
+ ```console
+ $ sha256sum --check chezmoi_{{ $version }}_checksums.txt --ignore-missing
+ ```
+
+=== "macOS"
+
+ ```console
+ $ shasum --algorithm 256 --check chezmoi_{{ $version }}_checksums.txt --ignore-missing
+ ```
+
+For more information on chezmoi's release signing process, see the [developer
+documentation on chezmoi's releases](/developer/releases/).
diff --git a/assets/cosign/cosign.key b/assets/cosign/cosign.key
new file mode 100644
index 00000000000..1f5885968e8
--- /dev/null
+++ b/assets/cosign/cosign.key
@@ -0,0 +1,11 @@
+-----BEGIN ENCRYPTED COSIGN PRIVATE KEY-----
+eyJrZGYiOnsibmFtZSI6InNjcnlwdCIsInBhcmFtcyI6eyJOIjozMjc2OCwiciI6
+OCwicCI6MX0sInNhbHQiOiJ0Ris3cmtnL2RPZ0YxZzcwSTA4dVQ0aWdPYisxcTkv
+SjRNaDIvd1RPQ2VNPSJ9LCJjaXBoZXIiOnsibmFtZSI6Im5hY2wvc2VjcmV0Ym94
+Iiwibm9uY2UiOiJWMGpoNGxmenMyNFNRMEpyUExzeFNhbHZacGd5ZGJpbiJ9LCJj
+aXBoZXJ0ZXh0IjoiTGMrTGsvQTRTdVBmblcyYWJnT2VFbnZDbkxNNG9QRnBFTnpZ
+ZG04b1BVSlRSdmVsTWxJcjR4Slc1SjNJaXRLYlREOVFUMGRjZ1ozOE0zenh4WGNm
+TVFxNFBmYXpsZHIwTHlFOE5LREx5bmtlMEcrT2ZwQ2RsbExhb1ZWWW5Uck9RWi9D
+Y09Xanp4T3FXQ1VGWjlBK0UwVzJLSUJ2VHBjSHZNWVdDOVN3SDBwTUNja2dYc21p
+SitOTzhYbmwwWTJ4T3N2My84SWJ4TXRzMmc9PSJ9
+-----END ENCRYPTED COSIGN PRIVATE KEY-----
diff --git a/assets/cosign/cosign.pub b/assets/cosign/cosign.pub
new file mode 100644
index 00000000000..6081834113c
--- /dev/null
+++ b/assets/cosign/cosign.pub
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJDy2Dn3u5hqjQkTrcAukXwJty9Ke
+oquP+qONwiD4r+cjO8yrhoELoUk1ogXzvpM7f9bOS/YS5pdx2snCmMudDg==
+-----END PUBLIC KEY-----
diff --git a/go.sum b/go.sum
index cefc6f05d1a..a2e869e0392 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,7 @@
+cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk=
filippo.io/age v1.0.0 h1:V6q14n0mqYU3qKFkZ6oOaF9oXneOviS3ubXsSVBRSzc=
filippo.io/age v1.0.0/go.mod h1:PaX+Si/Sd5G8LgfCwldsSba3H1DDQZhIhFGkhbHaBq8=
+filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
@@ -63,6 +65,7 @@ github.com/bradenhilton/cityhash v1.0.0/go.mod h1:Wmb8yW1egA9ulrsRX4mxfYx5zq4nBW
github.com/bradenhilton/mozillainstallhash v1.0.0 h1:QL9byVGb4FrVOI7MubnME3uPNj5R78tqYQPlxuBmXMw=
github.com/bradenhilton/mozillainstallhash v1.0.0/go.mod h1:yVD0OX1izZHYl1lBm2UDojyE/k0xIqKJK78k+tdWV+k=
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/bwesterb/go-ristretto v1.2.1 h1:Xd9ZXmjKE2aY8Ub7+4bX7tXsIPsV1pIZaUlJUjI1toE=
github.com/bwesterb/go-ristretto v1.2.1/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
github.com/charmbracelet/bubbles v0.14.0 h1:DJfCwnARfWjZLvMglhSQzo76UZ2gucuHPy9jLWX45Og=
github.com/charmbracelet/bubbles v0.14.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc=
@@ -83,9 +86,12 @@ github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARu
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U=
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
@@ -98,6 +104,7 @@ github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnm
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
@@ -133,6 +140,7 @@ github.com/google/go-github/v47 v47.1.0 h1:Cacm/WxQBOa9lF0FT0EMjZ2BWMetQ1TQfyurn
github.com/google/go-github/v47 v47.1.0/go.mod h1:VPZBXNbFSJGjyjFRUKo9vZGawTajnWzC/YjGw/oFKi0=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -155,20 +163,26 @@ github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
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/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
@@ -218,6 +232,7 @@ github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ
github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0=
github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
@@ -238,10 +253,13 @@ github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
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/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
@@ -249,6 +267,7 @@ github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
@@ -367,6 +386,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
@@ -378,10 +398,12 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/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 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -396,5 +418,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
+mvdan.cc/editorconfig v0.2.0 h1:XL+7ys6ls/RKrkUNFQvEwIvNHh+JKx8Mj1pUV5wQxQE=
mvdan.cc/sh/v3 v3.5.1 h1:hmP3UOw4f+EYexsJjFxvU38+kn+V/s2CclXHanIBkmQ=
mvdan.cc/sh/v3 v3.5.1/go.mod h1:1JcoyAKm1lZw/2bZje/iYKWicU/KMd0rsyJeKHnsK4E=
|
feat
|
Sign release assets
|
899338d4069cc4102cf7d18f658db222d8b64508
|
2023-04-29 06:03:11
|
Danielo Rodriguez
|
docs: update encryption md to account for chezmoiroot
| false
|
diff --git a/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md b/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md
index 3a318a51acb..09c705ef341 100644
--- a/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md
+++ b/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md
@@ -12,10 +12,10 @@ This can be achieved with the following process:
4. Configure chezmoi to use the private key.
5. Add encrypted files.
-First, change to chezmoi's source directory:
+First, change to chezmoi's root directory:
```console
-$ chezmoi cd
+$ chezmoi cd ~
```
Generate an age private key encrypted with a passphrase in the file
|
docs
|
update encryption md to account for chezmoiroot
|
fcc684a21f36502625730d6677db4bc5e134786f
|
2022-09-25 21:46:08
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/go.mod b/go.mod
index d584fe2c845..c012d3ea7a4 100644
--- a/go.mod
+++ b/go.mod
@@ -41,7 +41,7 @@ require (
go.uber.org/multierr v1.8.0
golang.org/x/exp v0.0.0-20220921164117-439092de6870
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
- golang.org/x/sync v0.0.0-20220907140024-f12130a52804
+ golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8
golang.org/x/term v0.0.0-20220919170432-7a66f970e087
gopkg.in/ini.v1 v1.67.0
@@ -53,7 +53,7 @@ require (
require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
- github.com/Microsoft/go-winio v0.5.2 // indirect
+ github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
@@ -114,12 +114,14 @@ require (
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/xanzy/ssh-agent v0.3.2 // indirect
- github.com/yuin/goldmark v1.4.15 // indirect
+ github.com/yuin/goldmark v1.5.1 // indirect
github.com/yuin/goldmark-emoji v1.0.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
- golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 // indirect
- golang.org/x/net v0.0.0-20220921203646-d300de134e69 // indirect
+ golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 // indirect
+ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+ golang.org/x/net v0.0.0-20220923203811-8be639271d50 // indirect
golang.org/x/text v0.3.7 // indirect
+ golang.org/x/tools v0.1.12 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
diff --git a/go.sum b/go.sum
index 82a6855f371..f01aa67f35e 100644
--- a/go.sum
+++ b/go.sum
@@ -10,8 +10,9 @@ github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmy
github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
-github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
+github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
+github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 h1:NsReiLpErIPzRrnogAXYwSoU7txA977LjDGrbkewJbg=
github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
@@ -326,8 +327,8 @@ github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.4/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
-github.com/yuin/goldmark v1.4.15 h1:CFa84T0goNn/UIXYS+dmjjVxMyTAvpOmzld40N/nfK0=
-github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.5.1 h1:u+ry9U7p4EE0QhDhdOQi7rzmAakZlrMg1B7VbLbhW0Y=
+github.com/yuin/goldmark v1.5.1/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=
github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
@@ -349,23 +350,24 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY=
-golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 h1:WJywXQVIb56P2kAvXeMGTIgQ1ZHQxR60+F9dLsodECc=
+golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20220921164117-439092de6870 h1:j8b6j9gzSigH28O5SjSpQSSh9lFd6f5D/q0aHjNTulc=
golang.org/x/exp v0.0.0-20220921164117-439092de6870/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220921203646-d300de134e69 h1:hUJpGDpnfwdJW8iNypFjmSY0sCBEL+spFTZ2eO+Sfps=
-golang.org/x/net v0.0.0-20220921203646-d300de134e69/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220923203811-8be639271d50 h1:vKyz8L3zkd+xrMeIaBsQ/MNVPVFSffdaU3ZyYlBGFnI=
+golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 h1:lxqLZaMad/dJHMFZH0NiNpiEZI/nhgWhe4wgzpE+MuA=
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
-golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -409,6 +411,7 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
|
chore
|
Update dependencies
|
69337372db0bf316b577087c3c590ffd9353b2cc
|
2021-09-24 22:04:28
|
Tom Payne
|
chore: Improve doctor output on bare-bones machines (#1457)
| false
|
diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
index 203d984e394..273afaa2118 100644
--- a/internal/cmd/doctorcmd.go
+++ b/internal/cmd/doctorcmd.go
@@ -158,11 +158,13 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
name: "shell",
binaryname: shell,
ifNotSet: checkResultError,
+ ifNotExist: checkResultError,
},
&binaryCheck{
name: "editor",
binaryname: editor,
ifNotSet: checkResultWarning,
+ ifNotExist: checkResultWarning,
},
&umaskCheck{},
&binaryCheck{
@@ -378,7 +380,7 @@ func (c *dirCheck) Name() string {
func (c *dirCheck) Run(system chezmoi.System) (checkResult, string) {
if _, err := system.ReadDir(c.dirname); err != nil {
- return checkResultError, fmt.Sprintf("%s: %v", c.dirname, err)
+ return checkResultError, err.Error()
}
return checkResultOK, fmt.Sprintf("%s is a directory", c.dirname)
}
@@ -438,7 +440,7 @@ func (c *suspiciousEntriesCheck) Name() string {
func (c *suspiciousEntriesCheck) Run(system chezmoi.System) (checkResult, string) {
// FIXME check that config file templates are in root
var suspiciousEntries []string
- if err := chezmoi.WalkDir(system, c.dirname, func(absPath chezmoi.AbsPath, info fs.FileInfo, err error) error {
+ switch err := chezmoi.WalkDir(system, c.dirname, func(absPath chezmoi.AbsPath, info fs.FileInfo, err error) error {
if err != nil {
return err
}
@@ -450,7 +452,10 @@ func (c *suspiciousEntriesCheck) Run(system chezmoi.System) (checkResult, string
suspiciousEntries = append(suspiciousEntries, relPath)
}
return nil
- }); err != nil {
+ }); {
+ case errors.Is(err, fs.ErrNotExist):
+ return checkResultOK, fmt.Sprintf("%s: no such file or directory", c.dirname)
+ case err != nil:
return checkResultError, err.Error()
}
if len(suspiciousEntries) > 0 {
diff --git a/internal/cmd/testdata/scripts/doctor_unix.txt b/internal/cmd/testdata/scripts/doctor_unix.txt
index 92e087ae661..d6275f365dc 100644
--- a/internal/cmd/testdata/scripts/doctor_unix.txt
+++ b/internal/cmd/testdata/scripts/doctor_unix.txt
@@ -16,28 +16,36 @@ chmod 755 bin/vimdiff
mkhomedir
mksourcedir
+# test that chezmoi doctor behaves as expected
chezmoi doctor
-stdout 'ok\s+version\s+'
-stdout 'ok\s+os-arch\s+'
-stdout 'warning\s+config-file\s+.*multiple config files'
-stdout 'ok\s+source-dir\s+'
-stdout 'ok\s+suspicious-entries\s+'
-stdout 'ok\s+dest-dir\s+'
-stdout 'ok\s+shell\s+'
-stdout 'ok\s+editor\s+'
-stdout 'ok\s+git-cli\s+'
-stdout 'ok\s+merge-cli\s+'
-stdout 'ok\s+age-cli\s+'
-stdout 'ok\s+gnupg-cli\s+'
-stdout 'ok\s+1password-cli\s+'
-stdout 'ok\s+bitwarden-cli\s+'
-stdout 'ok\s+gopass-cli\s+'
-stdout 'ok\s+keepassxc-cli\s+'
-stdout 'info\s+keepassxc-db\s+'
-stdout 'ok\s+lastpass-cli\s+'
-stdout 'ok\s+pass-cli\s+'
-stdout 'ok\s+vault-cli\s+'
-stdout 'ok\s+secret-cli\s+'
+stdout '^ok\s+version\s+'
+stdout '^ok\s+os-arch\s+'
+stdout '^warning\s+config-file\s+.*multiple config files'
+stdout '^ok\s+source-dir\s+'
+stdout '^ok\s+suspicious-entries\s+'
+stdout '^ok\s+dest-dir\s+'
+stdout '^ok\s+shell\s+'
+stdout '^ok\s+editor\s+'
+stdout '^ok\s+git-cli\s+'
+stdout '^ok\s+merge-cli\s+'
+stdout '^ok\s+age-cli\s+'
+stdout '^ok\s+gnupg-cli\s+'
+stdout '^ok\s+1password-cli\s+'
+stdout '^ok\s+bitwarden-cli\s+'
+stdout '^ok\s+gopass-cli\s+'
+stdout '^ok\s+keepassxc-cli\s+'
+stdout '^info\s+keepassxc-db\s+'
+stdout '^ok\s+lastpass-cli\s+'
+stdout '^ok\s+pass-cli\s+'
+stdout '^ok\s+vault-cli\s+'
+stdout '^ok\s+secret-cli\s+'
+
+# test that chezmoi doctor warns about missing directories on an empty system
+chhome home2/user
+! chezmoi doctor
+stdout '^ok\s+config-file\s+'
+stdout '^error\s+source-dir\s+'
+stdout '^ok\s+suspicious-entries\s+'
-- bin/age --
#!/bin/sh
|
chore
|
Improve doctor output on bare-bones machines (#1457)
|
00b33e53d3630f037ef78429a4d48958300e7dd7
|
2024-01-06 07:52:54
|
Tom Payne
|
chore: Connect stderr when running commands
| false
|
diff --git a/internal/chezmoitest/chezmoitest.go b/internal/chezmoitest/chezmoitest.go
index 14ab3af4c53..bdfe59bf176 100644
--- a/internal/chezmoitest/chezmoitest.go
+++ b/internal/chezmoitest/chezmoitest.go
@@ -4,6 +4,7 @@ package chezmoitest
import (
"fmt"
"io/fs"
+ "os"
"os/exec"
"regexp"
"runtime"
@@ -49,6 +50,8 @@ func GPGGenerateKey(command, homeDir string) (key, passphrase string, err error)
"--pinentry-mode", "loopback",
"--quick-generate-key", key,
)
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
err = chezmoilog.LogCmdRun(cmd)
return
}
diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
index bef9d455878..23265166645 100644
--- a/internal/cmd/doctorcmd.go
+++ b/internal/cmd/doctorcmd.go
@@ -576,6 +576,7 @@ func (c *dirCheck) Run(system chezmoi.System, homeDirAbsPath chezmoi.AbsPath) (c
"status",
"--porcelain=v2",
)
+ cmd.Stderr = os.Stderr
output, err := cmd.Output()
if err != nil {
gitStatus = gitStatusError
diff --git a/internal/cmd/doctorcmd_unix.go b/internal/cmd/doctorcmd_unix.go
index f96ef4d703d..38170ade7b0 100644
--- a/internal/cmd/doctorcmd_unix.go
+++ b/internal/cmd/doctorcmd_unix.go
@@ -5,6 +5,7 @@ package cmd
import (
"bytes"
"fmt"
+ "os"
"os/exec"
"runtime"
@@ -43,6 +44,7 @@ func (unameCheck) Run(system chezmoi.System, homeDirAbsPath chezmoi.AbsPath) (ch
return checkResultSkipped, ""
}
cmd := exec.Command("uname", "-a")
+ cmd.Stderr = os.Stderr
data, err := chezmoilog.LogCmdOutput(cmd)
if err != nil {
return checkResultFailed, err.Error()
diff --git a/internal/cmds/execute-template/main.go b/internal/cmds/execute-template/main.go
index e2f2a11d1df..d872770962f 100644
--- a/internal/cmds/execute-template/main.go
+++ b/internal/cmds/execute-template/main.go
@@ -118,7 +118,9 @@ func run() error {
// FIXME we should use chezmoi's template functions if/when needed,
// for now we use a bespoke output function
funcMap["output"] = func(name string, args ...string) string {
- out, err := exec.Command(name, args...).Output()
+ cmd := exec.Command(name, args...)
+ cmd.Stderr = os.Stderr
+ out, err := cmd.Output()
if err != nil {
panic(err)
}
diff --git a/internal/cmds/generate-install.sh/main.go b/internal/cmds/generate-install.sh/main.go
index aa2e4bf6326..42a362cdf6b 100644
--- a/internal/cmds/generate-install.sh/main.go
+++ b/internal/cmds/generate-install.sh/main.go
@@ -41,7 +41,9 @@ type platformValue struct {
type platformSet map[platform]platformValue
func goToolDistList() (platformSet, error) {
- data, err := exec.Command("go", "tool", "dist", "list", "-json").Output()
+ cmd := exec.Command("go", "tool", "dist", "list", "-json")
+ cmd.Stderr = os.Stderr
+ data, err := cmd.Output()
if err != nil {
return nil, err
}
|
chore
|
Connect stderr when running commands
|
4a016d0248f421eb9bfa416333efcee5bb92f8c6
|
2025-03-17 02:03:14
|
Tom Payne
|
chore: Update GitHub Actions
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ac771ec633b..fbea35214e7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -458,7 +458,7 @@ jobs:
with:
go-version: ${{ env.GO_VERSION }}
upload-cache: false
- - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837
+ - uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea
with:
version: v${{ env.GOLANGCI_LINT_VERSION }}
args: --timeout=5m
|
chore
|
Update GitHub Actions
|
e3bf3a57b93daf57d8a140ff409449fcd7660f4e
|
2022-07-09 06:31:50
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 02495be0b03..67ee3597380 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ env:
GO_VERSION: 1.18.3
GOFUMPT_VERSION: 0.3.1
GOLANGCI_LINT_VERSION: 1.46.2
- TPARSE_VERSION: 0.10.3
+ TPARSE_VERSION: 0.11.0
jobs:
changes:
runs-on: ubuntu-20.04
diff --git a/go.mod b/go.mod
index ff7dd8de799..60e6c90ca33 100644
--- a/go.mod
+++ b/go.mod
@@ -5,13 +5,13 @@ go 1.17
require (
filippo.io/age v1.0.0
github.com/Masterminds/sprig/v3 v3.2.2
- github.com/bmatcuk/doublestar/v4 v4.0.2
+ github.com/bmatcuk/doublestar/v4 v4.0.3
github.com/bradenhilton/mozillainstallhash v1.0.0
github.com/charmbracelet/glamour v0.5.0
github.com/coreos/go-semver v0.3.0
github.com/go-git/go-git/v5 v5.4.2
github.com/google/go-github/v45 v45.2.0
- github.com/google/gops v0.3.24
+ github.com/google/gops v0.3.25
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/mitchellh/mapstructure v1.5.0
@@ -32,9 +32,9 @@ require (
github.com/zalando/go-keyring v0.2.1
go.etcd.io/bbolt v1.3.6
go.uber.org/multierr v1.8.0
- golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
+ golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
- golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664
+ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467
gopkg.in/yaml.v3 v3.0.1
howett.net/plist v1.0.0
@@ -45,7 +45,7 @@ require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
- github.com/ProtonMail/go-crypto v0.0.0-20220517143526-88bb52951d5b // indirect
+ github.com/ProtonMail/go-crypto v0.0.0-20220623141421-5afb4c282135 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
@@ -75,7 +75,7 @@ require (
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
- github.com/microcosm-cc/bluemonday v1.0.18 // indirect
+ github.com/microcosm-cc/bluemonday v1.0.19 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -98,7 +98,7 @@ require (
github.com/yuin/goldmark-emoji v1.0.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
- golang.org/x/net v0.0.0-20220622184535-263ec571b305 // indirect
+ golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
diff --git a/go.sum b/go.sum
index 19472b44337..af4a4f6b817 100644
--- a/go.sum
+++ b/go.sum
@@ -28,36 +28,51 @@ cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+Y
cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y=
cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
+cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712DPA=
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
+cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk=
+cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/firestore v1.6.1 h1:8rBq3zRjnHx8UtBvaOWqBB1xq9jH6/wltfQLlTMh2Fw=
cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
+cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1 h1:ukjixP1wl0LpnZ6LWtZJ0mX5tBmjp1f8Sqer8Z2OMUU=
cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.14.0 h1:6RRlFMv1omScs6iq2hfE3IvgE+l6RfJPampq8UZc5TU=
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
+cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/age v1.0.0 h1:V6q14n0mqYU3qKFkZ6oOaF9oXneOviS3ubXsSVBRSzc=
filippo.io/age v1.0.0/go.mod h1:PaX+Si/Sd5G8LgfCwldsSba3H1DDQZhIhFGkhbHaBq8=
+filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -73,8 +88,8 @@ github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VM
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-github.com/ProtonMail/go-crypto v0.0.0-20220517143526-88bb52951d5b h1:lcbBNuQhppsc7A5gjdHmdlqUqJfgGMylBdGyDs0j7G8=
-github.com/ProtonMail/go-crypto v0.0.0-20220517143526-88bb52951d5b/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
+github.com/ProtonMail/go-crypto v0.0.0-20220623141421-5afb4c282135 h1:xDc/cFH/hwyr9KyWc0sm26lpsscqtfZBvU8NpRLHwJ0=
+github.com/ProtonMail/go-crypto v0.0.0-20220623141421-5afb4c282135/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
@@ -91,6 +106,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo=
github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -102,25 +118,31 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWTiQ3jsA=
-github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.0.3 h1:4OP3JgX9zL4yBFezFv8AuFpxWkgp8pNV9A1FY4bVVN4=
+github.com/bmatcuk/doublestar/v4 v4.0.3/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/bradenhilton/cityhash v1.0.0 h1:1QauDCwfxwIGwO2jBTJdEBqXgfCusAgQOSgdl4RsTMI=
github.com/bradenhilton/cityhash v1.0.0/go.mod h1:Wmb8yW1egA9ulrsRX4mxfYx5zq4nBWOCZ+j63oK6uz8=
github.com/bradenhilton/mozillainstallhash v1.0.0 h1:QL9byVGb4FrVOI7MubnME3uPNj5R78tqYQPlxuBmXMw=
github.com/bradenhilton/mozillainstallhash v1.0.0/go.mod h1:yVD0OX1izZHYl1lBm2UDojyE/k0xIqKJK78k+tdWV+k=
+github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/charmbracelet/glamour v0.5.0 h1:wu15ykPdB7X6chxugG/NNfDUbyyrCLV9XBalj5wdu3g=
github.com/charmbracelet/glamour v0.5.0/go.mod h1:9ZRtG19AUIzcTm7FGLGbq3D5WKQ5UyZBbQsMQN0XIqc=
+github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 h1:cqQfy1jclcSy/FwLjemeg3SR1yaINm74aQyupQ0Bl8M=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@@ -131,9 +153,12 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U=
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
@@ -151,15 +176,19 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad h1:EmNYJhPYy0pOFjCx2PrgtaBXmee0iUX9hLlxE1xHOJE=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
@@ -178,8 +207,10 @@ github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2Su
github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
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 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -187,6 +218,7 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -194,11 +226,14 @@ github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -253,10 +288,12 @@ github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMe
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gops v0.3.24 h1:JwwsSS4AFp0l9+AH6pLD8FIHIH3x313zLDxfJFs9aGI=
-github.com/google/gops v0.3.24/go.mod h1:8A7ebAm0id9K3H0uOggeRVGxszSvnlURun9mg3GdYDw=
+github.com/google/gops v0.3.25 h1:Pf6uw+cO6pDhc7HJ71NiG0x8dyQTeQcmg3HQFF39qVw=
+github.com/google/gops v0.3.25/go.mod h1:8A7ebAm0id9K3H0uOggeRVGxszSvnlURun9mg3GdYDw=
+github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60=
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -268,6 +305,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2 h1:LR89qFljJ48s990kEKGsk213yIJDPI4205OKOzbURK8=
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -283,13 +321,17 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
+github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
+github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
+github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
@@ -297,20 +339,25 @@ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJr
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/hashicorp/consul/api v1.12.0 h1:k3y1FYv6nuKyNTqj6w9gXOx5r5CfLj/k/euUeBXj1OY=
github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=
github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -318,6 +365,7 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -325,11 +373,13 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
+github.com/hashicorp/serf v0.9.7 h1:hkdgbqizGQHuU5IPqYM1JdSMV8nKfpuOnZYXssk9muY=
github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
@@ -340,25 +390,32 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 h1:WjT3fLi9n8YWh/Ih8Q1LHAPsTqGddPcHqscN+PJ3i68=
github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -366,12 +423,14 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
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/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -397,8 +456,8 @@ github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/microcosm-cc/bluemonday v1.0.17/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
-github.com/microcosm-cc/bluemonday v1.0.18 h1:6HcxvXDAi3ARt3slx6nTesbvorIc3QeTzBNRvWktHBo=
-github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
+github.com/microcosm-cc/bluemonday v1.0.19 h1:OI7hoF5FY4pFz2VA//RN8TfM0YJ2dJcl4P4APrCWy6c=
+github.com/microcosm-cc/bluemonday v1.0.19/go.mod h1:QNzV2UbLK2/53oIIwTOyLUSABMkjZ4tqiyC1g/DyqxE=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
@@ -417,9 +476,11 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/muesli/combinator v0.3.0 h1:SZDuRzzwmVPLkbOzbhGzBTwd5+Y6aFN4UusOW2azrNA=
github.com/muesli/combinator v0.3.0/go.mod h1:ttPegJX0DPQaGDtJKMInIP6Vfp5pN8RX7QntFCcpy18=
@@ -430,6 +491,7 @@ github.com/muesli/termenv v0.12.0 h1:KuQRUE3PgxRFWhq4gHvZtPSLCGDqM5q/cYr1pZ39ytc
github.com/muesli/termenv v0.12.0/go.mod h1:WCCv32tusQ/EEZ5S8oUIIrC/nIuBcxCVqlN4Xfkv+7A=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
@@ -448,11 +510,13 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -461,6 +525,7 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP
github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -480,16 +545,20 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4=
github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo=
github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sagikazarmark/crypt v0.6.0 h1:REOEXCs/NFY/1jOCEouMuT4zEniE5YoXbvpC5X/TLF8=
github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/shirou/gopsutil/v3 v3.22.4 h1:srAQaiX6jX/cYL6q29aE0m8lOskT9CurZ9N61YR3yoI=
github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
@@ -498,6 +567,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
@@ -530,7 +600,9 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs=
github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo=
+github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/twpayne/go-pinentry v0.2.0 h1:hS5NEJiilop9xP9pBX/1NYduzDlGGMdg1KamTBTrOWw=
@@ -548,6 +620,7 @@ github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
github.com/xanzy/ssh-agent v0.3.1 h1:AmzO1SSWxw73zxFZPRwaMN1MohDw8UyHnmuxyceTEGo=
github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w=
+github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -560,14 +633,19 @@ github.com/yuin/goldmark v1.4.12 h1:6hffw6vALvEDqJ19dOJvJKOoAOKe4NDaTqvd2sktGN0=
github.com/yuin/goldmark v1.4.12/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=
github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
+github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
github.com/zalando/go-keyring v0.2.1 h1:MBRN/Z8H4U5wEKXiD67YbDAr5cj/DOStmSga70/2qKc=
github.com/zalando/go-keyring v0.2.1/go.mod h1:g63M2PPn0w5vjmEbwAX3ib5I+41zdm4esSETOn9Y6Dw=
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
+go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc=
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
+go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg=
go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/v2 v2.305.4 h1:Dcx3/MYyfKcPNLpR4VVQUP5KgYrBeJtktBwEKkw08Ao=
go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
+go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4=
go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -575,6 +653,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -584,6 +663,7 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
+go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -611,8 +691,10 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -624,9 +706,11 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
@@ -635,6 +719,7 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -687,8 +772,10 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21jo2PjChrtGaAvF5M3I=
-golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0=
+golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -709,8 +796,9 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNahi9+NSp7yYuCsl5eAQtL0=
-golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 h1:VnGaRqoLmqZH/3TMLJwYCEWkR4j1nuIU1U9TvbqsDUw=
+golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
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=
@@ -811,9 +899,11 @@ golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/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-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU=
-golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d h1:/m5NbqQelATgoSPVC2Z23sR4kVNokFwDDyWh/3rGY+I=
+golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -831,6 +921,7 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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=
@@ -881,6 +972,7 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -893,7 +985,9 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -932,7 +1026,10 @@ google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc
google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
+google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
+google.golang.org/api v0.81.0 h1:o8WF5AvfidafWbFjsRyupxyEQJNUWxLZJCK5NXrxZZ8=
google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko=
+google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -982,6 +1079,7 @@ google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
@@ -1018,7 +1116,12 @@ google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I=
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1048,7 +1151,9 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1079,6 +1184,7 @@ gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -1100,14 +1206,20 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
+mvdan.cc/editorconfig v0.2.0 h1:XL+7ys6ls/RKrkUNFQvEwIvNHh+JKx8Mj1pUV5wQxQE=
mvdan.cc/editorconfig v0.2.0/go.mod h1:lvnnD3BNdBYkhq+B4uBuFFKatfp02eB6HixDvEz91C0=
mvdan.cc/sh/v3 v3.5.1 h1:hmP3UOw4f+EYexsJjFxvU38+kn+V/s2CclXHanIBkmQ=
mvdan.cc/sh/v3 v3.5.1/go.mod h1:1JcoyAKm1lZw/2bZje/iYKWicU/KMd0rsyJeKHnsK4E=
+rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/goversion v1.2.0 h1:SPn+NLTiAG7w30IRK/DKp1BjvpWabYgxlLp/+kx5J8w=
rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=
+rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
chore
|
Update dependencies
|
5b73a4d496eaa653c6eb39f1a319f8c2167112ce
|
2024-10-26 22:00:38
|
Ruslan Sayfutdinov
|
fix: Accept only supported values to 'unmanaged --path-style'
| false
|
diff --git a/internal/chezmoi/pathstyle.go b/internal/chezmoi/pathstyle.go
index daf3a9dba76..320de16e32c 100644
--- a/internal/chezmoi/pathstyle.go
+++ b/internal/chezmoi/pathstyle.go
@@ -5,7 +5,10 @@ import (
"strings"
)
-type PathStyle string
+type (
+ PathStyle string
+ PathStyleSimple string
+)
const (
PathStyleAbsolute PathStyle = "absolute"
@@ -23,6 +26,13 @@ var (
}
PathStyleFlagCompletionFunc = FlagCompletionFunc(PathStyleStrings)
+
+ PathStyleSimpleStrings = []string{
+ PathStyleAbsolute.String(),
+ PathStyleRelative.String(),
+ }
+
+ PathStyleSimpleFlagCompletionFunc = FlagCompletionFunc(PathStyleSimpleStrings)
)
// Set implements github.com/spf13/pflag.Value.Set.
@@ -48,3 +58,31 @@ func (p PathStyle) Type() string {
func (p PathStyle) Copy() *PathStyle {
return &p
}
+
+// Set implements github.com/spf13/pflag.Value.Set.
+func (p *PathStyleSimple) Set(s string) error {
+ uniqueAbbreviations := UniqueAbbreviations(PathStyleSimpleStrings)
+ pathStyleStr, ok := uniqueAbbreviations[s]
+ if !ok {
+ return fmt.Errorf("%s: unknown path style", s)
+ }
+ *p = PathStyleSimple(pathStyleStr)
+ return nil
+}
+
+func (p PathStyleSimple) String() string {
+ return string(p)
+}
+
+// Type implements github.com/spf13/pflag.Value.Type.
+func (p PathStyleSimple) Type() string {
+ return strings.Join(PathStyleSimpleStrings, "|")
+}
+
+func (p PathStyleSimple) Copy() *PathStyleSimple {
+ return &p
+}
+
+func (p PathStyleSimple) ToPathStyle() PathStyle {
+ return PathStyle(p)
+}
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
index 0a6f98289e6..a34f7cc0e4f 100644
--- a/internal/cmd/config.go
+++ b/internal/cmd/config.go
@@ -312,11 +312,10 @@ var (
whitespaceRx = regexp.MustCompile(`\s+`)
commonFlagCompletionFuncs = map[string]func(*cobra.Command, []string, string) ([]string, cobra.ShellCompDirective){
- "exclude": chezmoi.EntryTypeSetFlagCompletionFunc,
- "format": writeDataFormatFlagCompletionFunc,
- "include": chezmoi.EntryTypeSetFlagCompletionFunc,
- "path-style": chezmoi.PathStyleFlagCompletionFunc,
- "secrets": severityFlagCompletionFunc,
+ "exclude": chezmoi.EntryTypeSetFlagCompletionFunc,
+ "format": writeDataFormatFlagCompletionFunc,
+ "include": chezmoi.EntryTypeSetFlagCompletionFunc,
+ "secrets": severityFlagCompletionFunc,
}
)
@@ -383,7 +382,7 @@ func newConfig(options ...configOption) (*Config, error) {
recursive: true,
},
unmanaged: unmanagedCmdConfig{
- pathStyle: chezmoi.PathStyleRelative,
+ pathStyle: chezmoi.PathStyleSimple(chezmoi.PathStyleRelative),
},
// Configuration.
diff --git a/internal/cmd/managedcmd.go b/internal/cmd/managedcmd.go
index 51059b641ca..0122c8d0365 100644
--- a/internal/cmd/managedcmd.go
+++ b/internal/cmd/managedcmd.go
@@ -33,6 +33,10 @@ func (c *Config) newManagedCmd() *cobra.Command {
managedCmd.Flags().VarP(&c.managed.pathStyle, "path-style", "p", "Path style")
managedCmd.Flags().BoolVarP(&c.managed.tree, "tree", "t", c.managed.tree, "Print paths as a tree")
+ if err := managedCmd.RegisterFlagCompletionFunc("path-style", chezmoi.PathStyleFlagCompletionFunc); err != nil {
+ panic(err)
+ }
+
return managedCmd
}
diff --git a/internal/cmd/statuscmd.go b/internal/cmd/statuscmd.go
index 84363f5c3d5..e15e58e71c0 100644
--- a/internal/cmd/statuscmd.go
+++ b/internal/cmd/statuscmd.go
@@ -45,6 +45,10 @@ func (c *Config) newStatusCmd() *cobra.Command {
BoolVarP(&c.Status.parentDirs, "parent-dirs", "P", c.Status.parentDirs, "Show status of all parent directories")
statusCmd.Flags().BoolVarP(&c.Status.recursive, "recursive", "r", c.Status.recursive, "Recurse into subdirectories")
+ if err := statusCmd.RegisterFlagCompletionFunc("path-style", chezmoi.PathStyleFlagCompletionFunc); err != nil {
+ panic(err)
+ }
+
return statusCmd
}
diff --git a/internal/cmd/testdata/scripts/completion.txtar b/internal/cmd/testdata/scripts/completion.txtar
index 5dd0dfd6f85..2e94c0d63ef 100644
--- a/internal/cmd/testdata/scripts/completion.txtar
+++ b/internal/cmd/testdata/scripts/completion.txtar
@@ -30,10 +30,18 @@ cmp stdout golden/entry-type-set
exec chezmoi __complete --mode ''
cmp stdout golden/mode
-# test that path style values are completed
+# test that status path style values are completed
+exec chezmoi __complete status --path-style ''
+cmp stdout golden/path-style
+
+# test that managed path style values are completed
exec chezmoi __complete managed --path-style ''
cmp stdout golden/path-style
+# test that unmanaged path style values are completed
+exec chezmoi __complete unmanaged --path-style ''
+cmp stdout golden/unmanaged-path-style
+
# test that write --format values are completed
exec chezmoi __complete state dump --format ''
cmp stdout golden/write-data
@@ -78,6 +86,10 @@ relative
source-absolute
source-relative
:4
+-- golden/unmanaged-path-style --
+absolute
+relative
+:4
-- golden/use-builtin-flags --
--use-builtin-age Use builtin age
--use-builtin-diff Use builtin diff
diff --git a/internal/cmd/testdata/scripts/unmanaged.txtar b/internal/cmd/testdata/scripts/unmanaged.txtar
index 2df888e01c5..a197c4b2674 100644
--- a/internal/cmd/testdata/scripts/unmanaged.txtar
+++ b/internal/cmd/testdata/scripts/unmanaged.txtar
@@ -31,6 +31,10 @@ cmp stdout golden/unmanaged-with-some-managed
[unix] exec chezmoi unmanaged --path-style=absolute
[unix] cmpenv stdout golden/unmanaged-absolute
+# test chezmoi unmanaged --path-style=source-absolute
+! exec chezmoi unmanaged --path-style=source-absolute
+stderr 'source-absolute: unknown path style'
+
-- golden/unmanaged --
.local
-- golden/unmanaged-absolute --
diff --git a/internal/cmd/unmanagedcmd.go b/internal/cmd/unmanagedcmd.go
index 8d1fa6ca76b..87001073c6b 100644
--- a/internal/cmd/unmanagedcmd.go
+++ b/internal/cmd/unmanagedcmd.go
@@ -12,7 +12,7 @@ import (
)
type unmanagedCmdConfig struct {
- pathStyle chezmoi.PathStyle
+ pathStyle chezmoi.PathStyleSimple
tree bool
}
@@ -32,6 +32,10 @@ func (c *Config) newUnmanagedCmd() *cobra.Command {
unmanagedCmd.Flags().VarP(&c.unmanaged.pathStyle, "path-style", "p", "Path style")
unmanagedCmd.Flags().BoolVarP(&c.unmanaged.tree, "tree", "t", c.unmanaged.tree, "Print paths as a tree")
+ if err := unmanagedCmd.RegisterFlagCompletionFunc("path-style", chezmoi.PathStyleSimpleFlagCompletionFunc); err != nil {
+ panic(err)
+ }
+
return unmanagedCmd
}
@@ -99,7 +103,7 @@ func (c *Config) runUnmanagedCmd(cmd *cobra.Command, args []string, sourceState
paths := make([]fmt.Stringer, 0, len(unmanagedRelPaths.Elements()))
for relPath := range unmanagedRelPaths {
var path fmt.Stringer
- if c.unmanaged.pathStyle == chezmoi.PathStyleAbsolute {
+ if c.unmanaged.pathStyle.ToPathStyle() == chezmoi.PathStyleAbsolute {
path = c.DestDirAbsPath.Join(relPath)
} else {
path = relPath
|
fix
|
Accept only supported values to 'unmanaged --path-style'
|
50ef2067eab47bcbb097a555367b280cf8b89958
|
2022-03-09 02:32:59
|
Tom Payne
|
chore: Note that GNOME Keyring is supported on FreeBSD
| false
|
diff --git a/assets/chezmoi.io/docs/user-guide/password-managers/keychain-and-windows-credentials-manager.md b/assets/chezmoi.io/docs/user-guide/password-managers/keychain-and-windows-credentials-manager.md
index 3a97ba050f6..81fb924b3ac 100644
--- a/assets/chezmoi.io/docs/user-guide/password-managers/keychain-and-windows-credentials-manager.md
+++ b/assets/chezmoi.io/docs/user-guide/password-managers/keychain-and-windows-credentials-manager.md
@@ -1,7 +1,7 @@
# Keychain and Windows Credentials Manager
-chezmoi includes support for Keychain (on macOS), GNOME Keyring (on Linux), and
-Windows Credentials Manager (on Windows) via the
+chezmoi includes support for Keychain (on macOS), GNOME Keyring (on Linux and
+FreeBSD), and Windows Credentials Manager (on Windows) via the
[`zalando/go-keyring`](https://github.com/zalando/go-keyring) library.
Set values with:
|
chore
|
Note that GNOME Keyring is supported on FreeBSD
|
47f76444fea581685dd1a9c2dbfd922006c171a2
|
2021-12-10 19:11:57
|
Syphdias
|
docs: Fix link on chezmoi.io from templating to reference
| false
|
diff --git a/docs/TEMPLATING.md b/docs/TEMPLATING.md
index 51b03363314..fcae0c6d04d 100644
--- a/docs/TEMPLATING.md
+++ b/docs/TEMPLATING.md
@@ -331,7 +331,7 @@ for complete list.
chezmoi defines a few useful templates variables that depend on the system you
are currently on. A list of the variables defined by chezmoi can be found
-[here](REFERENCE.md#template-variables).
+[here](https://github.com/twpayne/chezmoi/blob/master/docs/REFERENCE.md#template-variables).
There are, however more variables than that. To view the variables available on
your system, execute:
|
docs
|
Fix link on chezmoi.io from templating to reference
|
8d3001b65ccfe359229220f471d31c16b91dd575
|
2022-08-02 12:37:33
|
dependabot[bot]
|
chore(deps): bump actions/setup-go from 3.2.0 to 3.2.1
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index af412729a4d..d0b0b1f5c1a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -119,7 +119,7 @@ jobs:
runs-on: macos-11
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
+ - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
go-version: ${{ env.GO_VERSION }}
@@ -166,7 +166,7 @@ jobs:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
with:
fetch-depth: 0
- - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
+ - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
go-version: ${{ env.GO_VERSION }}
@@ -262,7 +262,7 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
+ - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
go-version: 1.17.x
@@ -303,7 +303,7 @@ jobs:
runs-on: windows-2019
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
+ - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
go-version: ${{ env.GO_VERSION }}
@@ -343,7 +343,7 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
+ - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
go-version: ${{ env.GO_VERSION }}
@@ -367,7 +367,7 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
+ - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
go-version: ${{ env.GO_VERSION }}
@@ -406,7 +406,7 @@ jobs:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
with:
fetch-depth: 0
- - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
+ - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
go-version: ${{ env.GO_VERSION }}
|
chore
|
bump actions/setup-go from 3.2.0 to 3.2.1
|
6813da3465bac6a6a86711d68e81191647c86903
|
2021-09-28 01:02:31
|
Tom Payne
|
chore: Add more tests for readonly_ attribute
| false
|
diff --git a/internal/cmd/main_test.go b/internal/cmd/main_test.go
index 3f7db704048..09e6751f9a2 100644
--- a/internal/cmd/main_test.go
+++ b/internal/cmd/main_test.go
@@ -368,6 +368,10 @@ func cmdMkHomeDir(ts *testscript.TestScript, neg bool, args []string) {
Perm: 0o600,
Contents: []byte("# contents of .private\n"),
},
+ ".readonly": &vfst.File{
+ Perm: 0o444,
+ Contents: []byte("# contents of .readonly\n"),
+ },
".symlink": &vfst.Symlink{Target: ".dir/subdir/file"},
".template": "key = value\n",
},
@@ -405,6 +409,7 @@ func cmdMkSourceDir(ts *testscript.TestScript, neg bool, args []string) {
"executable_dot_executable": "# contents of .executable\n",
"dot_file": "# contents of .file\n",
"private_dot_private": "# contents of .private\n",
+ "readonly_dot_readonly": "# contents of .readonly\n",
"symlink_dot_symlink": ".dir/subdir/file\n",
"dot_template.tmpl": chezmoitest.JoinLines(
`key = {{ "value" }}`,
diff --git a/internal/cmd/testdata/scripts/archivetar.txt b/internal/cmd/testdata/scripts/archivetar.txt
index ff888a6965b..79ff7dc7437 100644
--- a/internal/cmd/testdata/scripts/archivetar.txt
+++ b/internal/cmd/testdata/scripts/archivetar.txt
@@ -21,5 +21,6 @@ cmp stdout golden/archive-tar
.executable
.file
.private
+.readonly
.symlink
.template
diff --git a/internal/cmd/testdata/scripts/archivezip.txt b/internal/cmd/testdata/scripts/archivezip.txt
index 36c49cba3f1..d1bbd84f8ad 100644
--- a/internal/cmd/testdata/scripts/archivezip.txt
+++ b/internal/cmd/testdata/scripts/archivezip.txt
@@ -17,6 +17,7 @@ Archive: archive.zip
testing: .executable OK
testing: .file OK
testing: .private OK
+ testing: .readonly OK
testing: .symlink OK
testing: .template OK
No errors detected in compressed data of archive.zip.
diff --git a/internal/cmd/testdata/scripts/dumpjson.txt b/internal/cmd/testdata/scripts/dumpjson.txt
index b7d237b3880..780fb0df76c 100644
--- a/internal/cmd/testdata/scripts/dumpjson.txt
+++ b/internal/cmd/testdata/scripts/dumpjson.txt
@@ -71,6 +71,12 @@ stderr 'not in source state'
"contents": "# contents of .private\n",
"perm": 384
},
+ ".readonly": {
+ "type": "file",
+ "name": ".readonly",
+ "contents": "# contents of .readonly\n",
+ "perm": 292
+ },
".symlink": {
"type": "symlink",
"name": ".symlink",
diff --git a/internal/cmd/testdata/scripts/dumpyaml.txt b/internal/cmd/testdata/scripts/dumpyaml.txt
index 87a7de3c1f1..75dda82158f 100644
--- a/internal/cmd/testdata/scripts/dumpyaml.txt
+++ b/internal/cmd/testdata/scripts/dumpyaml.txt
@@ -58,6 +58,12 @@ cmp stdout golden/dump-except-dirs.yaml
contents: |
# contents of .private
perm: 384
+.readonly:
+ type: file
+ name: .readonly
+ contents: |
+ # contents of .readonly
+ perm: 292
.symlink:
type: symlink
name: .symlink
@@ -110,6 +116,12 @@ cmp stdout golden/dump-except-dirs.yaml
contents: |
# contents of .private
perm: 384
+.readonly:
+ type: file
+ name: .readonly
+ contents: |
+ # contents of .readonly
+ perm: 292
.symlink:
type: symlink
name: .symlink
diff --git a/internal/cmd/testdata/scripts/managed.txt b/internal/cmd/testdata/scripts/managed.txt
index efded285075..28d2e5b38d2 100644
--- a/internal/cmd/testdata/scripts/managed.txt
+++ b/internal/cmd/testdata/scripts/managed.txt
@@ -39,6 +39,7 @@ cmp stdout golden/managed2
.executable
.file
.private
+.readonly
.remove
.symlink
.template
@@ -52,6 +53,7 @@ cmp stdout golden/managed2
.executable
.file
.private
+.readonly
.remove
.symlink
.template
@@ -66,6 +68,7 @@ cmp stdout golden/managed2
.executable
.file
.private
+.readonly
.remove
.template
-- golden/managed-symlinks --
diff --git a/internal/cmd/testdata/scripts/status.txt b/internal/cmd/testdata/scripts/status.txt
index 12ba4c5b755..148f0912a02 100644
--- a/internal/cmd/testdata/scripts/status.txt
+++ b/internal/cmd/testdata/scripts/status.txt
@@ -37,6 +37,7 @@ chezmoi status
A .executable
A .file
A .private
+ A .readonly
A .symlink
A .template
-- golden/status-except-dot-file --
@@ -48,6 +49,7 @@ chezmoi status
A .empty
A .executable
A .private
+ A .readonly
A .symlink
A .template
-- golden/status-modified-file --
|
chore
|
Add more tests for readonly_ attribute
|
febbe516ca6788f1a0c31bfaa2b1e4d8564d2feb
|
2021-01-22 22:57:53
|
dependabot[bot]
|
build(deps): bump github.com/stretchr/testify from 1.6.1 to 1.7.0
| false
|
diff --git a/go.mod b/go.mod
index 7a81feab2cf..842a8d8a45c 100644
--- a/go.mod
+++ b/go.mod
@@ -38,7 +38,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.7.1
github.com/stretchr/objx v0.3.0 // indirect
- github.com/stretchr/testify v1.6.1
+ github.com/stretchr/testify v1.7.0
github.com/twpayne/go-shell v0.3.0
github.com/twpayne/go-vfs v1.7.2
github.com/twpayne/go-vfsafero v1.0.0
diff --git a/go.sum b/go.sum
index 454eb5d6f46..e32f3d91b67 100644
--- a/go.sum
+++ b/go.sum
@@ -422,8 +422,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
|
build
|
bump github.com/stretchr/testify from 1.6.1 to 1.7.0
|
24cf35564573e088c9b86024ddae8e50b5648ecb
|
2024-03-11 01:33:50
|
dependabot[bot]
|
chore(deps): bump the python group in /assets with 2 updates
| false
|
diff --git a/assets/chezmoi.io/requirements.txt b/assets/chezmoi.io/requirements.txt
index b2e3d9d2c80..d0460b576c0 100644
--- a/assets/chezmoi.io/requirements.txt
+++ b/assets/chezmoi.io/requirements.txt
@@ -1,3 +1,3 @@
mkdocs==1.5.3
-mkdocs-material==9.5.12
+mkdocs-material==9.5.13
mkdocs-mermaid2-plugin==1.1.1
diff --git a/assets/requirements.dev.txt b/assets/requirements.dev.txt
index 470e282b510..92cf633071c 100644
--- a/assets/requirements.dev.txt
+++ b/assets/requirements.dev.txt
@@ -1 +1 @@
-ruff==0.3.0
+ruff==0.3.2
|
chore
|
bump the python group in /assets with 2 updates
|
d2895b52f2e1bba71ceb2101a995d17793fceb2f
|
2024-02-02 06:28:54
|
Tom Payne
|
chore: Remove outdated documentation on 1Password CLI v1
| false
|
diff --git a/assets/chezmoi.io/docs/reference/templates/1password-functions/index.md b/assets/chezmoi.io/docs/reference/templates/1password-functions/index.md
index 31624a3f981..59be71b94ec 100644
--- a/assets/chezmoi.io/docs/reference/templates/1password-functions/index.md
+++ b/assets/chezmoi.io/docs/reference/templates/1password-functions/index.md
@@ -44,8 +44,3 @@ CLI](https://developer.1password.com/docs/cli) (`op`).
`account1.1password.ca` will not be a valid lookup value, but `my@account1`,
`[email protected]`, `your@account1`, and
`[email protected]` would all be valid lookups.
-
-!!! warning
-
- Support for 1Password CLI v1 will be removed with the next major release of
- chezmoi.
|
chore
|
Remove outdated documentation on 1Password CLI v1
|
8a9164763bfd1f3c7fa716fa75bd501b9339ac1e
|
2022-02-06 22:35:46
|
Tom Payne
|
chore: Export NewGitHubClient function
| false
|
diff --git a/internal/cmds/execute-template/main.go b/internal/cmds/execute-template/main.go
index 5a11b0ca4f4..cabba9e0b20 100644
--- a/internal/cmds/execute-template/main.go
+++ b/internal/cmds/execute-template/main.go
@@ -2,15 +2,20 @@ package main
import (
"bytes"
+ "context"
"flag"
"fmt"
+ "net/http"
"os"
"path"
+ "strings"
"text/template"
"github.com/Masterminds/sprig/v3"
"github.com/google/renameio/v2/maybe"
"gopkg.in/yaml.v3"
+
+ "github.com/twpayne/chezmoi/v2/pkg/chezmoi"
)
var (
@@ -18,6 +23,24 @@ var (
outputFilename = flag.String("output", "", "output filename")
)
+func gitHubLatestRelease(userRepo string) string {
+ user, repo, ok := chezmoi.CutString(userRepo, "/")
+ if !ok {
+ panic(fmt.Errorf("%s: not a user/repo", userRepo))
+ }
+
+ ctx := context.Background()
+
+ client := chezmoi.NewGitHubClient(ctx, http.DefaultClient)
+
+ rr, _, err := client.Repositories.GetLatestRelease(ctx, user, repo)
+ if err != nil {
+ panic(err)
+ }
+
+ return strings.TrimPrefix(rr.GetName(), "v")
+}
+
func run() error {
flag.Parse()
@@ -38,7 +61,9 @@ func run() error {
templateName := path.Base(flag.Arg(0))
buffer := &bytes.Buffer{}
- tmpl, err := template.New(templateName).Funcs(sprig.TxtFuncMap()).ParseFiles(flag.Args()...)
+ funcMap := sprig.TxtFuncMap()
+ funcMap["gitHubLatestRelease"] = gitHubLatestRelease
+ tmpl, err := template.New(templateName).Funcs(funcMap).ParseFiles(flag.Args()...)
if err != nil {
return err
}
diff --git a/pkg/chezmoi/github.go b/pkg/chezmoi/github.go
new file mode 100644
index 00000000000..dfd360ceb40
--- /dev/null
+++ b/pkg/chezmoi/github.go
@@ -0,0 +1,31 @@
+package chezmoi
+
+import (
+ "context"
+ "net/http"
+ "os"
+
+ "github.com/google/go-github/v42/github"
+ "golang.org/x/oauth2"
+)
+
+// NewGitHubClient returns a new github.Client configured with an access token
+// and a http client, if available.
+func NewGitHubClient(ctx context.Context, httpClient *http.Client) *github.Client {
+ for _, key := range []string{
+ "CHEZMOI_GITHUB_ACCESS_TOKEN",
+ "CHEZMOI_GITHUB_TOKEN",
+ "GITHUB_ACCESS_TOKEN",
+ "GITHUB_TOKEN",
+ } {
+ if accessToken := os.Getenv(key); accessToken != "" {
+ httpClient = oauth2.NewClient(
+ context.WithValue(ctx, oauth2.HTTPClient, httpClient),
+ oauth2.StaticTokenSource(&oauth2.Token{
+ AccessToken: accessToken,
+ }))
+ break
+ }
+ }
+ return github.NewClient(httpClient)
+}
diff --git a/pkg/cmd/githubtemplatefuncs.go b/pkg/cmd/githubtemplatefuncs.go
index 7f9f7e60fce..6ea64084cd2 100644
--- a/pkg/cmd/githubtemplatefuncs.go
+++ b/pkg/cmd/githubtemplatefuncs.go
@@ -27,7 +27,7 @@ func (c *Config) gitHubKeysTemplateFunc(user string) []*github.Key {
raiseTemplateError(err)
return nil
}
- gitHubClient := newGitHubClient(ctx, httpClient)
+ gitHubClient := chezmoi.NewGitHubClient(ctx, httpClient)
var allKeys []*github.Key
opts := &github.ListOptions{
@@ -72,7 +72,7 @@ func (c *Config) gitHubLatestReleaseTemplateFunc(userRepo string) *github.Reposi
raiseTemplateError(err)
return nil
}
- gitHubClient := newGitHubClient(ctx, httpClient)
+ gitHubClient := chezmoi.NewGitHubClient(ctx, httpClient)
release, _, err := gitHubClient.Repositories.GetLatestRelease(ctx, user, repo)
if err != nil {
diff --git a/pkg/cmd/upgradecmd.go b/pkg/cmd/upgradecmd.go
index 38b034a44f1..d23e3f44c09 100644
--- a/pkg/cmd/upgradecmd.go
+++ b/pkg/cmd/upgradecmd.go
@@ -120,7 +120,7 @@ func (c *Config) runUpgradeCmd(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- client := newGitHubClient(ctx, httpClient)
+ client := chezmoi.NewGitHubClient(ctx, httpClient)
// Get the latest release.
rr, _, err := client.Repositories.GetLatestRelease(ctx, c.upgrade.owner, c.upgrade.repo)
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
index 3f080d377b2..532e1c31703 100644
--- a/pkg/cmd/util.go
+++ b/pkg/cmd/util.go
@@ -1,18 +1,13 @@
package cmd
import (
- "context"
"fmt"
- "net/http"
- "os"
"regexp"
"strconv"
"strings"
"unicode"
"github.com/coreos/go-semver/semver"
- "github.com/google/go-github/v42/github"
- "golang.org/x/oauth2"
)
var (
@@ -90,27 +85,6 @@ func firstNonEmptyString(ss ...string) string {
return ""
}
-// newGitHubClient returns a new github.Client configured with an access token
-// and a http client, if available.
-func newGitHubClient(ctx context.Context, httpClient *http.Client) *github.Client {
- for _, key := range []string{
- "CHEZMOI_GITHUB_ACCESS_TOKEN",
- "CHEZMOI_GITHUB_TOKEN",
- "GITHUB_ACCESS_TOKEN",
- "GITHUB_TOKEN",
- } {
- if accessToken := os.Getenv(key); accessToken != "" {
- httpClient = oauth2.NewClient(
- context.WithValue(ctx, oauth2.HTTPClient, httpClient),
- oauth2.StaticTokenSource(&oauth2.Token{
- AccessToken: accessToken,
- }))
- break
- }
- }
- return github.NewClient(httpClient)
-}
-
// isWellKnownAbbreviation returns true if word is a well known abbreviation.
func isWellKnownAbbreviation(word string) bool {
_, ok := wellKnownAbbreviations[word]
|
chore
|
Export NewGitHubClient function
|
96463397eb7c2116e6ad6f93cf359171d164977c
|
2022-11-06 01:08:56
|
Tom Payne
|
feat: Add dump-config command
| false
|
diff --git a/assets/chezmoi.io/docs/reference/commands/dump-config.md b/assets/chezmoi.io/docs/reference/commands/dump-config.md
new file mode 100644
index 00000000000..89a3fbe09ce
--- /dev/null
+++ b/assets/chezmoi.io/docs/reference/commands/dump-config.md
@@ -0,0 +1,9 @@
+# `dump-config`
+
+Dump the configuration.
+
+!!! example
+
+ ```console
+ $ chezmoi dump-config
+ ```
diff --git a/assets/chezmoi.io/mkdocs.yml b/assets/chezmoi.io/mkdocs.yml
index bda59516d4b..0023fd3d547 100644
--- a/assets/chezmoi.io/mkdocs.yml
+++ b/assets/chezmoi.io/mkdocs.yml
@@ -135,6 +135,7 @@ nav:
- diff: reference/commands/diff.md
- doctor: reference/commands/doctor.md
- dump: reference/commands/dump.md
+ - dump-config: reference/commands/dump-config.md
- edit: reference/commands/edit.md
- edit-config: reference/commands/edit-config.md
- encrypt: reference/commands/encrypt.md
diff --git a/pkg/chezmoi/ageencryption.go b/pkg/chezmoi/ageencryption.go
index 12949ef6e4d..09ce5eb60d3 100644
--- a/pkg/chezmoi/ageencryption.go
+++ b/pkg/chezmoi/ageencryption.go
@@ -20,19 +20,19 @@ import (
// An AgeEncryption uses age for encryption and decryption. See
// https://age-encryption.org.
type AgeEncryption struct {
- UseBuiltin bool
- BaseSystem System
- Command string
- Args []string
- Identity AbsPath
- Identities []AbsPath
- Passphrase bool
- Recipient string
- Recipients []string
- RecipientsFile AbsPath
- RecipientsFiles []AbsPath
- Suffix string
- Symmetric bool
+ UseBuiltin bool `json:"useBuiltin" mapstructure:"useBuiltin" yaml:"useBuiltin"`
+ BaseSystem System `json:"-" mapstructure:"-" yaml:"-"`
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
+ Identity AbsPath `json:"identity" mapstructure:"identity" yaml:"identity"`
+ Identities []AbsPath `json:"identities" mapstructure:"identities" yaml:"identities"`
+ Passphrase bool `json:"passphrase" mapstructure:"passphrase" yaml:"passphrase"`
+ Recipient string `json:"recipient" mapstructure:"recipient" yaml:"recipient"`
+ Recipients []string `json:"recipients" mapstructure:"recipients" yaml:"recipients"`
+ RecipientsFile AbsPath `json:"recipientsFile" mapstructure:"recipientsFile" yaml:"recipientsFile"`
+ RecipientsFiles []AbsPath `json:"recipientsFiles" mapstructure:"recipientsFiles" yaml:"recipientsFiles"`
+ Suffix string `json:"suffix" mapstructure:"suffix" yaml:"suffix"`
+ Symmetric bool `json:"symmetric" mapstructure:"symmetric" yaml:"symmetric"`
}
// Decrypt implements Encryption.Decrypt.
diff --git a/pkg/chezmoi/entrytypeset.go b/pkg/chezmoi/entrytypeset.go
index ee5026501b5..031df6ec155 100644
--- a/pkg/chezmoi/entrytypeset.go
+++ b/pkg/chezmoi/entrytypeset.go
@@ -247,6 +247,38 @@ func (s *EntryTypeSet) ContainsTargetStateEntry(targetStateEntry TargetStateEntr
}
}
+// MarshalJSON implements encoding/json.Marshaler.MarshalJSON.
+func (s *EntryTypeSet) MarshalJSON() ([]byte, error) {
+ switch s.bits {
+ case EntryTypesAll:
+ return []byte(`["all"]`), nil
+ case EntryTypesNone:
+ return []byte("[]"), nil
+ default:
+ var elements []string
+ for _, key := range entryTypeStrings {
+ if bit := entryTypeBits[key]; s.bits&bit == bit {
+ elements = append(elements, `"`+key+`"`)
+ }
+ }
+ return []byte("[" + strings.Join(elements, ",") + "]"), nil
+ }
+}
+
+// MarshalYAML implements gopkg.in/yaml.v3.Marshaler.
+func (s *EntryTypeSet) MarshalYAML() (any, error) {
+ if s.bits == EntryTypesAll {
+ return []string{"all"}, nil
+ }
+ var result []string
+ for _, key := range entryTypeStrings {
+ if bit := entryTypeBits[key]; s.bits&bit == bit {
+ result = append(result, key)
+ }
+ }
+ return result, nil
+}
+
// Set implements github.com/spf13/pflag.Value.Set.
func (s *EntryTypeSet) Set(str string) error {
if str == "none" {
diff --git a/pkg/chezmoi/gpgencryption.go b/pkg/chezmoi/gpgencryption.go
index f15e2293249..874ce03dcbb 100644
--- a/pkg/chezmoi/gpgencryption.go
+++ b/pkg/chezmoi/gpgencryption.go
@@ -12,12 +12,12 @@ import (
// A GPGEncryption uses gpg for encryption and decryption. See https://gnupg.org/.
type GPGEncryption struct {
- Command string
- Args []string
- Recipient string
- Recipients []string
- Symmetric bool
- Suffix string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
+ Recipient string `json:"recipient" mapstructure:"recipient" yaml:"recipient"`
+ Recipients []string `json:"recipients" mapstructure:"recipients" yaml:"recipients"`
+ Symmetric bool `json:"symmetric" mapstructure:"symmetric" yaml:"symmetric"`
+ Suffix string `json:"suffix" mapstructure:"suffix" yaml:"suffix"`
}
// Decrypt implements Encryption.Decrypt.
diff --git a/pkg/cmd/addcmd.go b/pkg/cmd/addcmd.go
index 94d0ba12371..d2130141a48 100644
--- a/pkg/cmd/addcmd.go
+++ b/pkg/cmd/addcmd.go
@@ -9,7 +9,7 @@ import (
)
type addCmdConfig struct {
- TemplateSymlinks bool `mapstructure:"templateSymlinks"`
+ TemplateSymlinks bool `json:"templateSymlinks" mapstructure:"templateSymlinks" yaml:"templateSymlinks"`
autoTemplate bool
create bool
encrypt bool
diff --git a/pkg/cmd/autobool.go b/pkg/cmd/autobool.go
index eb87eadc77c..2862748e88a 100644
--- a/pkg/cmd/autobool.go
+++ b/pkg/cmd/autobool.go
@@ -24,6 +24,26 @@ var autoBoolFlagCompletionFunc = chezmoi.FlagCompletionFunc([]string{
"auto", "AUTO", "Auto",
})
+// MarshalJSON implements encoding/json.Marshaler.MarshalJSON.
+func (b autoBool) MarshalJSON() ([]byte, error) {
+ switch {
+ case b.auto:
+ return []byte(`"auto"`), nil
+ case b.value:
+ return []byte(`true`), nil
+ default:
+ return []byte(`false`), nil
+ }
+}
+
+// MarshalYAML implements gopkg.in/yaml.v3.Marshaler.
+func (b autoBool) MarshalYAML() (any, error) {
+ if b.auto {
+ return "auto", nil
+ }
+ return b.value, nil
+}
+
// Set implements github.com/spf13/pflag.Value.Set.
func (b *autoBool) Set(s string) error {
if strings.ToLower(s) == "auto" {
diff --git a/pkg/cmd/awssecretsmanagertemplatefuncs.go b/pkg/cmd/awssecretsmanagertemplatefuncs.go
index 47cef512d22..1bd2c061179 100644
--- a/pkg/cmd/awssecretsmanagertemplatefuncs.go
+++ b/pkg/cmd/awssecretsmanagertemplatefuncs.go
@@ -11,9 +11,8 @@ import (
)
type awsSecretsManagerConfig struct {
- Region string
- Profile string
-
+ Region string `json:"region" mapstructure:"region" yaml:"region"`
+ Profile string `json:"profile" mapstructure:"profile" yaml:"profile"`
svc *secretsmanager.Client
cache map[string]string
jsonCache map[string]map[string]any
diff --git a/pkg/cmd/bitwardentemplatefuncs.go b/pkg/cmd/bitwardentemplatefuncs.go
index 4ce4536f2f1..430db9ebae5 100644
--- a/pkg/cmd/bitwardentemplatefuncs.go
+++ b/pkg/cmd/bitwardentemplatefuncs.go
@@ -10,7 +10,7 @@ import (
)
type bitwardenConfig struct {
- Command string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
outputCache map[string][]byte
}
diff --git a/pkg/cmd/cdcmd.go b/pkg/cmd/cdcmd.go
index fa5e8340181..456f760fe5c 100644
--- a/pkg/cmd/cdcmd.go
+++ b/pkg/cmd/cdcmd.go
@@ -7,8 +7,8 @@ import (
)
type cdCmdConfig struct {
- Command string `mapstructure:"command"`
- Args []string `mapstructure:"args"`
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
}
func (c *Config) newCDCmd() *cobra.Command {
diff --git a/pkg/cmd/completioncmd.go b/pkg/cmd/completioncmd.go
index 0b2c67f8899..8eec15b43ad 100644
--- a/pkg/cmd/completioncmd.go
+++ b/pkg/cmd/completioncmd.go
@@ -8,7 +8,7 @@ import (
)
type completionCmdConfig struct {
- Custom bool `mapstructure:"custom"`
+ Custom bool `json:"custom" mapstructure:"custom" yaml:"custom"`
}
func (c *Config) newCompletionCmd() *cobra.Command {
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
index 7ae9fc7d649..f8797196142 100644
--- a/pkg/cmd/config.go
+++ b/pkg/cmd/config.go
@@ -66,68 +66,68 @@ type purgeOptions struct {
}
type templateConfig struct {
- Options []string `mapstructure:"options"`
+ Options []string `json:"options" mapstructure:"options" yaml:"options"`
}
type warningsConfig struct {
- ConfigFileTemplateHasChanged bool `mapstructure:"configFileTemplateHasChanged"`
+ ConfigFileTemplateHasChanged bool `json:"configFileTemplateHasChanged" mapstructure:"configFileTemplateHasChanged" yaml:"configFileTemplateHasChanged"` //nolint:lll
}
// ConfigFile contains all data settable in the config file.
type ConfigFile struct {
// Global configuration.
- CacheDirAbsPath chezmoi.AbsPath `mapstructure:"cacheDir"`
- Color autoBool `mapstructure:"color"`
- Data map[string]any `mapstructure:"data"`
- Format writeDataFormat `mapstructure:"format"`
- DestDirAbsPath chezmoi.AbsPath `mapstructure:"destDir"`
- Interpreters map[string]*chezmoi.Interpreter `mapstructure:"interpreters"`
- Mode chezmoi.Mode `mapstructure:"mode"`
- Pager string `mapstructure:"pager"`
- PINEntry pinEntryConfig `mapstructure:"pinentry"`
- Progress bool `mapstructure:"progress"`
- Safe bool `mapstructure:"safe"`
- ScriptEnv map[string]string `mapstructure:"scriptEnv"`
- ScriptTempDir chezmoi.AbsPath `mapstructure:"scriptTempDir"`
- SourceDirAbsPath chezmoi.AbsPath `mapstructure:"sourceDir"`
- Template templateConfig `mapstructure:"template"`
- TextConv textConv `mapstructure:"textConv"`
- Umask fs.FileMode `mapstructure:"umask"`
- UseBuiltinAge autoBool `mapstructure:"useBuiltinAge"`
- UseBuiltinGit autoBool `mapstructure:"useBuiltinGit"`
- Verbose bool `mapstructure:"verbose"`
- Warnings warningsConfig `mapstructure:"warnings"`
- WorkingTreeAbsPath chezmoi.AbsPath `mapstructure:"workingTree"`
+ CacheDirAbsPath chezmoi.AbsPath `json:"cacheDir" mapstructure:"cacheDir" yaml:"cacheDir"`
+ Color autoBool `json:"color" mapstructure:"color" yaml:"color"`
+ Data map[string]any `json:"data" mapstructure:"data" yaml:"data"`
+ Format writeDataFormat `json:"format" mapstructure:"format" yaml:"format"`
+ DestDirAbsPath chezmoi.AbsPath `json:"destDir" mapstructure:"destDir" yaml:"destDir"`
+ Interpreters map[string]*chezmoi.Interpreter `json:"interpreters" mapstructure:"interpreters" yaml:"interpreters"` //nolint:lll
+ Mode chezmoi.Mode `json:"mode" mapstructure:"mode" yaml:"mode"`
+ Pager string `json:"pager" mapstructure:"pager" yaml:"pager"`
+ PINEntry pinEntryConfig `json:"pinentry" mapstructure:"pinentry" yaml:"pinentry"`
+ Progress bool `json:"progress" mapstructure:"progress" yaml:"progress"`
+ Safe bool `json:"safe" mapstructure:"safe" yaml:"safe"`
+ ScriptEnv map[string]string `json:"scriptEnv" mapstructure:"scriptEnv" yaml:"scriptEnv"`
+ ScriptTempDir chezmoi.AbsPath `json:"scriptTempDir" mapstructure:"scriptTempDir" yaml:"scriptTempDir"` //nolint:lll
+ SourceDirAbsPath chezmoi.AbsPath `json:"sourceDir" mapstructure:"sourceDir" yaml:"sourceDir"`
+ Template templateConfig `json:"template" mapstructure:"template" yaml:"template"`
+ TextConv textConv `json:"textConv" mapstructure:"textConv" yaml:"textConv"`
+ Umask fs.FileMode `json:"umask" mapstructure:"umask" yaml:"umask"`
+ UseBuiltinAge autoBool `json:"useBuiltinAge" mapstructure:"useBuiltinAge" yaml:"useBuiltinAge"` //nolint:lll
+ UseBuiltinGit autoBool `json:"useBuiltinGit" mapstructure:"useBuiltinGit" yaml:"useBuiltinGit"` //nolint:lll
+ Verbose bool `json:"verbose" mapstructure:"verbose" yaml:"verbose"`
+ Warnings warningsConfig `json:"warnings" mapstructure:"warnings" yaml:"warnings"`
+ WorkingTreeAbsPath chezmoi.AbsPath `json:"workingTree" mapstructure:"workingTree" yaml:"workingTree"`
// Password manager configurations.
- AWSSecretsManager awsSecretsManagerConfig `mapstructure:"awsSecretsManager"`
- Bitwarden bitwardenConfig `mapstructure:"bitwarden"`
- Gopass gopassConfig `mapstructure:"gopass"`
- Keepassxc keepassxcConfig `mapstructure:"keepassxc"`
- Keeper keeperConfig `mapstructure:"keeper"`
- Lastpass lastpassConfig `mapstructure:"lastpass"`
- Onepassword onepasswordConfig `mapstructure:"onepassword"`
- Pass passConfig `mapstructure:"pass"`
- Passhole passholeConfig `mapstructure:"passhole"`
- Secret secretConfig `mapstructure:"secret"`
- Vault vaultConfig `mapstructure:"vault"`
+ AWSSecretsManager awsSecretsManagerConfig `json:"awsSecretsManager" mapstructure:"awsSecretsManager" yaml:"awsSecretsManager"` //nolint:lll
+ Bitwarden bitwardenConfig `json:"bitwarden" mapstructure:"bitwarden" yaml:"bitwarden"`
+ Gopass gopassConfig `json:"gopass" mapstructure:"gopass" yaml:"gopass"`
+ Keepassxc keepassxcConfig `json:"keepassxc" mapstructure:"keepassxc" yaml:"keepassxc"`
+ Keeper keeperConfig `json:"keeper" mapstructure:"keeper" yaml:"keeper"`
+ Lastpass lastpassConfig `json:"lastpass" mapstructure:"lastpass" yaml:"lastpass"`
+ Onepassword onepasswordConfig `json:"onepassword" mapstructure:"onepassword" yaml:"onepassword"`
+ Pass passConfig `json:"pass" mapstructure:"pass" yaml:"pass"`
+ Passhole passholeConfig `json:"passhole" mapstructure:"passhole" yaml:"passhole"`
+ Secret secretConfig `json:"secret" mapstructure:"secret" yaml:"secret"`
+ Vault vaultConfig `json:"vault" mapstructure:"vault" yaml:"vault"`
// Encryption configurations.
- Encryption string `json:"encryption" mapstructure:"encryption"`
- Age chezmoi.AgeEncryption `json:"age" mapstructure:"age"`
- GPG chezmoi.GPGEncryption `json:"gpg" mapstructure:"gpg"`
+ Encryption string `json:"encryption" mapstructure:"encryption" yaml:"encryption"`
+ Age chezmoi.AgeEncryption `json:"age" mapstructure:"age" yaml:"age"`
+ GPG chezmoi.GPGEncryption `json:"gpg" mapstructure:"gpg" yaml:"gpg"`
// Command configurations.
- Add addCmdConfig `mapstructure:"add"`
- CD cdCmdConfig `mapstructure:"cd"`
- Completion completionCmdConfig `mapstructure:"completion"`
- Diff diffCmdConfig `mapstructure:"diff"`
- Edit editCmdConfig `mapstructure:"edit"`
- Git gitCmdConfig `mapstructure:"git"`
- Merge mergeCmdConfig `mapstructure:"merge"`
- Status statusCmdConfig `mapstructure:"status"`
- Update updateCmdConfig `mapstructure:"update"`
- Verify verifyCmdConfig `mapstructure:"verify"`
+ Add addCmdConfig `json:"add" mapstructure:"add" yaml:"add"`
+ CD cdCmdConfig `json:"cd" mapstructure:"cd" yaml:"cd"`
+ Completion completionCmdConfig `json:"completion" mapstructure:"completion" yaml:"completion"`
+ Diff diffCmdConfig `json:"diff" mapstructure:"diff" yaml:"diff"`
+ Edit editCmdConfig `json:"edit" mapstructure:"edit" yaml:"edit"`
+ Git gitCmdConfig `json:"git" mapstructure:"git" yaml:"git"`
+ Merge mergeCmdConfig `json:"merge" mapstructure:"merge" yaml:"merge"`
+ Status statusCmdConfig `json:"status" mapstructure:"status" yaml:"status"`
+ Update updateCmdConfig `json:"update" mapstructure:"update" yaml:"update"`
+ Verify verifyCmdConfig `json:"verify" mapstructure:"verify" yaml:"verify"`
}
// A Config represents a configuration.
@@ -1404,6 +1404,7 @@ func (c *Config) newRootCmd() (*cobra.Command, error) {
c.newDiffCmd(),
c.newDoctorCmd(),
c.newDumpCmd(),
+ c.newDumpConfigCmd(),
c.newEditCmd(),
c.newEditConfigCmd(),
c.newEncryptCommand(),
diff --git a/pkg/cmd/diffcmd.go b/pkg/cmd/diffcmd.go
index fc2445c4acc..a51136174c1 100644
--- a/pkg/cmd/diffcmd.go
+++ b/pkg/cmd/diffcmd.go
@@ -9,12 +9,12 @@ import (
)
type diffCmdConfig struct {
- Command string `mapstructure:"command"`
- Args []string `mapstructure:"args"`
- Exclude *chezmoi.EntryTypeSet `mapstructure:"exclude"`
- Pager string `mapstructure:"pager"`
- Reverse bool `mapstructure:"reverse"`
- ScriptContents bool `mapstructure:"scriptContents"`
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
+ Exclude *chezmoi.EntryTypeSet `json:"exclude" mapstructure:"exclude" yaml:"exclude"`
+ Pager string `json:"pager" mapstructure:"pager" yaml:"pager"`
+ Reverse bool `json:"reverse" mapstructure:"reverse" yaml:"reverse"`
+ ScriptContents bool `json:"scriptContents" mapstructure:"scriptContents" yaml:"scriptContents"`
include *chezmoi.EntryTypeSet
init bool
recursive bool
diff --git a/pkg/cmd/dumpconfigcmd.go b/pkg/cmd/dumpconfigcmd.go
new file mode 100644
index 00000000000..09202fef301
--- /dev/null
+++ b/pkg/cmd/dumpconfigcmd.go
@@ -0,0 +1,26 @@
+package cmd
+
+import "github.com/spf13/cobra"
+
+func (c *Config) newDumpConfigCmd() *cobra.Command {
+ dumpConfigCmd := &cobra.Command{
+ Use: "dump-config",
+ Short: "Dump the configuration values",
+ Long: mustLongHelp("dump-config"),
+ Example: example("dump-config"),
+ Args: cobra.NoArgs,
+ RunE: c.runDumpConfigCmd,
+ Annotations: map[string]string{
+ doesNotRequireValidConfig: "true",
+ },
+ }
+
+ flags := dumpConfigCmd.Flags()
+ flags.VarP(&c.Format, "format", "f", "Output format")
+
+ return dumpConfigCmd
+}
+
+func (c *Config) runDumpConfigCmd(cmd *cobra.Command, args []string) error {
+ return c.marshal(c.Format, c)
+}
diff --git a/pkg/cmd/editcmd.go b/pkg/cmd/editcmd.go
index d3dc3b946a6..83be593d1fb 100644
--- a/pkg/cmd/editcmd.go
+++ b/pkg/cmd/editcmd.go
@@ -12,12 +12,12 @@ import (
)
type editCmdConfig struct {
- Command string `mapstructure:"command"`
- Args []string `mapstructure:"args"`
- Hardlink bool `mapstructure:"hardlink"`
- MinDuration time.Duration `mapstructure:"minDuration"`
- Watch bool `mapstructure:"watch"`
- Apply bool `mapstructure:"apply"`
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
+ Hardlink bool `json:"hardlink" mapstructure:"hardlink" yaml:"hardlink"`
+ MinDuration time.Duration `json:"minDuration" mapstructure:"minDuration" yaml:"minDuration"`
+ Watch bool `json:"watch" mapstructure:"watch" yaml:"watch"`
+ Apply bool `json:"apply" mapstructure:"apply" yaml:"apply"`
filter *chezmoi.EntryTypeFilter
init bool
}
diff --git a/pkg/cmd/gitcmd.go b/pkg/cmd/gitcmd.go
index e12a471f6ff..78b635fe42d 100644
--- a/pkg/cmd/gitcmd.go
+++ b/pkg/cmd/gitcmd.go
@@ -5,10 +5,10 @@ import (
)
type gitCmdConfig struct {
- Command string `mapstructure:"command"`
- AutoAdd bool `mapstructure:"autoadd"`
- AutoCommit bool `mapstructure:"autocommit"`
- AutoPush bool `mapstructure:"autopush"`
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ AutoAdd bool `json:"autoadd" mapstructure:"autoadd" yaml:"autoadd"`
+ AutoCommit bool `json:"autocommit" mapstructure:"autocommit" yaml:"autocommit"`
+ AutoPush bool `json:"autopush" mapstructure:"autopush" yaml:"autopush"`
}
func (c *Config) newGitCmd() *cobra.Command {
diff --git a/pkg/cmd/gopasstemplatefuncs.go b/pkg/cmd/gopasstemplatefuncs.go
index 8582bdc266d..244caed7b76 100644
--- a/pkg/cmd/gopasstemplatefuncs.go
+++ b/pkg/cmd/gopasstemplatefuncs.go
@@ -21,7 +21,7 @@ var (
)
type gopassConfig struct {
- Command string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
versionOK bool
cache map[string]string
rawCache map[string][]byte
diff --git a/pkg/cmd/keepassxctemplatefuncs.go b/pkg/cmd/keepassxctemplatefuncs.go
index 9be1a854e72..feb7a460450 100644
--- a/pkg/cmd/keepassxctemplatefuncs.go
+++ b/pkg/cmd/keepassxctemplatefuncs.go
@@ -21,9 +21,9 @@ type keepassxcAttributeCacheKey struct {
}
type keepassxcConfig struct {
- Command string
- Database chezmoi.AbsPath
- Args []string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Database chezmoi.AbsPath `json:"database" mapstructure:"database" yaml:"database"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
version *semver.Version
cache map[string]map[string]string
attachmentCache map[string]map[string]string
diff --git a/pkg/cmd/keepertemplatefuncs.go b/pkg/cmd/keepertemplatefuncs.go
index 09ba2471746..8939061dfca 100644
--- a/pkg/cmd/keepertemplatefuncs.go
+++ b/pkg/cmd/keepertemplatefuncs.go
@@ -11,8 +11,8 @@ import (
)
type keeperConfig struct {
- Command string
- Args []string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
outputCache map[string][]byte
}
diff --git a/pkg/cmd/lastpasstemplatefuncs.go b/pkg/cmd/lastpasstemplatefuncs.go
index a396188200c..14e216d1b4e 100644
--- a/pkg/cmd/lastpasstemplatefuncs.go
+++ b/pkg/cmd/lastpasstemplatefuncs.go
@@ -27,7 +27,7 @@ var (
)
type lastpassConfig struct {
- Command string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
versionOK bool
cache map[string][]map[string]any
}
diff --git a/pkg/cmd/mergecmd.go b/pkg/cmd/mergecmd.go
index 2cd0ab3b986..b6e0279d7dc 100644
--- a/pkg/cmd/mergecmd.go
+++ b/pkg/cmd/mergecmd.go
@@ -14,8 +14,8 @@ import (
)
type mergeCmdConfig struct {
- Command string `mapstructure:"command"`
- Args []string `mapstructure:"args"`
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
}
func (c *Config) newMergeCmd() *cobra.Command {
diff --git a/pkg/cmd/onepasswordtemplatefuncs.go b/pkg/cmd/onepasswordtemplatefuncs.go
index f86b75b1269..0e7d57a239e 100644
--- a/pkg/cmd/onepasswordtemplatefuncs.go
+++ b/pkg/cmd/onepasswordtemplatefuncs.go
@@ -31,8 +31,8 @@ type onepasswordAccount struct {
}
type onepasswordConfig struct {
- Command string
- Prompt bool
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Prompt bool `json:"prompt" mapstructure:"prompt" yaml:"prompt"`
version *semver.Version
versionErr error
environFunc func() []string
diff --git a/pkg/cmd/passholetemplatefuncs.go b/pkg/cmd/passholetemplatefuncs.go
index 4813b9f8a8c..120216acdd7 100644
--- a/pkg/cmd/passholetemplatefuncs.go
+++ b/pkg/cmd/passholetemplatefuncs.go
@@ -17,9 +17,9 @@ type passholeCacheKey struct {
}
type passholeConfig struct {
- Command string
- Args []string
- Prompt bool
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
+ Prompt bool `json:"prompt" mapstructure:"prompt" yaml:"prompt"`
cache map[passholeCacheKey]string
password string
}
diff --git a/pkg/cmd/passtemplatefuncs.go b/pkg/cmd/passtemplatefuncs.go
index 6f6eeff4c6c..d518ee21fe8 100644
--- a/pkg/cmd/passtemplatefuncs.go
+++ b/pkg/cmd/passtemplatefuncs.go
@@ -9,7 +9,7 @@ import (
)
type passConfig struct {
- Command string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
cache map[string][]byte
}
diff --git a/pkg/cmd/pinentry.go b/pkg/cmd/pinentry.go
index d6db0dfbf1c..6420ec8211c 100644
--- a/pkg/cmd/pinentry.go
+++ b/pkg/cmd/pinentry.go
@@ -6,9 +6,9 @@ import (
)
type pinEntryConfig struct {
- Command string `mapstructure:"command"`
- Args []string `mapstructure:"args"`
- Options []string `mapstructure:"options"`
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
+ Options []string `json:"options" mapstructure:"options" yaml:"options"`
}
var pinEntryDefaultOptions = []string{
diff --git a/pkg/cmd/secrettemplatefuncs.go b/pkg/cmd/secrettemplatefuncs.go
index 6feae375b38..a1afcfa7f34 100644
--- a/pkg/cmd/secrettemplatefuncs.go
+++ b/pkg/cmd/secrettemplatefuncs.go
@@ -11,8 +11,8 @@ import (
)
type secretConfig struct {
- Command string
- Args []string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
+ Args []string `json:"args" mapstructure:"args" yaml:"args"`
cache map[string][]byte
}
diff --git a/pkg/cmd/statuscmd.go b/pkg/cmd/statuscmd.go
index 12d85fa017e..fb3cc5fa177 100644
--- a/pkg/cmd/statuscmd.go
+++ b/pkg/cmd/statuscmd.go
@@ -10,7 +10,7 @@ import (
)
type statusCmdConfig struct {
- Exclude *chezmoi.EntryTypeSet `mapstructure:"exclude"`
+ Exclude *chezmoi.EntryTypeSet `json:"exclude" mapstructure:"exclude" yaml:"exclude"`
include *chezmoi.EntryTypeSet
init bool
recursive bool
diff --git a/pkg/cmd/testdata/scripts/dumpconfig.txtar b/pkg/cmd/testdata/scripts/dumpconfig.txtar
new file mode 100644
index 00000000000..2997fda449c
--- /dev/null
+++ b/pkg/cmd/testdata/scripts/dumpconfig.txtar
@@ -0,0 +1,7 @@
+# test that chezmoi dump-config dumps the configuration in the given format
+exec chezmoi dump-config --format=yaml
+stdout 'key: value'
+
+-- home/user/.config/chezmoi/chezmoi.toml --
+[data]
+ key = "value"
diff --git a/pkg/cmd/updatecmd.go b/pkg/cmd/updatecmd.go
index 66ebf00b0ea..02c4585ced4 100644
--- a/pkg/cmd/updatecmd.go
+++ b/pkg/cmd/updatecmd.go
@@ -10,7 +10,7 @@ import (
)
type updateCmdConfig struct {
- RecurseSubmodules bool
+ RecurseSubmodules bool `json:"recurseSubmodules" mapstructure:"recurseSubmodules" yaml:"recurseSubmodules"`
apply bool
filter *chezmoi.EntryTypeFilter
init bool
diff --git a/pkg/cmd/vaulttemplatefuncs.go b/pkg/cmd/vaulttemplatefuncs.go
index 460c69129b0..51bc1308a86 100644
--- a/pkg/cmd/vaulttemplatefuncs.go
+++ b/pkg/cmd/vaulttemplatefuncs.go
@@ -9,7 +9,7 @@ import (
)
type vaultConfig struct {
- Command string
+ Command string `json:"command" mapstructure:"command" yaml:"command"`
cache map[string]any
}
diff --git a/pkg/cmd/verifycmd.go b/pkg/cmd/verifycmd.go
index 053eecdcfcd..fc6a0d60e14 100644
--- a/pkg/cmd/verifycmd.go
+++ b/pkg/cmd/verifycmd.go
@@ -7,7 +7,7 @@ import (
)
type verifyCmdConfig struct {
- Exclude *chezmoi.EntryTypeSet `mapstructure:"exclude"`
+ Exclude *chezmoi.EntryTypeSet `json:"exclude" mapstructure:"exclude" yaml:"exclude"`
include *chezmoi.EntryTypeSet
init bool
recursive bool
|
feat
|
Add dump-config command
|
82caee1c892a0810dc580a381c8b2debea69cc51
|
2024-06-11 00:58:41
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/go.mod b/go.mod
index a34529295ae..c14abd6aea5 100644
--- a/go.mod
+++ b/go.mod
@@ -12,9 +12,9 @@ require (
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2
github.com/Shopify/ejson v1.5.2
github.com/alecthomas/assert/v2 v2.10.0
- github.com/aws/aws-sdk-go-v2 v1.27.0
- github.com/aws/aws-sdk-go-v2/config v1.27.16
- github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.1
+ github.com/aws/aws-sdk-go-v2 v1.27.2
+ github.com/aws/aws-sdk-go-v2/config v1.27.18
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.3
github.com/bmatcuk/doublestar/v4 v4.6.1
github.com/bradenhilton/mozillainstallhash v1.0.1
github.com/charmbracelet/bubbles v0.18.0
@@ -26,7 +26,7 @@ require (
github.com/google/go-github/v62 v62.0.0
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
- github.com/itchyny/gojq v0.12.15
+ github.com/itchyny/gojq v0.12.16
github.com/klauspost/compress v1.17.8
github.com/mitchellh/copystructure v1.2.0
github.com/mitchellh/mapstructure v1.5.0
@@ -43,14 +43,14 @@ require (
github.com/twpayne/go-vfs/v5 v5.0.4
github.com/twpayne/go-xdg/v6 v6.1.3
github.com/ulikunitz/xz v0.5.12
- github.com/zalando/go-keyring v0.2.4
- github.com/zricethezav/gitleaks/v8 v8.18.2
+ github.com/zalando/go-keyring v0.2.5
+ github.com/zricethezav/gitleaks/v8 v8.18.3
go.etcd.io/bbolt v1.3.10
- golang.org/x/crypto v0.23.0
- golang.org/x/oauth2 v0.20.0
+ golang.org/x/crypto v0.24.0
+ golang.org/x/oauth2 v0.21.0
golang.org/x/sync v0.7.0
- golang.org/x/sys v0.20.0
- golang.org/x/term v0.20.0
+ golang.org/x/sys v0.21.0
+ golang.org/x/term v0.21.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
howett.net/plist v1.0.1
@@ -59,8 +59,8 @@ require (
require (
dario.cat/mergo v1.0.0 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/BobuSumisu/aho-corasick v1.0.3 // indirect
@@ -72,16 +72,16 @@ require (
github.com/alecthomas/repr v0.4.0 // indirect
github.com/alessio/shellescape v1.4.2 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.17.16 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.17.18 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
@@ -89,7 +89,7 @@ require (
github.com/charmbracelet/harmonica v0.2.0 // indirect
github.com/charmbracelet/lipgloss v0.11.0 // indirect
github.com/charmbracelet/x/ansi v0.1.2 // indirect
- github.com/charmbracelet/x/input v0.1.1 // indirect
+ github.com/charmbracelet/x/input v0.1.2 // indirect
github.com/charmbracelet/x/term v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.1.2 // indirect
github.com/cloudflare/circl v1.3.8 // indirect
@@ -114,10 +114,10 @@ require (
github.com/h2non/filetype v1.1.3 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
- github.com/huandu/xstrings v1.4.0 // indirect
+ github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
- github.com/itchyny/timefmt-go v0.1.5 // indirect
+ github.com/itchyny/timefmt-go v0.1.6 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -138,24 +138,24 @@ require (
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rs/zerolog v1.33.0 // indirect
- github.com/sagikazarmark/locafero v0.4.0 // indirect
+ github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
- github.com/spf13/viper v1.18.2 // indirect
+ github.com/spf13/viper v1.19.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/yuin/goldmark v1.7.1 // indirect
github.com/yuin/goldmark-emoji v1.0.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
- golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0 // indirect
- golang.org/x/net v0.25.0 // indirect
- golang.org/x/text v0.15.0 // indirect
- golang.org/x/tools v0.21.0 // indirect
+ golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
+ golang.org/x/net v0.26.0 // indirect
+ golang.org/x/text v0.16.0 // indirect
+ golang.org/x/tools v0.22.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
diff --git a/go.sum b/go.sum
index bc1f235d9e6..191426b86fd 100644
--- a/go.sum
+++ b/go.sum
@@ -1,15 +1,15 @@
-cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y=
-cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic=
-cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
-cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
+cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM=
+cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4=
+cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg=
+cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40=
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-cloud.google.com/go/firestore v1.14.0 h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw=
-cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ=
+cloud.google.com/go/firestore v1.15.0 h1:/k8ppuWOtNuDHt2tsRV42yI21uaGnKDEQnRFeBpbFF8=
+cloud.google.com/go/firestore v1.15.0/go.mod h1:GWOxFXcv8GZUtYpWHw/w6IuYNux/BtmeVTMmjrm4yhk=
cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
-cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
-cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
+cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg=
+cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s=
cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w=
cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
@@ -18,12 +18,12 @@ filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg=
filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE=
filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 h1:1nGuui+4POelzDwI7RG56yfQJHCnKvwfMoU7VsEp+Zg=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0/go.mod h1:99EvauvlcJ1U06amZiksfYz/3aFGyIhWGHVyiZXtBAI=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 h1:FDif4R1+UUR+00q6wquyX90K7A8dN+R5E8GEadoP7sU=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2/go.mod h1:aiYBYui4BJ/BJCAIKs92XiPyQfTaBWqvHujDwKb6CBU=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 h1:H+U3Gk9zY56G3u872L82bk4thcsy2Gghb9ExT4Zvm1o=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0/go.mod h1:mgrmMSgaLp9hmax62XQTd0N4aAqSE5E0DulSpVYK7vc=
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.1.0 h1:h4Zxgmi9oyZL2l8jeg1iRTqPloHktywWcu0nlJmo1tA=
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.1.0/go.mod h1:LgLGXawqSreJz135Elog0ywTJDsm0Hz2k+N+6ZK35u8=
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1 h1:9fXQS/0TtQmKXp8SureKouF+idbQvp7cPUxykiohnBs=
@@ -62,32 +62,32 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/aws/aws-sdk-go-v2 v1.27.0 h1:7bZWKoXhzI+mMR/HjdMx8ZCC5+6fY0lS5tr0bbgiLlo=
-github.com/aws/aws-sdk-go-v2 v1.27.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
-github.com/aws/aws-sdk-go-v2/config v1.27.16 h1:knpCuH7laFVGYTNd99Ns5t+8PuRjDn4HnnZK48csipM=
-github.com/aws/aws-sdk-go-v2/config v1.27.16/go.mod h1:vutqgRhDUktwSge3hrC3nkuirzkJ4E/mLj5GvI0BQas=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.16 h1:7d2QxY83uYl0l58ceyiSpxg9bSbStqBC6BeEeHEchwo=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.16/go.mod h1:Ae6li/6Yc6eMzysRL2BXlPYvnrLLBg3D11/AmOjw50k=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 h1:dQLK4TjtnlRGb0czOht2CevZ5l6RSyRWAnKeGd7VAFE=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3/go.mod h1:TL79f2P6+8Q7dTsILpiVST+AL9lkF6PPGI167Ny0Cjw=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 h1:lf/8VTF2cM+N4SLzaYJERKEWAXq8MOMpZfU6wEPWsPk=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7/go.mod h1:4SjkU7QiqK2M9oozyMzfZ/23LmUY+h3oFqhdeP5OMiI=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 h1:4OYVp0705xu8yjdyoWix0r9wPIRXnIzzOoUpQVHIJ/g=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7/go.mod h1:vd7ESTEvI76T2Na050gODNmNU7+OyKrIKroYTu4ABiI=
+github.com/aws/aws-sdk-go-v2 v1.27.2 h1:pLsTXqX93rimAOZG2FIYraDQstZaaGVVN4tNw65v0h8=
+github.com/aws/aws-sdk-go-v2 v1.27.2/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
+github.com/aws/aws-sdk-go-v2/config v1.27.18 h1:wFvAnwOKKe7QAyIxziwSKjmer9JBMH1vzIL6W+fYuKk=
+github.com/aws/aws-sdk-go-v2/config v1.27.18/go.mod h1:0xz6cgdX55+kmppvPm2IaKzIXOheGJhAufacPJaXZ7c=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.18 h1:D/ALDWqK4JdY3OFgA2thcPO1c9aYTT5STS/CvnkqY1c=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.18/go.mod h1:JuitCWq+F5QGUrmMPsk945rop6bB57jdscu+Glozdnc=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5 h1:dDgptDO9dxeFkXy+tEgVkzSClHZje/6JkPW5aZyEvrQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5/go.mod h1:gjvE2KBUgUQhcv89jqxrIxH9GaKs1JbZzWejj/DaHGA=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9 h1:cy8ahBJuhtM8GTTSyOkfy6WVPV1IE+SS5/wfXUYuulw=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9/go.mod h1:CZBXGLaJnEZI6EVNcPd7a6B5IC5cA/GkRWtu9fp3S6Y=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 h1:A4SYk07ef04+vxZToz9LWvAXl9LW0NClpPpMsi31cz0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9/go.mod h1:5jJcHuwDagxN+ErjQ3PU3ocf6Ylc/p9x+BLO/+X4iXw=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 h1:Wx0rlZoEJR7JwlSZcHnEa7CNjrSIyVxMFWGAaXy4fJY=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9/go.mod h1:aVMHdE0aHO3v+f/iw01fmXV/5DbfQ3Bi9nN7nd9bE9Y=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.1 h1:NSWsFzdHN41mJ5I/DOFzxgkKSYNHQADHn7Mu+lU/AKw=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.1/go.mod h1:5mMk0DgUgaHlcqtN65fNyZI0ZDX3i9Cw+nwq75HKB3U=
-github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 h1:aD7AGQhvPuAxlSUfo0CWU7s6FpkbyykMhGYMvlqTjVs=
-github.com/aws/aws-sdk-go-v2/service/sso v1.20.9/go.mod h1:c1qtZUWtygI6ZdvKppzCSXsDOq5I4luJPZ0Ud3juFCA=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 h1:Pav5q3cA260Zqez42T9UhIlsd9QeypszRPwC9LdSSsQ=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3/go.mod h1:9lmoVDVLz/yUZwLaQ676TK02fhCu4+PgRSmMaKR1ozk=
-github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 h1:69tpbPED7jKPyzMcrwSvhWcJ9bPnZsZs18NT40JwM0g=
-github.com/aws/aws-sdk-go-v2/service/sts v1.28.10/go.mod h1:0Aqn1MnEuitqfsCNyKsdKLhDUOr4txD/g19EfiUqgws=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 h1:o4T+fKxA3gTMcluBNZZXE9DNaMkJuUL1O3mffCUjoJo=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11/go.mod h1:84oZdJ+VjuJKs9v1UTC9NaodRZRseOXCTgku+vQJWR8=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.3 h1:+pg3v9mWOmnR01Pxd0dcsDWSLN0GWbcFiKf2YgZ4+SY=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.3/go.mod h1:M9TqBwpQ7AC6zu1Yji7vijRliqir7hxjuRcnxIk7jCc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 h1:gEYM2GSpr4YNWc6hCd5nod4+d4kd9vWIAWrmGuLdlMw=
+github.com/aws/aws-sdk-go-v2/service/sso v1.20.11/go.mod h1:gVvwPdPNYehHSP9Rs7q27U1EU+3Or2ZpXvzAYJNh63w=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 h1:iXjh3uaH3vsVcnyZX7MqCoCfcyxIrVE9iOQruRaWPrQ=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5/go.mod h1:5ZXesEuy/QcO0WUnt+4sDkxhdXRHTu2yG0uCSH8B6os=
+github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 h1:M/1u4HBpwLuMtjlxuI2y6HoVLzF5e2mfxHCg7ZVMYmk=
+github.com/aws/aws-sdk-go-v2/service/sts v1.28.12/go.mod h1:kcfd+eTdEi/40FIbLq4Hif3XMXnl5b/+t/KTfLt9xIk=
github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
@@ -114,8 +114,8 @@ github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/Zq
github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8=
github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
-github.com/charmbracelet/x/input v0.1.1 h1:YDOJaTUKCqtGnq9PHzx3pkkl4pXDOANUHmhH3DqMtM4=
-github.com/charmbracelet/x/input v0.1.1/go.mod h1:jvdTVUnNWj/RD6hjC4FsoB0SeZCJ2ZBkiuFP9zXvZI0=
+github.com/charmbracelet/x/input v0.1.2 h1:QJAZr33eOhDowkkEQ24rsJy4Llxlm+fRDf/cQrmqJa0=
+github.com/charmbracelet/x/input v0.1.2/go.mod h1:LGBim0maUY4Pitjn/4fHnuXb4KirU3DODsyuHuXdOyA=
github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI=
github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw=
github.com/charmbracelet/x/windows v0.1.2 h1:Iumiwq2G+BRmgoayww/qfcvof7W/3uLoelhxojXlRWg=
@@ -161,6 +161,8 @@ github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
github.com/fatih/semgroup v1.2.0 h1:h/OLXwEM+3NNyAdZEpMiH1OzfplU09i2qXPVThGZvyg=
github.com/fatih/semgroup v1.2.0/go.mod h1:1KAD4iIYfXjE4U13B48VM4z9QUwV5Tt8O4rS879kgm8=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -177,6 +179,10 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys=
github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -208,8 +214,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
-github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
-github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
+github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/cLCKqA=
+github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4=
github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 h1:zC34cGQu69FG7qzJ3WiKW244WfhDC3xxYMeNOX2gtUQ=
github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
@@ -220,14 +226,18 @@ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJr
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
-github.com/hashicorp/consul/api v1.25.1 h1:CqrdhYzc8XZuPnhIYZWH45toM0LB9ZeYr/gvpLVI3PE=
-github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g=
+github.com/hashicorp/consul/api v1.28.2 h1:mXfkRHrpHN4YY3RqL09nXU1eHKLNiuAN4kHvDQ16k/8=
+github.com/hashicorp/consul/api v1.28.2/go.mod h1:KyzqzgMEya+IZPcD65YFoOVAgPpbfERu4I/tzG6/ueE=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -239,17 +249,17 @@ github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfE
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
-github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
+github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/itchyny/gojq v0.12.15 h1:WC1Nxbx4Ifw5U2oQWACYz32JK8G9qxNtHzrvW4KEcqI=
-github.com/itchyny/gojq v0.12.15/go.mod h1:uWAHCbCIla1jiNxmeT5/B5mOjSdfkCq6p8vxWg+BM10=
-github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
-github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
+github.com/itchyny/gojq v0.12.16 h1:yLfgLxhIr/6sJNVmYfQjTIv0jGctu6/DgDoivmxTr7g=
+github.com/itchyny/gojq v0.12.16/go.mod h1:6abHbdC2uB9ogMS38XsErnfqJ94UlngIJGlRAIj4jTM=
+github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=
+github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
@@ -326,10 +336,10 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
-github.com/nats-io/nats.go v1.31.0 h1:/WFBHEc/dOKBF6qf1TZhrdEfTmOZ5JzdJ+Y3m6Y/p7E=
-github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8=
-github.com/nats-io/nkeys v0.4.6 h1:IzVe95ru2CT6ta874rt9saQRkWfe2nFj1NtvYSLqMzY=
-github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts=
+github.com/nats-io/nats.go v1.34.0 h1:fnxnPCNiwIG5w08rlMcEKTUw4AV/nKyGCOJE8TdhSPk=
+github.com/nats-io/nats.go v1.34.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
+github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
+github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@@ -367,10 +377,10 @@ github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sagikazarmark/crypt v0.17.0 h1:ZA/7pXyjkHoK4bW4mIdnCLvL8hd+Nrbiw7Dqk7D4qUk=
-github.com/sagikazarmark/crypt v0.17.0/go.mod h1:SMtHTvdmsZMuY/bpZoqokSoChIrcJ/epOxZN58PbZDg=
-github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
-github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
+github.com/sagikazarmark/crypt v0.19.0 h1:WMyLTjHBo64UvNcWqpzY3pbZTYgnemZU8FBZigKc42E=
+github.com/sagikazarmark/crypt v0.19.0/go.mod h1:c6vimRziqqERhtSe0MhIvzE1w54FrCHtrXb5NH/ja78=
+github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
+github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f h1:MvTmaQdww/z0Q4wrYjDSCcZ78NoftLQyHBSLW/Cx79Y=
@@ -402,8 +412,8 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
-github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
+github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
+github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -446,24 +456,34 @@ github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U=
github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s=
github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY=
-github.com/zalando/go-keyring v0.2.4 h1:wi2xxTqdiwMKbM6TWwi+uJCG/Tum2UV0jqaQhCa9/68=
-github.com/zalando/go-keyring v0.2.4/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk=
-github.com/zricethezav/gitleaks/v8 v8.18.2 h1:slo/sMmgs3qA+6Vv6iqVhsCv+gsl3RekQXqDN0M4g5M=
-github.com/zricethezav/gitleaks/v8 v8.18.2/go.mod h1:8F5GrdCpEtyN5R+0MKPubbOPqIHptNckH3F7bYrhT+Y=
+github.com/zalando/go-keyring v0.2.5 h1:Bc2HHpjALryKD62ppdEzaFG6VxL6Bc+5v0LYpN8Lba8=
+github.com/zalando/go-keyring v0.2.5/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk=
+github.com/zricethezav/gitleaks/v8 v8.18.3 h1:t+tMrQCMMlT/binrVyp8PMYs5vjiKBfph3WncYSE9j8=
+github.com/zricethezav/gitleaks/v8 v8.18.3/go.mod h1:3EFYK+ZNDHPNQinyZTVGHG7/sFsApEZ9DrCGA1AP63M=
go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
-go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
-go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
-go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0=
-go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
-go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4=
-go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA=
-go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao=
-go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
+go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c=
+go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4=
+go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A=
+go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4=
+go.etcd.io/etcd/client/v2 v2.305.12 h1:0m4ovXYo1CHaA/Mp3X/Fak5sRNIWf01wk/X1/G3sGKI=
+go.etcd.io/etcd/client/v2 v2.305.12/go.mod h1:aQ/yhsxMu+Oht1FOupSr60oBvcS9cKXHrzBpDsPTf9E=
+go.etcd.io/etcd/client/v3 v3.5.12 h1:v5lCPXn1pf1Uu3M4laUE2hp/geOTc5uPcYYsNe1lDxg=
+go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw=
go.etcd.io/gofail v0.1.0 h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg=
go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
+go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
+go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -476,14 +496,14 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0 h1:Mi0bCswbz+9cXmwFAdxoo5GPFMKONUpua6iUdtQS7lk=
-golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuhGX/+R1ZpfJ4/ia80JM=
+golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -491,10 +511,10 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
-golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+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.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.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -519,17 +539,17 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk=
+golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
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=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -537,34 +557,34 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-google.golang.org/api v0.153.0 h1:N1AwGhielyKFaUqH07/ZSIQR3uNPcV7NVw0vj+j4iR4=
-google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
-google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
-google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
-google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
-google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
-google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/api v0.171.0 h1:w174hnBPqut76FzW5Qaupt7zY8Kql6fiVjgys4f58sU=
+google.golang.org/api v0.171.0/go.mod h1:Hnq5AHm4OTMt2BUVjael2CWZFD6vksJdWCWiUAmjC9o=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s=
+google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:lfpJ/2rWPa/kJgxyyXM8PrNnfCzcmxJ265mADgwmvLI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
chore
|
Update dependencies
|
25cfd95a6ea7cd983fc07927b52fbf419d136ffb
|
2023-01-28 00:06:33
|
Tom Payne
|
chore: Fix name of test files in architecture doc
| false
|
diff --git a/assets/chezmoi.io/docs/developer/architecture.md b/assets/chezmoi.io/docs/developer/architecture.md
index bd2b85e583f..52128ee0b7a 100644
--- a/assets/chezmoi.io/docs/developer/architecture.md
+++ b/assets/chezmoi.io/docs/developer/architecture.md
@@ -163,7 +163,8 @@ integration tests use the
[`github.com/stretchr/testify`](https://pkg.go.dev/github.com/stretchr/testify)
framework. End-to-end tests use
[`github.com/rogpeppe/go-internal/testscript`](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript)
-with the test scripts themselves in `pkg/cmd/testdata/scripts/$TEST_NAME.txt`.
+with the test scripts themselves in
+`pkg/cmd/testdata/scripts/$TEST_NAME.txtar`.
You can run individual end-to-end tests with
|
chore
|
Fix name of test files in architecture doc
|
d9281fab4d8b866ae539c1ce48f4c7952ca670d8
|
2024-12-04 04:47:10
|
Tom Payne
|
chore: Update tools
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 466c15a5b7f..56892521508 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ env:
GOVERSIONINFO_VERSION: 1.4.1 # https://github.com/josephspurrier/goversioninfo/releases
PYTHON_VERSION: '3.10' # https://www.python.org/downloads/
RAGE_VERSION: 0.11.0 # https://github.com/str4d/rage/releases
- UV_VERSION: 0.5.5 # https://github.com/astral-sh/uv/releases
+ UV_VERSION: 0.5.6 # https://github.com/astral-sh/uv/releases
jobs:
changes:
runs-on: ubuntu-22.04
|
chore
|
Update tools
|
ee64171f248e015e3f39521913de6c2cec13358e
|
2023-01-31 00:55:19
|
Tom Payne
|
chore: Disable flaky nolintlint linter
| false
|
diff --git a/.golangci.yml b/.golangci.yml
index 3f93715be40..439b4c2d3f7 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -40,7 +40,6 @@ linters:
- misspell
- nilerr
- noctx
- - nolintlint
- nosprintfhostport
- prealloc
- predeclared
@@ -80,6 +79,7 @@ linters:
- nestif
- nilnil
- nlreturn
+ - nolintlint
- nonamedreturns
- nosnakecase
- paralleltest
|
chore
|
Disable flaky nolintlint linter
|
537d067a0f22111b62aaed687c8d20495088312a
|
2022-03-17 23:39:01
|
Tom Payne
|
chore: Update 1Password docs for CLI 2.0 release
| false
|
diff --git a/assets/chezmoi.io/docs/reference/templates/functions/onepasswordItemFields.md b/assets/chezmoi.io/docs/reference/templates/functions/onepasswordItemFields.md
index 5229f7d48bf..179ee3c9ae1 100644
--- a/assets/chezmoi.io/docs/reference/templates/functions/onepasswordItemFields.md
+++ b/assets/chezmoi.io/docs/reference/templates/functions/onepasswordItemFields.md
@@ -67,12 +67,7 @@ in the environment, by default you will be interactively prompted to sign in.
!!! info
- If you're using [1Password CLI 2.0](https://developer.1password.com/), then
- the structure of the data returned by the `onepasswordDetailsFields`
- template function will be different and you will need to update your
- templates.
-
- !!! warning
-
- The structure of the data returned will not be finalized until 1Password
- CLI 2.0 is released.
+ If you're using [1Password CLI
+ 2.0](https://developer.1password.com/docs/cli/), then the structure of the
+ data returned by the `onepasswordDetailsFields` template function will be
+ different and you will need to update your templates.
diff --git a/assets/chezmoi.io/docs/user-guide/password-managers/1password.md b/assets/chezmoi.io/docs/user-guide/password-managers/1password.md
index 893ec3e9fac..756e6264b93 100644
--- a/assets/chezmoi.io/docs/user-guide/password-managers/1password.md
+++ b/assets/chezmoi.io/docs/user-guide/password-managers/1password.md
@@ -72,12 +72,8 @@ your configuration file:
!!! info
- If you're using [1Password CLI 2.0](https://developer.1password.com/), then
- the structure of the data returned by the `onepassword`,
- `onepasswordDetailsFields`, and `onePasswordItemFiles` template functions
- will be different and you will need to update your templates.
-
- !!! warning
-
- The structure of the data returned will not be finalized until 1Password
- CLI 2.0 is released.
+ If you're using [1Password CLI
+ 2.0](https://developer.1password.com/docs/cli/), then the structure of the
+ data returned by the `onepassword`, `onepasswordDetailsFields`, and
+ `onePasswordItemFiles` template functions will be different and you will
+ need to update your templates.
|
chore
|
Update 1Password docs for CLI 2.0 release
|
56bb4a52849bb8c0ee5f17a399336f15edc2fd7d
|
2022-10-06 00:54:35
|
Tom Payne
|
chore: Copy github.com/twpayne/go-shell into module
| false
|
diff --git a/.golangci.yml b/.golangci.yml
index 724ebbc52f8..bbfe5a26fa0 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -146,3 +146,6 @@ issues:
- gosec
- lll
path: "_test\\.go$"
+ - linters:
+ - lll
+ path: ^pkg/shell/shellcgo\.go$
diff --git a/go.mod b/go.mod
index ce480cb21ca..ad6254bf5b9 100644
--- a/go.mod
+++ b/go.mod
@@ -30,7 +30,6 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.0
github.com/twpayne/go-pinentry v0.2.0
- github.com/twpayne/go-shell v0.3.1
github.com/twpayne/go-vfs/v4 v4.1.0
github.com/twpayne/go-xdg/v6 v6.0.0
github.com/ulikunitz/xz v0.5.10
diff --git a/go.sum b/go.sum
index b5e525f40e1..cefc6f05d1a 100644
--- a/go.sum
+++ b/go.sum
@@ -271,8 +271,6 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/twpayne/go-pinentry v0.2.0 h1:hS5NEJiilop9xP9pBX/1NYduzDlGGMdg1KamTBTrOWw=
github.com/twpayne/go-pinentry v0.2.0/go.mod h1:r6buhMwARxnnL0VRBqfd1tE6Fadk1kfP00GRMutEspY=
-github.com/twpayne/go-shell v0.3.1 h1:JIC6cyDpG/p8mRnFUleH07roi90q0J9QC8PnvtmYLRo=
-github.com/twpayne/go-shell v0.3.1/go.mod h1:H/gzux0DOH5jsjQSHXs6rs2Onxy+V4j6ycZTOulC0l8=
github.com/twpayne/go-vfs/v3 v3.0.0 h1:rMFBISZVhSowKeX1BxL8utM64V7CuUw9/rfekPdS7to=
github.com/twpayne/go-vfs/v3 v3.0.0/go.mod h1:JKfJtOC57Wqo7xYxFRKSqdXwyj3AhfyRrDxSE/XiAVA=
github.com/twpayne/go-vfs/v4 v4.1.0 h1:58tmzvh3AEKgqXlRZvlKn9HD6g1Q9T9bYdob0GhARrs=
diff --git a/pkg/cmd/cdcmd.go b/pkg/cmd/cdcmd.go
index 6784e57263f..fa5e8340181 100644
--- a/pkg/cmd/cdcmd.go
+++ b/pkg/cmd/cdcmd.go
@@ -2,7 +2,8 @@ package cmd
import (
"github.com/spf13/cobra"
- "github.com/twpayne/go-shell"
+
+ "github.com/twpayne/chezmoi/v2/pkg/shell"
)
type cdCmdConfig struct {
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
index efe82a09391..e2a714a4e1e 100644
--- a/pkg/cmd/config.go
+++ b/pkg/cmd/config.go
@@ -37,7 +37,6 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/twpayne/go-shell"
"github.com/twpayne/go-vfs/v4"
"github.com/twpayne/go-xdg/v6"
cobracompletefig "github.com/withfig/autocomplete-tools/integrations/cobra"
@@ -50,6 +49,7 @@ import (
"github.com/twpayne/chezmoi/v2/pkg/chezmoi"
"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
"github.com/twpayne/chezmoi/v2/pkg/git"
+ "github.com/twpayne/chezmoi/v2/pkg/shell"
)
const (
diff --git a/pkg/cmd/doctorcmd.go b/pkg/cmd/doctorcmd.go
index a2d0cc8e654..fb8eaf4db83 100644
--- a/pkg/cmd/doctorcmd.go
+++ b/pkg/cmd/doctorcmd.go
@@ -21,12 +21,12 @@ import (
"github.com/coreos/go-semver/semver"
"github.com/google/go-github/v47/github"
"github.com/spf13/cobra"
- "github.com/twpayne/go-shell"
"github.com/twpayne/go-xdg/v6"
"github.com/twpayne/chezmoi/v2/pkg/chezmoi"
"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
"github.com/twpayne/chezmoi/v2/pkg/git"
+ "github.com/twpayne/chezmoi/v2/pkg/shell"
)
// A checkResult is the result of a check.
diff --git a/pkg/shell/shell.go b/pkg/shell/shell.go
new file mode 100644
index 00000000000..3f5bbdadc2c
--- /dev/null
+++ b/pkg/shell/shell.go
@@ -0,0 +1,22 @@
+// Package shell returns the current user's shell across multiple platforms.
+package shell
+
+import (
+ "runtime"
+)
+
+// DefaultShell returns the default shell depending on runtime.GOOS.
+func DefaultShell() string {
+ switch runtime.GOOS {
+ case "darwin":
+ return "/bin/zsh"
+ case "openbsd":
+ return "/bin/ksh"
+ case "plan9":
+ return "/bin/rc"
+ case "windows":
+ return "powershell.exe"
+ default:
+ return "/bin/sh"
+ }
+}
diff --git a/pkg/shell/shell_darwin.go b/pkg/shell/shell_darwin.go
new file mode 100644
index 00000000000..4e4810749d0
--- /dev/null
+++ b/pkg/shell/shell_darwin.go
@@ -0,0 +1,45 @@
+//go:build darwin
+// +build darwin
+
+package shell
+
+import (
+ "os"
+ "os/exec"
+ "os/user"
+ "regexp"
+)
+
+//nolint:gochecknoglobals
+var dsclUserShellRegexp = regexp.MustCompile(`\AUserShell:\s+(.*?)\s*\z`)
+
+// CurrentUserShell returns the current user's shell.
+func CurrentUserShell() (string, bool) {
+ // If the SHELL environment variable is set, use it.
+ if shell, ok := os.LookupEnv("SHELL"); ok {
+ return shell, true
+ }
+
+ // Try to get the current user. If we can't then fallback to the default
+ // shell.
+ u, err := user.Current()
+ if err != nil {
+ return DefaultShell(), false
+ }
+
+ // If getpwnam_r is available, use it.
+ if shell, ok := cgoGetUserShell(u.Username); ok {
+ return shell, true
+ }
+
+ // If dscl is available, use it.
+ //nolint:gosec
+ if output, err := exec.Command("dscl", ".", "-read", u.HomeDir, "UserShell").Output(); err == nil {
+ if m := dsclUserShellRegexp.FindSubmatch(output); m != nil {
+ return string(m[1]), true
+ }
+ }
+
+ // Fallback to the default shell.
+ return DefaultShell(), false
+}
diff --git a/pkg/shell/shell_plan9.go b/pkg/shell/shell_plan9.go
new file mode 100644
index 00000000000..2ffbaee3d92
--- /dev/null
+++ b/pkg/shell/shell_plan9.go
@@ -0,0 +1,9 @@
+//go:build plan9
+// +build plan9
+
+package shell
+
+// CurrentUserShell returns the current user's shell.
+func CurrentUserShell() (string, bool) {
+ return DefaultShell(), false
+}
diff --git a/pkg/shell/shell_posix.go b/pkg/shell/shell_posix.go
new file mode 100644
index 00000000000..ecd8fa3edd9
--- /dev/null
+++ b/pkg/shell/shell_posix.go
@@ -0,0 +1,59 @@
+//go:build !darwin && !plan9 && !windows
+// +build !darwin,!plan9,!windows
+
+package shell
+
+import (
+ "bufio"
+ "os"
+ "os/exec"
+ "os/user"
+ "strings"
+)
+
+// CurrentUserShell returns the current user's shell.
+func CurrentUserShell() (string, bool) {
+ // If the SHELL environment variable is set, use it.
+ if shell, ok := os.LookupEnv("SHELL"); ok {
+ return shell, true
+ }
+
+ // Try to get the current user. If we can't then fallback to the default
+ // shell.
+ u, err := user.Current()
+ if err != nil {
+ return DefaultShell(), false
+ }
+
+ // If getpwnam_r is available, use it.
+ if shell, ok := cgoGetUserShell(u.Username); ok {
+ return shell, true
+ }
+
+ // If getent is available, use it.
+ if getent, err := exec.LookPath("getent"); err == nil {
+ if output, err := exec.Command(getent, "passwd", u.Username).Output(); err == nil {
+ if fields := strings.SplitN(strings.TrimSuffix(string(output), "\n"), ":", 7); len(fields) == 7 {
+ return fields[6], true
+ }
+ }
+ }
+
+ // If the user has an entry in /etc/passwd, use it.
+ if f, err := os.Open("/etc/passwd"); err == nil {
+ defer f.Close()
+
+ s := bufio.NewScanner(f)
+ for s.Scan() {
+ fields := strings.SplitN(strings.TrimSuffix(s.Text(), "\n"), ":", 7)
+ if len(fields) == 7 && fields[0] == u.Username {
+ return fields[6], true
+ }
+ }
+
+ _ = s.Err() // Ignore errors.
+ }
+
+ // Fallback to the default shell.
+ return DefaultShell(), false
+}
diff --git a/pkg/shell/shell_test.go b/pkg/shell/shell_test.go
new file mode 100644
index 00000000000..73241b3ccfe
--- /dev/null
+++ b/pkg/shell/shell_test.go
@@ -0,0 +1,13 @@
+package shell
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestCurrentUserShell(t *testing.T) {
+ shell, ok := CurrentUserShell()
+ assert.True(t, ok)
+ assert.NotEmpty(t, shell)
+}
diff --git a/pkg/shell/shell_windows.go b/pkg/shell/shell_windows.go
new file mode 100644
index 00000000000..c0d27ed4cc5
--- /dev/null
+++ b/pkg/shell/shell_windows.go
@@ -0,0 +1,21 @@
+package shell
+
+import (
+ "os"
+)
+
+// CurrentUserShell returns the current user's shell.
+func CurrentUserShell() (string, bool) {
+ // If the SHELL environment variable is set, use it.
+ if shell, ok := os.LookupEnv("SHELL"); ok {
+ return shell, true
+ }
+
+ // If the ComSpec environment variable is set, use it.
+ if comSpec, ok := os.LookupEnv("ComSpec"); ok {
+ return comSpec, true
+ }
+
+ // Fallback to the default shell.
+ return DefaultShell(), false
+}
diff --git a/pkg/shell/shellcgo.go b/pkg/shell/shellcgo.go
new file mode 100644
index 00000000000..ff9ce142436
--- /dev/null
+++ b/pkg/shell/shellcgo.go
@@ -0,0 +1,45 @@
+//go:build (cgo && aix) || (cgo && android) || (cgo && darwin) || (cgo && dragonfly) || (cgo && freebsd) || (cgo && illumos) || (cgo && linux) || (cgo && netbsd) || (cgo && openbsd) || (cgo && solaris)
+// +build cgo,aix cgo,android cgo,darwin cgo,dragonfly cgo,freebsd cgo,illumos cgo,linux cgo,netbsd cgo,openbsd cgo,solaris
+
+package shell
+
+// #cgo solaris CFLAGS: -D_POSIX_PTHREAD_SEMANTICS=1
+// #cgo illumos CFLAGS: -D_POSIX_PTHREAD_SEMANTICS=1
+// #include <errno.h>
+// #include <pwd.h>
+// #include <stdlib.h>
+// #include <sys/types.h>
+// #include <unistd.h>
+import "C"
+
+import (
+ "unsafe"
+)
+
+func cgoGetUserShell(name string) (string, bool) {
+ buflen := C.sysconf(C._SC_GETPW_R_SIZE_MAX)
+ if buflen == -1 {
+ buflen = 1024
+ }
+
+ for {
+ var (
+ cName = C.CString(name)
+ pwd C.struct_passwd
+ buf = make([]byte, buflen)
+ result *C.struct_passwd
+ )
+ //nolint:gocritic
+ rc := C.getpwnam_r(cName, &pwd, (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(buflen), &result)
+ C.free(unsafe.Pointer(cName))
+
+ switch rc {
+ case 0:
+ return C.GoString(result.pw_shell), true
+ case C.ERANGE:
+ buflen *= 2
+ default:
+ return "", false
+ }
+ }
+}
diff --git a/pkg/shell/shellnocgo.go b/pkg/shell/shellnocgo.go
new file mode 100644
index 00000000000..4a22cf09dd0
--- /dev/null
+++ b/pkg/shell/shellnocgo.go
@@ -0,0 +1,8 @@
+//go:build !cgo
+// +build !cgo
+
+package shell
+
+func cgoGetUserShell(name string) (string, bool) {
+ return "", false
+}
|
chore
|
Copy github.com/twpayne/go-shell into module
|
99718126071a7e9cd0ed4ceb8de985630182578a
|
2022-02-19 19:58:01
|
Tom Payne
|
chore: Rename variables and functions for clarity
| false
|
diff --git a/pkg/cmd/cdcmd.go b/pkg/cmd/cdcmd.go
index 9e5866bcc68..8a449773370 100644
--- a/pkg/cmd/cdcmd.go
+++ b/pkg/cmd/cdcmd.go
@@ -32,36 +32,36 @@ func (c *Config) newCDCmd() *cobra.Command {
}
func (c *Config) runCDCmd(cmd *cobra.Command, args []string) error {
- shellCommand, shellArgs := c.shell()
- return c.run(c.WorkingTreeAbsPath, shellCommand, shellArgs)
+ cdCommand, cdArgs := c.cdCommand()
+ return c.run(c.WorkingTreeAbsPath, cdCommand, cdArgs)
}
-func (c *Config) shell() (string, []string) {
- shellCommand := c.CD.Command
- shellArgs := c.CD.Args
+func (c *Config) cdCommand() (string, []string) {
+ cdCommand := c.CD.Command
+ cdArgs := c.CD.Args
- // If the user has set a shell command then use it.
- if shellCommand != "" {
- return shellCommand, shellArgs
+ // If the user has set a cd command then use it.
+ if cdCommand != "" {
+ return cdCommand, cdArgs
}
// Determine the user's shell.
- shellCommand, _ = shell.CurrentUserShell()
+ cdCommand, _ = shell.CurrentUserShell()
// If the shell is found, return it.
- if path, err := exec.LookPath(shellCommand); err == nil {
- return path, shellArgs
+ if path, err := exec.LookPath(cdCommand); err == nil {
+ return path, cdArgs
}
// Otherwise, if the shell contains spaces, then assume that the first word
// is the editor and the rest are arguments.
- components := whitespaceRx.Split(shellCommand, -1)
+ components := whitespaceRx.Split(cdCommand, -1)
if len(components) > 1 {
if path, err := exec.LookPath(components[0]); err == nil {
- return path, append(components[1:], shellArgs...)
+ return path, append(components[1:], cdArgs...)
}
}
// Fallback to shell command only.
- return shellCommand, shellArgs
+ return cdCommand, cdArgs
}
diff --git a/pkg/cmd/doctorcmd.go b/pkg/cmd/doctorcmd.go
index fc8fea66831..ede17044088 100644
--- a/pkg/cmd/doctorcmd.go
+++ b/pkg/cmd/doctorcmd.go
@@ -132,7 +132,7 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- shellCommand, _ := c.shell()
+ cdCommand, _ := c.cdCommand()
editCommand, _ := c.editor(nil)
checks := []check{
&versionCheck{
@@ -166,8 +166,8 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
dirname: c.DestDirAbsPath,
},
&binaryCheck{
- name: "shell",
- binaryname: shellCommand,
+ name: "cd-command",
+ binaryname: cdCommand,
ifNotSet: checkResultError,
ifNotExist: checkResultError,
},
diff --git a/pkg/cmd/testdata/scripts/doctor_unix.txt b/pkg/cmd/testdata/scripts/doctor_unix.txt
index 32775ff95e7..7cf823b6a7c 100644
--- a/pkg/cmd/testdata/scripts/doctor_unix.txt
+++ b/pkg/cmd/testdata/scripts/doctor_unix.txt
@@ -28,7 +28,7 @@ stdout '^warning\s+config-file\s+.*multiple config files'
stdout '^ok\s+source-dir\s+'
stdout '^ok\s+suspicious-entries\s+'
stdout '^ok\s+dest-dir\s+'
-stdout '^ok\s+shell\s+'
+stdout '^ok\s+cd-command\s+'
stdout '^ok\s+edit-command\s+'
stdout '^ok\s+git-command\s+'
stdout '^ok\s+merge-command\s+'
|
chore
|
Rename variables and functions for clarity
|
73339f83bd15a819fe4c9aba199f8f7732c20f0a
|
2021-11-15 01:13:57
|
Tom Payne
|
chore: Fix stale use of gofumports
| false
|
diff --git a/Makefile b/Makefile
index b074407bf27..f98313087f9 100644
--- a/Makefile
+++ b/Makefile
@@ -78,10 +78,10 @@ format: ensure-gofumpt
find . -name \*.go | xargs ./bin/gofumpt -w
.PHONY: ensure-tools
-ensure-tools: ensure-gofumports ensure-golangci-lint
+ensure-tools: ensure-gofumpt ensure-golangci-lint
.PHONY: ensure-gofumpt
-ensure-gofumports:
+ensure-gofumpt:
if [ ! -x bin/gofumpt ] ; then \
mkdir -p bin ; \
GOBIN=$(shell pwd)/bin ${GO} install mvdan.cc/[email protected] ; \
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 29450457933..f6dd698af61 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -109,8 +109,8 @@ that:
generate` and including any modified files in your commit.
* The code is correctly formatted, according to
- [`gofumports`](https://mvdan.cc/gofumpt/gofumports). You can ensure this by
- running `make format`.
+ [`gofumpt`](https://mvdan.cc/gofumpt/). You can ensure this by running `make
+ format`.
* The code passes [`golangci-lint`](https://github.com/golangci/golangci-lint).
You can ensure this by running `make lint`.
|
chore
|
Fix stale use of gofumports
|
e74a926a464961f66cdb3476eb1f2ef79f56f5e9
|
2023-01-19 00:44:10
|
Luke Karrys
|
fix: Walk flattened external archives
| false
|
diff --git a/pkg/chezmoi/archive.go b/pkg/chezmoi/archive.go
index a9420d1de21..88bea08a19c 100644
--- a/pkg/chezmoi/archive.go
+++ b/pkg/chezmoi/archive.go
@@ -132,10 +132,44 @@ func isTarArchive(r io.Reader) bool {
return err == nil
}
+func implicitDirHeader(dir string, fileHeader *tar.Header) *tar.Header {
+ return &tar.Header{
+ Typeflag: tar.TypeDir,
+ Name: dir,
+ Mode: 0o777,
+ Size: 0,
+ Uid: fileHeader.Uid,
+ Gid: fileHeader.Gid,
+ Uname: fileHeader.Uname,
+ Gname: fileHeader.Gname,
+ ModTime: fileHeader.ModTime,
+ }
+}
+
// walkArchiveTar walks over all the entries in a tar archive.
func walkArchiveTar(r io.Reader, f WalkArchiveFunc) error {
tarReader := tar.NewReader(r)
var skippedDirPrefixes []string
+ seenDirs := newSet[string]()
+ processHeader := func(header *tar.Header, dir string) error {
+ for _, skippedDirPrefix := range skippedDirPrefixes {
+ if strings.HasPrefix(header.Name, skippedDirPrefix) {
+ return fs.SkipDir
+ }
+ }
+ if seenDirs.contains(dir) {
+ return nil
+ }
+ seenDirs.add(dir)
+ name := strings.TrimSuffix(header.Name, "/")
+ switch err := f(name, header.FileInfo(), tarReader, header.Linkname); {
+ case errors.Is(err, fs.SkipDir):
+ skippedDirPrefixes = append(skippedDirPrefixes, header.Name)
+ case err != nil:
+ return err
+ }
+ return nil
+ }
HEADER:
for {
header, err := tarReader.Next()
@@ -145,24 +179,28 @@ HEADER:
case err != nil:
return err
}
- for _, skippedDirPrefix := range skippedDirPrefixes {
- if strings.HasPrefix(header.Name, skippedDirPrefix) {
- continue HEADER
- }
- }
- name := strings.TrimSuffix(header.Name, "/")
switch header.Typeflag {
- case tar.TypeDir, tar.TypeReg:
- switch err := f(name, header.FileInfo(), tarReader, ""); {
- case errors.Is(err, fs.SkipDir):
- skippedDirPrefixes = append(skippedDirPrefixes, header.Name)
- case errors.Is(err, Break):
- return nil
- case err != nil:
- return err
+ case tar.TypeReg, tar.TypeDir, tar.TypeSymlink:
+ if header.Typeflag == tar.TypeReg {
+ dirs, _ := path.Split(header.Name)
+ dirComponents := strings.Split(strings.TrimSuffix(dirs, "/"), "/")
+ for i := range dirComponents {
+ dir := strings.Join(dirComponents[0:i+1], "/")
+ if len(dir) > 0 {
+ switch err := processHeader(implicitDirHeader(dir+"/", header), dir+"/"); {
+ case errors.Is(err, fs.SkipDir):
+ continue HEADER
+ case errors.Is(err, Break):
+ return nil
+ case err != nil:
+ return err
+ }
+ }
+ }
}
- case tar.TypeSymlink:
- switch err := f(name, header.FileInfo(), nil, header.Linkname); {
+ switch err := processHeader(header, header.Name); {
+ case errors.Is(err, fs.SkipDir):
+ continue HEADER
case errors.Is(err, Break):
return nil
case err != nil:
diff --git a/pkg/chezmoi/archive_test.go b/pkg/chezmoi/archive_test.go
index ed7fd908142..d101f57b720 100644
--- a/pkg/chezmoi/archive_test.go
+++ b/pkg/chezmoi/archive_test.go
@@ -12,50 +12,73 @@ import (
)
func TestWalkArchive(t *testing.T) {
+ nestedRoot := map[string]any{
+ "dir1": map[string]any{
+ "subdir1": map[string]any{
+ "file1": "",
+ "file2": "",
+ },
+ "subdir2": map[string]any{
+ "file1": "",
+ "file2": "",
+ },
+ },
+ "dir2": map[string]any{
+ "subdir1": map[string]any{
+ "file1": "",
+ "file2": "",
+ },
+ "subdir2": map[string]any{
+ "file1": "",
+ "file2": "",
+ },
+ },
+ "file1": "",
+ "file2": "",
+ "symlink1": &archivetest.Symlink{Target: "file1"},
+ "symlink2": &archivetest.Symlink{Target: "file2"},
+ }
+ flatRoot := map[string]any{
+ "dir1/subdir1/file1": "",
+ "dir1/subdir1/file2": "",
+ "dir1/subdir2/file1": "",
+ "dir1/subdir2/file2": "",
+ "dir2/subdir1/file1": "",
+ "dir2/subdir1/file2": "",
+ "dir2/subdir2/file1": "",
+ "dir2/subdir2/file2": "",
+ "file1": "",
+ "file2": "",
+ "symlink1": &archivetest.Symlink{Target: "file1"},
+ "symlink2": &archivetest.Symlink{Target: "file2"},
+ }
for _, tc := range []struct {
name string
+ root map[string]any
dataFunc func(map[string]any) ([]byte, error)
archiveFormat ArchiveFormat
}{
{
name: "tar",
+ root: nestedRoot,
dataFunc: archivetest.NewTar,
archiveFormat: ArchiveFormatTar,
},
{
name: "zip",
+ root: nestedRoot,
dataFunc: archivetest.NewZip,
archiveFormat: ArchiveFormatZip,
},
+ {
+ name: "tar-flat",
+ root: flatRoot,
+ dataFunc: archivetest.NewTar,
+ archiveFormat: ArchiveFormatTar,
+ },
} {
t.Run(tc.name, func(t *testing.T) {
- root := map[string]any{
- "dir1": map[string]any{
- "subdir1": map[string]any{
- "file1": "",
- "file2": "",
- },
- "subdir2": map[string]any{
- "file1": "",
- "file2": "",
- },
- },
- "dir2": map[string]any{
- "subdir1": map[string]any{
- "file1": "",
- "file2": "",
- },
- "subdir2": map[string]any{
- "file1": "",
- "file2": "",
- },
- },
- "file1": "",
- "file2": "",
- "symlink1": &archivetest.Symlink{Target: "file1"},
- "symlink2": &archivetest.Symlink{Target: "file2"},
- }
- data, err := tc.dataFunc(root)
+ data, err := tc.dataFunc(tc.root)
require.NoError(t, err)
expectedNames := []string{
|
fix
|
Walk flattened external archives
|
a24ba24090eed87c25c490cf48fc33414abc1c7d
|
2022-02-19 19:58:01
|
Tom Payne
|
chore: Add shell, cd, and editor args to doctor command output
| false
|
diff --git a/pkg/cmd/doctorcmd.go b/pkg/cmd/doctorcmd.go
index 6af0cc4a6e8..b686b875c52 100644
--- a/pkg/cmd/doctorcmd.go
+++ b/pkg/cmd/doctorcmd.go
@@ -50,6 +50,13 @@ var checkResultStr = map[checkResult]string{
checkResultFailed: "failed",
}
+// An argsCheck checks that arguments for a binary.
+type argsCheck struct {
+ name string
+ command string
+ args []string
+}
+
// A binaryCheck checks that a binary called name is installed and optionally at
// least version minVersion.
type binaryCheck struct {
@@ -134,9 +141,9 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
return err
}
shellCommand, _ := shell.CurrentUserShell()
- shellCommand, _ = parseCommand(shellCommand, nil)
- cdCommand, _ := c.cdCommand()
- editCommand, _ := c.editor(nil)
+ shellCommand, shellArgs := parseCommand(shellCommand, nil)
+ cdCommand, cdArgs := c.cdCommand()
+ editCommand, editArgs := c.editor(nil)
checks := []check{
&versionCheck{
versionInfo: c.versionInfo,
@@ -174,18 +181,33 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
ifNotSet: checkResultError,
ifNotExist: checkResultError,
},
+ &argsCheck{
+ name: "shell-args",
+ command: shellCommand,
+ args: shellArgs,
+ },
&binaryCheck{
name: "cd-command",
binaryname: cdCommand,
ifNotSet: checkResultError,
ifNotExist: checkResultError,
},
+ &argsCheck{
+ name: "cd-args",
+ command: cdCommand,
+ args: cdArgs,
+ },
&binaryCheck{
name: "edit-command",
binaryname: editCommand,
ifNotSet: checkResultWarning,
ifNotExist: checkResultWarning,
},
+ &argsCheck{
+ name: "edit-args",
+ command: editCommand,
+ args: editArgs,
+ },
&binaryCheck{
name: "diff-command",
binaryname: c.Diff.Command,
@@ -329,6 +351,14 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
return nil
}
+func (c *argsCheck) Name() string {
+ return c.name
+}
+
+func (c *argsCheck) Run(system chezmoi.System, homeDirAbsPath chezmoi.AbsPath) (checkResult, string) {
+ return checkResultOK, shellQuoteCommand(c.command, c.args)
+}
+
func (c *binaryCheck) Name() string {
return c.name
}
diff --git a/pkg/cmd/testdata/scripts/doctor_unix.txt b/pkg/cmd/testdata/scripts/doctor_unix.txt
index d169293f62a..464eabfb7dc 100644
--- a/pkg/cmd/testdata/scripts/doctor_unix.txt
+++ b/pkg/cmd/testdata/scripts/doctor_unix.txt
@@ -29,8 +29,11 @@ stdout '^ok\s+source-dir\s+'
stdout '^ok\s+suspicious-entries\s+'
stdout '^ok\s+dest-dir\s+'
stdout '^ok\s+shell-command\s+'
+stdout '^ok\s+shell-args\s+'
stdout '^ok\s+cd-command\s+'
+stdout '^ok\s+cd-args\s+'
stdout '^ok\s+edit-command\s+'
+stdout '^ok\s+edit-args\s+'
stdout '^ok\s+git-command\s+'
stdout '^ok\s+merge-command\s+'
stdout '^warning\s+age-command\s+'
|
chore
|
Add shell, cd, and editor args to doctor command output
|
58c458cb3d7556c07714cb4e5884b0687c4d205b
|
2022-04-10 04:23:58
|
Tom Payne
|
fix: Fix apply --verbose when diff.command is set
| false
|
diff --git a/pkg/chezmoi/externaldiffsystem.go b/pkg/chezmoi/externaldiffsystem.go
index 13c504c7d24..b8578f14d8d 100644
--- a/pkg/chezmoi/externaldiffsystem.go
+++ b/pkg/chezmoi/externaldiffsystem.go
@@ -174,7 +174,10 @@ func (s *ExternalDiffSystem) WriteFile(filename AbsPath, data []byte, perm fs.Fi
if err := os.WriteFile(targetAbsPath.String(), data, perm); err != nil {
return err
}
- return s.runDiffCommand(filename, targetAbsPath)
+ if err := s.runDiffCommand(filename, targetAbsPath); err != nil {
+ return err
+ }
+ return s.system.WriteFile(filename, data, perm)
}
// WriteSymlink implements System.WriteSymlink.
diff --git a/pkg/cmd/testdata/scripts/diffcommand_unix.txt b/pkg/cmd/testdata/scripts/diffcommand_unix.txt
index ed322e9d781..695735824be 100644
--- a/pkg/cmd/testdata/scripts/diffcommand_unix.txt
+++ b/pkg/cmd/testdata/scripts/diffcommand_unix.txt
@@ -25,6 +25,7 @@ stdout ^arg\s+${HOME@R}/\.file\s+${WORK@R}/.*/\.file$
# test that chezmoi apply --verbose uses diff.command
chezmoi apply --verbose
stdout ^arg\s+${HOME@R}/\.file\s+${WORK@R}/.*/\.file$
+exists $HOME/.file
chhome home3/user
|
fix
|
Fix apply --verbose when diff.command is set
|
ef2be283d0215bb79bdb7f43a0e1848fb71ef34d
|
2022-05-18 11:43:48
|
Tom Payne
|
fix: Fix use of slashes in glob on Windows
| false
|
diff --git a/pkg/chezmoi/patternset.go b/pkg/chezmoi/patternset.go
index d0d32e76a46..3e2b3fdddde 100644
--- a/pkg/chezmoi/patternset.go
+++ b/pkg/chezmoi/patternset.go
@@ -68,7 +68,7 @@ func (ps *patternSet) add(pattern string, include patternSetIncludeType) error {
func (ps *patternSet) glob(fileSystem vfs.FS, prefix string) ([]string, error) {
allMatches := newStringSet()
for includePattern := range ps.includePatterns {
- matches, err := doublestar.Glob(fileSystem, prefix+includePattern)
+ matches, err := doublestar.Glob(fileSystem, filepath.ToSlash(prefix+includePattern))
if err != nil {
return nil, err
}
diff --git a/pkg/chezmoi/realsystem.go b/pkg/chezmoi/realsystem.go
index 0682180c057..8111f74234b 100644
--- a/pkg/chezmoi/realsystem.go
+++ b/pkg/chezmoi/realsystem.go
@@ -5,6 +5,7 @@ import (
"io/fs"
"os"
"os/exec"
+ "path/filepath"
"runtime"
"github.com/bmatcuk/doublestar/v4"
@@ -19,7 +20,7 @@ type RealSystemOption func(*RealSystem)
// Glob implements System.Glob.
func (s *RealSystem) Glob(pattern string) ([]string, error) {
- return doublestar.Glob(s.UnderlyingFS(), pattern)
+ return doublestar.Glob(s.UnderlyingFS(), filepath.ToSlash(pattern))
}
// IdempotentCmdCombinedOutput implements System.IdempotentCmdCombinedOutput.
diff --git a/pkg/cmd/templatefuncs.go b/pkg/cmd/templatefuncs.go
index af74af91424..a39c46e7a2a 100644
--- a/pkg/cmd/templatefuncs.go
+++ b/pkg/cmd/templatefuncs.go
@@ -47,7 +47,7 @@ func (c *Config) globTemplateFunc(pattern string) []string {
panic(err)
}
- matches, err := doublestar.Glob(c.fileSystem, pattern)
+ matches, err := doublestar.Glob(c.fileSystem, filepath.ToSlash(pattern))
if err != nil {
panic(err)
}
|
fix
|
Fix use of slashes in glob on Windows
|
b69d69c0d11a51c2eda1276dc7bb6e33ba8bc9bc
|
2024-03-01 08:00:57
|
dependabot[bot]
|
chore(deps): bump golang/govulncheck-action from 1.0.1 to 1.0.2
| false
|
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index f2b3aa78727..3e4dfa9dfe2 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -21,6 +21,6 @@ jobs:
id: go-version
run: |
echo go-version="$(awk '/GO_VERSION:/ { print $2 }' .github/workflows/main.yml | tr -d \')" >> "${GITHUB_OUTPUT}"
- - uses: golang/govulncheck-action@7da72f730e37eeaad891fcff0a532d27ed737cd4
+ - uses: golang/govulncheck-action@3a32958c2706f7048305d5a2e53633d7e37e97d0
with:
go-version-input: ${{ steps.go-version.outputs.go-version }}
|
chore
|
bump golang/govulncheck-action from 1.0.1 to 1.0.2
|
b3a8879e30a20134c9bef48646055e57aa78d8c5
|
2022-10-13 18:52:21
|
Tom Payne
|
chore: Use GitHub output in govulncheck workflow
| false
|
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 97bf2ba1995..94d5ec34dea 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -8,13 +8,13 @@ jobs:
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: go-version
+ id: go-version
run: |
- # FIXME it should be possible to use a step output instead of an environment variable
- echo GO_VERSION="$(awk '/GO_VERSION:/ { print $2 }' .github/workflows/main.yml)" >> ${GITHUB_ENV}
+ echo go-version="$(awk '/GO_VERSION:/ { print $2 }' .github/workflows/main.yml)" >> ${GITHUB_OUTPUT}
- uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
with:
cache: true
- go-version: ${{ env.GO_VERSION }}
+ go-version: ${{ steps.go-version.outputs.go-version }}
- name: install
run: |
go install golang.org/x/vuln/cmd/govulncheck@latest
|
chore
|
Use GitHub output in govulncheck workflow
|
acc8a3174ad4dc1d878e8777cfd6e06e27f9c5ed
|
2022-02-17 20:23:35
|
sitiom
|
docs: Update dotbot Windows support
| false
|
diff --git a/assets/chezmoi.io/docs/comparison-table.md b/assets/chezmoi.io/docs/comparison-table.md
index fd046c3d110..1992691e78a 100644
--- a/assets/chezmoi.io/docs/comparison-table.md
+++ b/assets/chezmoi.io/docs/comparison-table.md
@@ -12,7 +12,7 @@
| Distribution | Single binary | Python package | Multiple files | Single script or package | Single script | - |
| Install method | Many | git submodule | Many | Many | Many | Manual |
| Non-root install on bare system | ✅ | ⁉️ | ⁉️ | ✅ | ✅ | ✅ |
-| Windows support | ✅ | ❌ | ❌ | ❌ | ✅ | ✅ |
+| Windows support | ✅ | ✅ | ❌ | ❌ | ✅ | ✅ |
| Bootstrap requirements | None | Python, git | Perl, git | sh, git | git | git |
| Source repos | Single | Single | Multiple | Multiple | Single | Single |
| dotfiles are... | Files | Symlinks | Files | Files | Files | Files |
|
docs
|
Update dotbot Windows support
|
3a4c1d0b535e5c2500cc8233bbbc9624c7a37dc9
|
2021-11-12 04:18:50
|
Tom Payne
|
feat: Add upgrade method to doctor command output
| false
|
diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
index 0a5897e9a67..6e8afdca468 100644
--- a/internal/cmd/doctorcmd.go
+++ b/internal/cmd/doctorcmd.go
@@ -99,6 +99,9 @@ type suspiciousEntriesCheck struct {
// A umaskCheck checks the umask.
type umaskCheck struct{}
+// A upgradeMethodCheck checks the upgrade method.
+type upgradeMethodCheck struct{}
+
// A versionCheck checks the version information.
type versionCheck struct {
versionInfo VersionInfo
@@ -136,6 +139,7 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
},
&osArchCheck{},
&executableCheck{},
+ &upgradeMethodCheck{},
&configFileCheck{
basename: chezmoiRelPath,
bds: c.bds,
@@ -493,6 +497,25 @@ func (c *umaskCheck) Name() string {
return "umask"
}
+func (c *upgradeMethodCheck) Run(system chezmoi.System, homeDirAbsPath chezmoi.AbsPath) (checkResult, string) {
+ executable, err := os.Executable()
+ if err != nil {
+ return checkResultFailed, err.Error()
+ }
+ method, err := getUpgradeMethod(system.UnderlyingFS(), chezmoi.NewAbsPath(executable))
+ if err != nil {
+ return checkResultFailed, err.Error()
+ }
+ if method == "" {
+ return checkResultSkipped, ""
+ }
+ return checkResultOK, method
+}
+
+func (c *upgradeMethodCheck) Name() string {
+ return "upgrade-method"
+}
+
func (c *versionCheck) Name() string {
return "version"
}
diff --git a/internal/cmd/noupgradecmd.go b/internal/cmd/noupgradecmd.go
index c6bc699f14f..2a0b8dde39a 100644
--- a/internal/cmd/noupgradecmd.go
+++ b/internal/cmd/noupgradecmd.go
@@ -5,6 +5,9 @@ package cmd
import (
"github.com/spf13/cobra"
+ "github.com/twpayne/go-vfs/v4"
+
+ "github.com/twpayne/chezmoi/v2/internal/chezmoi"
)
type upgradeCmdConfig struct {
@@ -16,3 +19,7 @@ type upgradeCmdConfig struct {
func (c *Config) newUpgradeCmd() *cobra.Command {
return nil
}
+
+func getUpgradeMethod(vfs.FS, chezmoi.AbsPath) (string, error) {
+ return "", nil
+}
diff --git a/internal/cmd/upgradecmd.go b/internal/cmd/upgradecmd.go
index 7069db0371d..96703a97c17 100644
--- a/internal/cmd/upgradecmd.go
+++ b/internal/cmd/upgradecmd.go
@@ -33,10 +33,10 @@ import (
)
const (
- methodReplaceExecutable = "replace-executable"
- methodSnapRefresh = "snap-refresh"
- methodUpgradePackage = "upgrade-package"
- methodSudoPrefix = "sudo-"
+ upgradeMethodReplaceExecutable = "replace-executable"
+ upgradeMethodSnapRefresh = "snap-refresh"
+ upgradeMethodUpgradePackage = "upgrade-package"
+ upgradeMethodSudoPrefix = "sudo-"
libcTypeGlibc = "glibc"
libcTypeMusl = "musl"
@@ -142,28 +142,34 @@ func (c *Config) runUpgradeCmd(cmd *cobra.Command, args []string) error {
executableAbsPath := chezmoi.NewAbsPath(executable)
method := c.upgrade.method
if method == "" {
- method, err = getMethod(c.fileSystem, executableAbsPath)
- if err != nil {
+ switch method, err = getUpgradeMethod(c.fileSystem, executableAbsPath); {
+ case err != nil:
return err
+ case method == "":
+ return fmt.Errorf("%s/%s: cannot determine upgrade method for %s", runtime.GOOS, runtime.GOARCH, executableAbsPath)
}
}
+ c.logger.Info().
+ Str("executable", executable).
+ Str("method", method).
+ Msg("upgradeMethod")
// Replace the executable with the updated version.
switch method {
- case methodReplaceExecutable:
+ case upgradeMethodReplaceExecutable:
if err := c.replaceExecutable(ctx, executableAbsPath, version, rr); err != nil {
return err
}
- case methodSnapRefresh:
+ case upgradeMethodSnapRefresh:
if err := c.snapRefresh(); err != nil {
return err
}
- case methodUpgradePackage:
+ case upgradeMethodUpgradePackage:
useSudo := false
if err := c.upgradePackage(ctx, version, rr, useSudo); err != nil {
return err
}
- case methodSudoPrefix + methodUpgradePackage:
+ case upgradeMethodSudoPrefix + upgradeMethodUpgradePackage:
useSudo := true
if err := c.upgradePackage(ctx, version, rr, useSudo); err != nil {
return err
@@ -175,7 +181,7 @@ func (c *Config) runUpgradeCmd(cmd *cobra.Command, args []string) error {
// Find the executable. If we replaced the executable directly, then use
// that, otherwise look in $PATH.
path := executable
- if method != methodReplaceExecutable {
+ if method != upgradeMethodReplaceExecutable {
path, err = exec.LookPath(c.upgrade.repo)
if err != nil {
return err
@@ -432,9 +438,9 @@ func (c *Config) verifyChecksum(ctx context.Context, rr *github.RepositoryReleas
return nil
}
-// getMethod attempts to determine the method by which chezmoi can be upgraded
-// by looking at how it was installed.
-func getMethod(fileSystem vfs.Stater, executableAbsPath chezmoi.AbsPath) (string, error) {
+// getUpgradeMethod attempts to determine the method by which chezmoi can be
+// upgraded by looking at how it was installed.
+func getUpgradeMethod(fileSystem vfs.Stater, executableAbsPath chezmoi.AbsPath) (string, error) {
// If the executable is in the user's home directory, then always use
// replace-executable.
userHomeDir, err := os.UserHomeDir()
@@ -444,7 +450,7 @@ func getMethod(fileSystem vfs.Stater, executableAbsPath chezmoi.AbsPath) (string
if executableInUserHomeDir, err := vfs.Contains(fileSystem, executableAbsPath.String(), userHomeDir); err != nil {
return "", err
} else if executableInUserHomeDir {
- return methodReplaceExecutable, nil
+ return upgradeMethodReplaceExecutable, nil
}
// If the executable is in the system's temporary directory, then always use
@@ -452,17 +458,17 @@ func getMethod(fileSystem vfs.Stater, executableAbsPath chezmoi.AbsPath) (string
if executableIsInTempDir, err := vfs.Contains(fileSystem, executableAbsPath.String(), os.TempDir()); err != nil {
return "", err
} else if executableIsInTempDir {
- return methodReplaceExecutable, nil
+ return upgradeMethodReplaceExecutable, nil
}
switch runtime.GOOS {
case "darwin":
- return methodUpgradePackage, nil
+ return upgradeMethodUpgradePackage, nil
case "freebsd":
- return methodReplaceExecutable, nil
+ return upgradeMethodReplaceExecutable, nil
case "linux":
if ok, _ := vfs.Contains(fileSystem, executableAbsPath.String(), "/snap"); ok {
- return methodSnapRefresh, nil
+ return upgradeMethodSnapRefresh, nil
}
info, err := fileSystem.Stat(executableAbsPath.String())
@@ -474,22 +480,22 @@ func getMethod(fileSystem vfs.Stater, executableAbsPath chezmoi.AbsPath) (string
uid := os.Getuid()
switch int(executableStat.Uid) {
case 0:
- method := methodUpgradePackage
+ method := upgradeMethodUpgradePackage
if uid != 0 {
if _, err := exec.LookPath("sudo"); err == nil {
- method = methodSudoPrefix + method
+ method = upgradeMethodSudoPrefix + method
}
}
return method, nil
case uid:
- return methodReplaceExecutable, nil
+ return upgradeMethodReplaceExecutable, nil
default:
return "", fmt.Errorf("%s: cannot upgrade executable owned by non-current non-root user", executableAbsPath)
}
case "openbsd":
- return methodReplaceExecutable, nil
+ return upgradeMethodReplaceExecutable, nil
default:
- return "", fmt.Errorf("%s: unsupported GOOS", runtime.GOOS)
+ return "", nil
}
}
|
feat
|
Add upgrade method to doctor command output
|
442ec84a2f3b03f2aff42c6e397f6750cc1893f9
|
2022-02-08 07:21:09
|
Tom Payne
|
chore: Add empty test file for internal execute-template command
| false
|
diff --git a/internal/cmds/execute-template/main_test.go b/internal/cmds/execute-template/main_test.go
new file mode 100644
index 00000000000..06ab7d0f9a3
--- /dev/null
+++ b/internal/cmds/execute-template/main_test.go
@@ -0,0 +1 @@
+package main
|
chore
|
Add empty test file for internal execute-template command
|
f10fdcd612df5af8a7b746a7305ba6918fb4140b
|
2022-04-02 04:07:38
|
dependabot[bot]
|
chore(deps): bump github.com/zalando/go-keyring from 0.2.0 to 0.2.1
| false
|
diff --git a/go.mod b/go.mod
index e90a26d62c0..8b4c0e43ec2 100644
--- a/go.mod
+++ b/go.mod
@@ -29,7 +29,7 @@ require (
github.com/twpayne/go-vfs/v4 v4.1.0
github.com/twpayne/go-xdg/v6 v6.0.0
github.com/ulikunitz/xz v0.5.10
- github.com/zalando/go-keyring v0.2.0
+ github.com/zalando/go-keyring v0.2.1
go.etcd.io/bbolt v1.3.6
go.uber.org/multierr v1.8.0
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a
diff --git a/go.sum b/go.sum
index 682a275db1a..1a7faf746f7 100644
--- a/go.sum
+++ b/go.sum
@@ -27,41 +27,31 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD
cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.99.0 h1:y/cM2iqGgGi5D5DQZl6D9STN/3dR/Vx5Mp8s752oJTY=
cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712DPA=
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.6.1 h1:8rBq3zRjnHx8UtBvaOWqBB1xq9jH6/wltfQLlTMh2Fw=
cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1 h1:ukjixP1wl0LpnZ6LWtZJ0mX5tBmjp1f8Sqer8Z2OMUU=
cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0 h1:6RRlFMv1omScs6iq2hfE3IvgE+l6RfJPampq8UZc5TU=
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/age v1.0.0 h1:V6q14n0mqYU3qKFkZ6oOaF9oXneOviS3ubXsSVBRSzc=
filippo.io/age v1.0.0/go.mod h1:PaX+Si/Sd5G8LgfCwldsSba3H1DDQZhIhFGkhbHaBq8=
-filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -79,7 +69,6 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f h1:J2FzIrXN82q5uyUraeJpLIm7U6PffRwje2ORho5yIik=
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
@@ -96,7 +85,6 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo=
github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -114,46 +102,34 @@ github.com/bradenhilton/cityhash v1.0.0 h1:1QauDCwfxwIGwO2jBTJdEBqXgfCusAgQOSgdl
github.com/bradenhilton/cityhash v1.0.0/go.mod h1:Wmb8yW1egA9ulrsRX4mxfYx5zq4nBWOCZ+j63oK6uz8=
github.com/bradenhilton/mozillainstallhash v1.0.0 h1:QL9byVGb4FrVOI7MubnME3uPNj5R78tqYQPlxuBmXMw=
github.com/bradenhilton/mozillainstallhash v1.0.0/go.mod h1:yVD0OX1izZHYl1lBm2UDojyE/k0xIqKJK78k+tdWV+k=
-github.com/bradleyfalzon/ghinstallation/v2 v2.0.4 h1:tXKVfhE7FcSkhkv0UwkLvPDeZ4kz6OXd0PKPlFqf81M=
github.com/bradleyfalzon/ghinstallation/v2 v2.0.4/go.mod h1:B40qPqJxWE0jDZgOR1JmaMy+4AY1eBP+IByOvqyAKp0=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk=
github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/charmbracelet/glamour v0.5.0 h1:wu15ykPdB7X6chxugG/NNfDUbyyrCLV9XBalj5wdu3g=
github.com/charmbracelet/glamour v0.5.0/go.mod h1:9ZRtG19AUIzcTm7FGLGbq3D5WKQ5UyZBbQsMQN0XIqc=
-github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI=
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 h1:KwaoQzs/WeUxxJqiJsZ4euOly1Az/IgZXXSxlD/UBNk=
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
@@ -173,16 +149,12 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.1 h1:cgDRLG7bs59Zd+apAWuzLQL95obVYAymNJek76W3mgw=
github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.2 h1:JiO+kJTpmYGjEodY7O1Zk8oZcNz1+f30UtwtXoFUPzE=
github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
@@ -198,17 +170,14 @@ github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2Su
github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
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 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1 h1:4dntyT+x6QTOSCIrgczbQ+ockAEha0cfxD5Wi0iCzjY=
github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -217,14 +186,11 @@ github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o=
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -273,7 +239,6 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-github/v41 v41.0.0 h1:HseJrM2JFf2vfiZJ8anY2hqBjdfY1Vlj/K27ueww4gg=
github.com/google/go-github/v41 v41.0.0/go.mod h1:XgmCA5H323A9rtgExdTcnDkcqp6S30AVACCBDOonIxg=
github.com/google/go-github/v43 v43.0.0 h1:y+GL7LIsAIF2NZlJ46ZoC/D1W1ivZasT0lnWHMYPZ+U=
github.com/google/go-github/v43 v43.0.0/go.mod h1:ZkTvvmCXBvsfPpTHXnH/d2hP9Y0cTbvN9kr5xqyXOIc=
@@ -282,10 +247,8 @@ github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gops v0.3.22 h1:lyvhDxfPLHAOR2xIYwjPhN387qHxyU21Sk9sz/GhmhQ=
github.com/google/gops v0.3.22/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8=
-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60=
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -297,7 +260,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2 h1:LR89qFljJ48s990kEKGsk213yIJDPI4205OKOzbURK8=
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -315,34 +277,27 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU=
github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/consul/api v1.12.0 h1:k3y1FYv6nuKyNTqj6w9gXOx5r5CfLj/k/euUeBXj1OY=
github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.0.0 h1:bkKf0BeBXcSYa7f5Fyi9gMuQ8gNsxeiNpZjR6VxNZeo=
github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -350,21 +305,18 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/serf v0.9.6 h1:uuEX1kLR6aoda1TBttmJQKDLZE1Ob7KN0NPdE7EtCDc=
github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
@@ -374,35 +326,27 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kevinburke/ssh_config v1.1.0 h1:pH/t1WS9NzT8go394IqZeJTMHVm6Cr6ZJ6AQ+mdNo/o=
github.com/kevinburke/ssh_config v1.1.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 h1:WjT3fLi9n8YWh/Ih8Q1LHAPsTqGddPcHqscN+PJ3i68=
github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
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=
@@ -419,7 +363,6 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -454,11 +397,9 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/muesli/combinator v0.3.0 h1:SZDuRzzwmVPLkbOzbhGzBTwd5+Y6aFN4UusOW2azrNA=
github.com/muesli/combinator v0.3.0/go.mod h1:ttPegJX0DPQaGDtJKMInIP6Vfp5pN8RX7QntFCcpy18=
@@ -468,7 +409,6 @@ github.com/muesli/termenv v0.9.0/go.mod h1:R/LzAKf+suGs4IsO95y7+7DpFHO0KABgnZqtl
github.com/muesli/termenv v0.11.0 h1:fwNUbu2mfWlgicwG7qYzs06aOI8Z/zKPAv8J4uKbT+o=
github.com/muesli/termenv v0.11.0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
@@ -485,7 +425,6 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -496,7 +435,6 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -511,20 +449,16 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
-github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4=
github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo=
github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.4.0 h1:Rqcx6Sf/bWQUmmfGQhcFx3wQQEfb2UZWhAKvGRairm0=
github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/shirou/gopsutil/v3 v3.21.9 h1:Vn4MUz2uXhqLSiCbGFRc0DILbMVLAY92DSkT8bsYrHg=
github.com/shirou/gopsutil/v3 v3.21.9/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
@@ -532,7 +466,6 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
@@ -564,9 +497,7 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
-github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/twpayne/go-pinentry v0.2.0 h1:hS5NEJiilop9xP9pBX/1NYduzDlGGMdg1KamTBTrOWw=
@@ -584,7 +515,6 @@ github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
github.com/xanzy/ssh-agent v0.3.1 h1:AmzO1SSWxw73zxFZPRwaMN1MohDw8UyHnmuxyceTEGo=
github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w=
-github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -597,15 +527,12 @@ github.com/yuin/goldmark v1.4.10 h1:+WgKGo8CQrlMTRJpGCFCyNddOhW801TKC2QijVV9QVg=
github.com/yuin/goldmark v1.4.10/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=
github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
-github.com/zalando/go-keyring v0.2.0 h1:IZOFhp3Gw5WeaGTVpKtKD2o/s+BeeqQkKUhtMDTQ190=
-github.com/zalando/go-keyring v0.2.0/go.mod h1:cu3uCHLkG4H4ali7PdTkEWoq2p07YHHoI+oi16YT5x8=
+github.com/zalando/go-keyring v0.2.1 h1:MBRN/Z8H4U5wEKXiD67YbDAr5cj/DOStmSga70/2qKc=
+github.com/zalando/go-keyring v0.2.1/go.mod h1:g63M2PPn0w5vjmEbwAX3ib5I+41zdm4esSETOn9Y6Dw=
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.etcd.io/etcd/api/v3 v3.5.1 h1:v28cktvBq+7vGyJXF8G+rWJmj+1XUmMtqcLnH8hDocM=
go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/client/pkg/v3 v3.5.1 h1:XIQcHCFSG53bJETYeRJtIxdLv2EWRGxcfzR8lSnTH4E=
go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.1 h1:vtxYCKWA9x31w0WJj7DdqsHFNjhkigdAnziDtkZb/l4=
go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -613,7 +540,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -651,10 +577,8 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -666,11 +590,9 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
@@ -680,7 +602,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -857,7 +778,6 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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=
@@ -914,7 +834,6 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -952,7 +871,6 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv
google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.63.0 h1:n2bqqK895ygnBpdPDYetfy23K7fJ22wsrZKCyfuRkkA=
google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1024,7 +942,6 @@ google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ6
google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1052,7 +969,6 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -1083,7 +999,6 @@ gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -1103,15 +1018,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
-rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/goversion v1.2.0 h1:SPn+NLTiAG7w30IRK/DKp1BjvpWabYgxlLp/+kx5J8w=
rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=
-rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
chore
|
bump github.com/zalando/go-keyring from 0.2.0 to 0.2.1
|
ecb6c1d98bbe3e3f9de7951680bb975b1266b536
|
2021-11-30 14:17:17
|
Felipe Santos
|
feat: Add .chezmoi.configFile template variable
| false
|
diff --git a/docs/REFERENCE.md b/docs/REFERENCE.md
index 9e6ec884035..c6781bedd6b 100644
--- a/docs/REFERENCE.md
+++ b/docs/REFERENCE.md
@@ -1891,6 +1891,7 @@ chezmoi provides the following automatically-populated variables:
| -------------------------- | ---------- | ------------------------------------------------------------------------------------------------------------------------------- |
| `.chezmoi.arch` | `string` | Architecture, e.g. `amd64`, `arm`, etc. as returned by [runtime.GOARCH](https://pkg.go.dev/runtime?tab=doc#pkg-constants). |
| `.chezmoi.args` | `[]string` | The arguments passed to the `chezmoi` command, starting with the program command. |
+| `.chezmoi.configFile` | `string` | The path to the configuration file used by chezmoi, if any. |
| `.chezmoi.executable` | `string` | The path to the `chezmoi` executable, if available. |
| `.chezmoi.fqdnHostname` | `string` | The fully-qualified domain name hostname of the machine chezmoi is running on. |
| `.chezmoi.group` | `string` | The group of the user running chezmoi. |
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
index b3cda30b83d..e6ebd1d38ea 100644
--- a/internal/cmd/config.go
+++ b/internal/cmd/config.go
@@ -930,6 +930,7 @@ func (c *Config) defaultTemplateData() map[string]interface{} {
"chezmoi": map[string]interface{}{
"arch": runtime.GOARCH,
"args": os.Args,
+ "configFile": c.configFileAbsPath.String(),
"executable": executable,
"fqdnHostname": fqdnHostname,
"group": group,
|
feat
|
Add .chezmoi.configFile template variable
|
86b90bea6c1012ed64d467221cadce1e77553c41
|
2023-03-11 18:16:06
|
Tom Payne
|
chore: Tidy up nolint directives
| false
|
diff --git a/pkg/cmd/templatefuncs.go b/pkg/cmd/templatefuncs.go
index f20f1f5ae36..6afb72ed93c 100644
--- a/pkg/cmd/templatefuncs.go
+++ b/pkg/cmd/templatefuncs.go
@@ -422,8 +422,7 @@ func (c *Config) toIniTemplateFunc(data map[string]any) string {
return builder.String()
}
-//nolint:revive,stylecheck
-func (c *Config) toPrettyJsonTemplateFunc(args ...any) string {
+func (c *Config) toPrettyJsonTemplateFunc(args ...any) string { //nolint:revive,stylecheck
var (
indent = " "
value any
diff --git a/pkg/shell/shell_darwin.go b/pkg/shell/shell_darwin.go
index 4e4810749d0..f647bb0ebea 100644
--- a/pkg/shell/shell_darwin.go
+++ b/pkg/shell/shell_darwin.go
@@ -10,8 +10,7 @@ import (
"regexp"
)
-//nolint:gochecknoglobals
-var dsclUserShellRegexp = regexp.MustCompile(`\AUserShell:\s+(.*?)\s*\z`)
+var dsclUserShellRegexp = regexp.MustCompile(`\AUserShell:\s+(.*?)\s*\z`) //nolint:gochecknoglobals
// CurrentUserShell returns the current user's shell.
func CurrentUserShell() (string, bool) {
@@ -33,8 +32,7 @@ func CurrentUserShell() (string, bool) {
}
// If dscl is available, use it.
- //nolint:gosec
- if output, err := exec.Command("dscl", ".", "-read", u.HomeDir, "UserShell").Output(); err == nil {
+ if output, err := exec.Command("dscl", ".", "-read", u.HomeDir, "UserShell").Output(); err == nil { //nolint:gosec
if m := dsclUserShellRegexp.FindSubmatch(output); m != nil {
return string(m[1]), true
}
diff --git a/pkg/shell/shellcgo.go b/pkg/shell/shellcgo.go
index ff9ce142436..284759a9c3b 100644
--- a/pkg/shell/shellcgo.go
+++ b/pkg/shell/shellcgo.go
@@ -29,8 +29,7 @@ func cgoGetUserShell(name string) (string, bool) {
buf = make([]byte, buflen)
result *C.struct_passwd
)
- //nolint:gocritic
- rc := C.getpwnam_r(cName, &pwd, (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(buflen), &result)
+ rc := C.getpwnam_r(cName, &pwd, (*C.char)(unsafe.Pointer(&buf[0])), C.size_t(buflen), &result) //nolint:gocritic
C.free(unsafe.Pointer(cName))
switch rc {
|
chore
|
Tidy up nolint directives
|
1c7c2fe29a64203acebe4f945f1a0eac6bb89ea3
|
2023-06-05 03:48:19
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cbbc812abb3..80baf03d770 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ env:
AGE_VERSION: 1.1.1
GO_VERSION: 1.20.4
GOFUMPT_VERSION: 0.4.0
- GOLANGCI_LINT_VERSION: 1.53.1
+ GOLANGCI_LINT_VERSION: 1.53.2
GOVERSIONINFO_VERSION: 1.4.0
jobs:
changes:
diff --git a/go.mod b/go.mod
index 4699a498376..420ec190964 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
github.com/google/go-github/v52 v52.0.0
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
- github.com/itchyny/gojq v0.12.12
+ github.com/itchyny/gojq v0.12.13
github.com/klauspost/compress v1.16.5
github.com/mitchellh/mapstructure v1.5.0
github.com/muesli/combinator v0.3.0
@@ -125,7 +125,7 @@ require (
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/text v0.9.0 // indirect
- golang.org/x/tools v0.9.2 // indirect
+ golang.org/x/tools v0.9.3 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
diff --git a/go.sum b/go.sum
index 4c0678ee470..bc78d3055fc 100644
--- a/go.sum
+++ b/go.sum
@@ -159,8 +159,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/itchyny/gojq v0.12.12 h1:x+xGI9BXqKoJQZkr95ibpe3cdrTbY8D9lonrK433rcA=
-github.com/itchyny/gojq v0.12.12/go.mod h1:j+3sVkjxwd7A7Z5jrbKibgOLn0ZfLWkV+Awxr/pyzJE=
+github.com/itchyny/gojq v0.12.13 h1:IxyYlHYIlspQHHTE0f3cJF0NKDMfajxViuhBLnHd/QU=
+github.com/itchyny/gojq v0.12.13/go.mod h1:JzwzAqenfhrPUuwbmEz3nu3JQmFLlQTQMUcOdnu/Sf4=
github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -397,8 +397,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.9.2 h1:UXbndbirwCAx6TULftIfie/ygDNCwxEie+IiNP1IcNc=
-golang.org/x/tools v0.9.2/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
chore
|
Update dependencies
|
51d5d80dee197fc72f2b2aad65216aee99cf75b2
|
2022-02-14 04:35:18
|
Tom Payne
|
chore: Remove dead code
| false
|
diff --git a/pkg/cmd/initcmd.go b/pkg/cmd/initcmd.go
index c116aa8ce6e..baabb684ea5 100644
--- a/pkg/cmd/initcmd.go
+++ b/pkg/cmd/initcmd.go
@@ -85,20 +85,6 @@ var dotfilesRepoGuesses = []struct {
httpUsernameGuessRepl: "$1",
sshRepoGuessRepl: "[email protected]:~$1/$2",
},
- /*
- {
- rx: regexp.MustCompile(`\Acodeberg\.org/([-0-9A-Za-z]+)\z`),
- httpRepoGuessRepl: "https://codeberg.org/$1/dotfiles.git",
- httpUsernameGuessRepl: "$1",
- sshRepoGuessRepl: "[email protected]:$1/dotfiles.git",
- },
- {
- rx: regexp.MustCompile(`\Acodeberg\.org/([-0-9A-Za-z]+)/([-0-9A-Za-z]+)\z`),
- httpRepoGuessRepl: "https://codeberg.org/$1/$2.git",
- httpUsernameGuessRepl: "$1",
- sshRepoGuessRepl: "[email protected]:$1/$2.git",
- },
- */
}
// A loggableGitCloneOptions is a git.CloneOptions that implements
|
chore
|
Remove dead code
|
2e8acac2c4c756d11eb97a56f5c701950f120ed8
|
2023-10-10 23:32:09
|
Tom Payne
|
chore: Build with Go 1.21.3
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7a66fe786d5..3f2e45687ee 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ env:
ACTIONLINT_VERSION: 1.6.25
AGE_VERSION: 1.1.1
CHOCOLATEY_VERSION: 2.2.2
- GO_VERSION: 1.21.2
+ GO_VERSION: 1.21.3
GOFUMPT_VERSION: 0.4.0
GOLANGCI_LINT_VERSION: 1.54.2
GOLINES_VERSION: 0.11.0
|
chore
|
Build with Go 1.21.3
|
df477bfca5b2c66bfdf54c98307ff8d19848eb18
|
2023-01-31 00:45:55
|
dependabot[bot]
|
chore(deps): bump github/codeql-action from 2.1.37 to 2.2.1
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cfe74673a9a..34f1bccb227 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,10 +47,10 @@ jobs:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
fetch-depth: 1
- - uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
+ - uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
with:
languages: go
- - uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
+ - uses: github/codeql-action/analyze@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
misspell:
runs-on: ubuntu-22.04
steps:
|
chore
|
bump github/codeql-action from 2.1.37 to 2.2.1
|
b1eda2662347096c5796c8b102db5cb71d47aa06
|
2025-02-26 01:33:44
|
Tom Payne
|
docs: Add link to article
| false
|
diff --git a/assets/chezmoi.io/docs/links/articles.md.yaml b/assets/chezmoi.io/docs/links/articles.md.yaml
index 04a79a8abdf..a6980a888aa 100644
--- a/assets/chezmoi.io/docs/links/articles.md.yaml
+++ b/assets/chezmoi.io/docs/links/articles.md.yaml
@@ -498,3 +498,8 @@ articles:
lang: JP
title: 'chezmoi で macOS の user defaults も管理する'
url: https://pihero.hatenadiary.jp/entry/2025/01/26/130123
+- date: '2025-02-19'
+ version: 2.59.1
+ lang: JP
+ title: 'WSLとWindowsの設定ファイルを「chezmoi」を使って安全に管理しよう'
+ url: https://thinkit.co.jp/article/37943
|
docs
|
Add link to article
|
2b6d310326139b8df1cc89409edaade29a87fdfe
|
2022-10-13 02:14:25
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/completions/chezmoi-completion.bash b/completions/chezmoi-completion.bash
index 55772674966..0648d9b37a0 100644
--- a/completions/chezmoi-completion.bash
+++ b/completions/chezmoi-completion.bash
@@ -128,7 +128,7 @@ __chezmoi_process_completion_results() {
__chezmoi_handle_special_char "$cur" =
# Print the activeHelp statements before we finish
- if [ ${#activeHelp} -ne 0 ]; then
+ if [ ${#activeHelp[*]} -ne 0 ]; then
printf "\n";
printf "%s\n" "${activeHelp[@]}"
printf "\n"
diff --git a/completions/chezmoi.ps1 b/completions/chezmoi.ps1
index b8a4ab698e7..8c07cede587 100644
--- a/completions/chezmoi.ps1
+++ b/completions/chezmoi.ps1
@@ -10,7 +10,7 @@ filter __chezmoi_escapeStringWithSpecialChars {
$_ -replace '\s|#|@|\$|;|,|''|\{|\}|\(|\)|"|`|\||<|>|&','`$&'
}
-Register-ArgumentCompleter -CommandName 'chezmoi' -ScriptBlock {
+[scriptblock]$__chezmoiCompleterBlock = {
param(
$WordToComplete,
$CommandAst,
@@ -226,3 +226,5 @@ Register-ArgumentCompleter -CommandName 'chezmoi' -ScriptBlock {
}
}
+
+Register-ArgumentCompleter -CommandName 'chezmoi' -ScriptBlock $__chezmoiCompleterBlock
diff --git a/go.mod b/go.mod
index ad6254bf5b9..9a2fe048b5d 100644
--- a/go.mod
+++ b/go.mod
@@ -26,7 +26,7 @@ require (
github.com/rogpeppe/go-internal v1.9.0
github.com/rs/zerolog v1.28.0
github.com/sergi/go-diff v1.1.0
- github.com/spf13/cobra v1.5.0
+ github.com/spf13/cobra v1.6.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.0
github.com/twpayne/go-pinentry v0.2.0
@@ -37,10 +37,10 @@ require (
github.com/zalando/go-keyring v0.2.1
go.etcd.io/bbolt v1.3.7-0.20220226045046-fd5535f71f48
go.uber.org/multierr v1.8.0
- golang.org/x/exp v0.0.0-20221004215720-b9f4876ce741
- golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
+ golang.org/x/exp v0.0.0-20221012134508-3640c57a48ea
+ golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0
- golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec
+ golang.org/x/sys v0.0.0-20221010170243-090e33056c14
golang.org/x/term v0.0.0-20220919170432-7a66f970e087
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
@@ -115,10 +115,10 @@ require (
github.com/yuin/goldmark v1.5.2 // indirect
github.com/yuin/goldmark-emoji v1.0.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
- golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect
+ golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
- golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect
- golang.org/x/text v0.3.7 // indirect
+ golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+ golang.org/x/text v0.3.8 // indirect
golang.org/x/tools v0.1.12 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
diff --git a/go.sum b/go.sum
index a2e869e0392..196c2b29cd4 100644
--- a/go.sum
+++ b/go.sum
@@ -157,7 +157,6 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -272,8 +271,8 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
-github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
-github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
+github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
+github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -326,10 +325,10 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0=
-golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20221004215720-b9f4876ce741 h1:fGZugkZk2UgYBxtpKmvub51Yno1LJDeEsRp2xGD+0gY=
-golang.org/x/exp v0.0.0-20221004215720-b9f4876ce741/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a h1:NmSIgad6KjE6VvHciPZuNRTKxGhlPfD6OA87W/PLkqg=
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/exp v0.0.0-20221012134508-3640c57a48ea h1:c+JVtpqmcDxL2rnX9ramD4VqXvu01vReExyKr38B/l4=
+golang.org/x/exp v0.0.0-20221012134508-3640c57a48ea/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -338,10 +337,10 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2HzHcTFta3z5nsc13wI4=
-golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 h1:lxqLZaMad/dJHMFZH0NiNpiEZI/nhgWhe4wgzpE+MuA=
-golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
+golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
+golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 h1:cu5kTvlzcw1Q5S9f5ip1/cpiB4nXvw1XYzFPGgzLUOY=
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -370,8 +369,8 @@ golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cIyEbeXLBhy5Ha4nevyc=
+golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
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=
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 h1:tPwmk4vmvVCMdr98VgL4JH+qZxPL8fqlUOHnyOM8N3w=
@@ -380,8 +379,9 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
chore
|
Update dependencies
|
4243b95486671e70202ae6bfa754e3dccbc15a1f
|
2024-11-01 21:58:12
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/go.mod b/go.mod
index 3c7c7de31f0..b79387288ba 100644
--- a/go.mod
+++ b/go.mod
@@ -11,16 +11,16 @@ require (
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2
github.com/Shopify/ejson v1.5.2
github.com/alecthomas/assert/v2 v2.11.0
- github.com/aws/aws-sdk-go-v2 v1.32.2
- github.com/aws/aws-sdk-go-v2/config v1.28.0
- github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2
+ github.com/aws/aws-sdk-go-v2 v1.32.3
+ github.com/aws/aws-sdk-go-v2/config v1.28.1
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3
github.com/bmatcuk/doublestar/v4 v4.7.1
github.com/bradenhilton/mozillainstallhash v1.0.1
github.com/charmbracelet/bubbles v0.20.0
github.com/charmbracelet/bubbletea v1.1.2
github.com/charmbracelet/glamour v0.8.0
github.com/coreos/go-semver v0.3.1
- github.com/fsnotify/fsnotify v1.7.0
+ github.com/fsnotify/fsnotify v1.8.0
github.com/go-git/go-git/v5 v5.12.0
github.com/google/go-github/v66 v66.0.0
github.com/google/renameio/v2 v2.0.0
@@ -43,7 +43,7 @@ require (
github.com/twpayne/go-xdg/v6 v6.1.3
github.com/ulikunitz/xz v0.5.12
github.com/zalando/go-keyring v0.2.6
- github.com/zricethezav/gitleaks/v8 v8.21.1
+ github.com/zricethezav/gitleaks/v8 v8.21.2
go.etcd.io/bbolt v1.3.11
go.uber.org/automaxprocs v1.6.0
golang.org/x/crypto v0.28.0
@@ -64,7 +64,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
- github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
+ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.3 // indirect
github.com/BobuSumisu/aho-corasick v1.0.3 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.3.0 // indirect
@@ -73,23 +73,23 @@ require (
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
github.com/alecthomas/repr v0.4.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.17.41 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.17.42 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
github.com/aws/smithy-go v1.22.0 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/bradenhilton/cityhash v1.0.0 // indirect
github.com/charmbracelet/harmonica v0.2.0 // indirect
- github.com/charmbracelet/lipgloss v0.13.1 // indirect
- github.com/charmbracelet/x/ansi v0.4.0 // indirect
+ github.com/charmbracelet/lipgloss v1.0.0 // indirect
+ github.com/charmbracelet/x/ansi v0.4.2 // indirect
github.com/charmbracelet/x/term v0.2.0 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/creack/pty/v2 v2.0.0-20231209135443-03db72c7b76c // indirect
diff --git a/go.sum b/go.sum
index a39ae26eec2..d8bd4b8bacc 100644
--- a/go.sum
+++ b/go.sum
@@ -38,8 +38,8 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 h1:eXnN9
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0/go.mod h1:XIpam8wumeZ5rVMuhdDQLMfIPDf1WO3IzrCRO3e3e3o=
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.3 h1:6LyjnnaLpcOKK0fbYisI+mb8CE7iNe7i89nMNQxFxs8=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.3/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/BobuSumisu/aho-corasick v1.0.3 h1:uuf+JHwU9CHP2Vx+wAy6jcksJThhJS9ehR8a+4nPE9g=
github.com/BobuSumisu/aho-corasick v1.0.3/go.mod h1:hm4jLcvZKI2vRF2WDU1N4p/jpWtpOzp3nLmi9AzX/XE=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
@@ -71,32 +71,32 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/aws/aws-sdk-go-v2 v1.32.2 h1:AkNLZEyYMLnx/Q/mSKkcMqwNFXMAvFto9bNsHqcTduI=
-github.com/aws/aws-sdk-go-v2 v1.32.2/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
-github.com/aws/aws-sdk-go-v2/config v1.28.0 h1:FosVYWcqEtWNxHn8gB/Vs6jOlNwSoyOCA/g/sxyySOQ=
-github.com/aws/aws-sdk-go-v2/config v1.28.0/go.mod h1:pYhbtvg1siOOg8h5an77rXle9tVG8T+BWLWAo7cOukc=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.41 h1:7gXo+Axmp+R4Z+AK8YFQO0ZV3L0gizGINCOWxSLY9W8=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.41/go.mod h1:u4Eb8d3394YLubphT4jLEwN1rLNq2wFOlT6OuxFwPzU=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 h1:TMH3f/SCAWdNtXXVPPu5D6wrr4G5hI1rAxbcocKfC7Q=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17/go.mod h1:1ZRXLdTpzdJb9fwTMXiLipENRxkGMTn1sfKexGllQCw=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 h1:UAsR3xA31QGf79WzpG/ixT9FZvQlh5HY1NRqSHBNOCk=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21/go.mod h1:JNr43NFf5L9YaG3eKTm7HQzls9J+A9YYcGI5Quh1r2Y=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 h1:6jZVETqmYCadGFvrYEQfC5fAQmlo80CeL5psbno6r0s=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21/go.mod h1:1SR0GbLlnN3QUmYaflZNiH1ql+1qrSiB2vwcJ+4UM60=
+github.com/aws/aws-sdk-go-v2 v1.32.3 h1:T0dRlFBKcdaUPGNtkBSwHZxrtis8CQU17UpNBZYd0wk=
+github.com/aws/aws-sdk-go-v2 v1.32.3/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
+github.com/aws/aws-sdk-go-v2/config v1.28.1 h1:oxIvOUXy8x0U3fR//0eq+RdCKimWI900+SV+10xsCBw=
+github.com/aws/aws-sdk-go-v2/config v1.28.1/go.mod h1:bRQcttQJiARbd5JZxw6wG0yIK3eLeSCPdg6uqmmlIiI=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.42 h1:sBP0RPjBU4neGpIYyx8mkU2QqLPl5u9cmdTWVzIpHkM=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.42/go.mod h1:FwZBfU530dJ26rv9saAbxa9Ej3eF/AK0OAY86k13n4M=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 h1:68jFVtt3NulEzojFesM/WVarlFpCaXLKaBxDpzkQ9OQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18/go.mod h1:Fjnn5jQVIo6VyedMc0/EhPpfNlPl7dHV916O6B+49aE=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 h1:Jw50LwEkVjuVzE1NzkhNKkBf9cRN7MtE1F/b2cOKTUM=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22/go.mod h1:Y/SmAyPcOTmpeVaWSzSKiILfXTVJwrGmYZhcRbhWuEY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 h1:981MHwBaRZM7+9QSR6XamDzF/o7ouUGxFzr+nVSIhrs=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22/go.mod h1:1RA1+aBEfn+CAB/Mh0MB6LsdCYCnjZm7tKXtnk499ZQ=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 h1:s7NA1SOw8q/5c0wr8477yOPp0z+uBaXBnLE0XYb0POA=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2/go.mod h1:fnjjWyAW/Pj5HYOxl9LJqWtEwS7W2qgcRLWP+uWbss0=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2 h1:Rrqru2wYkKQCS2IM5/JrgKUQIoNTqA6y/iuxkjzxC6M=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2/go.mod h1:QuCURO98Sqee2AXmqDNxKXYFm2OEDAVAPApMqO0Vqnc=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 h1:bSYXVyUzoTHoKalBmwaZxs97HU9DWWI3ehHSAMa7xOk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.2/go.mod h1:skMqY7JElusiOUjMJMOv1jJsP7YUg7DrhgqZZWuzu1U=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 h1:AhmO1fHINP9vFYUE0LHzCWg/LfUWUF+zFPEcY9QXb7o=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2/go.mod h1:o8aQygT2+MVP0NaV6kbdE1YnnIM8RRVQzoeUH45GOdI=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 h1:CiS7i0+FUe+/YY1GvIBLLrR/XNGZ4CtM1Ll0XavNuVo=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.2/go.mod h1:HtaiBI8CjYoNVde8arShXb94UbQQi9L4EMr6D+xGBwo=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 h1:qcxX0JYlgWH3hpPUnd6U0ikcl6LLA9sLkXE2w1fpMvY=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3/go.mod h1:cLSNEmI45soc+Ef8K/L+8sEA3A3pYFEYf5B5UI+6bH4=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3 h1:CyA6J82ePPoh1Nj8ErOR2e/JRlzfFzWpGwGMFzFjwZg=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3/go.mod h1:EliITPlGcBz0FRiVl7lRLtzI1cnDybFcfLYMZedOInE=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 h1:UTpsIf0loCIWEbrqdLb+0RxnTXfWh2vhw4nQmFi4nPc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.3/go.mod h1:FZ9j3PFHHAR+w0BSEjK955w5YD2UwB/l/H0yAK3MJvI=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 h1:2YCmIXv3tmiItw0LlYf6v7gEHebLY45kBEnPezbUKyU=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3/go.mod h1:u19stRyNPxGhj6dRm+Cdgu6N75qnbW7+QN0q0dsAk58=
+github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 h1:wVnQ6tigGsRqSWDEEyH6lSAJ9OyFUsSnbaUWChuSGzs=
+github.com/aws/aws-sdk-go-v2/service/sts v1.32.3/go.mod h1:VZa9yTFyj4o10YGsmDO4gbQJUvvhY72fhumT8W4LqsE=
github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM=
github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
@@ -125,10 +125,10 @@ github.com/charmbracelet/glamour v0.8.0 h1:tPrjL3aRcQbn++7t18wOpgLyl8wrOHUEDS7IZ
github.com/charmbracelet/glamour v0.8.0/go.mod h1:ViRgmKkf3u5S7uakt2czJ272WSg2ZenlYEZXT2x7Bjw=
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
-github.com/charmbracelet/lipgloss v0.13.1 h1:Oik/oqDTMVA01GetT4JdEC033dNzWoQHdWnHnQmXE2A=
-github.com/charmbracelet/lipgloss v0.13.1/go.mod h1:zaYVJ2xKSKEnTEEbX6uAHabh2d975RJ+0yfkFpRBz5U=
-github.com/charmbracelet/x/ansi v0.4.0 h1:NqwHA4B23VwsDn4H3VcNX1W1tOmgnvY1NDx5tOXdnOU=
-github.com/charmbracelet/x/ansi v0.4.0/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
+github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
+github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
+github.com/charmbracelet/x/ansi v0.4.2 h1:0JM6Aj/g/KC154/gOP4vfxun0ff6itogDYk41kof+qk=
+github.com/charmbracelet/x/ansi v0.4.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b h1:MnAMdlwSltxJyULnrYbkZpp4k58Co7Tah3ciKhSNo0Q=
github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
github.com/charmbracelet/x/term v0.2.0 h1:cNB9Ot9q8I711MyZ7myUR5HFWL/lc3OpU8jZ4hwm0x0=
@@ -180,8 +180,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
github.com/gitleaks/go-gitdiff v0.9.1 h1:ni6z6/3i9ODT685OLCTf+s/ERlWUNWQF4x1pvoNICw0=
github.com/gitleaks/go-gitdiff v0.9.1/go.mod h1:pKz0X4YzCKZs30BL+weqBIG7mx0jl4tF1uXV9ZyNvrA=
github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
@@ -469,8 +469,8 @@ github.com/yuin/goldmark-emoji v1.0.4 h1:vCwMkPZSNefSUnOW2ZKRUjBSD5Ok3W78IXhGxxA
github.com/yuin/goldmark-emoji v1.0.4/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=
github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
-github.com/zricethezav/gitleaks/v8 v8.21.1 h1:DSBzsltNAZekyBem9T9Xp7QaM+6nKDOqV4AA3vSfxvQ=
-github.com/zricethezav/gitleaks/v8 v8.21.1/go.mod h1:5HpElkNYAzjyv93hZWjohiNol6+nsveKzm9MTgmkWtI=
+github.com/zricethezav/gitleaks/v8 v8.21.2 h1:Wk4vazk5aIyqa4EeITrSwXg+cp4b69wGd7iyHEw+jbc=
+github.com/zricethezav/gitleaks/v8 v8.21.2/go.mod h1:5HpElkNYAzjyv93hZWjohiNol6+nsveKzm9MTgmkWtI=
go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c=
diff --git a/internal/cmd/addcmd_test.go b/internal/cmd/addcmd_test.go
index fbc7a2c61de..12c8e218263 100644
--- a/internal/cmd/addcmd_test.go
+++ b/internal/cmd/addcmd_test.go
@@ -286,7 +286,7 @@ func TestAddCmdChmod(t *testing.T) {
func TestAddCmdSecretsError(t *testing.T) {
chezmoitest.WithTestFS(t, map[string]any{
"/home/user": map[string]any{
- ".secret": "AWS_ACCESS_KEY_ID=AKIA0000000000000000\n",
+ ".secret": "AWS_ACCESS_KEY_ID=AKIA0123456789ABCDEF\n",
},
}, func(fileSystem vfs.FS) {
assert.Error(t, newTestConfig(t, fileSystem).execute([]string{"add", "--secrets=error", "/home/user/.secret"}))
diff --git a/internal/cmd/testdata/scripts/addsecrets.txtar b/internal/cmd/testdata/scripts/addsecrets.txtar
index 0529f43f6fc..0194c8ef04b 100644
--- a/internal/cmd/testdata/scripts/addsecrets.txtar
+++ b/internal/cmd/testdata/scripts/addsecrets.txtar
@@ -24,4 +24,4 @@ stderr 'Identified a pattern that may indicate AWS credentials, risking unauthor
exists $CHEZMOISOURCEDIR/dot_secret
-- home/user/.secret --
-AWS_ACCESS_KEY_ID=AKIA0000000000000000
+AWS_ACCESS_KEY_ID=AKIA0123456789ABCDEF
|
chore
|
Update dependencies
|
2c3a349ea692bfc1ccf59438a32757c0c6ac7563
|
2022-09-15 00:34:25
|
Muescha
|
docs: Change remote origin from ssh to https
| false
|
diff --git a/assets/chezmoi.io/docs/quick-start.md b/assets/chezmoi.io/docs/quick-start.md
index 2b8be375c8d..fef987d5d26 100644
--- a/assets/chezmoi.io/docs/quick-start.md
+++ b/assets/chezmoi.io/docs/quick-start.md
@@ -74,7 +74,7 @@ $ git commit -m "Initial commit"
and then push your repo:
```console
-$ git remote add origin [email protected]:username/dotfiles.git
+$ git remote add origin https://github.com/username/dotfiles.git
$ git branch -M main
$ git push -u origin main
```
|
docs
|
Change remote origin from ssh to https
|
3b1743ce48f4bdb32051e10ab01145cbc23ceed1
|
2023-09-01 16:09:29
|
dependabot[bot]
|
chore(deps): bump actions/setup-go from 4.0.1 to 4.1.0
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8928ea156f2..5935bc06856 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -116,7 +116,7 @@ jobs:
runs-on: macos-11
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- name: build
@@ -146,7 +146,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: oldstable
- name: build
@@ -173,7 +173,7 @@ jobs:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
with:
fetch-depth: 0
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- name: install-release-dependencies
@@ -231,7 +231,7 @@ jobs:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
with:
fetch-depth: 0
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- name: install-age
@@ -269,7 +269,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- name: install-website-dependencies
@@ -286,7 +286,7 @@ jobs:
runs-on: windows-2022
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
@@ -325,7 +325,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- name: generate
@@ -355,7 +355,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc
@@ -394,7 +394,7 @@ jobs:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
with:
fetch-depth: 0
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06
@@ -419,7 +419,7 @@ jobs:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
with:
fetch-depth: 0
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ env.GO_VERSION }}
- name: prepare-chezmoi.io
|
chore
|
bump actions/setup-go from 4.0.1 to 4.1.0
|
dfa0f8043ff743e69f6773cca022653506e60c59
|
2025-01-30 22:07:31
|
Tom Payne
|
fix: Fix persistent state mode in chattr command
| false
|
diff --git a/internal/cmd/chattrcmd.go b/internal/cmd/chattrcmd.go
index 0017b8ac466..a4bb298aa98 100644
--- a/internal/cmd/chattrcmd.go
+++ b/internal/cmd/chattrcmd.go
@@ -83,7 +83,7 @@ func (c *Config) newChattrCmd() *cobra.Command {
ValidArgsFunction: c.chattrCmdValidArgs,
RunE: c.makeRunEWithSourceState(c.runChattrCmd),
Annotations: newAnnotations(
- persistentStateModeReadOnly,
+ persistentStateModeReadWrite,
modifiesSourceDirectory,
requiresSourceDirectory,
),
|
fix
|
Fix persistent state mode in chattr command
|
fee00885f39125232195f3f03c44a9b9167b7a8c
|
2022-01-22 02:33:47
|
Tom Payne
|
chore: Sort functions
| false
|
diff --git a/internal/chezmoi/sourcestate.go b/internal/chezmoi/sourcestate.go
index 4a24d24bdaa..eb11111bdc6 100644
--- a/internal/chezmoi/sourcestate.go
+++ b/internal/chezmoi/sourcestate.go
@@ -112,6 +112,13 @@ func WithCacheDir(cacheDirAbsPath AbsPath) SourceStateOption {
}
}
+// WithDefaultTemplateDataFunc sets the default template data function.
+func WithDefaultTemplateDataFunc(defaultTemplateDataFunc func() map[string]interface{}) SourceStateOption {
+ return func(s *SourceState) {
+ s.defaultTemplateDataFunc = defaultTemplateDataFunc
+ }
+}
+
// WithDestDir sets the destination directory.
func WithDestDir(destDirAbsPath AbsPath) SourceStateOption {
return func(s *SourceState) {
@@ -182,13 +189,6 @@ func WithSystem(system System) SourceStateOption {
}
}
-// WithDefaultTemplateDataFunc sets the default template data function.
-func WithDefaultTemplateDataFunc(defaultTemplateDataFunc func() map[string]interface{}) SourceStateOption {
- return func(s *SourceState) {
- s.defaultTemplateDataFunc = defaultTemplateDataFunc
- }
-}
-
// WithTemplateDataOnly sets whether only template data should be read.
func WithTemplateDataOnly(templateDataOnly bool) SourceStateOption {
return func(s *SourceState) {
|
chore
|
Sort functions
|
7f0702503528fb708a5d9fc7b2a826decb777b26
|
2021-12-20 02:40:21
|
Tom Payne
|
chore: Tidy up absolute path handling
| false
|
diff --git a/internal/chezmoi/path_unix.go b/internal/chezmoi/path_unix.go
index 73c6e2acbeb..c32720a90ff 100644
--- a/internal/chezmoi/path_unix.go
+++ b/internal/chezmoi/path_unix.go
@@ -11,15 +11,20 @@ import (
// NewAbsPathFromExtPath returns a new AbsPath by converting extPath to use
// slashes, performing tilde expansion, and making the path absolute.
func NewAbsPathFromExtPath(extPath string, homeDirAbsPath AbsPath) (AbsPath, error) {
- tildeSlashPath := expandTilde(filepath.ToSlash(extPath), homeDirAbsPath)
- if filepath.IsAbs(tildeSlashPath) {
- return NewAbsPath(tildeSlashPath), nil
- }
- slashPathAbsPath, err := filepath.Abs(tildeSlashPath)
- if err != nil {
- return EmptyAbsPath, err
+ switch {
+ case extPath == "~":
+ return homeDirAbsPath, nil
+ case strings.HasPrefix(extPath, "~/"):
+ return homeDirAbsPath.JoinString(extPath[2:]), nil
+ case filepath.IsAbs(extPath):
+ return NewAbsPath(extPath), nil
+ default:
+ absPath, err := filepath.Abs(extPath)
+ if err != nil {
+ return EmptyAbsPath, err
+ }
+ return NewAbsPath(absPath), nil
}
- return NewAbsPath(slashPathAbsPath), nil
}
// NormalizePath returns path normalized. On non-Windows systems, normalized
@@ -32,18 +37,6 @@ func NormalizePath(path string) (AbsPath, error) {
return NewAbsPath(absPath), nil
}
-// expandTilde expands a leading tilde in path.
-func expandTilde(path string, homeDirAbsPath AbsPath) string {
- switch {
- case path == "~":
- return homeDirAbsPath.String()
- case strings.HasPrefix(path, "~/"):
- return homeDirAbsPath.JoinString(path[2:]).String()
- default:
- return path
- }
-}
-
// normalizeLinkname returns linkname normalized. On non-Windows systems, it
// returns linkname unchanged.
func normalizeLinkname(linkname string) string {
diff --git a/internal/chezmoi/path_windows.go b/internal/chezmoi/path_windows.go
index 41986c5e458..91cc394ba85 100644
--- a/internal/chezmoi/path_windows.go
+++ b/internal/chezmoi/path_windows.go
@@ -9,17 +9,20 @@ import (
// slashes, performing tilde expansion, making the path absolute, and converting
// the volume name to uppercase.
func NewAbsPathFromExtPath(extPath string, homeDirAbsPath AbsPath) (AbsPath, error) {
- slashTildePath := filepath.ToSlash(expandTilde(extPath, homeDirAbsPath))
- if filepath.IsAbs(slashTildePath) {
- return NewAbsPath(volumeNameToUpper(slashTildePath)), nil
- }
- tildeAbsPath, err := filepath.Abs(slashTildePath)
- if err != nil {
- return EmptyAbsPath, err
+ switch {
+ case extPath == "~":
+ return homeDirAbsPath, nil
+ case len(extPath) >= 2 && extPath[0] == '~' && isSlash(extPath[1]):
+ return homeDirAbsPath.JoinString(filepath.ToSlash(extPath[2:])), nil
+ case filepath.IsAbs(extPath):
+ return NewAbsPath(volumeNameToUpper(extPath)).ToSlash(), nil
+ default:
+ extPath, err := filepath.Abs(extPath)
+ if err != nil {
+ return EmptyAbsPath, err
+ }
+ return NewAbsPath(volumeNameToUpper(extPath)).ToSlash(), nil
}
- // filepath.Abs on Windows converts forward slashes to backslashes so we
- // have to call filepath.ToSlash again.
- return NewAbsPath(filepath.ToSlash(volumeNameToUpper(tildeAbsPath))), nil
}
// NormalizePath returns path normalized. On Windows, normalized paths are
@@ -36,18 +39,6 @@ func NormalizePath(path string) (AbsPath, error) {
return NewAbsPath(path).ToSlash(), nil
}
-// expandTilde expands a leading tilde in path.
-func expandTilde(path string, homeDirAbsPath AbsPath) string {
- switch {
- case path == "~":
- return homeDirAbsPath.String()
- case len(path) >= 2 && path[0] == '~' && isSlash(path[1]):
- return homeDirAbsPath.JoinString(path[2:]).String()
- default:
- return path
- }
-}
-
// normalizeLinkname returns linkname normalized. On Windows, backslashes are
// converted to forward slashes and if linkname is an absolute path then the
// volume name is converted to uppercase.
|
chore
|
Tidy up absolute path handling
|
232fda48f2846fe9f1c8d2ecc56d0c7edabbb947
|
2022-10-30 22:27:34
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/go.mod b/go.mod
index 4b337a2d815..e8bedba403b 100644
--- a/go.mod
+++ b/go.mod
@@ -37,7 +37,7 @@ require (
github.com/zalando/go-keyring v0.2.1
go.etcd.io/bbolt v1.3.7-0.20220226045046-fd5535f71f48
go.uber.org/multierr v1.8.0
- golang.org/x/exp v0.0.0-20221026004748-78e5e7837ae6
+ golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f
golang.org/x/oauth2 v0.1.0
golang.org/x/sync v0.1.0
golang.org/x/sys v0.1.0
@@ -52,7 +52,7 @@ require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
- github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad // indirect
+ github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
@@ -86,7 +86,7 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/css v1.0.0 // indirect
- github.com/huandu/xstrings v1.3.2 // indirect
+ github.com/huandu/xstrings v1.3.3 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
diff --git a/go.sum b/go.sum
index 60009c855f4..7dee3cea5ad 100644
--- a/go.sum
+++ b/go.sum
@@ -14,8 +14,8 @@ github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v
github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad h1:QeeqI2zxxgZVe11UrYFXXx6gVxPVF40ygekjBzEg4XY=
-github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
+github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I=
+github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
@@ -152,8 +152,8 @@ github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
-github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4=
+github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
@@ -330,8 +330,8 @@ golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
-golang.org/x/exp v0.0.0-20221026004748-78e5e7837ae6 h1:mC6uOkPi9SUk8A59jZvw7//rlyc+MlELtQUCyOUSKZQ=
-golang.org/x/exp v0.0.0-20221026004748-78e5e7837ae6/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f h1:Al51T6tzvuh3oiwX11vex3QgJ2XTedFPGmbEVh8cdoc=
+golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
chore
|
Update dependencies
|
7a2fa6ec611bd05411d6dccbe30f20f933c7c869
|
2025-01-27 09:18:13
|
Tom Payne
|
chore: Increase type strictness of persistent state interface
| false
|
diff --git a/internal/chezmoi/boltpersistentstate.go b/internal/chezmoi/boltpersistentstate.go
index 5df90823742..6a93d910c23 100644
--- a/internal/chezmoi/boltpersistentstate.go
+++ b/internal/chezmoi/boltpersistentstate.go
@@ -129,7 +129,7 @@ func (b *BoltPersistentState) DeleteBucket(bucket []byte) error {
}
// Data returns all the data in b.
-func (b *BoltPersistentState) Data() (any, error) {
+func (b *BoltPersistentState) Data() (map[string]map[string]string, error) {
if b.empty {
return nil, nil
}
diff --git a/internal/chezmoi/boltpersistentstate_test.go b/internal/chezmoi/boltpersistentstate_test.go
index 85467c1ec43..5e7d880af30 100644
--- a/internal/chezmoi/boltpersistentstate_test.go
+++ b/internal/chezmoi/boltpersistentstate_test.go
@@ -72,7 +72,7 @@ func TestBoltPersistentState(t *testing.T) {
string(bucket): {
string(key): string(value),
},
- }, data.(map[string]map[string]string))
+ }, data)
assert.NoError(t, b1.Close())
diff --git a/internal/chezmoi/debugpersistentstate.go b/internal/chezmoi/debugpersistentstate.go
index 3b7b99e6bf5..4f9562c06f0 100644
--- a/internal/chezmoi/debugpersistentstate.go
+++ b/internal/chezmoi/debugpersistentstate.go
@@ -36,7 +36,7 @@ func (s *DebugPersistentState) CopyTo(p PersistentState) error {
}
// Data implements PersistentState.Data.
-func (s *DebugPersistentState) Data() (any, error) {
+func (s *DebugPersistentState) Data() (map[string]map[string]string, error) {
data, err := s.persistentState.Data()
chezmoilog.InfoOrError(s.logger, "Data", err,
slog.Any("data", data),
diff --git a/internal/chezmoi/mockpersistentstate.go b/internal/chezmoi/mockpersistentstate.go
index a43103d01d1..4e8b7024453 100644
--- a/internal/chezmoi/mockpersistentstate.go
+++ b/internal/chezmoi/mockpersistentstate.go
@@ -30,8 +30,16 @@ func (s *MockPersistentState) CopyTo(p PersistentState) error {
}
// Data implements PersistentState.Data.
-func (s *MockPersistentState) Data() (any, error) {
- return s.buckets, nil
+func (s *MockPersistentState) Data() (map[string]map[string]string, error) {
+ data := make(map[string]map[string]string)
+ for bucket, bucketMap := range s.buckets {
+ dataBucketMap := make(map[string]string, len(bucketMap))
+ for key, value := range bucketMap {
+ dataBucketMap[key] = string(value)
+ }
+ data[bucket] = dataBucketMap
+ }
+ return data, nil
}
// Delete implements PersistentState.Delete.
diff --git a/internal/chezmoi/nullpersistentstate.go b/internal/chezmoi/nullpersistentstate.go
index 09bbb33795d..12894df9229 100644
--- a/internal/chezmoi/nullpersistentstate.go
+++ b/internal/chezmoi/nullpersistentstate.go
@@ -11,7 +11,7 @@ func (NullPersistentState) Close() error { return nil }
func (NullPersistentState) CopyTo(s PersistentState) error { return nil }
// Data does nothing.
-func (NullPersistentState) Data() (any, error) { return nil, nil }
+func (NullPersistentState) Data() (map[string]map[string]string, error) { return nil, nil }
// Delete does nothing.
func (NullPersistentState) Delete(bucket, key []byte) error { return nil }
diff --git a/internal/chezmoi/persistentstate.go b/internal/chezmoi/persistentstate.go
index 373e02500de..c69a6154e01 100644
--- a/internal/chezmoi/persistentstate.go
+++ b/internal/chezmoi/persistentstate.go
@@ -22,7 +22,7 @@ var (
type PersistentState interface {
Close() error
CopyTo(s PersistentState) error
- Data() (any, error)
+ Data() (map[string]map[string]string, error)
Delete(bucket, key []byte) error
DeleteBucket(bucket []byte) error
ForEach(bucket []byte, fn func(k, v []byte) error) error
diff --git a/internal/cmd/testdata/scripts/state.txtar b/internal/cmd/testdata/scripts/state.txtar
index 70fe1254191..d757f9ee3c9 100644
--- a/internal/cmd/testdata/scripts/state.txtar
+++ b/internal/cmd/testdata/scripts/state.txtar
@@ -7,7 +7,7 @@ exec chezmoi state get --bucket=bucket --key=key
# test that chezmoi state set sets a value that can be retrieved with chezmoi state get
exec chezmoi state set --bucket=bucket --key=key --value=value
exec chezmoi state get --bucket=bucket --key=key
-stdout value
+stdout ^value$
exec chezmoi state data --format=yaml
cmp stdout golden/data.yaml
|
chore
|
Increase type strictness of persistent state interface
|
5d0c9677413eaffb86bd0678fd0acdfcb1cd6011
|
2022-10-18 05:41:17
|
Tom Payne
|
chore: Tweak template directive implementation
| false
|
diff --git a/pkg/chezmoi/sourcestate.go b/pkg/chezmoi/sourcestate.go
index a03395818cb..a8bfd7bec33 100644
--- a/pkg/chezmoi/sourcestate.go
+++ b/pkg/chezmoi/sourcestate.go
@@ -2183,14 +2183,14 @@ func (e *External) OriginString() string {
// returns data with the lines containing directives removed. The lines are
// removed so that any delimiters do not break template parsing.
func (o *TemplateOptions) parseDirectives(data []byte) []byte {
- matches := templateDirectiveRx.FindAllSubmatchIndex(data, -1)
- if matches == nil {
+ directiveMatches := templateDirectiveRx.FindAllSubmatchIndex(data, -1)
+ if directiveMatches == nil {
return data
}
// Parse options from directives.
- for _, match := range matches {
- keyValuePairMatches := templateDirectiveKeyValuePairRx.FindAllSubmatch(data[match[2]:match[3]], -1)
+ for _, directiveMatch := range directiveMatches {
+ keyValuePairMatches := templateDirectiveKeyValuePairRx.FindAllSubmatch(data[directiveMatch[2]:directiveMatch[3]], -1)
for _, keyValuePairMatch := range keyValuePairMatches {
key := string(keyValuePairMatch[1])
value := maybeUnquote(string(keyValuePairMatch[2]))
@@ -2206,15 +2206,12 @@ func (o *TemplateOptions) parseDirectives(data []byte) []byte {
}
// Remove lines containing directives.
- slices := make([][]byte, 0, len(matches)+1)
- for i, match := range matches {
- if i == 0 {
- slices = append(slices, data[:match[0]])
- } else {
- slices = append(slices, data[matches[i-1][1]:match[0]])
- }
+ slices := make([][]byte, 0, len(directiveMatches)+1)
+ slices = append(slices, data[:directiveMatches[0][0]])
+ for i, directiveMatch := range directiveMatches[1:] {
+ slices = append(slices, data[directiveMatches[i][1]:directiveMatch[0]])
}
- slices = append(slices, data[matches[len(matches)-1][1]:])
+ slices = append(slices, data[directiveMatches[len(directiveMatches)-1][1]:])
return bytes.Join(slices, nil)
}
|
chore
|
Tweak template directive implementation
|
6ff87d17e8a70d1b09d4498c81ff1fe38b6a43b6
|
2024-05-12 23:40:23
|
Tom Payne
|
chore: Update golangci-lint
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f86d0953e70..9edba425993 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ env:
FIND_TYPOS_VERSION: 0.0.3
GO_VERSION: 1.22.3
GOFUMPT_VERSION: 0.6.0
- GOLANGCI_LINT_VERSION: 1.58.0
+ GOLANGCI_LINT_VERSION: 1.58.1
GOLINES_VERSION: 0.12.2
GOVERSIONINFO_VERSION: 1.4.0
RAGE_VERSION: 0.10.0
|
chore
|
Update golangci-lint
|
da02a3429e02c2263ccbdb3539c22ff4c08a6d33
|
2021-01-24 07:37:12
|
Justin Grote
|
ci: Add artifact capture to Github Actions
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e67b65f0781..324179faca2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,13 +36,20 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Build
- run: go build ./...
+ run: |
+ mkdir dist
+ go build -o dist ./...
- name: Run
run: |
go run . --version
go run ./chezmoi2 --version
- name: Test
run: go test -race ./...
+ - name: Artifact
+ uses: actions/upload-artifact@v2
+ with:
+ name: chezmoi2-${{ matrix.os }}
+ path: dist/chezmoi*
test-release:
runs-on: ubuntu-18.04
steps:
|
ci
|
Add artifact capture to Github Actions
|
d97f15754323a42e87f373072a35ff02fbf4f188
|
2023-11-05 01:33:11
|
Tom Payne
|
chore: Rename annotation
| false
|
diff --git a/internal/cmd/annotation.go b/internal/cmd/annotation.go
index 1b866e7f08e..ea0aedd6957 100644
--- a/internal/cmd/annotation.go
+++ b/internal/cmd/annotation.go
@@ -5,6 +5,7 @@ import "github.com/spf13/cobra"
// Annotations.
var (
createSourceDirectoryIfNeeded = tagAnnotation("chezmoi_create_source_directory_if_needed")
+ doesNotRequireValidConfig = tagAnnotation("chezmoi_runs_with_invalid_config")
dryRun = tagAnnotation("chezmoi_dry_run")
modifiesConfigFile = tagAnnotation("chezmoi_modifies_config_file")
modifiesDestinationDirectory = tagAnnotation("chezmoi_modifies_destination_directory")
@@ -14,7 +15,6 @@ var (
requiresSourceDirectory = tagAnnotation("chezmoi_requires_source_directory")
requiresWorkingTree = tagAnnotation("chezmoi_requires_working_tree")
runsCommands = tagAnnotation("chezmoi_runs_commands")
- runsWithInvalidConfig = tagAnnotation("chezmoi_runs_with_invalid_config")
)
// Persistent state modes.
diff --git a/internal/cmd/catconfigcmd.go b/internal/cmd/catconfigcmd.go
index 295a677cb7c..d8b34035bbe 100644
--- a/internal/cmd/catconfigcmd.go
+++ b/internal/cmd/catconfigcmd.go
@@ -11,8 +11,8 @@ func (c *Config) newCatConfigCmd() *cobra.Command {
Args: cobra.NoArgs,
RunE: c.runCatConfigCmd,
Annotations: newAnnotations(
+ doesNotRequireValidConfig,
requiresConfigDirectory,
- runsWithInvalidConfig,
),
}
diff --git a/internal/cmd/cdcmd.go b/internal/cmd/cdcmd.go
index a9e88678f92..2ce655284a4 100644
--- a/internal/cmd/cdcmd.go
+++ b/internal/cmd/cdcmd.go
@@ -26,9 +26,9 @@ func (c *Config) newCDCmd() *cobra.Command {
Args: cobra.MaximumNArgs(1),
Annotations: newAnnotations(
createSourceDirectoryIfNeeded,
+ doesNotRequireValidConfig,
requiresWorkingTree,
runsCommands,
- runsWithInvalidConfig,
),
}
diff --git a/internal/cmd/completioncmd.go b/internal/cmd/completioncmd.go
index f47e42f255a..aff87ab830c 100644
--- a/internal/cmd/completioncmd.go
+++ b/internal/cmd/completioncmd.go
@@ -21,7 +21,7 @@ func (c *Config) newCompletionCmd() *cobra.Command {
Example: example("completion"),
RunE: c.runCompletionCmd,
Annotations: newAnnotations(
- runsWithInvalidConfig,
+ doesNotRequireValidConfig,
),
}
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
index cf17273be8b..4ca2201175a 100644
--- a/internal/cmd/config.go
+++ b/internal/cmd/config.go
@@ -1862,7 +1862,7 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
})
// Read the config file.
- if annotations.hasTag(runsWithInvalidConfig) {
+ if annotations.hasTag(doesNotRequireValidConfig) {
if c.configFileAbsPathErr == nil {
_ = c.readConfig()
}
diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
index 39ce11e4c30..b4d4528fe05 100644
--- a/internal/cmd/doctorcmd.go
+++ b/internal/cmd/doctorcmd.go
@@ -155,8 +155,8 @@ func (c *Config) newDoctorCmd() *cobra.Command {
Long: mustLongHelp("doctor"),
RunE: c.runDoctorCmd,
Annotations: newAnnotations(
+ doesNotRequireValidConfig,
runsCommands,
- runsWithInvalidConfig,
),
}
diff --git a/internal/cmd/editconfigcmd.go b/internal/cmd/editconfigcmd.go
index a095a9bf93d..201af11aa69 100644
--- a/internal/cmd/editconfigcmd.go
+++ b/internal/cmd/editconfigcmd.go
@@ -13,10 +13,10 @@ func (c *Config) newEditConfigCmd() *cobra.Command {
Args: cobra.NoArgs,
RunE: c.runEditConfigCmd,
Annotations: newAnnotations(
+ doesNotRequireValidConfig,
modifiesConfigFile,
requiresConfigDirectory,
runsCommands,
- runsWithInvalidConfig,
),
}
diff --git a/internal/cmd/editconfigtemplatecmd.go b/internal/cmd/editconfigtemplatecmd.go
index ec105849f56..3989cf02df2 100644
--- a/internal/cmd/editconfigtemplatecmd.go
+++ b/internal/cmd/editconfigtemplatecmd.go
@@ -18,9 +18,9 @@ func (c *Config) newEditConfigTemplateCmd() *cobra.Command {
Args: cobra.NoArgs,
RunE: c.makeRunEWithSourceState(c.runEditConfigTemplateCmd),
Annotations: newAnnotations(
+ doesNotRequireValidConfig,
modifiesSourceDirectory,
runsCommands,
- runsWithInvalidConfig,
),
}
diff --git a/internal/cmd/generatecmd.go b/internal/cmd/generatecmd.go
index c2cc9fd953e..7a700f7cc7e 100644
--- a/internal/cmd/generatecmd.go
+++ b/internal/cmd/generatecmd.go
@@ -19,7 +19,7 @@ func (c *Config) newGenerateCmd() *cobra.Command {
ValidArgs: []string{"install.sh"},
RunE: c.runGenerateCmd,
Annotations: newAnnotations(
- runsWithInvalidConfig,
+ doesNotRequireValidConfig,
),
}
|
chore
|
Rename annotation
|
d5076094c272fc6131743137b39e0cec4ae831ba
|
2022-04-30 20:39:19
|
Tom Payne
|
docs: Minor tweaks
| false
|
diff --git a/assets/chezmoi.io/docs/index.md b/assets/chezmoi.io/docs/index.md
index 7435ea1a2c1..f750a39a99f 100644
--- a/assets/chezmoi.io/docs/index.md
+++ b/assets/chezmoi.io/docs/index.md
@@ -2,8 +2,9 @@
Manage your dotfiles across multiple diverse machines, securely.
-With chezmoi, you can install chezmoi and your dotfiles on a new, empty machine
-with a single command:
+With chezmoi, pronounced /ʃeɪ mwa/ (shay-moi), you can install chezmoi and your
+dotfiles from your GitHub dotfiles repo on a new, empty machine with a single
+command:
```console
$ sh -c "$(curl -fsLS chezmoi.io/get)" -- init --apply $GITHUB_USERNAME
diff --git a/assets/chezmoi.io/docs/why-use-chezmoi.md b/assets/chezmoi.io/docs/why-use-chezmoi.md
index c9306b0d155..ceba997709c 100644
--- a/assets/chezmoi.io/docs/why-use-chezmoi.md
+++ b/assets/chezmoi.io/docs/why-use-chezmoi.md
@@ -29,14 +29,31 @@ you work in.
safe. Overall, I love the way Chezmoi fits so perfectly into the niche of
managing dotfiles.
- - [@mike_kasberg](https://www.mikekasberg.com/blog/2021/05/12/my-dotfiles-story.html)
+ — [@mike_kasberg](https://www.mikekasberg.com/blog/2021/05/12/my-dotfiles-story.html)
+
+!!! quote
+
+ I had initially been turned off when I first encountered [chezmoi], because
+ [chezmoi] seemed overkill for (what appeared to me) a simple task.
+
+ But the problem of managing a relatively small number of dotfiles across a
+ relatively small number of machines with small differences between them and
+ keeping them up to date proved to be _MUCH_ more complex than I imagined.
+ Copy things around by hand, and then later distributing them via source
+ control got hairy very quickly.
+
+ I finally realized all those features were absolutely necessary to manage
+ things sanely, and once I took some time to learn how to do things with
+ chezmoi, I have never looked back.
+
+ — [njt](https://news.ycombinator.com/item?id=31015669)
!!! quote
Regular reminder that chezmoi is the best dotfile manager utility I've used
and you can too
- — [@mbbroberg](https://twitter.com/mbbroberg/status/1355644967625125892)
+ — [@mbbroberg](https://twitter.com/mbbroberg/status/1355644967625125892)
If you're using any of the following methods:
|
docs
|
Minor tweaks
|
2d272293af920b043a2d6cc8a48d832b44a66170
|
2022-05-30 13:36:04
|
Tom Payne
|
fix: Include git repo commands in dump command output
| false
|
diff --git a/pkg/chezmoi/dumpsystem.go b/pkg/chezmoi/dumpsystem.go
index 76f1be2ee92..dc4beac46cf 100644
--- a/pkg/chezmoi/dumpsystem.go
+++ b/pkg/chezmoi/dumpsystem.go
@@ -2,6 +2,7 @@ package chezmoi
import (
"io/fs"
+ "os/exec"
vfs "github.com/twpayne/go-vfs/v4"
)
@@ -11,6 +12,7 @@ type dataType string
// dataTypes.
const (
+ dataTypeCommand dataType = "command"
dataTypeDir dataType = "dir"
dataTypeFile dataType = "file"
dataTypeScript dataType = "script"
@@ -24,6 +26,13 @@ type DumpSystem struct {
data map[string]interface{}
}
+// A commandData contains data about a command.
+type commandData struct {
+ Type dataType `json:"type" toml:"type" yaml:"type"`
+ Path string `json:"path" toml:"path" yaml:"path"`
+ Args []string `json:"args" toml:"args" yaml:"args"`
+}
+
// A dirData contains data about a directory.
type dirData struct {
Type dataType `json:"type" toml:"type" yaml:"type"`
@@ -79,6 +88,19 @@ func (s *DumpSystem) Mkdir(dirname AbsPath, perm fs.FileMode) error {
return nil
}
+// RunCmd implements System.RunCmd.
+func (s *DumpSystem) RunCmd(cmd *exec.Cmd) error {
+ if cmd.Dir == "" {
+ return nil
+ }
+ s.data[cmd.Dir] = &commandData{
+ Type: dataTypeCommand,
+ Path: cmd.Path,
+ Args: cmd.Args,
+ }
+ return nil
+}
+
// RunScript implements System.RunScript.
func (s *DumpSystem) RunScript(scriptname RelPath, dir AbsPath, data []byte, interpreter *Interpreter) error {
scriptnameStr := scriptname.String()
diff --git a/pkg/cmd/testdata/scripts/externalgitrepo.txt b/pkg/cmd/testdata/scripts/externalgitrepo.txt
index 9260b65caf8..e95a446afd5 100644
--- a/pkg/cmd/testdata/scripts/externalgitrepo.txt
+++ b/pkg/cmd/testdata/scripts/externalgitrepo.txt
@@ -45,6 +45,10 @@ chhome home2/user
chezmoi apply
! grep '# edited' $HOME/.dir/.file
+# test that chezmoi dump prints the git command
+chezmoi dump --format=yaml
+stdout 'type: command'
+
-- golden/.file --
# contents of .file
-- home/user/.local/share/chezmoi/.chezmoiexternal.toml --
|
fix
|
Include git repo commands in dump command output
|
7c1f4efe9d98bced38ff4160bbb6421b288c852f
|
2022-04-03 02:27:16
|
Tom Payne
|
chore: Tidy up more variable names
| false
|
diff --git a/.github/ISSUE_TEMPLATE/01_support_request.md b/.github/ISSUE_TEMPLATE/01_support_request.md
index 81d0260d890..0230ef32de2 100644
--- a/.github/ISSUE_TEMPLATE/01_support_request.md
+++ b/.github/ISSUE_TEMPLATE/01_support_request.md
@@ -23,7 +23,7 @@ Describe what you have tried so far.
## Output of any commands you've tried with `--verbose` flag
```console
-$ chezmoi --verbose <your-command>
+$ chezmoi --verbose $COMMAND
```
## Output of `chezmoi doctor`
diff --git a/.github/ISSUE_TEMPLATE/03_bug_report.md b/.github/ISSUE_TEMPLATE/03_bug_report.md
index a0491400d6b..6b2900c5d47 100644
--- a/.github/ISSUE_TEMPLATE/03_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/03_bug_report.md
@@ -20,7 +20,7 @@ A clear and concise description of what you expected to happen.
## Output of command with the `--verbose` flag
```console
-$ chezmoi --verbose <your-command>
+$ chezmoi --verbose $COMMAND
```
## Output of `chezmoi doctor`
|
chore
|
Tidy up more variable names
|
00bff5d79adf9297f61ab729ad2c837c56afd22d
|
2022-11-06 03:09:36
|
Tom Payne
|
chore: Refactor handling of annotations
| false
|
diff --git a/pkg/cmd/addcmd.go b/pkg/cmd/addcmd.go
index d2130141a48..bb58655250d 100644
--- a/pkg/cmd/addcmd.go
+++ b/pkg/cmd/addcmd.go
@@ -30,12 +30,12 @@ func (c *Config) newAddCmd() *cobra.Command {
Example: example("add"),
Args: cobra.MinimumNArgs(1),
RunE: c.makeRunEWithSourceState(c.runAddCmd),
- Annotations: map[string]string{
- createSourceDirectoryIfNeeded: "true",
- modifiesSourceDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- requiresWorkingTree: "true",
- },
+ Annotations: newAnnotations(
+ createSourceDirectoryIfNeeded,
+ modifiesSourceDirectory,
+ persistentStateModeReadWrite,
+ requiresWorkingTree,
+ ),
}
flags := addCmd.Flags()
diff --git a/pkg/cmd/annotation.go b/pkg/cmd/annotation.go
new file mode 100644
index 00000000000..cea9a8a9c11
--- /dev/null
+++ b/pkg/cmd/annotation.go
@@ -0,0 +1,73 @@
+package cmd
+
+import "github.com/spf13/cobra"
+
+// Annotations.
+var (
+ createSourceDirectoryIfNeeded = tagAnnotation("chezmoi_create_source_directory_if_needed")
+ doesNotRequireValidConfig = tagAnnotation("chezmoi_does_not_require_valid_config")
+ modifiesConfigFile = tagAnnotation("chezmoi_modifies_config_file")
+ modifiesDestinationDirectory = tagAnnotation("chezmoi_modifies_destination_directory")
+ modifiesSourceDirectory = tagAnnotation("chezmoi_modifies_source_directory")
+ requiresConfigDirectory = tagAnnotation("chezmoi_requires_config_directory")
+ requiresSourceDirectory = tagAnnotation("chezmoi_requires_source_directory")
+ requiresWorkingTree = tagAnnotation("chezmoi_requires_working_tree")
+ runsCommands = tagAnnotation("chezmoi_runs_commands")
+)
+
+// Persistent state modes.
+const (
+ persistentStateModeKey = "chezoi_persistent_state_mode"
+
+ persistentStateModeEmpty persistentStateMode = "empty"
+ persistentStateModeReadOnly persistentStateMode = "read-only"
+ persistentStateModeReadMockWrite persistentStateMode = "read-mock-write"
+ persistentStateModeReadWrite persistentStateMode = "read-write"
+)
+
+type annotation interface {
+ key() string
+ value() string
+}
+
+type annotationsSet map[string]string
+
+func getAnnotations(cmd *cobra.Command) annotationsSet {
+ return annotationsSet(cmd.Annotations)
+}
+
+func newAnnotations(annotations ...annotation) annotationsSet {
+ result := make(map[string]string, len(annotations))
+ for _, annotation := range annotations {
+ result[annotation.key()] = annotation.value()
+ }
+ return result
+}
+
+func (a annotationsSet) hasTag(tag annotation) bool {
+ return a[tag.key()] == tag.value()
+}
+
+func (a annotationsSet) persistentStateMode() persistentStateMode {
+ return persistentStateMode(a[persistentStateModeKey])
+}
+
+type persistentStateMode string
+
+func (m persistentStateMode) key() string {
+ return persistentStateModeKey
+}
+
+func (m persistentStateMode) value() string {
+ return string(m)
+}
+
+type tagAnnotation string
+
+func (a tagAnnotation) key() string {
+ return string(a)
+}
+
+func (a tagAnnotation) value() string {
+ return "true"
+}
diff --git a/pkg/cmd/applycmd.go b/pkg/cmd/applycmd.go
index e4e79b33c8d..50ba0a54290 100644
--- a/pkg/cmd/applycmd.go
+++ b/pkg/cmd/applycmd.go
@@ -20,11 +20,11 @@ func (c *Config) newApplyCmd() *cobra.Command {
Example: example("apply"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.runApplyCmd,
- Annotations: map[string]string{
- modifiesDestinationDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesDestinationDirectory,
+ persistentStateModeReadWrite,
+ requiresSourceDirectory,
+ ),
}
flags := applyCmd.Flags()
diff --git a/pkg/cmd/archivecmd.go b/pkg/cmd/archivecmd.go
index f6cfabe310f..a57d0f6778d 100644
--- a/pkg/cmd/archivecmd.go
+++ b/pkg/cmd/archivecmd.go
@@ -29,10 +29,10 @@ func (c *Config) newArchiveCmd() *cobra.Command {
Example: example("archive"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.runArchiveCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeEmpty,
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ persistentStateModeEmpty,
+ requiresSourceDirectory,
+ ),
}
flags := archiveCmd.Flags()
diff --git a/pkg/cmd/catcmd.go b/pkg/cmd/catcmd.go
index 675dbc3ead0..b46802dbdea 100644
--- a/pkg/cmd/catcmd.go
+++ b/pkg/cmd/catcmd.go
@@ -18,9 +18,9 @@ func (c *Config) newCatCmd() *cobra.Command {
ValidArgsFunction: c.targetValidArgs,
Args: cobra.MinimumNArgs(1),
RunE: c.makeRunEWithSourceState(c.runCatCmd),
- Annotations: map[string]string{
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ requiresSourceDirectory,
+ ),
}
return catCmd
diff --git a/pkg/cmd/catconfigcmd.go b/pkg/cmd/catconfigcmd.go
index dd11d537f9b..d8b34035bbe 100644
--- a/pkg/cmd/catconfigcmd.go
+++ b/pkg/cmd/catconfigcmd.go
@@ -10,10 +10,10 @@ func (c *Config) newCatConfigCmd() *cobra.Command {
Example: example("cat-config"),
Args: cobra.NoArgs,
RunE: c.runCatConfigCmd,
- Annotations: map[string]string{
- doesNotRequireValidConfig: "true",
- requiresConfigDirectory: "true",
- },
+ Annotations: newAnnotations(
+ doesNotRequireValidConfig,
+ requiresConfigDirectory,
+ ),
}
return catConfigCmd
diff --git a/pkg/cmd/cdcmd.go b/pkg/cmd/cdcmd.go
index 456f760fe5c..017ac68a902 100644
--- a/pkg/cmd/cdcmd.go
+++ b/pkg/cmd/cdcmd.go
@@ -19,12 +19,12 @@ func (c *Config) newCDCmd() *cobra.Command {
Example: example("cd"),
RunE: c.runCDCmd,
Args: cobra.NoArgs,
- Annotations: map[string]string{
- createSourceDirectoryIfNeeded: "true",
- doesNotRequireValidConfig: "true",
- requiresWorkingTree: "true",
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ createSourceDirectoryIfNeeded,
+ doesNotRequireValidConfig,
+ requiresWorkingTree,
+ runsCommands,
+ ),
}
return cdCmd
diff --git a/pkg/cmd/chattrcmd.go b/pkg/cmd/chattrcmd.go
index 5933ffc377b..2bed703a79d 100644
--- a/pkg/cmd/chattrcmd.go
+++ b/pkg/cmd/chattrcmd.go
@@ -75,10 +75,10 @@ func (c *Config) newChattrCmd() *cobra.Command {
Args: cobra.MinimumNArgs(2),
ValidArgsFunction: c.chattrCmdValidArgs,
RunE: c.makeRunEWithSourceState(c.runChattrCmd),
- Annotations: map[string]string{
- modifiesSourceDirectory: "true",
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesSourceDirectory,
+ requiresSourceDirectory,
+ ),
}
return chattrCmd
diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
index 38371b87a2b..6ac2a2767a6 100644
--- a/pkg/cmd/cmd.go
+++ b/pkg/cmd/cmd.go
@@ -26,28 +26,6 @@ const (
gitHubRepo = "chezmoi"
)
-// Command annotations.
-const (
- createSourceDirectoryIfNeeded = "chezmoi_create_source_directory_if_needed"
- doesNotRequireValidConfig = "chezmoi_does_not_require_valid_config"
- modifiesConfigFile = "chezmoi_modifies_config_file"
- modifiesDestinationDirectory = "chezmoi_modifies_destination_directory"
- modifiesSourceDirectory = "chezmoi_modifies_source_directory"
- persistentStateMode = "chezmoi_persistent_state_mode"
- requiresConfigDirectory = "chezmoi_requires_config_directory"
- requiresSourceDirectory = "chezmoi_requires_source_directory"
- requiresWorkingTree = "chezmoi_requires_working_tree"
- runsCommands = "chezmoi_runs_commands"
-)
-
-// Persistent state modes.
-const (
- persistentStateModeEmpty = "empty"
- persistentStateModeReadOnly = "read-only"
- persistentStateModeReadMockWrite = "read-mock-write"
- persistentStateModeReadWrite = "read-write"
-)
-
var (
noArgs = []string(nil)
@@ -137,19 +115,6 @@ func Main(versionInfo VersionInfo, args []string) int {
return 0
}
-// boolAnnotation returns whether cmd is annotated with key.
-func boolAnnotation(cmd *cobra.Command, key string) bool {
- value, ok := cmd.Annotations[key]
- if !ok {
- return false
- }
- boolValue, err := strconv.ParseBool(value)
- if err != nil {
- panic(err)
- }
- return boolValue
-}
-
// example returns command's example.
func example(command string) string {
help, ok := helps[command]
diff --git a/pkg/cmd/completioncmd.go b/pkg/cmd/completioncmd.go
index 8eec15b43ad..d249f7423b2 100644
--- a/pkg/cmd/completioncmd.go
+++ b/pkg/cmd/completioncmd.go
@@ -20,9 +20,9 @@ func (c *Config) newCompletionCmd() *cobra.Command {
Long: mustLongHelp("completion"),
Example: example("completion"),
RunE: c.runCompletionCmd,
- Annotations: map[string]string{
- doesNotRequireValidConfig: "true",
- },
+ Annotations: newAnnotations(
+ doesNotRequireValidConfig,
+ ),
}
return completionCmd
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
index f8797196142..2f0f536e220 100644
--- a/pkg/cmd/config.go
+++ b/pkg/cmd/config.go
@@ -1513,11 +1513,13 @@ func (c *Config) newSourceState(
// persistentPostRunRootE performs post-run actions for the root command.
func (c *Config) persistentPostRunRootE(cmd *cobra.Command, args []string) error {
+ annotations := getAnnotations(cmd)
+
if err := c.persistentState.Close(); err != nil {
return err
}
- if boolAnnotation(cmd, modifiesConfigFile) {
+ if annotations.hasTag(modifiesConfigFile) {
configFileContents, err := c.baseSystem.ReadFile(c.configFileAbsPath)
switch {
case errors.Is(err, fs.ErrNotExist):
@@ -1540,7 +1542,7 @@ func (c *Config) persistentPostRunRootE(cmd *cobra.Command, args []string) error
}
}
- if boolAnnotation(cmd, modifiesSourceDirectory) {
+ if annotations.hasTag(modifiesSourceDirectory) {
var status *git.Status
if c.Git.AutoAdd || c.Git.AutoCommit || c.Git.AutoPush {
var err error
@@ -1599,6 +1601,8 @@ func (c *Config) pageOutputString(output, cmdPager string) error {
// persistentPreRunRootE performs pre-run actions for the root command.
func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error {
+ annotations := getAnnotations(cmd)
+
// Enable CPU profiling if configured.
if !c.cpuProfile.Empty() {
f, err := os.Create(c.cpuProfile.String())
@@ -1633,7 +1637,7 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
})
// Read the config file.
- if boolAnnotation(cmd, doesNotRequireValidConfig) {
+ if annotations.hasTag(doesNotRequireValidConfig) {
if c.configFileAbsPathErr == nil {
_ = c.readConfig()
}
@@ -1685,10 +1689,10 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
}
// Set up the persistent state.
- switch {
- case cmd.Annotations[persistentStateMode] == persistentStateModeEmpty:
+ switch persistentStateMode := annotations.persistentStateMode(); {
+ case persistentStateMode == persistentStateModeEmpty:
c.persistentState = chezmoi.NewMockPersistentState()
- case cmd.Annotations[persistentStateMode] == persistentStateModeReadOnly:
+ case persistentStateMode == persistentStateModeReadOnly:
persistentStateFileAbsPath, err := c.persistentStateFile()
if err != nil {
return err
@@ -1699,9 +1703,9 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
if err != nil {
return err
}
- case cmd.Annotations[persistentStateMode] == persistentStateModeReadMockWrite:
+ case persistentStateMode == persistentStateModeReadMockWrite:
fallthrough
- case cmd.Annotations[persistentStateMode] == persistentStateModeReadWrite && c.dryRun:
+ case persistentStateMode == persistentStateModeReadWrite && c.dryRun:
persistentStateFileAbsPath, err := c.persistentStateFile()
if err != nil {
return err
@@ -1720,7 +1724,7 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
return err
}
c.persistentState = dryRunPersistentState
- case cmd.Annotations[persistentStateMode] == persistentStateModeReadWrite:
+ case persistentStateMode == persistentStateModeReadWrite:
persistentStateFileAbsPath, err := c.persistentStateFile()
if err != nil {
return err
@@ -1742,10 +1746,10 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
// Set up the source and destination systems.
c.sourceSystem = c.baseSystem
c.destSystem = c.baseSystem
- if !boolAnnotation(cmd, modifiesDestinationDirectory) {
+ if !annotations.hasTag(modifiesDestinationDirectory) {
c.destSystem = chezmoi.NewReadOnlySystem(c.destSystem)
}
- if !boolAnnotation(cmd, modifiesSourceDirectory) {
+ if !annotations.hasTag(modifiesSourceDirectory) {
c.sourceSystem = chezmoi.NewReadOnlySystem(c.sourceSystem)
}
if c.dryRun {
@@ -1762,21 +1766,21 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
}
// Create the config directory if needed.
- if boolAnnotation(cmd, requiresConfigDirectory) {
+ if annotations.hasTag(requiresConfigDirectory) {
if err := chezmoi.MkdirAll(c.baseSystem, c.configFileAbsPath.Dir(), fs.ModePerm); err != nil {
return err
}
}
// Create the source directory if needed.
- if boolAnnotation(cmd, createSourceDirectoryIfNeeded) {
+ if annotations.hasTag(createSourceDirectoryIfNeeded) {
if err := chezmoi.MkdirAll(c.baseSystem, c.SourceDirAbsPath, fs.ModePerm); err != nil {
return err
}
}
// Verify that the source directory exists and is a directory, if needed.
- if boolAnnotation(cmd, requiresSourceDirectory) {
+ if annotations.hasTag(requiresSourceDirectory) {
switch fileInfo, err := c.baseSystem.Stat(c.SourceDirAbsPath); {
case err == nil && fileInfo.IsDir():
// Do nothing.
@@ -1788,7 +1792,7 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
}
// Create the runtime directory if needed.
- if boolAnnotation(cmd, runsCommands) {
+ if annotations.hasTag(runsCommands) {
if runtime.GOOS == "linux" && c.bds.RuntimeDir != "" {
// Snap sets the $XDG_RUNTIME_DIR environment variable to
// /run/user/$uid/snap.$snap_name, but does not create this
@@ -1822,7 +1826,7 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
}
// Create the working tree directory if needed.
- if boolAnnotation(cmd, requiresWorkingTree) {
+ if annotations.hasTag(requiresWorkingTree) {
if _, err := c.SourceDirAbsPath.TrimDirPrefix(c.WorkingTreeAbsPath); err != nil {
return err
}
diff --git a/pkg/cmd/diffcmd.go b/pkg/cmd/diffcmd.go
index a51136174c1..5a6589adff9 100644
--- a/pkg/cmd/diffcmd.go
+++ b/pkg/cmd/diffcmd.go
@@ -29,10 +29,10 @@ func (c *Config) newDiffCmd() *cobra.Command {
Example: example("diff"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.runDiffCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadMockWrite,
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadMockWrite,
+ requiresSourceDirectory,
+ ),
}
flags := diffCmd.Flags()
diff --git a/pkg/cmd/doctorcmd.go b/pkg/cmd/doctorcmd.go
index 1fdd72f7324..352e16160dc 100644
--- a/pkg/cmd/doctorcmd.go
+++ b/pkg/cmd/doctorcmd.go
@@ -151,10 +151,10 @@ func (c *Config) newDoctorCmd() *cobra.Command {
Example: example("doctor"),
Long: mustLongHelp("doctor"),
RunE: c.runDoctorCmd,
- Annotations: map[string]string{
- doesNotRequireValidConfig: "true",
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ doesNotRequireValidConfig,
+ runsCommands,
+ ),
}
return doctorCmd
diff --git a/pkg/cmd/dumpcmd.go b/pkg/cmd/dumpcmd.go
index f5b15711af3..5d0afc94fb9 100644
--- a/pkg/cmd/dumpcmd.go
+++ b/pkg/cmd/dumpcmd.go
@@ -20,10 +20,10 @@ func (c *Config) newDumpCmd() *cobra.Command {
Example: example("dump"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.runDumpCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadMockWrite,
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadMockWrite,
+ requiresSourceDirectory,
+ ),
}
flags := dumpCmd.Flags()
diff --git a/pkg/cmd/dumpconfigcmd.go b/pkg/cmd/dumpconfigcmd.go
index 09202fef301..099da637bb1 100644
--- a/pkg/cmd/dumpconfigcmd.go
+++ b/pkg/cmd/dumpconfigcmd.go
@@ -10,9 +10,9 @@ func (c *Config) newDumpConfigCmd() *cobra.Command {
Example: example("dump-config"),
Args: cobra.NoArgs,
RunE: c.runDumpConfigCmd,
- Annotations: map[string]string{
- doesNotRequireValidConfig: "true",
- },
+ Annotations: newAnnotations(
+ doesNotRequireValidConfig,
+ ),
}
flags := dumpConfigCmd.Flags()
diff --git a/pkg/cmd/editcmd.go b/pkg/cmd/editcmd.go
index 83be593d1fb..08264a214b8 100644
--- a/pkg/cmd/editcmd.go
+++ b/pkg/cmd/editcmd.go
@@ -30,13 +30,13 @@ func (c *Config) newEditCmd() *cobra.Command {
Example: example("edit"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.runEditCmd,
- Annotations: map[string]string{
- modifiesDestinationDirectory: "true",
- modifiesSourceDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- requiresSourceDirectory: "true",
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ modifiesDestinationDirectory,
+ modifiesSourceDirectory,
+ persistentStateModeReadWrite,
+ requiresSourceDirectory,
+ runsCommands,
+ ),
}
flags := editCmd.Flags()
diff --git a/pkg/cmd/editconfigcmd.go b/pkg/cmd/editconfigcmd.go
index 3d3821ec9c2..201af11aa69 100644
--- a/pkg/cmd/editconfigcmd.go
+++ b/pkg/cmd/editconfigcmd.go
@@ -12,12 +12,12 @@ func (c *Config) newEditConfigCmd() *cobra.Command {
Example: example("edit-config"),
Args: cobra.NoArgs,
RunE: c.runEditConfigCmd,
- Annotations: map[string]string{
- doesNotRequireValidConfig: "true",
- modifiesConfigFile: "true",
- requiresConfigDirectory: "true",
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ doesNotRequireValidConfig,
+ modifiesConfigFile,
+ requiresConfigDirectory,
+ runsCommands,
+ ),
}
return editConfigCmd
diff --git a/pkg/cmd/forgetcmd.go b/pkg/cmd/forgetcmd.go
index 71ede348282..a100df6b62f 100644
--- a/pkg/cmd/forgetcmd.go
+++ b/pkg/cmd/forgetcmd.go
@@ -18,10 +18,10 @@ func (c *Config) newForgetCmd() *cobra.Command {
ValidArgsFunction: c.targetValidArgs,
Args: cobra.MinimumNArgs(1),
RunE: c.makeRunEWithSourceState(c.runForgetCmd),
- Annotations: map[string]string{
- modifiesSourceDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- },
+ Annotations: newAnnotations(
+ modifiesSourceDirectory,
+ persistentStateModeReadWrite,
+ ),
}
return forgetCmd
diff --git a/pkg/cmd/generatecmd.go b/pkg/cmd/generatecmd.go
index 6e2e23c81dc..321d45ec295 100644
--- a/pkg/cmd/generatecmd.go
+++ b/pkg/cmd/generatecmd.go
@@ -18,9 +18,9 @@ func (c *Config) newGenerateCmd() *cobra.Command {
Args: cobra.ExactArgs(1),
ValidArgs: []string{"install.sh"},
RunE: c.runGenerateCmd,
- Annotations: map[string]string{
- doesNotRequireValidConfig: "true",
- },
+ Annotations: newAnnotations(
+ doesNotRequireValidConfig,
+ ),
}
return generateCmd
diff --git a/pkg/cmd/gitcmd.go b/pkg/cmd/gitcmd.go
index 78b635fe42d..da0fcd18e5c 100644
--- a/pkg/cmd/gitcmd.go
+++ b/pkg/cmd/gitcmd.go
@@ -18,11 +18,11 @@ func (c *Config) newGitCmd() *cobra.Command {
Long: mustLongHelp("git"),
Example: example("git"),
RunE: c.runGitCmd,
- Annotations: map[string]string{
- createSourceDirectoryIfNeeded: "true",
- requiresWorkingTree: "true",
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ createSourceDirectoryIfNeeded,
+ requiresWorkingTree,
+ runsCommands,
+ ),
}
return gitCmd
diff --git a/pkg/cmd/importcmd.go b/pkg/cmd/importcmd.go
index 92806938b5a..44f932f0656 100644
--- a/pkg/cmd/importcmd.go
+++ b/pkg/cmd/importcmd.go
@@ -24,11 +24,11 @@ func (c *Config) newImportCmd() *cobra.Command {
Example: example("import"),
Args: cobra.MaximumNArgs(1),
RunE: c.makeRunEWithSourceState(c.runImportCmd),
- Annotations: map[string]string{
- createSourceDirectoryIfNeeded: "true",
- modifiesSourceDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- },
+ Annotations: newAnnotations(
+ createSourceDirectoryIfNeeded,
+ modifiesSourceDirectory,
+ persistentStateModeReadWrite,
+ ),
}
flags := importCmd.Flags()
diff --git a/pkg/cmd/initcmd.go b/pkg/cmd/initcmd.go
index 205a98ffdb4..85cc63d18ed 100644
--- a/pkg/cmd/initcmd.go
+++ b/pkg/cmd/initcmd.go
@@ -105,13 +105,13 @@ func (c *Config) newInitCmd() *cobra.Command {
Long: mustLongHelp("init"),
Example: example("init"),
RunE: c.runInitCmd,
- Annotations: map[string]string{
- createSourceDirectoryIfNeeded: "true",
- modifiesDestinationDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- requiresWorkingTree: "true",
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ createSourceDirectoryIfNeeded,
+ modifiesDestinationDirectory,
+ persistentStateModeReadWrite,
+ requiresWorkingTree,
+ runsCommands,
+ ),
}
flags := initCmd.Flags()
diff --git a/pkg/cmd/mergeallcmd.go b/pkg/cmd/mergeallcmd.go
index 3634c326154..e7192c66b1d 100644
--- a/pkg/cmd/mergeallcmd.go
+++ b/pkg/cmd/mergeallcmd.go
@@ -18,10 +18,10 @@ func (c *Config) newMergeAllCmd() *cobra.Command {
Long: mustLongHelp("merge-all"),
Example: example("merge-all"),
RunE: c.runMergeAllCmd,
- Annotations: map[string]string{
- modifiesSourceDirectory: "true",
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesSourceDirectory,
+ requiresSourceDirectory,
+ ),
}
flags := mergeAllCmd.Flags()
diff --git a/pkg/cmd/mergecmd.go b/pkg/cmd/mergecmd.go
index b6e0279d7dc..d3a36161430 100644
--- a/pkg/cmd/mergecmd.go
+++ b/pkg/cmd/mergecmd.go
@@ -27,10 +27,10 @@ func (c *Config) newMergeCmd() *cobra.Command {
Example: example("merge"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.makeRunEWithSourceState(c.runMergeCmd),
- Annotations: map[string]string{
- modifiesSourceDirectory: "true",
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesSourceDirectory,
+ requiresSourceDirectory,
+ ),
}
return mergeCmd
diff --git a/pkg/cmd/purgecmd.go b/pkg/cmd/purgecmd.go
index 2d5f4a45525..cf810cd9543 100644
--- a/pkg/cmd/purgecmd.go
+++ b/pkg/cmd/purgecmd.go
@@ -24,10 +24,10 @@ func (c *Config) newPurgeCmd() *cobra.Command {
Example: example("purge"),
Args: cobra.NoArgs,
RunE: c.runPurgeCmd,
- Annotations: map[string]string{
- modifiesDestinationDirectory: "true",
- modifiesSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesDestinationDirectory,
+ modifiesSourceDirectory,
+ ),
}
flags := purgeCmd.Flags()
diff --git a/pkg/cmd/readdcmd.go b/pkg/cmd/readdcmd.go
index 855af9b9e4f..eb4c8deaf0f 100644
--- a/pkg/cmd/readdcmd.go
+++ b/pkg/cmd/readdcmd.go
@@ -23,11 +23,11 @@ func (c *Config) newReAddCmd() *cobra.Command {
ValidArgsFunction: c.targetValidArgs,
Args: cobra.NoArgs,
RunE: c.makeRunEWithSourceState(c.runReAddCmd),
- Annotations: map[string]string{
- modifiesSourceDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesSourceDirectory,
+ persistentStateModeReadWrite,
+ requiresSourceDirectory,
+ ),
}
flags := reAddCmd.Flags()
diff --git a/pkg/cmd/removecmd.go b/pkg/cmd/removecmd.go
index 80e4b60ed0d..14c47244844 100644
--- a/pkg/cmd/removecmd.go
+++ b/pkg/cmd/removecmd.go
@@ -24,11 +24,11 @@ func (c *Config) newRemoveCmd() *cobra.Command {
ValidArgsFunction: c.targetValidArgs,
Args: cobra.MinimumNArgs(1),
RunE: c.makeRunEWithSourceState(c.runRemoveCmd),
- Annotations: map[string]string{
- modifiesDestinationDirectory: "true",
- modifiesSourceDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- },
+ Annotations: newAnnotations(
+ modifiesDestinationDirectory,
+ modifiesSourceDirectory,
+ persistentStateModeReadWrite,
+ ),
}
flags := removeCmd.Flags()
diff --git a/pkg/cmd/statecmd.go b/pkg/cmd/statecmd.go
index 7c4f25f374e..0845b0716eb 100644
--- a/pkg/cmd/statecmd.go
+++ b/pkg/cmd/statecmd.go
@@ -55,9 +55,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Print the raw data in the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateDataCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadOnly,
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadOnly,
+ ),
}
stateDataPersistentFlags := stateDataCmd.PersistentFlags()
stateDataPersistentFlags.VarP(&c.Format, "format", "f", "Output format")
@@ -71,9 +71,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Delete a value from the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateDeleteCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadWrite,
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadWrite,
+ ),
}
stateDeletePersistentFlags := stateDeleteCmd.PersistentFlags()
stateDeletePersistentFlags.StringVar(&c.state.delete.bucket, "bucket", c.state.delete.bucket, "Bucket")
@@ -85,9 +85,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Delete a bucket from the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateDeleteBucketCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadWrite,
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadWrite,
+ ),
}
stateDeleteBucketPersistentFlags := stateDeleteBucketCmd.PersistentFlags()
stateDeleteBucketPersistentFlags.StringVar(&c.state.deleteBucket.bucket, "bucket", c.state.deleteBucket.bucket, "Bucket") //nolint:lll
@@ -98,9 +98,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Generate a dump of the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateDumpCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadOnly,
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadOnly,
+ ),
}
stateDumpPersistentFlags := stateDumpCmd.PersistentFlags()
stateDumpPersistentFlags.VarP(&c.Format, "format", "f", "Output format")
@@ -114,9 +114,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Get a value from the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateGetCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadOnly,
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadOnly,
+ ),
}
stateGetPersistentFlags := stateGetCmd.PersistentFlags()
stateGetPersistentFlags.StringVar(&c.state.get.bucket, "bucket", c.state.get.bucket, "Bucket")
@@ -128,9 +128,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Get a bucket from the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateGetBucketCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadOnly,
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadOnly,
+ ),
}
stateGetBucketPersistentFlags := stateGetBucketCmd.PersistentFlags()
stateGetBucketPersistentFlags.StringVar(&c.state.getBucket.bucket, "bucket", c.state.getBucket.bucket, "bucket")
@@ -145,9 +145,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Reset the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateResetCmd,
- Annotations: map[string]string{
- modifiesDestinationDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesDestinationDirectory,
+ ),
}
stateCmd.AddCommand(stateResetCmd)
@@ -156,9 +156,9 @@ func (c *Config) newStateCmd() *cobra.Command {
Short: "Set a value from the persistent state",
Args: cobra.NoArgs,
RunE: c.runStateSetCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadWrite,
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadWrite,
+ ),
}
stateSetPersistentFlags := stateSetCmd.PersistentFlags()
stateSetPersistentFlags.StringVar(&c.state.set.bucket, "bucket", c.state.set.bucket, "Bucket")
diff --git a/pkg/cmd/statuscmd.go b/pkg/cmd/statuscmd.go
index fb3cc5fa177..20c289b33fa 100644
--- a/pkg/cmd/statuscmd.go
+++ b/pkg/cmd/statuscmd.go
@@ -24,11 +24,11 @@ func (c *Config) newStatusCmd() *cobra.Command {
Example: example("status"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.runStatusCmd,
- Annotations: map[string]string{
- modifiesDestinationDirectory: "true",
- persistentStateMode: persistentStateModeReadMockWrite,
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ modifiesDestinationDirectory,
+ persistentStateModeReadMockWrite,
+ requiresSourceDirectory,
+ ),
}
flags := statusCmd.Flags()
diff --git a/pkg/cmd/updatecmd.go b/pkg/cmd/updatecmd.go
index 02c4585ced4..601849b0e19 100644
--- a/pkg/cmd/updatecmd.go
+++ b/pkg/cmd/updatecmd.go
@@ -25,13 +25,13 @@ func (c *Config) newUpdateCmd() *cobra.Command {
Example: example("update"),
Args: cobra.NoArgs,
RunE: c.runUpdateCmd,
- Annotations: map[string]string{
- modifiesDestinationDirectory: "true",
- persistentStateMode: persistentStateModeReadWrite,
- requiresSourceDirectory: "true",
- requiresWorkingTree: "true",
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ modifiesDestinationDirectory,
+ persistentStateModeReadWrite,
+ requiresSourceDirectory,
+ requiresWorkingTree,
+ runsCommands,
+ ),
}
flags := updateCmd.Flags()
diff --git a/pkg/cmd/upgradecmd.go b/pkg/cmd/upgradecmd.go
index ed9b5206c94..9352d1e5233 100644
--- a/pkg/cmd/upgradecmd.go
+++ b/pkg/cmd/upgradecmd.go
@@ -93,9 +93,9 @@ func (c *Config) newUpgradeCmd() *cobra.Command {
Example: example("upgrade"),
Args: cobra.NoArgs,
RunE: c.runUpgradeCmd,
- Annotations: map[string]string{
- runsCommands: "true",
- },
+ Annotations: newAnnotations(
+ runsCommands,
+ ),
}
flags := upgradeCmd.Flags()
diff --git a/pkg/cmd/verifycmd.go b/pkg/cmd/verifycmd.go
index fc6a0d60e14..2596c2a3947 100644
--- a/pkg/cmd/verifycmd.go
+++ b/pkg/cmd/verifycmd.go
@@ -21,10 +21,10 @@ func (c *Config) newVerifyCmd() *cobra.Command {
Example: example("verify"),
ValidArgsFunction: c.targetValidArgs,
RunE: c.runVerifyCmd,
- Annotations: map[string]string{
- persistentStateMode: persistentStateModeReadMockWrite,
- requiresSourceDirectory: "true",
- },
+ Annotations: newAnnotations(
+ persistentStateModeReadMockWrite,
+ requiresSourceDirectory,
+ ),
}
flags := verifyCmd.Flags()
|
chore
|
Refactor handling of annotations
|
2dbfd803cdcc3890cd8961877425e09a9c24841d
|
2023-01-31 00:44:09
|
dependabot[bot]
|
chore(deps): bump actions/checkout from 3.2.0 to 3.3.0
| false
|
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index ee61f1d096b..de76ae8bd13 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -6,7 +6,7 @@ jobs:
govulncheck:
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- name: go-version
id: go-version
run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 05842fa55ba..cfe74673a9a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
outputs:
code: ${{ steps.filter.outputs.code }}
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- id: filter
uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
with:
@@ -44,7 +44,7 @@ jobs:
permissions:
security-events: write
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
fetch-depth: 1
- uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
@@ -54,7 +54,7 @@ jobs:
misspell:
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: reviewdog/action-misspell@fe8d5c98c3761ef40755a7bb95460b2a33f6b346
with:
locale: US
@@ -63,7 +63,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -85,7 +85,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: macos-12
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
with:
path: ~/.vagrant.d
@@ -100,7 +100,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -111,7 +111,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: macos-12
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
with:
path: ~/.vagrant.d
@@ -126,7 +126,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: macos-11
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
cache: true
@@ -157,7 +157,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
cache: true
@@ -183,7 +183,7 @@ jobs:
needs: changes
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
fetch-depth: 0
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
@@ -242,7 +242,7 @@ jobs:
needs: changes
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
fetch-depth: 0
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
@@ -283,7 +283,7 @@ jobs:
test-website:
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
cache: true
@@ -299,7 +299,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: windows-2019
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
cache: true
@@ -339,7 +339,7 @@ jobs:
check:
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
cache: true
@@ -366,7 +366,7 @@ jobs:
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
cache: true
@@ -405,7 +405,7 @@ jobs:
run: snapcraft whoami
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
fetch-depth: 0
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
@@ -445,7 +445,7 @@ jobs:
- release
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
fetch-depth: 0
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
|
chore
|
bump actions/checkout from 3.2.0 to 3.3.0
|
c7bf73ac505272c730d487787684117b69f50b34
|
2022-05-28 04:01:09
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/go.mod b/go.mod
index 5d635857a3e..01ef37bda5c 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
github.com/charmbracelet/glamour v0.5.0
github.com/coreos/go-semver v0.3.0
github.com/go-git/go-git/v5 v5.4.2
- github.com/google/go-github/v44 v44.1.0
+ github.com/google/go-github/v45 v45.0.0
github.com/google/gops v0.3.23
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
@@ -22,7 +22,7 @@ require (
github.com/sergi/go-diff v1.1.0
github.com/spf13/afero v1.8.2
github.com/spf13/cobra v1.4.0
- github.com/spf13/viper v1.11.0
+ github.com/spf13/viper v1.12.0
github.com/stretchr/testify v1.7.1
github.com/twpayne/go-pinentry v0.2.0
github.com/twpayne/go-shell v0.3.1
@@ -35,7 +35,7 @@ require (
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
- golang.org/x/term v0.0.0-20220411215600-e5f449aeb171
+ golang.org/x/term v0.0.0-20220526004731-065cf7ba2467
gopkg.in/yaml.v3 v3.0.0
howett.net/plist v1.0.0
mvdan.cc/sh/v3 v3.5.1
@@ -97,8 +97,8 @@ require (
github.com/yuin/goldmark v1.4.12 // indirect
github.com/yuin/goldmark-emoji v1.0.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
- golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect
- golang.org/x/net v0.0.0-20220524220425-1d687d428aca // indirect
+ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+ golang.org/x/net v0.0.0-20220526153639-5463443f8c37 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
diff --git a/go.sum b/go.sum
index 4295b9d5783..57d75b99ec1 100644
--- a/go.sum
+++ b/go.sum
@@ -39,8 +39,10 @@ cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712D
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
-cloud.google.com/go/compute v1.5.0 h1:b1zWmYuuHz7gO9kDcM/EpHGr06UgsYNRpNJzI2kFiLM=
cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
+cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
+cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc=
+cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
@@ -94,6 +96,7 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
@@ -143,6 +146,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -161,6 +165,7 @@ 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=
github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
@@ -173,6 +178,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -184,7 +190,6 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI
github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -206,8 +211,10 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1 h1:4dntyT+x6QTOSCIrgczbQ+ockAEha0cfxD5Wi0iCzjY=
github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -217,6 +224,7 @@ github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -273,8 +281,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v44 v44.1.0 h1:shWPaufgdhr+Ad4eo/pZv9ORTxFpsxPEPEuuXAKIQGA=
-github.com/google/go-github/v44 v44.1.0/go.mod h1:iWn00mWcP6PRWHhXm0zuFJ8wbEjE5AGO5D5HXYM4zgw=
+github.com/google/go-github/v45 v45.0.0 h1:LU0WBjYidxIVyx7PZeWb+FP4JZJ3Wh3FQgdumnGqiLs=
+github.com/google/go-github/v45 v45.0.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -316,14 +324,16 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
-github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI=
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
+github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk=
+github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/hashicorp/consul/api v1.12.0 h1:k3y1FYv6nuKyNTqj6w9gXOx5r5CfLj/k/euUeBXj1OY=
github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
@@ -378,8 +388,10 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -387,6 +399,7 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
@@ -397,6 +410,7 @@ github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -470,16 +484,15 @@ github.com/muesli/termenv v0.9.0/go.mod h1:R/LzAKf+suGs4IsO95y7+7DpFHO0KABgnZqtl
github.com/muesli/termenv v0.11.0 h1:fwNUbu2mfWlgicwG7qYzs06aOI8Z/zKPAv8J4uKbT+o=
github.com/muesli/termenv v0.11.0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
@@ -499,6 +512,8 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
@@ -506,9 +521,13 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -525,8 +544,8 @@ github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.5.0 h1:K6qABjdpr5rjHCw6q4rSdeM+8kNmdIHvEPDvEMkoai4=
-github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpOAnclKvg+mdA=
+github.com/sagikazarmark/crypt v0.6.0 h1:REOEXCs/NFY/1jOCEouMuT4zEniE5YoXbvpC5X/TLF8=
+github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
@@ -538,13 +557,13 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
@@ -553,8 +572,8 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44=
-github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk=
+github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
+github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As=
@@ -567,7 +586,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
@@ -607,12 +625,14 @@ github.com/zalando/go-keyring v0.2.1 h1:MBRN/Z8H4U5wEKXiD67YbDAr5cj/DOStmSga70/2
github.com/zalando/go-keyring v0.2.1/go.mod h1:g63M2PPn0w5vjmEbwAX3ib5I+41zdm4esSETOn9Y6Dw=
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.etcd.io/etcd/api/v3 v3.5.2 h1:tXok5yLlKyuQ/SXSjtqHc4uzNaMqZi2XsoSPr/LlJXI=
-go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
-go.etcd.io/etcd/client/pkg/v3 v3.5.2 h1:4hzqQ6hIb3blLyQ8usCU4h3NghkqcsohEQ3o3VetYxE=
-go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.2 h1:ymrVwTkefuqA/rPkSW7/B4ApijbPVefRumkY+stNfS0=
-go.etcd.io/etcd/client/v2 v2.305.2/go.mod h1:2D7ZejHVMIfog1221iLSYlQRzrtECw3kz4I4VAQm3qI=
+go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc=
+go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
+go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg=
+go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/v2 v2.305.4 h1:Dcx3/MYyfKcPNLpR4VVQUP5KgYrBeJtktBwEKkw08Ao=
+go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
+go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4=
+go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -629,6 +649,7 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
+go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -646,8 +667,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 h1:SLP7Q4Di66FONjDJbCYrCRrh97focO6sLogHO7/g8F0=
-golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -736,8 +757,10 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220524220425-1d687d428aca h1:xTaFYiPROfpPhqrfTIDXj0ri1SpfueYT951s4bAuDO8=
-golang.org/x/net v0.0.0-20220524220425-1d687d428aca/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220526153639-5463443f8c37 h1:lUkvobShwKsOesNfWWlCS5q7fnbG1MEliIzwu886fn8=
+golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -795,6 +818,7 @@ golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -809,6 +833,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -832,6 +858,7 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -855,13 +882,14 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
-golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
+golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -937,8 +965,9 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -974,8 +1003,11 @@ google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tD
google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
-google.golang.org/api v0.74.0 h1:ExR2D+5TYIrMphWgs5JCgwRhEDlPDXXrLwHHMgPHTXE=
google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
+google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
+google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
+google.golang.org/api v0.81.0 h1:o8WF5AvfidafWbFjsRyupxyEQJNUWxLZJCK5NXrxZZ8=
+google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1055,8 +1087,14 @@ google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2
google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg=
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I=
+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1084,8 +1122,10 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1152,3 +1192,4 @@ rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
diff --git a/pkg/chezmoi/github.go b/pkg/chezmoi/github.go
index feede2e4095..e1340897305 100644
--- a/pkg/chezmoi/github.go
+++ b/pkg/chezmoi/github.go
@@ -5,7 +5,7 @@ import (
"net/http"
"os"
- "github.com/google/go-github/v44/github"
+ "github.com/google/go-github/v45/github"
"golang.org/x/oauth2"
)
diff --git a/pkg/cmd/doctorcmd.go b/pkg/cmd/doctorcmd.go
index 6e71fa6d839..eb6b3212ba0 100644
--- a/pkg/cmd/doctorcmd.go
+++ b/pkg/cmd/doctorcmd.go
@@ -18,7 +18,7 @@ import (
"text/tabwriter"
"github.com/coreos/go-semver/semver"
- "github.com/google/go-github/v44/github"
+ "github.com/google/go-github/v45/github"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/twpayne/go-shell"
diff --git a/pkg/cmd/githubtemplatefuncs.go b/pkg/cmd/githubtemplatefuncs.go
index 6fb1ed12019..905f8d3bcdf 100644
--- a/pkg/cmd/githubtemplatefuncs.go
+++ b/pkg/cmd/githubtemplatefuncs.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "github.com/google/go-github/v44/github"
+ "github.com/google/go-github/v45/github"
"github.com/twpayne/chezmoi/v2/pkg/chezmoi"
)
diff --git a/pkg/cmd/testdata/scripts/init.txt b/pkg/cmd/testdata/scripts/init.txt
index 2738304f899..3466b2af274 100644
--- a/pkg/cmd/testdata/scripts/init.txt
+++ b/pkg/cmd/testdata/scripts/init.txt
@@ -73,7 +73,7 @@ chhome home8/user
# test that chezmoi init fails if the generated config is not valid
mkgitconfig
! chezmoi init
-stderr 'parsing error'
+stderr 'While parsing config:'
! exists .config/chezmoi
chhome home/user
diff --git a/pkg/cmd/upgradecmd.go b/pkg/cmd/upgradecmd.go
index 802914cf716..19434e420e1 100644
--- a/pkg/cmd/upgradecmd.go
+++ b/pkg/cmd/upgradecmd.go
@@ -21,7 +21,7 @@ import (
"strings"
"github.com/coreos/go-semver/semver"
- "github.com/google/go-github/v44/github"
+ "github.com/google/go-github/v45/github"
"github.com/spf13/cobra"
vfs "github.com/twpayne/go-vfs/v4"
|
chore
|
Update dependencies
|
4de3fdc709bd1b3d64a0a56f49b0dc5d4219ca85
|
2022-04-16 01:51:47
|
Dhruvin Shah
|
docs: Document workaround for #1574
| false
|
diff --git a/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md b/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md
index e2d14d04587..dc85b3b2a43 100644
--- a/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md
+++ b/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md
@@ -161,3 +161,39 @@ subdirectory of your home directory you can use:
scriptTempDir = "~/tmp"
```
+## chezmoi reports `chezmoi: mkdir xxxxx: no such file or directory` when trying to manage file or directory
+
+This error occurs when you try to add directory/file to be managed via chezmoi
+but the same directory is only listed in `.chezmoiexternal.$FORMAT`.
+
+A workaround can be applied in a such case via manually creating import
+directory in chezmoi source directory (typically `~/.local/share/chezmoi`) and
+create `.keep` file.
+
+For example, if `.chezmoiexternal.toml` has the configuration:
+
+```toml
+[".config/nvim"]
+ type = "git-repo"
+ url = "https://github.com/NvChad/NvChad.git"
+ refreshPeriod = "168h"
+ [".config/nvim".pull]
+ args = ["--ff-only"]
+```
+
+Now `chezmoi add ~/.config/direnv/direnvrc` will raise the error:
+
+```
+chezmoi: mkdir /home/<user>/.local/share/chezmoi/dot_config/direnv: no such file or directory
+```
+
+But the workaround can be applied:
+
+```console
+$ chezmoi cd
+$ mkdir -p dot_config/
+$ touch dot_config/.keep
+```
+
+Now once that done `chezmoi add ~/.config/direnv/direnvrc` should work. For
+reference see [this issue](https://github.com/twpayne/chezmoi/issues/2006)
|
docs
|
Document workaround for #1574
|
fa6f3ae1d51f4faf8e41a4e1158c292f7bfba6c2
|
2021-11-04 00:35:16
|
Tom Payne
|
chore: Bump golangci-lint to v1.43.0
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c3ee00353b..ed11335bee1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ on:
env:
AGE_VERSION: 1.0.0
GO_VERSION: 1.17.2
- GOLANGCI_LINT_VERSION: 1.42.1
+ GOLANGCI_LINT_VERSION: 1.43.0
jobs:
changes:
runs-on: ubuntu-20.04
diff --git a/.golangci.yml b/.golangci.yml
index 55e4f83d905..2b29beff956 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,9 @@
linters:
enable:
- asciicheck
+ - bidichk
- bodyclose
+ - contextcheck
- deadcode
- depguard
- dogsled
@@ -44,6 +46,7 @@ linters:
- structcheck
- stylecheck
- tagliatelle
+ - tenv
- thelper
- typecheck
- unconvert
@@ -69,10 +72,12 @@ linters:
- maligned
- nakedret
- nestif
+ - nilnil
- nlreturn
- paralleltest
- testpackage
- tparallel
+ - varnamelen
- wrapcheck
- wsl
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
index 56b4ae8a767..49b00f7d549 100644
--- a/internal/cmd/config.go
+++ b/internal/cmd/config.go
@@ -551,7 +551,6 @@ func (c *Config) applyArgs(ctx context.Context, targetSystem chezmoi.System, tar
Umask: options.umask,
}
- //nolint:ifshort
keptGoingAfterErr := false
for _, targetRelPath := range targetRelPaths {
switch err := sourceState.Apply(targetSystem, c.destSystem, c.persistentState, targetDirAbsPath, targetRelPath, applyOptions); {
|
chore
|
Bump golangci-lint to v1.43.0
|
988fcdcfc3b7896c750079c434ce6e73730b6f06
|
2021-11-28 20:16:21
|
Tom Payne
|
feat: Add state delete-bucket command
| false
|
diff --git a/docs/HOWTO.md b/docs/HOWTO.md
index bff7dd1783d..b8c9ebfdbdd 100644
--- a/docs/HOWTO.md
+++ b/docs/HOWTO.md
@@ -47,6 +47,7 @@
* [Understand how scripts work](#understand-how-scripts-work)
* [Install packages with scripts](#install-packages-with-scripts)
* [Run a script when the contents of another file changes](#run-a-script-when-the-contents-of-another-file-changes)
+ * [Clear the state of `run_once_` scripts](#clear-the-state-of-run_once_-scripts)
* [Use chezmoi on macOS](#use-chezmoi-on-macos)
* [Use `brew bundle` to manage your brews and casks](#use-brew-bundle-to-manage-your-brews-and-casks)
* [Use chezmoi on Windows](#use-chezmoi-on-windows)
@@ -1432,6 +1433,18 @@ does not create `dconf.ini` in your home directory.
---
+### Clear the state of `run_once_` scripts
+
+chezmoi stores whether and when `run_once_` scripts have been run in the
+`scriptState` bucket of its persistent state. To clear the state of `run_once_`
+scripts, run:
+
+```console
+$ chezmoi delete-bucket --bucket=scriptState
+```
+
+---
+
## Use chezmoi on macOS
---
diff --git a/docs/REFERENCE.md b/docs/REFERENCE.md
index 479f8b2ce8b..c818ab06bb5 100644
--- a/docs/REFERENCE.md
+++ b/docs/REFERENCE.md
@@ -1702,6 +1702,7 @@ Manipulate the persistent state.
```console
$ chezmoi state data
$ chezmoi state delete --bucket=bucket --key=key
+$ chezmoi state delete-bucket --bucket=bucket
$ chezmoi state dump
$ chezmoi state get --bucket=bucket --key=key
$ chezmoi state set --bucket=bucket --key=key --value=value
diff --git a/internal/chezmoi/boltpersistentstate.go b/internal/chezmoi/boltpersistentstate.go
index 9a7ab7d8849..133f44a5e61 100644
--- a/internal/chezmoi/boltpersistentstate.go
+++ b/internal/chezmoi/boltpersistentstate.go
@@ -111,6 +111,20 @@ func (b *BoltPersistentState) Delete(bucket, key []byte) error {
})
}
+// DeleteBucket deletes the bucket.
+func (b *BoltPersistentState) DeleteBucket(bucket []byte) error {
+ if b.empty {
+ return nil
+ }
+ if err := b.open(); err != nil {
+ return err
+ }
+
+ return b.db.Update(func(tx *bbolt.Tx) error {
+ return tx.DeleteBucket(bucket)
+ })
+}
+
// Data returns all the data in b.
func (b *BoltPersistentState) Data() (interface{}, error) {
if b.empty {
diff --git a/internal/chezmoi/debugpersistentstate.go b/internal/chezmoi/debugpersistentstate.go
index 614a3db5b08..4c2729c98e9 100644
--- a/internal/chezmoi/debugpersistentstate.go
+++ b/internal/chezmoi/debugpersistentstate.go
@@ -54,6 +54,15 @@ func (s *DebugPersistentState) Delete(bucket, key []byte) error {
return err
}
+// DeleteBucket implements PersistentState.DeleteBucket.
+func (s *DebugPersistentState) DeleteBucket(bucket []byte) error {
+ err := s.persistentState.DeleteBucket(bucket)
+ s.logger.Err(err).
+ Bytes("bucket", bucket).
+ Msg("DeleteBucket")
+ return err
+}
+
// ForEach implements PersistentState.ForEach.
func (s *DebugPersistentState) ForEach(bucket []byte, fn func(k, v []byte) error) error {
err := s.persistentState.ForEach(bucket, func(k, v []byte) error {
diff --git a/internal/chezmoi/mockpersistentstate.go b/internal/chezmoi/mockpersistentstate.go
index 1ac20c3ea1f..effcfdbe428 100644
--- a/internal/chezmoi/mockpersistentstate.go
+++ b/internal/chezmoi/mockpersistentstate.go
@@ -44,6 +44,12 @@ func (s *MockPersistentState) Delete(bucket, key []byte) error {
return nil
}
+// DeleteBucket implements PersistentState.DeleteBucket.
+func (s *MockPersistentState) DeleteBucket(bucket []byte) error {
+ delete(s.buckets, string(bucket))
+ return nil
+}
+
// ForEach implements PersistentState.ForEach.
func (s *MockPersistentState) ForEach(bucket []byte, fn func(k, v []byte) error) error {
for k, v := range s.buckets[string(bucket)] {
diff --git a/internal/chezmoi/nullpersistentstate.go b/internal/chezmoi/nullpersistentstate.go
index 060fc978adc..edde318bdb7 100644
--- a/internal/chezmoi/nullpersistentstate.go
+++ b/internal/chezmoi/nullpersistentstate.go
@@ -16,6 +16,9 @@ func (NullPersistentState) Data() (interface{}, error) { return nil, nil }
// Delete does nothing.
func (NullPersistentState) Delete(bucket, key []byte) error { return nil }
+// DeleteBucket does nothing.
+func (NullPersistentState) DeleteBucket(bucket []byte) error { return nil }
+
// ForEach does nothing.
func (NullPersistentState) ForEach(bucket []byte, fn func(k, v []byte) error) error { return nil }
diff --git a/internal/chezmoi/persistentstate.go b/internal/chezmoi/persistentstate.go
index bbc40887726..d6c9fd562af 100644
--- a/internal/chezmoi/persistentstate.go
+++ b/internal/chezmoi/persistentstate.go
@@ -20,6 +20,7 @@ type PersistentState interface {
CopyTo(s PersistentState) error
Data() (interface{}, error)
Delete(bucket, key []byte) error
+ DeleteBucket(bucket []byte) error
ForEach(bucket []byte, fn func(k, v []byte) error) error
Get(bucket, key []byte) ([]byte, error)
Set(bucket, key, value []byte) error
diff --git a/internal/cmd/statecmd.go b/internal/cmd/statecmd.go
index c846efdbee4..eca137324b1 100644
--- a/internal/cmd/statecmd.go
+++ b/internal/cmd/statecmd.go
@@ -11,11 +11,12 @@ import (
)
type stateCmdConfig struct {
- data stateDataCmdConfig
- delete stateDeleteCmdConfig
- dump stateDumpCmdConfig
- get stateGetCmdConfig
- set stateSetCmdConfig
+ data stateDataCmdConfig
+ delete stateDeleteCmdConfig
+ deleteBucket stateDeleteBucketCmdConfig
+ dump stateDumpCmdConfig
+ get stateGetCmdConfig
+ set stateSetCmdConfig
}
type stateDataCmdConfig struct {
@@ -27,6 +28,10 @@ type stateDeleteCmdConfig struct {
key string
}
+type stateDeleteBucketCmdConfig struct {
+ bucket string
+}
+
type stateDumpCmdConfig struct {
format writeDataFormat
}
@@ -77,6 +82,21 @@ func (c *Config) newStateCmd() *cobra.Command {
stateDeletePersistentFlags.StringVar(&c.state.delete.key, "key", c.state.delete.key, "key")
stateCmd.AddCommand(stateDeleteCmd)
+ stateDeleteBucketCmd := &cobra.Command{
+ Use: "delete-bucket",
+ Short: "Delete a bucket from the persistent state",
+ Args: cobra.NoArgs,
+ RunE: c.runStateDeleteBucketCmd,
+ Annotations: map[string]string{
+ persistentStateMode: persistentStateModeReadWrite,
+ },
+ }
+ stateDeleteBucketPersistentFlags := stateDeleteBucketCmd.PersistentFlags()
+ stateDeleteBucketPersistentFlags.StringVar(
+ &c.state.deleteBucket.bucket, "bucket", c.state.deleteBucket.bucket, "bucket",
+ )
+ stateCmd.AddCommand(stateDeleteBucketCmd)
+
stateDumpCmd := &cobra.Command{
Use: "dump",
Short: "Generate a dump of the persistent state",
@@ -145,6 +165,10 @@ func (c *Config) runStateDeleteCmd(cmd *cobra.Command, args []string) error {
return c.persistentState.Delete([]byte(c.state.delete.bucket), []byte(c.state.delete.key))
}
+func (c *Config) runStateDeleteBucketCmd(cmd *cobra.Command, args []string) error {
+ return c.persistentState.DeleteBucket([]byte(c.state.deleteBucket.bucket))
+}
+
func (c *Config) runStateDumpCmd(cmd *cobra.Command, args []string) error {
data, err := chezmoi.PersistentStateData(c.persistentState)
if err != nil {
diff --git a/internal/cmd/testdata/scripts/state_unix.txt b/internal/cmd/testdata/scripts/state_unix.txt
index 6f4e485b0e7..40c3e38e7d2 100644
--- a/internal/cmd/testdata/scripts/state_unix.txt
+++ b/internal/cmd/testdata/scripts/state_unix.txt
@@ -14,6 +14,11 @@ chezmoi state dump --format=yaml
stdout 70396a619400b7f78dbb83ab8ddb76ffe0b8e31557e64bab2ca9677818a52135:
stdout runAt:
+# test that chezmoi delete-bucket deletes a bucket
+chezmoi state delete-bucket --bucket=scriptState
+chezmoi state dump --format=yaml
+! stdout runAt:
+
# test that chezmoi state reset removes the persistent state
chezmoi --force state reset
! exists $CHEZMOICONFIGDIR/chezmoistate.boltdb
|
feat
|
Add state delete-bucket command
|
23af7788b1d9ecd456a6e2ffdc647c0fcaa1398b
|
2022-06-01 14:58:34
|
dependabot[bot]
|
chore(deps): bump goreleaser/goreleaser-action from 2.9.1 to 3
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3fa3b77390d..ed8405c22a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -226,7 +226,7 @@ jobs:
sudo apt-get -yq --no-install-suggests --no-install-recommends install musl-tools snapcraft
- name: build-release
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- uses: goreleaser/goreleaser-action@b953231f81b8dfd023c58e0854a721e35037f28b
+ uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef
with:
version: latest
args: release --skip-publish --snapshot
@@ -433,7 +433,7 @@ jobs:
SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }}
run: |
snapcraft login --with <(echo "$SNAPCRAFT_LOGIN" | base64 -d)
- - uses: goreleaser/goreleaser-action@b953231f81b8dfd023c58e0854a721e35037f28b
+ - uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef
with:
version: latest
args: release
|
chore
|
bump goreleaser/goreleaser-action from 2.9.1 to 3
|
5198b509b7915029ce787b85aa9de467a2f5e0ac
|
2024-01-01 17:25:55
|
dependabot[bot]
|
chore(deps): bump reviewdog/action-misspell from 1.14.1 to 1.15.0
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 82812da17a3..17a5cecde93 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- - uses: reviewdog/action-misspell@4348e72b9038b006ffc37b6b0dd4421a2e9a68ef
+ - uses: reviewdog/action-misspell@06d6a480724fa783c220081bbc22336a78dbbe82
with:
locale: US
test-alpine:
|
chore
|
bump reviewdog/action-misspell from 1.14.1 to 1.15.0
|
a7714ea2c2ae5c059911a141f16d8341a3ace687
|
2025-02-15 01:33:37
|
Tom Payne
|
chore: Update dependencies
| false
|
diff --git a/go.mod b/go.mod
index 9cc8a2d2fb7..5ef428b66b2 100644
--- a/go.mod
+++ b/go.mod
@@ -5,8 +5,8 @@ go 1.24.0
require (
filippo.io/age v1.2.1
github.com/1password/onepassword-sdk-go v0.1.7
- github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
- github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.0
+ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2
+ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1
github.com/Masterminds/sprig/v3 v3.3.0
github.com/Shopify/ejson v1.5.4
github.com/alecthomas/assert/v2 v2.11.0
@@ -22,7 +22,7 @@ require (
github.com/fsnotify/fsnotify v1.8.0
github.com/go-git/go-git/v5 v5.13.2
github.com/goccy/go-yaml v1.15.22
- github.com/google/go-github/v69 v69.0.0
+ github.com/google/go-github/v69 v69.1.0
github.com/google/renameio/v2 v2.0.0
github.com/gopasspw/gopass v1.15.15
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
@@ -67,8 +67,8 @@ require (
filippo.io/edwards25519 v1.1.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
- github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
+ github.com/AzureAD/microsoft-authentication-library-for-go v1.4.0 // indirect
github.com/BobuSumisu/aho-corasick v1.0.3 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.3.1 // indirect
diff --git a/go.sum b/go.sum
index e15a000bbfc..1561382bf9b 100644
--- a/go.sum
+++ b/go.sum
@@ -36,20 +36,20 @@ github.com/1password/onepassword-sdk-go v0.1.7 h1:KGvK3nL5+jfDstcAVG5DZVQdAAJqZi
github.com/1password/onepassword-sdk-go v0.1.7/go.mod h1:tCgAKPZA64sVLmwizpOtFVc+OtXYHCwSp/+2Y+7CxyY=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1 h1:1mvYtZfWQAnwNah/C+Z+Jb9rQH95LPE2vlmMuWAHJk8=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1/go.mod h1:75I/mXtme1JyWFtz8GocPHVFyH421IBoZErnO16dd0k=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.1 h1:Bk5uOhSAenHyR5P61D/NzeQCv+4fEVV8mOkJ82NqpWw=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.1/go.mod h1:QZ4pw3or1WPmRBxf0cHd1tknzrT54WPBOQoGutCPvSU=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 h1:F0gBpfdPLGsw+nsgk6aqqkZS1jiixa5WwFe3fk/T3Ys=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2/go.mod h1:SqINnQ9lVVdRlyC8cd1lCI0SdX4n2paeABd2K8ggfnE=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.0 h1:WLUIpeyv04H0RCcQHaA4TNoyrQ39Ox7V+re+iaqzTe0=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.0/go.mod h1:hd8hTTIY3VmUVPRHNH7GVCHO3SHgXkJKZHReby/bnUQ=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 h1:eXnN9kaS8TiDwXjoie3hMRLuwdUBUMW9KRgOqB3mCaw=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0/go.mod h1:XIpam8wumeZ5rVMuhdDQLMfIPDf1WO3IzrCRO3e3e3o=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1 h1:mrkDCdkMsD4l9wjFGhofFHFrV43Y3c53RSLKOCJ5+Ow=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1/go.mod h1:hPv41DbqMmnxcGralanA/kVlfdH5jv3T4LxGku2E1BY=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 h1:bFWuoEKg+gImo7pvkiQEFAc8ocibADgXeiLAxWhWmkI=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1/go.mod h1:Vih/3yc6yac2JzU4hzpaDupBJP0Flaia9rXXrU8xyww=
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 h1:H5xDQaE3XowWfhZRUpnfC+rGZMEVoSiji+b+/HFAPU4=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.0 h1:MUkXAnvvDHgvPItl0nBj0hgk0f7hnnQbGm0h0+YxbN4=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/BobuSumisu/aho-corasick v1.0.3 h1:uuf+JHwU9CHP2Vx+wAy6jcksJThhJS9ehR8a+4nPE9g=
github.com/BobuSumisu/aho-corasick v1.0.3/go.mod h1:hm4jLcvZKI2vRF2WDU1N4p/jpWtpOzp3nLmi9AzX/XE=
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
@@ -242,8 +242,6 @@ github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7
github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/goccy/go-yaml v1.15.17 h1:dK4FbbTTEOZTLH/NW3/xBqg0JdC14YKVmYwS9GT3H60=
-github.com/goccy/go-yaml v1.15.17/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
github.com/goccy/go-yaml v1.15.22 h1:iQI1hvCoiYYiVFq76P4AI8ImgDOfgiyKnl/AWjK8/gA=
github.com/goccy/go-yaml v1.15.22/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -269,8 +267,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go=
github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY=
-github.com/google/go-github/v69 v69.0.0 h1:YnFvZ3pEIZF8KHmI8xyQQe3mYACdkhnaTV2hr7CP2/w=
-github.com/google/go-github/v69 v69.0.0/go.mod h1:xne4jymxLR6Uj9b7J7PyTpkMYstEMMwGZa0Aehh1azM=
+github.com/google/go-github/v69 v69.1.0 h1:ljzwzEsHsc4qUqyHEJCNA1dMqvoTK3YX2NAaK6iprDg=
+github.com/google/go-github/v69 v69.1.0/go.mod h1:xne4jymxLR6Uj9b7J7PyTpkMYstEMMwGZa0Aehh1azM=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
|
chore
|
Update dependencies
|
d81e88b2cbaca0a6a90887ca421c8ee3b72a62e4
|
2024-05-12 21:26:07
|
Tom Payne
|
chore: Add test for #3744
| false
|
diff --git a/internal/cmd/testdata/scripts/issue3744.txtar b/internal/cmd/testdata/scripts/issue3744.txtar
new file mode 100644
index 00000000000..93e428ea272
--- /dev/null
+++ b/internal/cmd/testdata/scripts/issue3744.txtar
@@ -0,0 +1,22 @@
+[!exec:git] skip 'git not found in $PATH'
+
+mkgitconfig
+
+# create a repo
+exec git init --bare $WORK/dotfiles.git
+exec chezmoi init file://$WORK/dotfiles.git
+
+# test that chezmoi add creates and pushes a commit with a custom message template
+stdin golden/stdin
+exec chezmoi add --no-tty $HOME${/}.file
+exec git --git-dir=$WORK/dotfiles.git show HEAD
+stdout 'Custom commit message'
+
+-- golden/stdin --
+Custom commit message
+-- home/user/.config/chezmoi/chezmoi.toml --
+[git]
+ autoPush = true
+ commitMessageTemplate = "{{ promptString \"message\" }}"
+-- home/user/.file --
+# contents of .file
|
chore
|
Add test for #3744
|
755e02f4628abc5ddf40ccf8651d53dfadc9cff1
|
2022-06-20 02:38:33
|
Tom Payne
|
fix: Don't return an error when the user chooses quit from a prompt
| false
|
diff --git a/pkg/cmd/addcmd.go b/pkg/cmd/addcmd.go
index 1ddd61a4ca3..6665dfab659 100644
--- a/pkg/cmd/addcmd.go
+++ b/pkg/cmd/addcmd.go
@@ -123,7 +123,7 @@ func (c *Config) defaulReplaceFunc(
case choice == "no":
return chezmoi.Skip
case choice == "quit":
- return chezmoi.ExitCodeError(1)
+ return chezmoi.ExitCodeError(0)
case choice == "yes":
return nil
default:
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
index 7da5874f30a..2b5d89bb717 100644
--- a/pkg/cmd/config.go
+++ b/pkg/cmd/config.go
@@ -876,9 +876,9 @@ func (c *Config) defaultPreApplyFunc(
case choice == "skip":
return chezmoi.Skip
case choice == "quit":
- return chezmoi.ExitCodeError(1)
+ return chezmoi.ExitCodeError(0)
default:
- return nil
+ panic(fmt.Sprintf("%s: unexpected choice", choice))
}
}
}
|
fix
|
Don't return an error when the user chooses quit from a prompt
|
ec58b0a1f31d4ea8a0cfc64f6fe0131ee19e8053
|
2022-08-04 22:48:15
|
Tom Payne
|
chore: Bump golangci-lint to version 1.47.3
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5fcd8be8e41..f99323f1a47 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ env:
AGE_VERSION: 1.0.0
GO_VERSION: 1.19
GOFUMPT_VERSION: 0.3.1
- GOLANGCI_LINT_VERSION: 1.47.2
+ GOLANGCI_LINT_VERSION: 1.47.3
TPARSE_VERSION: 0.11.1
jobs:
changes:
@@ -369,7 +369,7 @@ jobs:
- uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
cache: true
- go-version: ${{ env.GO_VERSION }}
+ go-version: 1.18.x # FIXME use ${{ env.GO_VERSION }} when golangci-lint supports Go 1.19
- uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc
with:
version: v${{ env.GOLANGCI_LINT_VERSION }}
diff --git a/Makefile b/Makefile
index 244ae32e2bb..e5b4dcfc8f4 100644
--- a/Makefile
+++ b/Makefile
@@ -126,7 +126,7 @@ ensure-gofumpt:
.PHONY: ensure-golangci-lint
ensure-golangci-lint:
- if [ ! -x bin/golangci-lint ] || ( ./bin/golangci-lint --version | grep -Fqv "version ${GOLANGCI_LINT_VERSION}" ) ; then \
+ if [ ! -x bin/golangci-lint ] || ( ./bin/golangci-lint version | grep -Fqv "version ${GOLANGCI_LINT_VERSION}" ) ; then \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- v${GOLANGCI_LINT_VERSION} ; \
fi
|
chore
|
Bump golangci-lint to version 1.47.3
|
e60e889070f7ad942c4412baa4039da81af01b6c
|
2021-10-07 23:50:44
|
Tom Payne
|
chore: Add test for encrypted template modify scripts
| false
|
diff --git a/internal/cmd/testdata/scripts/modifyencrypted.txt b/internal/cmd/testdata/scripts/modifyencrypted.txt
index 28c76007aff..b33174ab8a4 100644
--- a/internal/cmd/testdata/scripts/modifyencrypted.txt
+++ b/internal/cmd/testdata/scripts/modifyencrypted.txt
@@ -1,15 +1,28 @@
[windows] skip 'UNIX only'
[!exec:age] skip 'age not found in $PATH'
-mkageconfig
-
# test that chezmoi applies encrypted modify scripts
+mkageconfig
+cp golden/.modify $HOME
mkdir $CHEZMOISOURCEDIR
chezmoi encrypt --output=$CHEZMOISOURCEDIR${/}modify_encrypted_dot_modify.age golden/modify.sh
grep '-----BEGIN AGE ENCRYPTED FILE-----' $CHEZMOISOURCEDIR/modify_encrypted_dot_modify.age
chezmoi apply --force
cmp $HOME/.modify golden/.modify-modified
+chhome home2/user
+
+# test that chezmoi applies encrypted template modify scripts
+mkageconfig
+cp golden/.modify $HOME
+mkdir $CHEZMOISOURCEDIR
+chezmoi encrypt --output=$CHEZMOISOURCEDIR${/}modify_encrypted_dot_modify.tmpl.age golden/modify.sh.tmpl
+grep '-----BEGIN AGE ENCRYPTED FILE-----' $CHEZMOISOURCEDIR/modify_encrypted_dot_modify.tmpl.age
+chezmoi apply --force
+cmp $HOME/.modify golden/.modify-modified
+
+-- golden/.modify --
+# contents of .modify
-- golden/.modify-modified --
# contents of .modify
# modified
@@ -18,5 +31,8 @@ cmp $HOME/.modify golden/.modify-modified
cat
echo "# modified"
--- home/user/.modify --
-# contents of .modify
+-- golden/modify.sh.tmpl --
+#!/bin/sh
+
+cat
+echo {{ "# modified" | quote }}
|
chore
|
Add test for encrypted template modify scripts
|
8f72b73dc0908b79622b74f4190d5d7537c8f5cc
|
2024-05-25 21:21:51
|
Braden Hilton
|
chore: run install.ps1 on both powershell and pwsh
| false
|
diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
index 50a18cdcee0..161fde163ca 100644
--- a/.github/workflows/installer.yml
+++ b/.github/workflows/installer.yml
@@ -75,15 +75,29 @@ jobs:
BINARY: ${{ matrix.os == 'windows-2022' && 'bin/chezmoi.exe' || 'bin/chezmoi' }}
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
- - name: test-${{ matrix.os }}-local
+ - name: test-${{ matrix.os }}-local-pwsh
shell: pwsh
run: |
if (Test-Path -Path ${{ env.BINARY }}) { Remove-Item -Force ${{ env.BINARY }} }
assets/scripts/install.ps1 -d
${{ env.BINARY }} --version
- - name: test-${{ matrix.os }}-url
+ - name: test-${{ matrix.os }}-local-powershell
+ if: matrix.os == 'windows-2022'
+ shell: powershell
+ run: |
+ if (Test-Path -Path ${{ env.BINARY }}) { Remove-Item -Force ${{ env.BINARY }} }
+ assets/scripts/install.ps1 -d
+ ${{ env.BINARY }} --version
+ - name: test-${{ matrix.os }}-url-pwsh
shell: pwsh
run: |
if (Test-Path -Path ${{ env.BINARY }}) { Remove-Item -Force ${{ env.BINARY }} }
iex "&{$(irm 'https://raw.githubusercontent.com/twpayne/chezmoi/${{ env.SHA }}/assets/scripts/install.ps1')} -d"
${{ env.BINARY }} --version
+ - name: test-${{ matrix.os }}-url-powershell
+ if: matrix.os == 'windows-2022'
+ shell: powershell
+ run: |
+ if (Test-Path -Path ${{ env.BINARY }}) { Remove-Item -Force ${{ env.BINARY }} }
+ iex "&{$(irm 'https://raw.githubusercontent.com/twpayne/chezmoi/${{ env.SHA }}/assets/scripts/install.ps1')} -d"
+ ${{ env.BINARY }} --version
|
chore
|
run install.ps1 on both powershell and pwsh
|
5f39fec6189bf970e5ac8e10c90980696c4089e0
|
2022-02-23 05:26:10
|
Tom Payne
|
feat: Add status.exclude configuration variable
| false
|
diff --git a/assets/chezmoi.io/docs/reference/configuration-file/variables.md b/assets/chezmoi.io/docs/reference/configuration-file/variables.md
index d03d1e96e59..d77d0dc503c 100644
--- a/assets/chezmoi.io/docs/reference/configuration-file/variables.md
+++ b/assets/chezmoi.io/docs/reference/configuration-file/variables.md
@@ -67,5 +67,6 @@ The following configuration variables are available:
| `pinentry` | `args` | []string | *none* | Extra args to the pinentry command |
| | `command` | string | *none* | pinentry command |
| | `options` | []string | *see `pinentry` below* | Extra options for pinentry |
+| `status` | `exclude` | []string | *none* | Entry types to exclude from status |
| `template` | `options` | []string | `["missingkey=error"]` | Template options |
| `vault` | `command` | string | `vault` | Vault CLI command |
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
index 46be6d852d7..09df00887ac 100644
--- a/pkg/cmd/config.go
+++ b/pkg/cmd/config.go
@@ -129,6 +129,7 @@ type Config struct {
Edit editCmdConfig `mapstructure:"edit"`
Git gitCmdConfig `mapstructure:"git"`
Merge mergeCmdConfig `mapstructure:"merge"`
+ Status statusCmdConfig `mapstructure:"status"`
// Command configurations, not settable in the config file.
apply applyCmdConfig
@@ -145,7 +146,6 @@ type Config struct {
remove removeCmdConfig
secret secretCmdConfig
state stateCmdConfig
- status statusCmdConfig
update updateCmdConfig
upgrade upgradeCmdConfig
verify verifyCmdConfig
@@ -376,8 +376,8 @@ func newConfig(options ...configOption) (*Config, error) {
format: defaultWriteDataFormat,
},
},
- status: statusCmdConfig{
- exclude: chezmoi.NewEntryTypeSet(chezmoi.EntryTypesNone),
+ Status: statusCmdConfig{
+ Exclude: chezmoi.NewEntryTypeSet(chezmoi.EntryTypesNone),
include: chezmoi.NewEntryTypeSet(chezmoi.EntryTypesAll),
recursive: true,
},
diff --git a/pkg/cmd/statuscmd.go b/pkg/cmd/statuscmd.go
index d2968c5a905..fa23d0df98a 100644
--- a/pkg/cmd/statuscmd.go
+++ b/pkg/cmd/statuscmd.go
@@ -10,7 +10,7 @@ import (
)
type statusCmdConfig struct {
- exclude *chezmoi.EntryTypeSet
+ Exclude *chezmoi.EntryTypeSet `mapstructure:"exclude"`
include *chezmoi.EntryTypeSet
init bool
recursive bool
@@ -32,10 +32,10 @@ func (c *Config) newStatusCmd() *cobra.Command {
}
flags := statusCmd.Flags()
- flags.VarP(c.status.exclude, "exclude", "x", "Exclude entry types")
- flags.VarP(c.status.include, "include", "i", "Include entry types")
- flags.BoolVar(&c.status.init, "init", c.update.init, "Recreate config file from template")
- flags.BoolVarP(&c.status.recursive, "recursive", "r", c.status.recursive, "Recurse into subdirectories")
+ flags.VarP(c.Status.Exclude, "exclude", "x", "Exclude entry types")
+ flags.VarP(c.Status.include, "include", "i", "Include entry types")
+ flags.BoolVar(&c.Status.init, "init", c.update.init, "Recreate config file from template")
+ flags.BoolVarP(&c.Status.recursive, "recursive", "r", c.Status.recursive, "Recurse into subdirectories")
return statusCmd
}
@@ -70,9 +70,9 @@ func (c *Config) runStatusCmd(cmd *cobra.Command, args []string, sourceState *ch
return chezmoi.Skip
}
if err := c.applyArgs(cmd.Context(), dryRunSystem, c.DestDirAbsPath, args, applyArgsOptions{
- include: c.status.include.Sub(c.status.exclude),
- init: c.status.init,
- recursive: c.status.recursive,
+ include: c.Status.include.Sub(c.Status.Exclude),
+ init: c.Status.init,
+ recursive: c.Status.recursive,
umask: c.Umask,
preApplyFunc: preApplyFunc,
}); err != nil {
|
feat
|
Add status.exclude configuration variable
|
6d647970894f568c67e9bb02feb30ac8e6f84c90
|
2024-05-06 05:31:26
|
Tom Payne
|
chore: Update golangci-lint
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 502d56f7f8b..5240708935c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ env:
FIND_TYPOS_VERSION: 0.0.3
GO_VERSION: 1.22.2
GOFUMPT_VERSION: 0.6.0
- GOLANGCI_LINT_VERSION: 1.57.2
+ GOLANGCI_LINT_VERSION: 1.58.0
GOLINES_VERSION: 0.12.2
GOVERSIONINFO_VERSION: 1.4.0
RAGE_VERSION: 0.10.0
diff --git a/.golangci.yml b/.golangci.yml
index dd72444b897..6ab8e286f76 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -6,17 +6,19 @@ linters:
- asciicheck
- bidichk
- bodyclose
+ - canonicalheader
- containedctx
- decorder
- dogsled
- dupword
- durationcheck
+ - err113
- errcheck
- errchkjson
- errname
- errorlint
- - execinquery
- exportloopref
+ - fatcontext
- forbidigo
- forcetypeassert
- gci
@@ -24,7 +26,6 @@ linters:
- gochecksumtype
- gocritic
- godot
- - goerr113
- gofmt
- gofumpt
- goimports
@@ -145,7 +146,7 @@ issues:
- EXC0011 # include issues about comments from `stylecheck`
exclude-rules:
- linters:
- - goerr113
+ - err113
text: do not define dynamic errors, use wrapped static errors instead
- linters:
- revive
|
chore
|
Update golangci-lint
|
55a230d7daad64540b4b996fb7c8b2eb0eaeb907
|
2022-02-25 06:40:07
|
Tom Payne
|
chore: Remove flaky concurrency-hammer test
| false
|
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 38b1ac6dc26..6ec3ab0019f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,29 +53,6 @@ jobs:
languages: go
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- concurrency-hammer:
- # run the full chezmoi test suite multiple times with Go's race detector
- # enabled in the hope that this will catch concurrency issues
- needs: changes
- if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
- runs-on: ubuntu-latest
- steps:
- - name: Set up Go
- uses: actions/setup-go@v2
- with:
- go-version: ${{ env.GO_VERSION }}
- - name: Checkout
- uses: actions/checkout@v2
- - name: Cache Go modules
- uses: actions/cache@v2
- with:
- path: ~/go/pkg/mod
- key: ${{ runner.os }}-concurrency-hammer-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-concurrency-hammer-
- - name: Test
- run: |
- go test -count=4 -race ./...
test-alpine:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
@@ -507,7 +484,6 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
needs:
- check
- - concurrency-hammer
- lint
- test-alpine
- test-archlinux
|
chore
|
Remove flaky concurrency-hammer test
|
3d04f876a024942f6bfaa6690e5dd5ad1bc14497
|
2022-04-22 03:53:41
|
Tom Payne
|
chore: Connect stdin, stdout, and stderr when running git
| false
|
diff --git a/pkg/chezmoi/sourcestate.go b/pkg/chezmoi/sourcestate.go
index e96f1d297c5..48dfb1eb3fd 100644
--- a/pkg/chezmoi/sourcestate.go
+++ b/pkg/chezmoi/sourcestate.go
@@ -1051,6 +1051,9 @@ func (s *SourceState) Read(ctx context.Context, options *ReadOptions) error {
args = append(args, external.Clone.Args...)
args = append(args, external.URL, destAbsPath.String())
cmd := exec.Command("git", args...)
+ cmd.Stdin = os.Stdin
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
sourceStateCommand := &SourceStateCommand{
cmd: cmd,
external: true,
@@ -1067,6 +1070,9 @@ func (s *SourceState) Read(ctx context.Context, options *ReadOptions) error {
args = append(args, external.Pull.Args...)
cmd := exec.Command("git", args...)
cmd.Dir = destAbsPath.String()
+ cmd.Stdin = os.Stdin
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
sourceStateCommand := &SourceStateCommand{
cmd: cmd,
external: true,
|
chore
|
Connect stdin, stdout, and stderr when running git
|
075d5485ab63f8ca91491df10d1db242575e7ea6
|
2023-03-07 21:23:54
|
Zhizhen He
|
docs: Fix typo
| false
|
diff --git a/assets/chezmoi.io/docs/reference/commands/re-add.md b/assets/chezmoi.io/docs/reference/commands/re-add.md
index eb173994f2d..99e9c95d188 100644
--- a/assets/chezmoi.io/docs/reference/commands/re-add.md
+++ b/assets/chezmoi.io/docs/reference/commands/re-add.md
@@ -5,7 +5,7 @@ templates, and all entries that are not files are ignored.
!!! hint
- If you want to re-add a single file uncondtionally, use `chezmoi add --force` instead.
+ If you want to re-add a single file unconditionally, use `chezmoi add --force` instead.
!!! example
diff --git a/assets/chezmoi.io/docs/reference/templates/aws-secrets-manager-functions/awsSecretsManager.md b/assets/chezmoi.io/docs/reference/templates/aws-secrets-manager-functions/awsSecretsManager.md
index 05b4bf4fc5f..ea3956fabbd 100644
--- a/assets/chezmoi.io/docs/reference/templates/aws-secrets-manager-functions/awsSecretsManager.md
+++ b/assets/chezmoi.io/docs/reference/templates/aws-secrets-manager-functions/awsSecretsManager.md
@@ -1,6 +1,6 @@
# `awsSecretsManager` *arn*
-`awsSecretsManager` returns structured data retreived from
+`awsSecretsManager` returns structured data retrieved from
[AWS Secrets Manager](https://aws.amazon.com/secrets-manager/). *arn* specifies the `SecretId` passed to
[`GetSecretValue`](https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_GetSecretValue.html). This can
either be the full ARN or the
diff --git a/assets/chezmoi.io/docs/reference/templates/directives.md b/assets/chezmoi.io/docs/reference/templates/directives.md
index 5596424078a..75531dc8677 100644
--- a/assets/chezmoi.io/docs/reference/templates/directives.md
+++ b/assets/chezmoi.io/docs/reference/templates/directives.md
@@ -39,7 +39,7 @@ inherited by templates called from the file.
## Line endings
-Many of the template functions available in chezmoi primarily use UNIX-syle
+Many of the template functions available in chezmoi primarily use UNIX-style
line endings (`lf`/`\n`), which may result in unexpected output when running
`chezmoi diff` on a `modify_` template. These line endings can be overridden
with a template directive:
diff --git a/assets/chezmoi.io/docs/reference/templates/keeper-functions/keeper.md b/assets/chezmoi.io/docs/reference/templates/keeper-functions/keeper.md
index 8fd2654b7b2..620ec89a418 100644
--- a/assets/chezmoi.io/docs/reference/templates/keeper-functions/keeper.md
+++ b/assets/chezmoi.io/docs/reference/templates/keeper-functions/keeper.md
@@ -1,6 +1,6 @@
# `keeper` *uid*
-`keeper` returns structured data retreived from
+`keeper` returns structured data retrieved from
[Keeper](https://www.keepersecurity.com/) using the [Commander
CLI](https://docs.keeper.io/secrets-manager/commander-cli). *uid* is passed to
`keeper get --format=json` and the output is parsed as JSON.
diff --git a/go.mod b/go.mod
index de16a12e060..260862b41bd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/twpayne/chezmoi/v2
-go 1.18
+go 1.19
require (
filippo.io/age v1.1.1
|
docs
|
Fix typo
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.