p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5141 from thaJeztah/carry_5040

Browse Source 
Removed all mentions of "please" from docs and messages
This commit is contained in:
Sebastiaan van Stijn
2024-06-11 22:01:50 +02:00
committed by GitHub
parent 52eddcf4e4 e06ef800fc
commit ed2d365653
42 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/cli.go
View File

@ -546,7 +546,7 @@ func getServerHost(hosts []string, tlsOptions *tlsconfig.Options) (string, error
case 1:
host = hosts[0]
default:
return "", errors.New("Please specify only one -H")
return "", errors.New("Specify only one -H")
}
return dopts.ParseHost(tlsOptions != nil, host)

2
cli/command/context/export.go
View File

@ -42,7 +42,7 @@ func writeTo(dockerCli command.Cli, reader io.Reader, dest string) error {
var printDest bool
if dest == "-" {
if dockerCli.Out().IsTerminal() {
return errors.New("cowardly refusing to export to a terminal, please specify a file path")
return errors.New("cowardly refusing to export to a terminal, specify a file path")
}
writer = dockerCli.Out()
} else {

2
cli/command/image/trust.go
View File

@ -100,7 +100,7 @@ func PushTrustedReference(ioStreams command.Streams, repoInfo *registry.Reposito
}
if target == nil {
return errors.Errorf("no targets found, please provide a specific tag in order to sign it")
return errors.Errorf("no targets found, provide a specific tag in order to sign it")
}
fmt.Fprintln(ioStreams.Out(), "Signing and pushing trust metadata")

2
cli/command/registry.go
View File

@ -29,7 +29,7 @@ const patSuggest = "You can log in with your password or a Personal Access " +
// for the given command.
func RegistryAuthenticationPrivilegedFunc(cli Cli, index *registrytypes.IndexInfo, cmdName string) types.RequestPrivilegeFunc {
return func(ctx context.Context) (string, error) {
fmt.Fprintf(cli.Out(), "\nPlease login prior to %s:\n", cmdName)
fmt.Fprintf(cli.Out(), "\nLogin prior to %s:\n", cmdName)
indexServer := registry.GetAuthConfigKey(index)
isDefaultRegistry := indexServer == registry.IndexServer
authConfig, err := GetDefaultAuthConfig(cli.ConfigFile(), true, indexServer, isDefaultRegistry)

2
cli/command/stack/config_test.go
View File

@ -14,7 +14,7 @@ func TestConfigWithEmptyComposeFile(t *testing.T) {
cmd := newConfigCommand(test.NewFakeCli(&fakeClient{}))
cmd.SetOut(io.Discard)
assert.ErrorContains(t, cmd.Execute(), `Please specify a Compose file`)
assert.ErrorContains(t, cmd.Execute(), `Specify a Compose file`)
}
func TestConfigMergeInterpolation(t *testing.T) {

2
cli/command/stack/loader/loader.go
View File

@ -76,7 +76,7 @@ func GetConfigDetails(composefiles []string, stdin io.Reader) (composetypes.Conf
var details composetypes.ConfigDetails
if len(composefiles) == 0 {
return details, errors.New("Please specify a Compose file (with --compose-file)")
return details, errors.New("Specify a Compose file (with --compose-file)")
}
if composefiles[0] == "-" && len(composefiles) == 1 {

2
cli/command/swarm/testdata/init-init-autolock.golden vendored
View File

@ -7,5 +7,5 @@ command and provide the following key:
unlock-key
Please remember to store this key in a password manager, since without it you
Remember to store this key in a password manager, since without it you
will not be able to restart the manager.

2
cli/command/swarm/testdata/unlockkeys-unlock-key-rotate.golden vendored
View File

@ -5,5 +5,5 @@ command and provide the following key:
unlock-key
Please remember to store this key in a password manager, since without it you
Remember to store this key in a password manager, since without it you
will not be able to restart the manager.

2
cli/command/swarm/testdata/unlockkeys-unlock-key.golden vendored
View File

@ -3,5 +3,5 @@ command and provide the following key:
unlock-key
Please remember to store this key in a password manager, since without it you
Remember to store this key in a password manager, since without it you
will not be able to restart the manager.

2
cli/command/swarm/testdata/update-autolock-unlock-key.golden vendored
View File

@ -4,5 +4,5 @@ command and provide the following key:
unlock-key
Please remember to store this key in a password manager, since without it you
Remember to store this key in a password manager, since without it you
will not be able to restart the manager.

2
cli/command/swarm/unlock.go
View File

@ -54,7 +54,7 @@ func runUnlock(ctx context.Context, dockerCli command.Cli) error {
return errors.New("Error: swarm is not locked")
}
key, err := readKey(dockerCli.In(), "Please enter unlock key: ")
key, err := readKey(dockerCli.In(), "Enter unlock key: ")
if err != nil {
return err
}

2
cli/command/swarm/unlock_key.go
View File

@ -88,7 +88,7 @@ func printUnlockCommand(out io.Writer, unlockKey string) {
if len(unlockKey) > 0 {
fmt.Fprintf(out, "To unlock a swarm manager after it restarts, "+
"run the `docker swarm unlock`\ncommand and provide the following key:\n\n %s\n\n"+
"Please remember to store this key in a password manager, since without it you\n"+
"Remember to store this key in a password manager, since without it you\n"+
"will not be able to restart the manager.\n", unlockKey)
}
}

2
cli/command/trust/revoke.go
View File

@ -44,7 +44,7 @@ func revokeTrust(ctx context.Context, dockerCLI command.Cli, remote string, opti
return errors.New("cannot use a digest reference for IMAGE:TAG")
}
if imgRefAndAuth.Tag() == "" && !options.forceYes {
deleteRemote, err := command.PromptForConfirmation(ctx, dockerCLI.In(), dockerCLI.Out(), fmt.Sprintf("Please confirm you would like to delete all signature data for %s?", remote))
deleteRemote, err := command.PromptForConfirmation(ctx, dockerCLI.In(), dockerCLI.Out(), fmt.Sprintf("Confirm you would like to delete all signature data for %s?", remote))
if err != nil {
return err
}

8
cli/command/trust/revoke_test.go
View File

@ -70,7 +70,7 @@ func TestTrustRevokeCommand(t *testing.T) {
doc: "OfflineErrors_Confirm",
notaryRepository: notary.GetOfflineNotaryRepository,
args: []string{"reg-name.io/image"},
expectedMessage: "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] ",
expectedMessage: "Confirm you would like to delete all signature data for reg-name.io/image? [y/N] ",
expectedErr: revokeCancelledError,
},
{
@ -89,7 +89,7 @@ func TestTrustRevokeCommand(t *testing.T) {
doc: "UninitializedErrors_Confirm",
notaryRepository: notary.GetUninitializedNotaryRepository,
args: []string{"reg-name.io/image"},
expectedMessage: "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] ",
expectedMessage: "Confirm you would like to delete all signature data for reg-name.io/image? [y/N] ",
expectedErr: revokeCancelledError,
},
{
@ -108,7 +108,7 @@ func TestTrustRevokeCommand(t *testing.T) {
doc: "EmptyNotaryRepo_Confirm",
notaryRepository: notary.GetEmptyTargetsNotaryRepository,
args: []string{"reg-name.io/image"},
expectedMessage: "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] ",
expectedMessage: "Confirm you would like to delete all signature data for reg-name.io/image? [y/N] ",
expectedErr: revokeCancelledError,
},
{
@ -127,7 +127,7 @@ func TestTrustRevokeCommand(t *testing.T) {
doc: "AllSigConfirmation",
notaryRepository: notary.GetEmptyTargetsNotaryRepository,
args: []string{"alpine"},
expectedMessage: "Please confirm you would like to delete all signature data for alpine? [y/N] ",
expectedMessage: "Confirm you would like to delete all signature data for alpine? [y/N] ",
expectedErr: revokeCancelledError,
},
}

2
cli/command/trust/signer_add.go
View File

@ -53,7 +53,7 @@ func addSigner(ctx context.Context, dockerCLI command.Cli, options signerAddOpti
return fmt.Errorf("signer name \"%s\" must start with lowercase alphanumeric characters and can include \"-\" or \"_\" after the first character", signerName)
}
if signerName == "releases" {
return errors.New("releases is a reserved keyword, please use a different signer name")
return errors.New("releases is a reserved keyword, use a different signer name")
}
if options.keys.Len() == 0 {

2
cli/command/trust/signer_add_test.go
View File

@ -34,7 +34,7 @@ func TestTrustSignerAddErrors(t *testing.T) {
{
name: "reserved-releases-signer-add",
args: []string{"releases", "my-image", "--key", "/path/to/key"},
expectedError: "releases is a reserved keyword, please use a different signer name",
expectedError: "releases is a reserved keyword, use a different signer name",
},
{
name: "disallowed-chars",

2
cli/command/trust/testdata/trust-revoke-prompt-termination.golden vendored
View File

@ -1 +1 @@
Please confirm you would like to delete all signature data for example/trust-demo? [y/N]
Confirm you would like to delete all signature data for example/trust-demo? [y/N]