2017-08-24 18:43:55 -04:00
|
|
|
package trust
|
|
|
|
|
|
|
|
import (
|
2018-08-08 11:55:48 -04:00
|
|
|
"bytes"
|
2018-11-08 05:37:49 -05:00
|
|
|
"context"
|
2017-08-24 18:43:55 -04:00
|
|
|
"encoding/hex"
|
2018-11-08 05:37:49 -05:00
|
|
|
"io"
|
2017-08-24 18:43:55 -04:00
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/docker/cli/cli/trust"
|
|
|
|
"github.com/docker/cli/internal/test"
|
2018-03-08 08:35:17 -05:00
|
|
|
notaryfake "github.com/docker/cli/internal/test/notary"
|
2018-11-08 05:37:49 -05:00
|
|
|
"github.com/docker/docker/api/types"
|
2024-01-24 08:32:07 -05:00
|
|
|
"github.com/docker/docker/api/types/image"
|
2023-07-14 17:42:40 -04:00
|
|
|
"github.com/docker/docker/api/types/system"
|
2024-06-09 09:53:08 -04:00
|
|
|
"github.com/docker/docker/client"
|
2017-10-30 12:21:41 -04:00
|
|
|
"github.com/theupdateframework/notary"
|
2024-06-09 09:53:08 -04:00
|
|
|
notaryclient "github.com/theupdateframework/notary/client"
|
2017-10-30 12:21:41 -04:00
|
|
|
"github.com/theupdateframework/notary/tuf/data"
|
2018-11-08 05:37:49 -05:00
|
|
|
"github.com/theupdateframework/notary/tuf/utils"
|
2020-02-22 12:12:14 -05:00
|
|
|
"gotest.tools/v3/assert"
|
|
|
|
is "gotest.tools/v3/assert/cmp"
|
|
|
|
"gotest.tools/v3/golden"
|
2017-08-24 18:43:55 -04:00
|
|
|
)
|
|
|
|
|
2018-03-09 14:26:43 -05:00
|
|
|
// TODO(n4ss): remove common tests with the regular inspect command
|
2018-03-09 12:37:43 -05:00
|
|
|
|
2017-08-24 18:43:55 -04:00
|
|
|
type fakeClient struct {
|
2024-06-09 09:53:08 -04:00
|
|
|
client.Client
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
2023-07-14 17:42:40 -04:00
|
|
|
func (c *fakeClient) Info(context.Context) (system.Info, error) {
|
|
|
|
return system.Info{}, nil
|
2018-11-08 05:37:49 -05:00
|
|
|
}
|
|
|
|
|
cli/command/trust: fakeClient: remove name for unused arg (revive)
cli/command/trust/inspect_pretty_test.go:30:27: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive)
func (c *fakeClient) Info(ctx context.Context) (types.Info, error) {
^
cli/command/trust/inspect_pretty_test.go:34:42: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive)
func (c *fakeClient) ImageInspectWithRaw(ctx context.Context, imageID string) (types.ImageInspect, []byte, error) {
^
cli/command/trust/inspect_pretty_test.go:38:32: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive)
func (c *fakeClient) ImagePush(ctx context.Context, image string, options types.ImagePushOptions) (io.ReadCloser, error) {
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-03-30 10:40:07 -04:00
|
|
|
func (c *fakeClient) ImageInspectWithRaw(context.Context, string) (types.ImageInspect, []byte, error) {
|
2018-11-08 05:37:49 -05:00
|
|
|
return types.ImageInspect{}, []byte{}, nil
|
|
|
|
}
|
|
|
|
|
2024-01-24 08:32:07 -05:00
|
|
|
func (c *fakeClient) ImagePush(context.Context, string, image.PushOptions) (io.ReadCloser, error) {
|
2018-11-08 05:37:49 -05:00
|
|
|
return &utils.NoopCloser{Reader: bytes.NewBuffer([]byte{})}, nil
|
|
|
|
}
|
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandErrors(t *testing.T) {
|
2017-08-24 18:43:55 -04:00
|
|
|
testCases := []struct {
|
|
|
|
name string
|
|
|
|
args []string
|
|
|
|
expectedError string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "not-enough-args",
|
2018-03-09 12:37:43 -05:00
|
|
|
expectedError: "requires at least 1 argument",
|
2017-08-24 18:43:55 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "sha-reference",
|
|
|
|
args: []string{"870d292919d01a0af7e7f056271dc78792c05f55f49b9b9012b6d89725bd9abd"},
|
|
|
|
expectedError: "invalid repository name",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "invalid-img-reference",
|
|
|
|
args: []string{"ALPINE"},
|
|
|
|
expectedError: "invalid reference format",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tc := range testCases {
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(
|
2017-08-24 18:43:55 -04:00
|
|
|
test.NewFakeCli(&fakeClient{}))
|
|
|
|
cmd.SetArgs(tc.args)
|
2022-02-25 08:33:57 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd.Flags().Set("pretty", "true")
|
2018-03-06 14:03:47 -05:00
|
|
|
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandOfflineErrors(t *testing.T) {
|
2017-09-14 16:16:54 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetOfflineNotaryRepository)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(cli)
|
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-13 12:50:37 -04:00
|
|
|
cmd.SetArgs([]string{"nonexistent-reg-name.io/image"})
|
2022-02-25 08:33:57 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
linting: ST1005: error strings should not be capitalized (stylecheck)
While fixing, also updated errors without placeholders to `errors.New()`, and
updated some code to use pkg/errors if it was already in use in the file.
cli/command/config/inspect.go:59:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/node/inspect.go:61:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/secret/inspect.go:57:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/trust/common.go:77:74: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signatures or cannot access %s", remote)
^
cli/command/trust/common.go:85:73: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signers for %s", remote)
^
cli/command/trust/sign.go:137:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("No tag specified for %s", imgRefAndAuth.Name())
^
cli/command/trust/sign.go:151:19: ST1005: error strings should not be capitalized (stylecheck)
return *target, fmt.Errorf("No tag specified")
^
cli/command/trust/signer_add.go:77:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Failed to add signer to: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:52:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Error removing signer from: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:67:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("All signed tags are currently revoked, use docker trust sign to fix")
^
cli/command/trust/signer_remove.go:108:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("No signer %s for repository %s", signerName, repoName)
^
opts/hosts.go:89:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", addr)
^
opts/hosts.go:100:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected %s: %s", proto, addr)
^
opts/hosts.go:119:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected tcp: %s", tryAddr)
^
opts/hosts.go:144:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
opts/hosts.go:155:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-09-02 18:04:53 -04:00
|
|
|
assert.ErrorContains(t, cmd.Execute(), "no signatures or cannot access nonexistent-reg-name.io/image")
|
2017-09-13 12:50:37 -04:00
|
|
|
|
2017-09-14 16:16:54 -04:00
|
|
|
cli = test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetOfflineNotaryRepository)
|
2018-03-09 14:26:43 -05:00
|
|
|
cmd = newInspectCommand(cli)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-13 12:50:37 -04:00
|
|
|
cmd.SetArgs([]string{"nonexistent-reg-name.io/image:tag"})
|
2022-02-25 08:33:57 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
linting: ST1005: error strings should not be capitalized (stylecheck)
While fixing, also updated errors without placeholders to `errors.New()`, and
updated some code to use pkg/errors if it was already in use in the file.
cli/command/config/inspect.go:59:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/node/inspect.go:61:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/secret/inspect.go:57:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/trust/common.go:77:74: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signatures or cannot access %s", remote)
^
cli/command/trust/common.go:85:73: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signers for %s", remote)
^
cli/command/trust/sign.go:137:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("No tag specified for %s", imgRefAndAuth.Name())
^
cli/command/trust/sign.go:151:19: ST1005: error strings should not be capitalized (stylecheck)
return *target, fmt.Errorf("No tag specified")
^
cli/command/trust/signer_add.go:77:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Failed to add signer to: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:52:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Error removing signer from: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:67:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("All signed tags are currently revoked, use docker trust sign to fix")
^
cli/command/trust/signer_remove.go:108:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("No signer %s for repository %s", signerName, repoName)
^
opts/hosts.go:89:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", addr)
^
opts/hosts.go:100:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected %s: %s", proto, addr)
^
opts/hosts.go:119:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected tcp: %s", tryAddr)
^
opts/hosts.go:144:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
opts/hosts.go:155:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-09-02 18:04:53 -04:00
|
|
|
assert.ErrorContains(t, cmd.Execute(), "no signatures or cannot access nonexistent-reg-name.io/image")
|
2017-09-13 12:50:37 -04:00
|
|
|
}
|
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandUninitializedErrors(t *testing.T) {
|
2017-09-14 16:16:54 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetUninitializedNotaryRepository)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(cli)
|
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-13 12:50:37 -04:00
|
|
|
cmd.SetArgs([]string{"reg/unsigned-img"})
|
2022-02-25 08:33:57 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
linting: ST1005: error strings should not be capitalized (stylecheck)
While fixing, also updated errors without placeholders to `errors.New()`, and
updated some code to use pkg/errors if it was already in use in the file.
cli/command/config/inspect.go:59:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/node/inspect.go:61:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/secret/inspect.go:57:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/trust/common.go:77:74: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signatures or cannot access %s", remote)
^
cli/command/trust/common.go:85:73: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signers for %s", remote)
^
cli/command/trust/sign.go:137:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("No tag specified for %s", imgRefAndAuth.Name())
^
cli/command/trust/sign.go:151:19: ST1005: error strings should not be capitalized (stylecheck)
return *target, fmt.Errorf("No tag specified")
^
cli/command/trust/signer_add.go:77:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Failed to add signer to: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:52:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Error removing signer from: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:67:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("All signed tags are currently revoked, use docker trust sign to fix")
^
cli/command/trust/signer_remove.go:108:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("No signer %s for repository %s", signerName, repoName)
^
opts/hosts.go:89:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", addr)
^
opts/hosts.go:100:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected %s: %s", proto, addr)
^
opts/hosts.go:119:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected tcp: %s", tryAddr)
^
opts/hosts.go:144:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
opts/hosts.go:155:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-09-02 18:04:53 -04:00
|
|
|
assert.ErrorContains(t, cmd.Execute(), "no signatures or cannot access reg/unsigned-img")
|
2017-09-13 12:50:37 -04:00
|
|
|
|
2017-09-14 16:16:54 -04:00
|
|
|
cli = test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetUninitializedNotaryRepository)
|
2018-03-09 14:26:43 -05:00
|
|
|
cmd = newInspectCommand(cli)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-13 12:50:37 -04:00
|
|
|
cmd.SetArgs([]string{"reg/unsigned-img:tag"})
|
2022-02-25 08:33:57 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
linting: ST1005: error strings should not be capitalized (stylecheck)
While fixing, also updated errors without placeholders to `errors.New()`, and
updated some code to use pkg/errors if it was already in use in the file.
cli/command/config/inspect.go:59:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/node/inspect.go:61:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/secret/inspect.go:57:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
^
cli/command/trust/common.go:77:74: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signatures or cannot access %s", remote)
^
cli/command/trust/common.go:85:73: ST1005: error strings should not be capitalized (stylecheck)
return []trustTagRow{}, []client.RoleWithSignatures{}, []data.Role{}, fmt.Errorf("No signers for %s", remote)
^
cli/command/trust/sign.go:137:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("No tag specified for %s", imgRefAndAuth.Name())
^
cli/command/trust/sign.go:151:19: ST1005: error strings should not be capitalized (stylecheck)
return *target, fmt.Errorf("No tag specified")
^
cli/command/trust/signer_add.go:77:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Failed to add signer to: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:52:10: ST1005: error strings should not be capitalized (stylecheck)
return fmt.Errorf("Error removing signer from: %s", strings.Join(errRepos, ", "))
^
cli/command/trust/signer_remove.go:67:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("All signed tags are currently revoked, use docker trust sign to fix")
^
cli/command/trust/signer_remove.go:108:17: ST1005: error strings should not be capitalized (stylecheck)
return false, fmt.Errorf("No signer %s for repository %s", signerName, repoName)
^
opts/hosts.go:89:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", addr)
^
opts/hosts.go:100:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected %s: %s", proto, addr)
^
opts/hosts.go:119:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid proto, expected tcp: %s", tryAddr)
^
opts/hosts.go:144:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
opts/hosts.go:155:14: ST1005: error strings should not be capitalized (stylecheck)
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-09-02 18:04:53 -04:00
|
|
|
assert.ErrorContains(t, cmd.Execute(), "no signatures or cannot access reg/unsigned-img:tag")
|
2017-09-13 12:50:37 -04:00
|
|
|
}
|
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandEmptyNotaryRepoErrors(t *testing.T) {
|
2017-09-14 16:16:54 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetEmptyTargetsNotaryRepository)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(cli)
|
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-13 12:50:37 -04:00
|
|
|
cmd.SetArgs([]string{"reg/img:unsigned-tag"})
|
2022-02-25 08:33:57 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
2018-03-06 15:13:00 -05:00
|
|
|
assert.NilError(t, cmd.Execute())
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Contains(cli.OutBuffer().String(), "No signatures for reg/img:unsigned-tag"))
|
2018-03-09 14:26:43 -05:00
|
|
|
assert.Check(t, is.Contains(cli.OutBuffer().String(), "Administrative keys for reg/img"))
|
2017-09-13 12:50:37 -04:00
|
|
|
|
2017-09-14 16:16:54 -04:00
|
|
|
cli = test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetEmptyTargetsNotaryRepository)
|
2018-03-09 14:26:43 -05:00
|
|
|
cmd = newInspectCommand(cli)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-13 12:50:37 -04:00
|
|
|
cmd.SetArgs([]string{"reg/img"})
|
2022-02-25 08:33:57 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
2018-03-06 15:13:00 -05:00
|
|
|
assert.NilError(t, cmd.Execute())
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Contains(cli.OutBuffer().String(), "No signatures for reg/img"))
|
2018-03-09 14:26:43 -05:00
|
|
|
assert.Check(t, is.Contains(cli.OutBuffer().String(), "Administrative keys for reg/img"))
|
2017-09-13 12:50:37 -04:00
|
|
|
}
|
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandFullRepoWithoutSigners(t *testing.T) {
|
2017-08-24 18:43:55 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetLoadedWithNoSignersNotaryRepository)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(cli)
|
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-14 16:16:54 -04:00
|
|
|
cmd.SetArgs([]string{"signed-repo"})
|
2018-03-06 15:13:00 -05:00
|
|
|
assert.NilError(t, cmd.Execute())
|
2017-08-24 18:43:55 -04:00
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
golden.Assert(t, cli.OutBuffer().String(), "trust-inspect-pretty-full-repo-no-signers.golden")
|
2017-08-25 17:49:40 -04:00
|
|
|
}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandOneTagWithoutSigners(t *testing.T) {
|
2017-08-25 17:49:40 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetLoadedWithNoSignersNotaryRepository)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(cli)
|
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-14 16:16:54 -04:00
|
|
|
cmd.SetArgs([]string{"signed-repo:green"})
|
2018-03-06 15:13:00 -05:00
|
|
|
assert.NilError(t, cmd.Execute())
|
2017-09-14 17:58:28 -04:00
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
golden.Assert(t, cli.OutBuffer().String(), "trust-inspect-pretty-one-tag-no-signers.golden")
|
2017-08-25 17:49:40 -04:00
|
|
|
}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandFullRepoWithSigners(t *testing.T) {
|
2017-08-25 17:49:40 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetLoadedNotaryRepository)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(cli)
|
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-14 16:16:54 -04:00
|
|
|
cmd.SetArgs([]string{"signed-repo"})
|
2018-03-06 15:13:00 -05:00
|
|
|
assert.NilError(t, cmd.Execute())
|
2017-08-24 18:43:55 -04:00
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
golden.Assert(t, cli.OutBuffer().String(), "trust-inspect-pretty-full-repo-with-signers.golden")
|
2017-08-25 17:49:40 -04:00
|
|
|
}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
func TestTrustInspectPrettyCommandUnsignedTagInSignedRepo(t *testing.T) {
|
2017-08-25 17:49:40 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{})
|
2018-03-08 08:35:17 -05:00
|
|
|
cli.SetNotaryClient(notaryfake.GetLoadedNotaryRepository)
|
2018-03-09 12:37:43 -05:00
|
|
|
cmd := newInspectCommand(cli)
|
|
|
|
cmd.Flags().Set("pretty", "true")
|
2017-09-14 16:16:54 -04:00
|
|
|
cmd.SetArgs([]string{"signed-repo:unsigned"})
|
2018-03-06 15:13:00 -05:00
|
|
|
assert.NilError(t, cmd.Execute())
|
2017-08-24 18:43:55 -04:00
|
|
|
|
2018-03-09 12:37:43 -05:00
|
|
|
golden.Assert(t, cli.OutBuffer().String(), "trust-inspect-pretty-unsigned-tag-with-signers.golden")
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
2017-08-25 17:49:40 -04:00
|
|
|
func TestNotaryRoleToSigner(t *testing.T) {
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal(releasedRoleName, notaryRoleToSigner(data.CanonicalTargetsRole)))
|
|
|
|
assert.Check(t, is.Equal(releasedRoleName, notaryRoleToSigner(trust.ReleasesRole)))
|
|
|
|
assert.Check(t, is.Equal("signer", notaryRoleToSigner("targets/signer")))
|
|
|
|
assert.Check(t, is.Equal("docker/signer", notaryRoleToSigner("targets/docker/signer")))
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// It's nonsense for other base roles to have signed off on a target, but this function leaves role names intact
|
|
|
|
for _, role := range data.BaseRoles {
|
|
|
|
if role == data.CanonicalTargetsRole {
|
|
|
|
continue
|
|
|
|
}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal(role.String(), notaryRoleToSigner(role)))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal("notarole", notaryRoleToSigner(data.RoleName("notarole"))))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// check if a role name is "released": either targets/releases or targets TUF roles
|
|
|
|
func TestIsReleasedTarget(t *testing.T) {
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, isReleasedTarget(trust.ReleasesRole))
|
2017-08-24 18:43:55 -04:00
|
|
|
for _, role := range data.BaseRoles {
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal(role == data.CanonicalTargetsRole, isReleasedTarget(role)))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, !isReleasedTarget(data.RoleName("targets/not-releases")))
|
|
|
|
assert.Check(t, !isReleasedTarget(data.RoleName("random")))
|
|
|
|
assert.Check(t, !isReleasedTarget(data.RoleName("targets/releases/subrole")))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// creates a mock delegation with a given name and no keys
|
|
|
|
func mockDelegationRoleWithName(name string) data.DelegationRole {
|
|
|
|
baseRole := data.NewBaseRole(
|
|
|
|
data.RoleName(name),
|
|
|
|
notary.MinThreshold,
|
|
|
|
)
|
2018-04-10 09:55:00 -04:00
|
|
|
return data.DelegationRole{BaseRole: baseRole, Paths: []string{}}
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMatchEmptySignatures(t *testing.T) {
|
|
|
|
// first try empty targets
|
2024-06-09 09:53:08 -04:00
|
|
|
emptyTgts := []notaryclient.TargetSignedStruct{}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
matchedSigRows := matchReleasedSignatures(emptyTgts)
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(matchedSigRows, 0))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMatchUnreleasedSignatures(t *testing.T) {
|
|
|
|
// try an "unreleased" target with 3 signatures, 0 rows will appear
|
2024-06-09 09:53:08 -04:00
|
|
|
unreleasedTgts := []notaryclient.TargetSignedStruct{}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
2024-06-09 09:53:08 -04:00
|
|
|
tgt := notaryclient.Target{Name: "unreleased", Hashes: data.Hashes{notary.SHA256: []byte("hash")}}
|
2017-08-24 18:43:55 -04:00
|
|
|
for _, unreleasedRole := range []string{"targets/a", "targets/b", "targets/c"} {
|
2024-06-09 09:53:08 -04:00
|
|
|
unreleasedTgts = append(unreleasedTgts, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName(unreleasedRole), Target: tgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
matchedSigRows := matchReleasedSignatures(unreleasedTgts)
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(matchedSigRows, 0))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMatchOneReleasedSingleSignature(t *testing.T) {
|
|
|
|
// now try only 1 "released" target with no additional sigs, 1 row will appear with 0 signers
|
2024-06-09 09:53:08 -04:00
|
|
|
oneReleasedTgt := []notaryclient.TargetSignedStruct{}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// make and append the "released" target to our mock input
|
2024-06-09 09:53:08 -04:00
|
|
|
releasedTgt := notaryclient.Target{Name: "released", Hashes: data.Hashes{notary.SHA256: []byte("released-hash")}}
|
|
|
|
oneReleasedTgt = append(oneReleasedTgt, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/releases"), Target: releasedTgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// make and append 3 non-released signatures on the "unreleased" target
|
2024-06-09 09:53:08 -04:00
|
|
|
unreleasedTgt := notaryclient.Target{Name: "unreleased", Hashes: data.Hashes{notary.SHA256: []byte("hash")}}
|
2017-08-24 18:43:55 -04:00
|
|
|
for _, unreleasedRole := range []string{"targets/a", "targets/b", "targets/c"} {
|
2024-06-09 09:53:08 -04:00
|
|
|
oneReleasedTgt = append(oneReleasedTgt, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName(unreleasedRole), Target: unreleasedTgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
matchedSigRows := matchReleasedSignatures(oneReleasedTgt)
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(matchedSigRows, 1))
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
outputRow := matchedSigRows[0]
|
|
|
|
// Empty signers because "targets/releases" doesn't show up
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(outputRow.Signers, 0))
|
|
|
|
assert.Check(t, is.Equal(releasedTgt.Name, outputRow.SignedTag))
|
|
|
|
assert.Check(t, is.Equal(hex.EncodeToString(releasedTgt.Hashes[notary.SHA256]), outputRow.Digest))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMatchOneReleasedMultiSignature(t *testing.T) {
|
|
|
|
// now try only 1 "released" target with 3 additional sigs, 1 row will appear with 3 signers
|
2024-06-09 09:53:08 -04:00
|
|
|
oneReleasedTgt := []notaryclient.TargetSignedStruct{}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// make and append the "released" target to our mock input
|
2024-06-09 09:53:08 -04:00
|
|
|
releasedTgt := notaryclient.Target{Name: "released", Hashes: data.Hashes{notary.SHA256: []byte("released-hash")}}
|
|
|
|
oneReleasedTgt = append(oneReleasedTgt, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/releases"), Target: releasedTgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// make and append 3 non-released signatures on both the "released" and "unreleased" targets
|
2024-06-09 09:53:08 -04:00
|
|
|
unreleasedTgt := notaryclient.Target{Name: "unreleased", Hashes: data.Hashes{notary.SHA256: []byte("hash")}}
|
2017-08-24 18:43:55 -04:00
|
|
|
for _, unreleasedRole := range []string{"targets/a", "targets/b", "targets/c"} {
|
2024-06-09 09:53:08 -04:00
|
|
|
oneReleasedTgt = append(oneReleasedTgt, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName(unreleasedRole), Target: unreleasedTgt})
|
|
|
|
oneReleasedTgt = append(oneReleasedTgt, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName(unreleasedRole), Target: releasedTgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
matchedSigRows := matchReleasedSignatures(oneReleasedTgt)
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(matchedSigRows, 1))
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
outputRow := matchedSigRows[0]
|
|
|
|
// We should have three signers
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.DeepEqual(outputRow.Signers, []string{"a", "b", "c"}))
|
|
|
|
assert.Check(t, is.Equal(releasedTgt.Name, outputRow.SignedTag))
|
|
|
|
assert.Check(t, is.Equal(hex.EncodeToString(releasedTgt.Hashes[notary.SHA256]), outputRow.Digest))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMatchMultiReleasedMultiSignature(t *testing.T) {
|
|
|
|
// now try 3 "released" targets with additional sigs to show 3 rows as follows:
|
|
|
|
// target-a is signed by targets/releases and targets/a - a will be the signer
|
|
|
|
// target-b is signed by targets/releases, targets/a, targets/b - a and b will be the signers
|
|
|
|
// target-c is signed by targets/releases, targets/a, targets/b, targets/c - a, b, and c will be the signers
|
2024-06-09 09:53:08 -04:00
|
|
|
multiReleasedTgts := []notaryclient.TargetSignedStruct{}
|
2017-08-24 18:43:55 -04:00
|
|
|
// make target-a, target-b, and target-c
|
2024-06-09 09:53:08 -04:00
|
|
|
targetA := notaryclient.Target{Name: "target-a", Hashes: data.Hashes{notary.SHA256: []byte("target-a-hash")}}
|
|
|
|
targetB := notaryclient.Target{Name: "target-b", Hashes: data.Hashes{notary.SHA256: []byte("target-b-hash")}}
|
|
|
|
targetC := notaryclient.Target{Name: "target-c", Hashes: data.Hashes{notary.SHA256: []byte("target-c-hash")}}
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// have targets/releases "sign" on all of these targets so they are released
|
2024-06-09 09:53:08 -04:00
|
|
|
multiReleasedTgts = append(multiReleasedTgts, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/releases"), Target: targetA})
|
|
|
|
multiReleasedTgts = append(multiReleasedTgts, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/releases"), Target: targetB})
|
|
|
|
multiReleasedTgts = append(multiReleasedTgts, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/releases"), Target: targetC})
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// targets/a signs off on all three targets (target-a, target-b, target-c):
|
2024-06-09 09:53:08 -04:00
|
|
|
for _, tgt := range []notaryclient.Target{targetA, targetB, targetC} {
|
|
|
|
multiReleasedTgts = append(multiReleasedTgts, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/a"), Target: tgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// targets/b signs off on the final two targets (target-b, target-c):
|
2024-06-09 09:53:08 -04:00
|
|
|
for _, tgt := range []notaryclient.Target{targetB, targetC} {
|
|
|
|
multiReleasedTgts = append(multiReleasedTgts, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/b"), Target: tgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// targets/c only signs off on the last target (target-c):
|
2024-06-09 09:53:08 -04:00
|
|
|
multiReleasedTgts = append(multiReleasedTgts, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/c"), Target: targetC})
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
matchedSigRows := matchReleasedSignatures(multiReleasedTgts)
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(matchedSigRows, 3))
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
// note that the output is sorted by tag name, so we can reliably index to validate data:
|
|
|
|
outputTargetA := matchedSigRows[0]
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.DeepEqual(outputTargetA.Signers, []string{"a"}))
|
|
|
|
assert.Check(t, is.Equal(targetA.Name, outputTargetA.SignedTag))
|
|
|
|
assert.Check(t, is.Equal(hex.EncodeToString(targetA.Hashes[notary.SHA256]), outputTargetA.Digest))
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
outputTargetB := matchedSigRows[1]
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.DeepEqual(outputTargetB.Signers, []string{"a", "b"}))
|
|
|
|
assert.Check(t, is.Equal(targetB.Name, outputTargetB.SignedTag))
|
|
|
|
assert.Check(t, is.Equal(hex.EncodeToString(targetB.Hashes[notary.SHA256]), outputTargetB.Digest))
|
2017-08-24 18:43:55 -04:00
|
|
|
|
|
|
|
outputTargetC := matchedSigRows[2]
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.DeepEqual(outputTargetC.Signers, []string{"a", "b", "c"}))
|
|
|
|
assert.Check(t, is.Equal(targetC.Name, outputTargetC.SignedTag))
|
|
|
|
assert.Check(t, is.Equal(hex.EncodeToString(targetC.Hashes[notary.SHA256]), outputTargetC.Digest))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMatchReleasedSignatureFromTargets(t *testing.T) {
|
|
|
|
// now try only 1 "released" target with no additional sigs, one rows will appear
|
2024-06-09 09:53:08 -04:00
|
|
|
oneReleasedTgt := []notaryclient.TargetSignedStruct{}
|
2017-08-24 18:43:55 -04:00
|
|
|
// make and append the "released" target to our mock input
|
2024-06-09 09:53:08 -04:00
|
|
|
releasedTgt := notaryclient.Target{Name: "released", Hashes: data.Hashes{notary.SHA256: []byte("released-hash")}}
|
|
|
|
oneReleasedTgt = append(oneReleasedTgt, notaryclient.TargetSignedStruct{Role: mockDelegationRoleWithName(data.CanonicalTargetsRole.String()), Target: releasedTgt})
|
2017-08-24 18:43:55 -04:00
|
|
|
matchedSigRows := matchReleasedSignatures(oneReleasedTgt)
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(matchedSigRows, 1))
|
2017-08-24 18:43:55 -04:00
|
|
|
outputRow := matchedSigRows[0]
|
|
|
|
// Empty signers because "targets" doesn't show up
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Len(outputRow.Signers, 0))
|
|
|
|
assert.Check(t, is.Equal(releasedTgt.Name, outputRow.SignedTag))
|
|
|
|
assert.Check(t, is.Equal(hex.EncodeToString(releasedTgt.Hashes[notary.SHA256]), outputRow.Digest))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
|
|
|
|
2017-08-25 17:49:40 -04:00
|
|
|
func TestGetSignerRolesWithKeyIDs(t *testing.T) {
|
2017-08-24 18:43:55 -04:00
|
|
|
roles := []data.Role{
|
|
|
|
{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key11"},
|
|
|
|
},
|
|
|
|
Name: "targets/alice",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key21", "key22"},
|
|
|
|
},
|
|
|
|
Name: "targets/releases",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key31"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalTargetsRole,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key41", "key01"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalRootRole,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key51"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalSnapshotRole,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key61"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalTimestampRole,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key71", "key72"},
|
|
|
|
},
|
|
|
|
Name: "targets/bob",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
expectedSignerRoleToKeyIDs := map[string][]string{
|
|
|
|
"alice": {"key11"},
|
|
|
|
"bob": {"key71", "key72"},
|
|
|
|
}
|
|
|
|
|
|
|
|
signerRoleToKeyIDs := getDelegationRoleToKeyMap(roles)
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.DeepEqual(expectedSignerRoleToKeyIDs, signerRoleToKeyIDs))
|
2017-08-25 17:49:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestFormatAdminRole(t *testing.T) {
|
|
|
|
aliceRole := data.Role{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key11"},
|
|
|
|
},
|
|
|
|
Name: "targets/alice",
|
|
|
|
}
|
2024-06-09 09:53:08 -04:00
|
|
|
aliceRoleWithSigs := notaryclient.RoleWithSignatures{Role: aliceRole, Signatures: nil}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal("", formatAdminRole(aliceRoleWithSigs)))
|
2017-08-25 17:49:40 -04:00
|
|
|
|
|
|
|
releasesRole := data.Role{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key11"},
|
|
|
|
},
|
|
|
|
Name: "targets/releases",
|
|
|
|
}
|
2024-06-09 09:53:08 -04:00
|
|
|
releasesRoleWithSigs := notaryclient.RoleWithSignatures{Role: releasesRole, Signatures: nil}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal("", formatAdminRole(releasesRoleWithSigs)))
|
2017-08-25 17:49:40 -04:00
|
|
|
|
|
|
|
timestampRole := data.Role{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key11"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalTimestampRole,
|
|
|
|
}
|
2024-06-09 09:53:08 -04:00
|
|
|
timestampRoleWithSigs := notaryclient.RoleWithSignatures{Role: timestampRole, Signatures: nil}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal("", formatAdminRole(timestampRoleWithSigs)))
|
2017-08-25 17:49:40 -04:00
|
|
|
|
|
|
|
snapshotRole := data.Role{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key11"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalSnapshotRole,
|
|
|
|
}
|
2024-06-09 09:53:08 -04:00
|
|
|
snapshotRoleWithSigs := notaryclient.RoleWithSignatures{Role: snapshotRole, Signatures: nil}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal("", formatAdminRole(snapshotRoleWithSigs)))
|
2017-08-25 17:49:40 -04:00
|
|
|
|
|
|
|
rootRole := data.Role{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key11"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalRootRole,
|
|
|
|
}
|
2024-06-09 09:53:08 -04:00
|
|
|
rootRoleWithSigs := notaryclient.RoleWithSignatures{Role: rootRole, Signatures: nil}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal("Root Key:\tkey11\n", formatAdminRole(rootRoleWithSigs)))
|
2017-08-25 17:49:40 -04:00
|
|
|
|
|
|
|
targetsRole := data.Role{
|
|
|
|
RootRole: data.RootRole{
|
|
|
|
KeyIDs: []string{"key99", "abc", "key11"},
|
|
|
|
},
|
|
|
|
Name: data.CanonicalTargetsRole,
|
|
|
|
}
|
2024-06-09 09:53:08 -04:00
|
|
|
targetsRoleWithSigs := notaryclient.RoleWithSignatures{Role: targetsRole, Signatures: nil}
|
2018-03-05 18:53:52 -05:00
|
|
|
assert.Check(t, is.Equal("Repository Key:\tabc, key11, key99\n", formatAdminRole(targetsRoleWithSigs)))
|
2017-08-24 18:43:55 -04:00
|
|
|
}
|
2018-08-08 11:55:48 -04:00
|
|
|
|
|
|
|
func TestPrintSignerInfoSortOrder(t *testing.T) {
|
|
|
|
roleToKeyIDs := map[string][]string{
|
|
|
|
"signer2-foo": {"B"},
|
|
|
|
"signer10-foo": {"C"},
|
|
|
|
"signer1-foo": {"A"},
|
|
|
|
}
|
|
|
|
|
2020-08-28 17:00:21 -04:00
|
|
|
expected := `SIGNER KEYS
|
|
|
|
signer1-foo A
|
|
|
|
signer2-foo B
|
|
|
|
signer10-foo C
|
2018-08-08 11:55:48 -04:00
|
|
|
`
|
|
|
|
buf := new(bytes.Buffer)
|
|
|
|
assert.NilError(t, printSignerInfo(buf, roleToKeyIDs))
|
|
|
|
assert.Check(t, is.Equal(expected, buf.String()))
|
|
|
|
}
|