docker: Fix signature for downloadConfigFile()

simar7 · simar7 · commit 55e97e97ce05 · 2019-11-27T09:32:37.000-08:00
Signed-off-by: Simarpreet Singh &lt;simar@linux.com&gt;
diff --git a/extractor/docker/docker.go b/extractor/docker/docker.go
@@ -214,7 +214,7 @@ func (d DockerExtractor) Extract(ctx context.Context, imageName string, filename
 	}
 
 	// download config file
-	config, err := downloadConfigFile(err, r, ctx, image, m)
+	config, err := downloadConfigFile(ctx, r, image, m)
 	if err != nil {
 		return nil, err
 	}
@@ -225,7 +225,7 @@ func (d DockerExtractor) Extract(ctx context.Context, imageName string, filename
 	return fileMap, nil
 }
 
-func downloadConfigFile(err error, r *registry.Registry, ctx context.Context, image registry.Image, m *schema2.DeserializedManifest) ([]byte, error) {
+func downloadConfigFile(ctx context.Context, r *registry.Registry, image registry.Image, m *schema2.DeserializedManifest) ([]byte, error) {
 	rc, err := r.DownloadLayer(ctx, image.Path, m.Manifest.Config.Digest)
 	if err != nil {
 		return nil, xerrors.Errorf("error in layer download: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (d DockerExtractor) Extract(ctx context.Context, imageName string, filename`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`// download config file`
`217`		`- config, err := downloadConfigFile(err, r, ctx, image, m)`
	`217`	`+ config, err := downloadConfigFile(ctx, r, image, m)`
`218`	`218`	`if err != nil {`
`219`	`219`	`return nil, err`
`220`	`220`	`}`
`@@ -225,7 +225,7 @@ func (d DockerExtractor) Extract(ctx context.Context, imageName string, filename`
`225`	`225`	`return fileMap, nil`
`226`	`226`	`}`
`227`	`227`
`228`		`-func downloadConfigFile(err error, r registry.Registry, ctx context.Context, image registry.Image, m schema2.DeserializedManifest) ([]byte, error) {`
	`228`	`+func downloadConfigFile(ctx context.Context, r registry.Registry, image registry.Image, m schema2.DeserializedManifest) ([]byte, error) {`
`229`	`229`	`rc, err := r.DownloadLayer(ctx, image.Path, m.Manifest.Config.Digest)`
`230`	`230`	`if err != nil {`
`231`	`231`	`return nil, xerrors.Errorf("error in layer download: %w", err)`