mirror of https://github.com/docker/cli.git
cli: remove unnecessary newlines (whitespace)
``` cli/config/config_test.go:465: unnecessary trailing newline (whitespace) } cli/compose/interpolation/interpolation.go:56: unnecessary leading newline (whitespace) switch value := value.(type) { cli/compose/interpolation/interpolation.go:94: unnecessary trailing newline (whitespace) } cli/command/image/build/context.go:348: unnecessary trailing newline (whitespace) } internal/licenseutils/client_test.go:98: unnecessary leading newline (whitespace) func (c *fakeLicensingClient) LoadLocalLicense(ctx context.Context, dclnt licensing.WrappedDockerClient) (*model.Subscription, error) { cli/registry/client/fetcher.go:211: unnecessary leading newline (whitespace) for _, endpoint := range endpoints { ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
2ec424a2d9
commit
612d83d6df
|
@ -345,7 +345,6 @@ func getDockerfileRelPath(absContextDir, givenDockerfile string) (string, error)
|
||||||
absDockerfile, err = filepath.EvalSymlinks(absDockerfile)
|
absDockerfile, err = filepath.EvalSymlinks(absDockerfile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", errors.Errorf("unable to evaluate symlinks in Dockerfile path: %v", err)
|
return "", errors.Errorf("unable to evaluate symlinks in Dockerfile path: %v", err)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,6 @@ func Interpolate(config map[string]interface{}, opts Options) (map[string]interf
|
||||||
|
|
||||||
func recursiveInterpolate(value interface{}, path Path, opts Options) (interface{}, error) {
|
func recursiveInterpolate(value interface{}, path Path, opts Options) (interface{}, error) {
|
||||||
switch value := value.(type) {
|
switch value := value.(type) {
|
||||||
|
|
||||||
case string:
|
case string:
|
||||||
newValue, err := opts.Substitute(value, template.Mapping(opts.LookupValue))
|
newValue, err := opts.Substitute(value, template.Mapping(opts.LookupValue))
|
||||||
if err != nil || newValue == value {
|
if err != nil || newValue == value {
|
||||||
|
@ -91,7 +90,6 @@ func recursiveInterpolate(value interface{}, path Path, opts Options) (interface
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return value, nil
|
return value, nil
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,6 @@ func TestValidateCredentialSpecs(t *testing.T) {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestValidateSecretConfigNames(t *testing.T) {
|
func TestValidateSecretConfigNames(t *testing.T) {
|
||||||
|
|
|
@ -462,7 +462,6 @@ func TestJSONWithPsFormatNoFile(t *testing.T) {
|
||||||
if config.PsFormat != `table {{.ID}}\t{{.Label "com.docker.label.cpu"}}` {
|
if config.PsFormat != `table {{.ID}}\t{{.Label "com.docker.label.cpu"}}` {
|
||||||
t.Fatalf("Unknown ps format: %s\n", config.PsFormat)
|
t.Fatalf("Unknown ps format: %s\n", config.PsFormat)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestJSONSaveWithNoFile(t *testing.T) {
|
func TestJSONSaveWithNoFile(t *testing.T) {
|
||||||
|
|
|
@ -75,5 +75,4 @@ func TestTlsListAndBatchRemove(t *testing.T) {
|
||||||
resEmpty, err := testee.listContextData("test-ctx")
|
resEmpty, err := testee.listContextData("test-ctx")
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
assert.DeepEqual(t, resEmpty, map[string]EndpointFiles{})
|
assert.DeepEqual(t, resEmpty, map[string]EndpointFiles{})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -209,7 +209,6 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
|
||||||
|
|
||||||
confirmedTLSRegistries := make(map[string]bool)
|
confirmedTLSRegistries := make(map[string]bool)
|
||||||
for _, endpoint := range endpoints {
|
for _, endpoint := range endpoints {
|
||||||
|
|
||||||
if endpoint.Version == registry.APIVersion1 {
|
if endpoint.Version == registry.APIVersion1 {
|
||||||
logrus.Debugf("skipping v1 endpoint %s", endpoint.URL)
|
logrus.Debugf("skipping v1 endpoint %s", endpoint.URL)
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in New Issue