Skip to content

Commit 96da14c

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

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
@@ -92,17 +92,24 @@ func createNewContext(o *CreateOptions, cli command.Cli, s store.Writer) error {
9292
if o.Docker == nil {
9393
return errors.New("docker endpoint configuration is required")
9494
}
95-
contextMetadata := newContextMetadata(o)
96-
contextTLSData := store.ContextTLSData{
97-
Endpoints: make(map[string]store.EndpointTLSData),
98-
}
9995
dockerEP, dockerTLS, err := getDockerEndpointMetadataAndTLS(cli, o.Docker)
10096
if err != nil {
10197
return errors.Wrap(err, "unable to create docker endpoint config")
10298
}
103-
contextMetadata.Endpoints[docker.DockerEndpoint] = dockerEP
99+
contextMetadata := store.Metadata{
100+
Endpoints: map[string]interface{}{
101+
docker.DockerEndpoint: dockerEP,
102+
},
103+
Metadata: command.DockerContext{
104+
Description: o.Description,
105+
},
106+
Name: o.Name,
107+
}
108+
contextTLSData := store.ContextTLSData{}
104109
if dockerTLS != nil {
105-
contextTLSData.Endpoints[docker.DockerEndpoint] = *dockerTLS
110+
contextTLSData.Endpoints = map[string]store.EndpointTLSData{
111+
docker.DockerEndpoint: *dockerTLS,
112+
}
106113
}
107114
if err := validateEndpoints(contextMetadata); err != nil {
108115
return err
@@ -161,13 +168,3 @@ func (d *descriptionDecorator) GetMetadata(name string) (store.Metadata, error)
161168
c.Metadata = typedContext
162169
return c, nil
163170
}
164-
165-
func newContextMetadata(o *CreateOptions) store.Metadata {
166-
return store.Metadata{
167-
Endpoints: make(map[string]interface{}),
168-
Metadata: command.DockerContext{
169-
Description: o.Description,
170-
},
171-
Name: o.Name,
172-
}
173-
}

0 commit comments

Comments
 (0)