Skip to content

Commit 0e2e66d

Browse files
committed
cli/command/context: remove newContextMetadata() utility
Inlining what it does Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 72264bc commit 0e2e66d

1 file changed

Lines changed: 13 additions & 16 deletions

File tree

cli/command/context/create.go

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,24 @@ func createNewContext(o *CreateOptions, cli command.Cli, s store.Writer) error {
9090
if o.Docker == nil {
9191
return errors.New("docker endpoint configuration is required")
9292
}
93-
contextMetadata := newContextMetadata(o)
94-
contextTLSData := store.ContextTLSData{
95-
Endpoints: make(map[string]store.EndpointTLSData),
96-
}
9793
dockerEP, dockerTLS, err := getDockerEndpointMetadataAndTLS(cli, o.Docker)
9894
if err != nil {
9995
return errors.Wrap(err, "unable to create docker endpoint config")
10096
}
101-
contextMetadata.Endpoints[docker.DockerEndpoint] = dockerEP
97+
contextMetadata := store.Metadata{
98+
Endpoints: map[string]interface{}{
99+
docker.DockerEndpoint: dockerEP,
100+
},
101+
Metadata: command.DockerContext{
102+
Description: o.Description,
103+
},
104+
Name: o.Name,
105+
}
106+
contextTLSData := store.ContextTLSData{}
102107
if dockerTLS != nil {
103-
contextTLSData.Endpoints[docker.DockerEndpoint] = *dockerTLS
108+
contextTLSData.Endpoints = map[string]store.EndpointTLSData{
109+
docker.DockerEndpoint: *dockerTLS,
110+
}
104111
}
105112
if err := validateEndpoints(contextMetadata); err != nil {
106113
return err
@@ -159,13 +166,3 @@ func (d *descriptionDecorator) GetMetadata(name string) (store.Metadata, error)
159166
c.Metadata = typedContext
160167
return c, nil
161168
}
162-
163-
func newContextMetadata(o *CreateOptions) store.Metadata {
164-
return store.Metadata{
165-
Endpoints: make(map[string]interface{}),
166-
Metadata: command.DockerContext{
167-
Description: o.Description,
168-
},
169-
Name: o.Name,
170-
}
171-
}

0 commit comments

Comments
 (0)