resolve golint errors

Signed-off-by: Josh Dolitsky <josh@dolit.ski>
pull/9782/head
Josh Dolitsky 4 years ago
parent 24a216d3b2
commit 8f60ee76a5
No known key found for this signature in database
GPG Key ID: B2B93673243A65FB

@ -113,13 +113,18 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
Prov: &descriptorPullSummary{}, Prov: &descriptorPullSummary{},
Ref: ref, Ref: ref,
} }
var getManifestErr error
if _, manifestData, ok := store.Get(manifest); !ok { if _, manifestData, ok := store.Get(manifest); !ok {
return nil, errors.Errorf("Unable to retrieve blob with digest %s", manifest.Digest) getManifestErr = errors.Errorf("Unable to retrieve blob with digest %s", manifest.Digest)
} else { } else {
result.Manifest.Data = manifestData result.Manifest.Data = manifestData
} }
if getManifestErr != nil {
return nil, getManifestErr
}
var getConfigDescriptorErr error
if _, configData, ok := store.Get(*configDescriptor); !ok { if _, configData, ok := store.Get(*configDescriptor); !ok {
return nil, errors.Errorf("Unable to retrieve blob with digest %s", configDescriptor.Digest) getConfigDescriptorErr = errors.Errorf("Unable to retrieve blob with digest %s", configDescriptor.Digest)
} else { } else {
result.Config.Data = configData result.Config.Data = configData
var meta *chart.Metadata var meta *chart.Metadata
@ -128,23 +133,34 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
} }
result.Chart.Meta = meta result.Chart.Meta = meta
} }
if getConfigDescriptorErr != nil {
return nil, getConfigDescriptorErr
}
if operation.withChart { if operation.withChart {
var getChartDescriptorErr error
if _, chartData, ok := store.Get(*chartDescriptor); !ok { if _, chartData, ok := store.Get(*chartDescriptor); !ok {
return nil, errors.Errorf("Unable to retrieve blob with digest %s", chartDescriptor.Digest) getChartDescriptorErr = errors.Errorf("Unable to retrieve blob with digest %s", chartDescriptor.Digest)
} else { } else {
result.Chart.Data = chartData result.Chart.Data = chartData
result.Chart.Digest = chartDescriptor.Digest.String() result.Chart.Digest = chartDescriptor.Digest.String()
result.Chart.Size = chartDescriptor.Size result.Chart.Size = chartDescriptor.Size
} }
if getChartDescriptorErr != nil {
return nil, getChartDescriptorErr
}
} }
if operation.withProv && !provMissing { if operation.withProv && !provMissing {
var getProvDescriptorErr error
if _, provData, ok := store.Get(*provDescriptor); !ok { if _, provData, ok := store.Get(*provDescriptor); !ok {
return nil, errors.Errorf("Unable to retrieve blob with digest %s", provDescriptor.Digest) getProvDescriptorErr = errors.Errorf("Unable to retrieve blob with digest %s", provDescriptor.Digest)
} else { } else {
result.Prov.Data = provData result.Prov.Data = provData
result.Prov.Digest = provDescriptor.Digest.String() result.Prov.Digest = provDescriptor.Digest.String()
result.Prov.Size = provDescriptor.Size result.Prov.Size = provDescriptor.Size
} }
if getProvDescriptorErr != nil {
return nil, getProvDescriptorErr
}
} }
fmt.Fprintf(c.out, "Pulled: %s\n", result.Ref) fmt.Fprintf(c.out, "Pulled: %s\n", result.Ref)
fmt.Fprintf(c.out, "Digest: %s\n", result.Manifest.Digest) fmt.Fprintf(c.out, "Digest: %s\n", result.Manifest.Digest)

Loading…
Cancel
Save