Skip to content

Commit 21344a8

Browse files
committed
copier: modify newCopier for golangci-lint
Fix linter error ``` Error: libimage/copier.go:180:51: `(*Runtime).newCopier` - `reportResolvedReference` always receives `nil` (unparam) ``` Signed-off-by: flouthoc <[email protected]>
1 parent 2fe195a commit 21344a8

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

libimage/copier.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ type Copier struct {
177177
// newCopier creates a Copier based on a runtime's system context.
178178
// Note that fields in options *may* overwrite the counterparts of
179179
// the specified system context. Please make sure to call `(*Copier).Close()`.
180-
func (r *Runtime) newCopier(options *CopyOptions, reportResolvedReference *types.ImageReference) (*Copier, error) {
181-
return NewCopier(options, r.SystemContext(), reportResolvedReference)
180+
func (r *Runtime) newCopier(options *CopyOptions) (*Copier, error) {
181+
return NewCopier(options, r.SystemContext(), nil)
182182
}
183183

184184
// storageAllowedPolicyScopes overrides the policy for local storage

libimage/import.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (r *Runtime) Import(ctx context.Context, path string, options *ImportOption
104104
return "", err
105105
}
106106

107-
c, err := r.newCopier(&options.CopyOptions, nil)
107+
c, err := r.newCopier(&options.CopyOptions)
108108
if err != nil {
109109
return "", err
110110
}

libimage/manifest_list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ func (m *ManifestList) Push(ctx context.Context, destination string, options *Ma
794794
// NOTE: we're using the logic in copier to create a proper
795795
// types.SystemContext. This prevents us from having an error prone
796796
// code duplicate here.
797-
copier, err := m.image.runtime.newCopier(&options.CopyOptions, nil)
797+
copier, err := m.image.runtime.newCopier(&options.CopyOptions)
798798
if err != nil {
799799
return "", err
800800
}

libimage/pull.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func nameFromAnnotations(annotations map[string]string) string {
225225
// copyFromDefault is the default copier for a number of transports. Other
226226
// transports require some specific dancing, sometimes Yoga.
227227
func (r *Runtime) copyFromDefault(ctx context.Context, ref types.ImageReference, options *CopyOptions) ([]*Image, []string, error) {
228-
c, err := r.newCopier(options, nil)
228+
c, err := r.newCopier(options)
229229
if err != nil {
230230
return nil, nil, err
231231
}
@@ -384,7 +384,7 @@ func (r *Runtime) copyFromDockerArchive(ctx context.Context, ref types.ImageRefe
384384

385385
// copyFromDockerArchiveReaderReference copies the specified readerRef from reader.
386386
func (r *Runtime) copyFromDockerArchiveReaderReference(ctx context.Context, reader *dockerArchiveTransport.Reader, readerRef types.ImageReference, options *CopyOptions) ([]*Image, []string, error) {
387-
c, err := r.newCopier(options, nil)
387+
c, err := r.newCopier(options)
388388
if err != nil {
389389
return nil, nil, err
390390
}
@@ -591,7 +591,7 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str
591591
if socketPath, ok := os.LookupEnv("NOTIFY_SOCKET"); ok {
592592
options.extendTimeoutSocket = socketPath
593593
}
594-
c, err := r.newCopier(&options.CopyOptions, nil)
594+
c, err := r.newCopier(&options.CopyOptions)
595595
if err != nil {
596596
return nil, err
597597
}

libimage/push.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (r *Runtime) Push(ctx context.Context, source, destination string, options
118118
}
119119
}
120120

121-
c, err := r.newCopier(&options.CopyOptions, nil)
121+
c, err := r.newCopier(&options.CopyOptions)
122122
if err != nil {
123123
return nil, err
124124
}

libimage/save.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (r *Runtime) saveSingleImage(ctx context.Context, name, format, path string
119119
return err
120120
}
121121

122-
c, err := r.newCopier(&options.CopyOptions, nil)
122+
c, err := r.newCopier(&options.CopyOptions)
123123
if err != nil {
124124
return err
125125
}
@@ -204,7 +204,7 @@ func (r *Runtime) saveDockerArchive(ctx context.Context, names []string, path st
204204
copyOpts := options.CopyOptions
205205
copyOpts.dockerArchiveAdditionalTags = local.tags
206206

207-
c, err := r.newCopier(&copyOpts, nil)
207+
c, err := r.newCopier(&copyOpts)
208208
if err != nil {
209209
return err
210210
}

0 commit comments

Comments
 (0)