upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
vault/tools/pipeline/internal/pkg/git/client/opts_test.go
Vault Automation 34b5b5b2ff
[VAULT-39994] pipeline(changed-files): add support for listing and checking changed files (#12127) (#12215) 
We've already deployed some changed file detection in the CI pipeline. It uses the Github API to fetch a list of all changed files on a PR and then run it through a simple groups categorization pass. It's been a useful strategy in the context of a Pull Request because it does not depend on the local state of the Git repo.

This commit introduces a local git-based file change detection and validation system for the pipeline tool, enabling developers to identify and validate changed files before pushing code. We intend to use the new tool in two primary ways:
  - As a Git pre-push hook when pushing new or updated branches. (Implemented here)
  - As part of the scheduled automated repository synchronization. (Up next, and it will use the same `git.CheckChangedFilesReq{}` implementation.

This will allow us to guard all pushes to `hashicorp/vault` and `ce/*` branches in `hashicorp/vault-enterprise`, whether run locally on a developer machine or in CI by our service user.

We introduce two new `pipeline` CLI commands:
  - `pipeline git list changed-files`
  - `pipeline git check changed-files`

Both support specifying what method of git inspection we want to use for the changed files list:
  - **`--branch <branch>`**: Lists all files added in the entire history of a specific branch. We use this when pushing a _new_ branch.
  - **`--range <range>`**: Lists all changed files within a commit range (e.g., `HEAD~5..HEAD`). We use this when updating an existing branch.
  - **`--commit <sha>`**: Lists all changed files in a specific commit (using `git show`). This isn't actually used at all in the pre-push hook but it useful if you wish to inspect a single commit on your branch.

The behavior when passing the `range` and `commit` is similar. We inspect the changed file list either for one or many commits (but with slightly different implementations for efficiency and accuracy.  The `branch` option is a bit different. We use it to inspect the branches entire history of changed files for enterprise files before pushing a new branch. We do this to ensure that our branch doesn't accidentally add and then subsequently remove enterprise files, leaving the contents in the history but nothing obvious in the diff.

Each command supports several different output formats. The default is the human readable text table, though `--format json` will write all of the details as valid JSON to STDOUT. When given the `--github-output` command each will write a more concise version of the JSON output to `$GITHUB_OUTPUT`. It differs from our standard JSON output as it has been formatted to be easier to use in Github Actions contexts without requiring complex filtering.

When run, changed files are automatically categorized into logical groups based on their file name, just like our existing changed file detection. A follow-up to this PR will introduce a configuration based system for classifying file groups. This will allow us to create generic support for changed file detection so that many repositories can adopt this pattern. 

The major difference in behavior between the two new commands is that the `list` command will always list the changed files for the given method/target, while the `check` command requires one-or-more changed file groups that we want to disallow to be included via the `-g` flag. If any changed files match the given group(s) then the command will fail. That allows us to specify the `enterprise` group and disallow the command to succeed if any of the changed files match the group.

The pre-push git hook now uses this system to prevent accidental pushes, however, it requires the local machine to have the `pipeline` tool in the `$PATH`. This ought not be much of a requirement as a working Go toolchain is required for any Vault developer. When it is not present we explain in our error messages how to resolve the problem and direct them to our slack channel if they need further assistance.

Signed-off-by: Ryan Cragun <me@ryan.ec>
Co-authored-by: Ryan Cragun <me@ryan.ec>
2026-02-05 22:37:08 +00:00

1052 lines
30 KiB
Go
Raw Blame History

// Copyright IBM Corp. 2016, 2025
// SPDX-License-Identifier: BUSL-1.1
package client
import (
"testing"
"github.com/stretchr/testify/require"
)
// Test the various Opts structs ability to render the correct flags in the
// correct order.
// NOTE: Many of these tests use incompatible options combinations but that's
// not what we care about, we're simply asserting that the rendered string
// matches what ought to be there given the config. Verifying flag options is
// not currently part of the library.
func TestOptsStringers(t *testing.T) {
t.Parallel()
for name, expect := range map[string]struct {
opts OptStringer
expected string
}{
"am": {
&AmOpts{
AllowEmpty: true, // Only supported for --resolved
CommitterDateIsAuthorDate: true,
Empty: EmptyCommitKeep,
Keep: true,
KeepNonPatch: true,
MessageID: true,
NoMessageID: true,
NoReReReAutoupdate: true,
NoVerify: true,
Quiet: true,
ReReReAutoupdate: true,
Signoff: true,
ThreeWayMerge: true,
Whitespace: ApplyWhitespaceActionFix,
Mbox: []string{"/path/to/my.patch"},
},
"--committer-date-is-author-date --empty=keep --keep --keep-non-patch --message-id --no-message-id --no-rerere-autoupdate --no-verify --quiet --rerere-autoupdate --signoff --3way --whitespace=fix /path/to/my.patch",
},
"am --continue": {
&AmOpts{
// Unallowed options are ignored
Empty: EmptyCommitKeep,
AllowEmpty: true,
// Sequence
Continue: true,
},
"--continue",
},
"am --abort": {
&AmOpts{
// Unallowed options are ignored
Empty: EmptyCommitKeep,
AllowEmpty: true,
// Sequence
Abort: true,
},
"--abort",
},
"am --quit": {
&AmOpts{
// Unallowed options are ignored
Empty: EmptyCommitKeep,
AllowEmpty: true,
// Sequence
Quit: true,
},
"--quit",
},
"am --allow-empty --resolved": {
&AmOpts{
// Unallowed options are ignored
Empty: EmptyCommitKeep,
// Allowed options are kept
AllowEmpty: true,
// Sequence
Resolved: true,
},
"--allow-empty --resolved",
},
"am --retry": {
&AmOpts{
// Unallowed options are ignored
Empty: EmptyCommitKeep,
AllowEmpty: true,
// Sequence
Retry: true,
},
"--retry",
},
"apply": {
&ApplyOpts{
AllowEmpty: true,
Cached: true,
Check: true,
Index: true,
Ours: true,
Recount: true,
Stat: true,
Summary: true,
Theirs: true,
ThreeWayMerge: true,
Union: true,
Whitespace: ApplyWhitespaceActionFix,
Patch: []string{"/path/to/my.diff"},
},
"--allow-empty --cached --check --index --ours --recount --stat --summary --theirs --3way --union --whitespace=fix /path/to/my.diff",
},
"branch copy": {
&BranchOpts{
Copy: true,
Force: true,
OldBranch: "my-old-branch",
NewBranch: "my-new-branch",
},
"--copy --force my-old-branch my-new-branch",
},
"branch delete": {
&BranchOpts{
Delete: true,
Remotes: true,
BranchName: "my-branch",
},
"--delete --remotes my-branch",
},
"branch move": {
&BranchOpts{
Move: true,
OldBranch: "my-old-branch",
NewBranch: "my-new-branch",
},
"--move my-old-branch my-new-branch",
},
"branch upstream set": {
&BranchOpts{
SetUpstream: true,
SetUpstreamTo: "my-upstream",
BranchName: "my-branch",
},
"--set-upstream --set-upstream-to=my-upstream my-branch",
},
"branch upstream unset": {
&BranchOpts{
UnsetUpstream: true,
BranchName: "my-branch",
},
"--unset-upstream my-branch",
},
"branch track": {
&BranchOpts{
Track: BranchTrackInherit,
NoTrack: true,
Force: true,
BranchName: "my-branch",
StartPoint: "HEAD~2",
},
"--force --no-track --track=inherit my-branch HEAD~2",
},
"branch with pattern": {
// Everything else in branch..
&BranchOpts{
Abbrev: 7,
All: true,
Contains: "abcd1234",
Format: "%%",
List: true,
Merged: "1234abcd",
NoColor: true,
NoColumn: true,
PointsAt: "12ab34cd",
Remotes: true,
ShowCurrent: true,
Sort: "key",
Pattern: []string{"my/dir", "another/dir"},
},
"--abbrev=7 --all --contains=abcd1234 --format=%% --list --merged=1234abcd --no-color --no-column --points-at=12ab34cd --remotes --show-current --sort=key my/dir another/dir",
},
"checkout 1/2 opts": {
&CheckoutOpts{
Branch: "source",
NewBranchForceCheckout: "new",
Force: true,
NoTrack: true,
Ours: true,
Quiet: true,
},
"-B new --force --no-track --ours --quiet source",
},
"checkout 2/2 opts": {
&CheckoutOpts{
Branch: "source",
NewBranch: "new",
Guess: true,
Orphan: "bar",
Progress: true,
Theirs: true,
Track: BranchTrackDirect,
StartPoint: "HEAD~1",
},
"-b new --guess --orphan bar --progress --theirs --track=direct source HEAD~1",
},
"checkout path spec": {
&CheckoutOpts{
Branch: "main",
StartPoint: "HEAD~1",
PathSpec: []string{"go.mod", "go.sum"},
},
"main HEAD~1 -- go.mod go.sum",
},
"cherry-pick 1/2 opts": {
&CherryPickOpts{
AllowEmpty: true,
AllowEmptyMessage: true,
Empty: EmptyCommitKeep,
FF: true,
GPGSign: true,
Mainline: "ABCDEFGH",
Record: true,
Signoff: true,
Commit: "1234ABCD",
},
"--allow-empty --allow-empty-message --empty=keep --ff --gpg-sign --mainline=ABCDEFGH -x --signoff 1234ABCD",
},
"cherry-pick: 2/2 opts": {
&CherryPickOpts{
GPGSignKeyID: "4321DCBA",
ReReReAutoupdate: true,
Strategy: MergeStrategyResolve,
StrategyOptions: []MergeStrategyOption{
MergeStrategyOptionDiffAlgorithmHistogram,
MergeStrategyOptionIgnoreSpaceChange,
},
Commit: "1234ABCD",
},
"--gpg-sign=4321DCBA --rerere-autoupdate --strategy=resolve --strategy-option=diff-algorithm=histogram --strategy-option=ignore-space-change 1234ABCD",
},
"cherry-pick --continue": {
&CherryPickOpts{
Continue: true,
// Options are ignored
Commit: "1234ABCD",
GPGSignKeyID: "4321DCBA",
},
"--continue",
},
"cherry-pick --abort": {
&CherryPickOpts{
Abort: true,
// Options are ignored
Commit: "1234ABCD",
GPGSignKeyID: "4321DCBA",
},
"--abort",
},
"cherry-pick --quit": {
&CherryPickOpts{
Quit: true,
// Options are ignored
Commit: "1234ABCD",
GPGSignKeyID: "4321DCBA",
},
"--quit",
},
"clone 1/2 opts": {
&CloneOpts{
Branch: "my-branch",
Depth: 3,
NoCheckout: true,
NoTags: true,
Origin: "my-fork",
Quiet: true,
Directory: "some-dir",
},
"--branch my-branch --depth 3 --no-checkout --no-tags --origin my-fork --quiet -- some-dir",
},
"clone 2/2 opts": {
&CloneOpts{
Branch: "my-branch",
Progress: true,
Sparse: true,
SingleBranch: true,
Repository: "my-repo",
Directory: "some-dir",
},
"--branch my-branch --progress --single-branch --sparse -- my-repo some-dir",
},
"commit 1/2 opts": {
&CommitOpts{
All: true,
AllowEmpty: true,
AllowEmptyMessage: true,
Amend: true,
Author: "example@hashicorp.com",
Branch: true,
Cleanup: CommitCleanupModeWhitespace,
Date: "1 day ago",
DryRun: true,
File: "path/to/message/file",
Fixup: &CommitFixup{
FixupLog: CommitFixupLogReword,
Commit: "1234ABCD",
},
GPGSign: true,
Long: true,
NoEdit: true,
PathSpec: []string{
"file/a",
"another/b",
},
},
"--all --allow-empty --allow-empty-message --amend --author=example@hashicorp.com --branch --cleanup=whitespace --date=1 day ago --dry-run --file=path/to/message/file --fixup=reword:1234ABCD --gpg-sign --long --no-edit -- file/a another/b",
},
"commit 2/2 opts": {
&CommitOpts{
GPGSignKeyID: "4321DCBA",
Patch: true,
Porcelain: true,
Message: "my commit message",
NoPostRewrite: true,
NoVerify: true,
Null: true,
Only: true,
ResetAuthor: true,
ReuseMessage: "1234ABCD",
Short: true,
Signoff: true,
Status: true,
Verbose: true,
PathSpec: []string{
"file/a",
"another/b",
},
},
"--gpg-sign=4321DCBA --patch --porcelain --message=my commit message --no-post-rewrite --no-verify --null --only --reset-author --reuse-message=1234ABCD --short --status --verbose -- file/a another/b",
},
"fetch": {
&FetchOpts{
All: true,
Atomic: true,
Depth: 5,
Deepen: 6,
Force: true,
NoTags: true,
Porcelain: true,
Progress: true,
Prune: true,
Quiet: true,
SetUpstream: true,
Unshallow: true,
Verbose: true,
Repository: "my-repo",
Refspec: []string{"my-branch"},
},
"--all --atomic --depth 5 --deepen 6 --force --no-tags --porcelain --progress --prune --quiet --set-upstream --unshallow --verbose my-repo my-branch",
},
"merge 1/2 opts": {
&MergeOpts{
Autostash: true,
DoCommit: true,
Commit: "1234ABCD",
File: "/path/to/file",
FF: true,
FFOnly: true,
IntoName: "my-other-branch",
Log: 2,
Message: "merging my branch",
Progress: true,
ReReReAutoupdate: true,
Squash: true,
Stat: true,
Strategy: MergeStrategyORT,
StrategyOptions: []MergeStrategyOption{
MergeStrategyOptionDiffAlgorithmMyers,
MergeStrategyOptionFindRenames,
},
Verbose: true,
},
"--autostash --commit --file=/path/to/file --ff --ff-only --into-name my-other-branch --log=2 --rerere-autoupdate --squash --stat --strategy=ort --strategy-option=diff-algorithm=myers --strategy-option=find-renames 1234ABCD",
},
"merge 2/2 opts": {
&MergeOpts{
NoAutostash: true,
NoDoCommit: true,
NoFF: true,
NoLog: true,
NoProgress: true,
NoRebase: true,
NoReReReAutoupdate: true,
NoSquash: true,
NoStat: true,
NoVerify: true,
},
"--no-autostash --no-commit --no-ff --no-log --no-progress --no-rebase --no-rerere-autoupdate --no-squash --no-stat --no-stat --no-verify",
},
"merge --continue": {
&MergeOpts{
Continue: true,
// Options are ignored
Commit: "1234ABCD",
Message: "merging my branch",
},
"--continue",
},
"merge --abort": {
&MergeOpts{
Abort: true,
// Options are ignored
Commit: "1234ABCD",
Message: "merging my branch",
},
"--abort",
},
"merge --quit": {
&MergeOpts{
Quit: true,
// Options are ignored
Commit: "1234ABCD",
Message: "merging my branch",
},
"--quit",
},
"pull 1/3 opts": {
&PullOpts{
Atomic: true,
Autostash: true,
Depth: 4,
DoCommit: true,
FF: true,
GPGSign: true,
NoLog: true,
NoStat: true,
Quiet: true,
Prune: true,
SetUpstream: true,
Squash: true,
Rebase: RebaseStrategyTrue,
Refspec: []string{"my-branch"},
Repository: "my-repo",
UpdateShallow: true,
}, "--atomic --autostash --commit --depth 4 --ff --gpg-sign --squash --no-log --no-stat --no-stat --prune --quiet --rebase=true --set-upstream my-repo my-branch",
},
"pull 2/3 opts": {
&PullOpts{
AllowUnrelatedHistories: true,
Append: true,
Deepen: 3,
FFOnly: true,
GPGSignKeyID: "4321DCBA",
Log: 5,
NoRebase: true,
NoRecurseSubmodules: true,
Porcelain: true,
Progress: true,
PruneTags: true,
Refspec: []string{"my-branch"},
Repository: "my-repo",
Stat: true,
Strategy: MergeStrategyOctopus,
StrategyOptions: []MergeStrategyOption{
MergeStrategyOptionDiffAlgorithmMinimal,
MergeStrategyOptionIgnoreCRAtEOL,
},
Verbose: true,
Verify: true,
}, "--deepen 3 --ff-only --gpg-sign=4321DCBA --log=5 --stat -X diff-algorithm=minimal -X ignore-cr-at-eol --no-rebase --no-recurse-submodules --porcelain --progress --prune-tags --verbose my-repo my-branch",
},
"pull 3/3 opts": {
&PullOpts{
All: true,
Cleanup: CommitCleanupModeDefault,
Force: true,
NoAutostash: true,
NoDoCommit: true,
NoFF: true,
NoSquash: true,
NoTags: true,
NoVerify: true,
RecurseSubmodules: RecurseSubmodulesOnDemand,
Refspec: []string{"my-branch"},
Repository: "my-repo",
Stat: true,
Unshallow: true,
}, "--all --force --stat --no-autostash --no-commit --no-ff --no-squash --no-tags --no-verify --unshallow my-repo my-branch",
},
"push 1/2 opts": {
&PushOpts{
All: true,
Branches: true,
DryRun: true,
FollowTags: true,
ForceIfIncludes: true,
Mirror: true,
NoForceWithLease: true,
NoRecurseSubmodules: true,
NoThin: true,
Porcelain: true,
Prune: true,
Quiet: true,
Refspec: []string{"my-branch"},
Repository: "my-repo",
SetUpstream: true,
Tags: true,
Verify: true,
}, "--all --branches --dry-run --follow-tags --force-if-includes --mirror --no-force-with-lease --no-recurse-submodules --no-thin --porcelain --prune --quiet --set-upstream --tags --verify my-repo my-branch",
},
"push 2/2 opts": {
&PushOpts{
Atomic: true,
Delete: true,
Exec: "/path/to/git-receive-pack",
Force: true,
ForceWithLease: "another-branch",
NoAtomic: true,
NoForceIfIncludes: true,
NoSigned: true,
NoVerify: true,
Progress: true,
PushOption: "a",
RecurseSubmodules: PushRecurseSubmodulesCheck,
Refspec: []string{"my-branch"},
Repository: "my-repo",
Signed: PushSignedTrue,
Verbose: true,
}, "--atomic --delete --exec=/path/to/git-receive-pack --force --force-with-lease=another-branch --no-atomic --no-force-if-includes --no-signed --no-verify --progress --push-option=a --recurse-submodules=check --signed=true --verbose my-repo my-branch",
},
"rebase 1/3 opts": {
&RebaseOpts{
AllowEmptyMessage: true,
Autosquash: true,
Branch: "my-branch",
Empty: EmptyCommitDrop,
ForkPoint: true,
IgnoreDate: true,
Merge: true,
NoAutostash: true,
NoRebaseMerges: true,
NoReReReAutoupdate: true,
NoVerify: true,
RescheduleFailedExec: true,
Root: true,
UpdateRefs: true,
}, "--allow-empty-message --autosquash --empty=drop --fork-point --ignore-date --merge --no-autostash --no-rebase-merges --no-rerere-autoupdate --no-verify --reschedule-failed-exec --root --update-refs my-branch",
},
"rebase 2/3 opts": {
&RebaseOpts{
Apply: true,
Branch: "my-branch",
CommitterDateIsAuthorDate: true,
Exec: "/path/to/git-receive-pack",
GPGSign: true,
IgnoreWhitespace: true,
KeepEmpty: true,
NoReapplyCherryPicks: true,
NoStat: true,
Onto: "new-base",
Quiet: true,
ResetAuthorDate: true,
Stat: true,
Whitespace: WhitespaceActionFix,
}, "--apply --committer-date-is-author-date --exec=/path/to/git-receive-pack --gpg-sign --ignore-whitespace --keep-empty --no-reapply-cherry-picks --no-stat --onto=new-base --quiet --reset-author-date --stat --whitespace=fix my-branch",
},
"rebase 3/3 opts": {
&RebaseOpts{
Autostash: true,
Branch: "my-branch",
Context: 3,
ForceRebase: true,
GPGSignKeyID: "4321DCBA",
KeepBase: "another-upstream",
NoAutosquash: true,
NoKeepEmpty: true,
NoRescheduleFailedExec: true,
NoUpdateRefs: true,
ReapplyCherryPicks: true,
RebaseMerges: RebaseMergesCousins,
ReReReAutoupdate: true,
Strategy: MergeStrategySubtree,
StrategyOptions: []MergeStrategyOption{
MergeStrategyOptionDiffAlgorithmPatience,
MergeStrategyOptionNoRenormalize,
},
Verbose: true,
}, "--autostash -C 3 --force-rebase --gpg-sign=4321DCBA --keep-base=another-upstream --no-autosquash --no-keep-empty --no-reschedule-failed-exec --no-update-refs --reapply-cherry-picks --rebase-merges=rebase-cousins --rerere-autoupdate --strategy=subtree --strategy-option=diff-algorithm=patience --strategy-option=no-renormalize --verbose my-branch",
},
"rebase --continue": {
&RebaseOpts{
Continue: true,
// Options are ignored
Branch: "my-branch",
GPGSignKeyID: "4321DCBA",
},
"--continue",
},
"rebase --abort": {
&RebaseOpts{
Abort: true,
// Options are ignored
Branch: "my-branch",
GPGSignKeyID: "4321DCBA",
},
"--abort",
},
"rebase --quit": {
&RebaseOpts{
Quit: true,
// Options are ignored
Branch: "my-branch",
GPGSignKeyID: "4321DCBA",
},
"--quit",
},
"rebase --skip": {
&RebaseOpts{
Skip: true,
// Options are ignored
Branch: "my-branch",
GPGSignKeyID: "4321DCBA",
},
"--skip",
},
"rebase --show-current-patch": {
&RebaseOpts{
ShowCurrentPatch: true,
// Options are ignored
Branch: "my-branch",
GPGSignKeyID: "4321DCBA",
},
"--show-current-patch",
},
"remote": {
&RemoteOpts{
Verbose: true,
},
"-v",
},
"remote add": {
&RemoteOpts{
Command: RemoteCommandAdd,
Track: []string{"branch-a", "branch-b"},
Master: "main",
Fetch: true,
Tags: true,
NoTags: true,
Name: "origin",
URL: "git@github.com:hashicorp/vault.git",
},
"add -f --tags --no-tags -m main -t branch-a -t branch-b origin git@github.com:hashicorp/vault.git",
},
"remote rename": {
&RemoteOpts{
Command: RemoteCommandRename,
Progress: true,
NoProgress: true,
Old: "old-remote",
New: "new-remote",
},
"rename --progress --no-progress old-remote new-remote",
},
"remote remove": {
&RemoteOpts{
Command: RemoteCommandRemove,
Name: "remote",
},
"remove remote",
},
"remote set-head": {
&RemoteOpts{
Command: RemoteCommandSetHead,
Name: "my-remote",
Auto: true,
Delete: true,
Branch: "my-branch",
},
"set-head my-remote --auto --delete my-branch",
},
"remote set-branches": {
&RemoteOpts{
Command: RemoteCommandSetBranches,
Add: true,
Name: "my-remote",
Branch: "branch-a",
Branches: []string{"branch-b", "branch-c"},
},
"set-branches --add my-remote branch-a branch-b branch-c",
},
"remote get-url": {
&RemoteOpts{
Command: RemoteCommandGetURL,
Push: true,
All: true,
Name: "my-remote",
},
"get-url --push --all my-remote",
},
"remote set-url oldurl": {
&RemoteOpts{
Command: RemoteCommandSetURL,
Push: true,
Name: "my-remote",
NewURL: "git@github.com:hashicorp/vault-enterprise.git",
OldURL: "git@github.com:hashicorp/vault.git",
},
"set-url --push my-remote git@github.com:hashicorp/vault-enterprise.git git@github.com:hashicorp/vault.git",
},
"remote set-url add": {
&RemoteOpts{
Command: RemoteCommandSetURL,
Add: true,
Push: true,
Name: "my-remote",
NewURL: "git@github.com:hashicorp/vault-enterprise.git",
},
"set-url --add --push my-remote git@github.com:hashicorp/vault-enterprise.git",
},
"remote set-url delete": {
&RemoteOpts{
Command: RemoteCommandSetURL,
Delete: true,
Push: true,
Name: "my-remote",
URL: "git@github.com:hashicorp/vault-enterprise.git",
},
"set-url --delete --push my-remote git@github.com:hashicorp/vault-enterprise.git",
},
"remote show": {
&RemoteOpts{
Command: RemoteCommandShow,
Verbose: true,
NoQuery: true,
Name: "my-remote",
},
"-v show -n my-remote",
},
"remote prune": {
&RemoteOpts{
Command: RemoteCommandPrune,
NoQuery: true,
DryRun: true,
Name: "branch-a",
Names: []string{"branch-b", "branch-c"},
},
"prune -n --dry-run branch-a branch-b branch-c",
},
"remote update": {
&RemoteOpts{
Command: RemoteCommandUpdate,
Verbose: true,
Prune: true,
},
"-v update --prune",
},
"reset": {
&ResetOpts{
Mode: ResetModeHard,
NoRefresh: true,
Patch: true,
Quiet: true,
Refresh: true,
Commit: "abcd1234",
Treeish: "HEAD~2",
PathSpec: []string{"vault/something_ent.go", "vault/cli/another_ent.go"},
},
"--hard --no-refresh --quiet --refresh --patch abcd1234 HEAD~2 -- vault/something_ent.go vault/cli/another_ent.go",
},
"rm": {
&RmOpts{
Cached: true,
DryRun: true,
Force: true,
IgnoreUnmatched: true,
Quiet: true,
Recursive: true,
Sparse: true,
PathSpec: []string{"vault/something_ent.go", "vault/cli/another_ent.go"},
},
"--cached --dry-run --force --ignore-unmatched --quiet -r --sparse -- vault/something_ent.go vault/cli/another_ent.go",
},
"show": {
&ShowOpts{
DiffAlgorithm: DiffAlgorithmHistogram,
DiffMerges: DiffMergeFormatDenseCombined,
Format: "medium",
NoColor: true,
NoPatch: true,
Output: "/path/to/my.diff",
Patch: true,
Quiet: true,
Raw: true,
Object: "HEAD",
PathSpec: []string{"go.mod", "go.sum"},
},
"--diff-algorithm=histogram --diff-merges=dense-combined --format=medium --no-color --no-patch --output=/path/to/my.diff --patch --quiet --raw HEAD -- go.mod go.sum",
},
"show pretty none name only": {
&ShowOpts{
Pretty: LogPrettyFormatNone,
NameOnly: true,
},
"--pretty= --name-only ",
},
"status": {
&StatusOpts{
AheadBehind: true,
Branch: true,
Column: "always",
FindRenames: 12,
Ignored: IgnoredModeMatching,
IgnoreSubmodules: IgnoreSubmodulesWhenDirty,
Long: true,
NoAheadBehind: true,
NoColumn: true,
NoRenames: true,
Porcelain: true,
Renames: true,
Short: true,
ShowStash: true,
UntrackedFiles: UntrackedFilesAll,
Verbose: true,
PathSpec: []string{"go.mod", "go.sum"},
},
"--ahead-behind --branch --column=always --find-renames=12 --ignored=matching --ignore-submodules=dirty --long --no-ahead-behind --no-column --no-renames --porcelain --renames --short --show-stash --untracked-files=all --verbose -- go.mod go.sum",
},
"log 1/3 opts": {
&LogOpts{
MaxCount: 10,
Skip: 5,
Since: "2 weeks ago",
After: "1 week ago",
Until: "yesterday",
Before: "today",
Author: "John Doe",
Committer: "Jane Smith",
Grep: "bug fix",
AllMatch: true,
InvertGrep: true,
RegexpIgnoreCase: true,
Merges: true,
NoMerges: true,
FirstParent: true,
},
"--max-count=10 --skip=5 --since=2 weeks ago --after=1 week ago --until=yesterday --before=today --author=John Doe --committer=Jane Smith --grep=bug fix --all-match --invert-grep --regexp-ignore-case --merges --no-merges --first-parent",
},
"log 2/3 opts": {
&LogOpts{
All: true,
Branches: []string{"main", "develop"},
Tags: []string{"v1.0", "v2.0"},
Remotes: []string{"origin", "upstream"},
Oneline: true,
Pretty: LogPrettyFormatFull,
Format: "%h %an %s",
AbbrevCommit: true,
NoAbbrevCommit: true,
Abbrev: 7,
Decorate: LogDecorateFormatShort,
DecorateRefs: []string{"refs/heads/*", "refs/tags/*"},
Source: true,
Graph: true,
Date: LogDateFormatRelative,
RelativeDate: true,
},
"--all --branches=main --branches=develop --tags=v1.0 --tags=v2.0 --remotes=origin --remotes=upstream --oneline --pretty=full --format=%h %an %s --abbrev-commit --no-abbrev-commit --abbrev=7 --decorate=short --decorate-refs=refs/heads/* --decorate-refs=refs/tags/* --source --graph --date=relative --relative-date",
},
"log 3/3 opts": {
&LogOpts{
Patch: true,
NoPatch: true,
Stat: true,
Shortstat: true,
NameOnly: true,
NameStatus: true,
DiffMerges: DiffMergeFormatCombined,
CombinedDiff: true,
DenseCombined: true,
Follow: true,
FullDiff: true,
DateOrder: true,
AuthorDateOrder: true,
TopoOrder: true,
Reverse: true,
SimplifyByDecoration: true,
FullHistory: true,
AncestryPath: true,
ShowPulls: true,
WalkReflogs: true,
Color: true,
NoColor: true,
NullSep: true,
Target: "HEAD~5..HEAD",
PathSpec: []string{"go.mod", "go.sum"},
},
"HEAD~5..HEAD --patch --no-patch --stat --shortstat --name-only --name-status --diff-merges=combined -c --cc --follow --full-diff --date-order --author-date-order --topo-order --reverse --simplify-by-decoration --full-history --ancestry-path --show-pulls --walk-reflogs --color --no-color -z -- go.mod go.sum",
},
"log oneline": {
&LogOpts{
Oneline: true,
MaxCount: 10,
},
"--max-count=10 --oneline",
},
"log with author and grep": {
&LogOpts{
Author: "example@hashicorp.com",
Grep: "fix",
RegexpIgnoreCase: true,
NoMerges: true,
},
"--author=example@hashicorp.com --grep=fix --regexp-ignore-case --no-merges",
},
"log graph with decoration": {
&LogOpts{
Graph: true,
Oneline: true,
All: true,
Decorate: LogDecorateFormatShort,
},
"--all --oneline --decorate=short --graph",
},
"log with pathspec": {
&LogOpts{
Patch: true,
Follow: true,
PathSpec: []string{"path/to/file.go"},
},
"--patch --follow -- path/to/file.go",
},
"log date range": {
&LogOpts{
Since: "2024-01-01",
Until: "2024-12-31",
Pretty: LogPrettyFormatShort,
NoMerges: true,
},
"--since=2024-01-01 --until=2024-12-31 --no-merges --pretty=short",
},
"log pretty none": {
&LogOpts{
Pretty: LogPrettyFormatNone,
},
"--pretty=",
},
"log with diff-filter multiple": {
&LogOpts{
DiffFilter: []LogDiffFilter{
LogDiffFilterAdded,
LogDiffFilterModified,
LogDiffFilterDeleted,
},
NameStatus: true,
MaxCount: 10,
},
"--max-count=10 --name-status --diff-filter=AMD",
},
"log with diff-filter added": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterAdded},
NameOnly: true,
},
"--name-only --diff-filter=A",
},
"log with diff-filter copied": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterCopied},
Stat: true,
},
"--stat --diff-filter=C",
},
"log with diff-filter deleted": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterDeleted},
NameStatus: true,
},
"--name-status --diff-filter=D",
},
"log with diff-filter modified": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterModified},
Patch: true,
},
"--patch --diff-filter=M",
},
"log with diff-filter renamed": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterRenamed},
NameOnly: true,
},
"--name-only --diff-filter=R",
},
"log with diff-filter type-changed": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterTypeChanged},
NameStatus: true,
},
"--name-status --diff-filter=T",
},
"log with diff-filter unmerged": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterUnmerged},
Stat: true,
},
"--stat --diff-filter=U",
},
"log with diff-filter unknown": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterUnknown},
NameOnly: true,
},
"--name-only --diff-filter=X",
},
"log with diff-filter broken": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterBroken},
NameStatus: true,
},
"--name-status --diff-filter=B",
},
"log with diff-filter all": {
&LogOpts{
DiffFilter: []LogDiffFilter{LogDiffFilterAll},
Stat: true,
},
"--stat --diff-filter=*",
},
"log with diff-filter all types": {
&LogOpts{
DiffFilter: []LogDiffFilter{
LogDiffFilterAdded,
LogDiffFilterCopied,
LogDiffFilterDeleted,
LogDiffFilterModified,
LogDiffFilterRenamed,
LogDiffFilterTypeChanged,
LogDiffFilterUnmerged,
LogDiffFilterUnknown,
LogDiffFilterBroken,
},
NameStatus: true,
},
"--name-status --diff-filter=ACDMRTUXB",
},
} {
t.Run(name, func(t *testing.T) {
t.Parallel()
require.Equal(t, expect.expected, expect.opts.String())
})
}
}
Reference in a new issue View git blame Copy permalink