containers/image registry: PR review follow-ups

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

cmd/opm/internal/util/util.go

@@ -52,7 +52,7 @@ func CreateCLIRegistry(cmd *cobra.Command) (image.Registry, error) {
 	}
 	return containersimageregistry.New(
 		containersimageregistry.DefaultSystemContext,
-		containersimageregistry.InsecureSkipTLSVerify(skipTLSVerify || useHTTP),
+		containersimageregistry.WithInsecureSkipTLSVerify(skipTLSVerify || useHTTP),
 	)
 }
 

pkg/lib/image/registry.go renamed to internal/testutil/image/registry.go

@@ -34,6 +34,9 @@ type Registry struct {
 var DefaultSystemContext = &types.SystemContext{OSChoice: "linux"}
 
 func New(sourceCtx *types.SystemContext, opts ...Option) (orimage.Registry, error) {
+	if sourceCtx == nil {
+		sourceCtx = &types.SystemContext{}
+	}
 	reg := &Registry{
 		sourceCtx: sourceCtx,
 	}
@@ -101,7 +104,7 @@ func newCacheConfig(dir string, preserve bool) *cacheConfig {
 	}
 }
 
-func ForceTemporaryImageCache() Option {
+func WithTemporaryImageCache() Option {
 	return func(r *Registry) error {
 		var err error
 		r.cache, err = getTemporaryImageCache()
@@ -112,11 +115,8 @@ func ForceTemporaryImageCache() Option {
 	}
 }
 
-func InsecureSkipTLSVerify(insecureSkipTLSVerify bool) Option {
+func WithInsecureSkipTLSVerify(insecureSkipTLSVerify bool) Option {
 	return func(r *Registry) error {
-		if r.sourceCtx == nil {
-			r.sourceCtx = &types.SystemContext{}
-		}
 		r.sourceCtx.DockerDaemonInsecureSkipTLSVerify = insecureSkipTLSVerify
 		r.sourceCtx.DockerInsecureSkipTLSVerify = types.NewOptionalBool(insecureSkipTLSVerify)
 		r.sourceCtx.OCIInsecureSkipTLSVerify = insecureSkipTLSVerify
@@ -154,9 +154,6 @@ func (r *Registry) Pull(ctx context.Context, ref orimage.Reference) error {
 	sourceCtx := r.sourceCtx
 	authFile := getAuthFile(r.sourceCtx, namedRef.String())
 	if authFile != "" {
-		if sourceCtx == nil {
-			sourceCtx = &types.SystemContext{}
-		}
 		sourceCtx.AuthFilePath = authFile
 	}
 

pkg/image/containersimageregistry/registry.go

@@ -25,10 +25,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/mod/sumdb/dirhash"
 
+	libimage "github.com/operator-framework/operator-registry/internal/testutil/image"
 	"github.com/operator-framework/operator-registry/pkg/image"
 	"github.com/operator-framework/operator-registry/pkg/image/containerdregistry"
 	"github.com/operator-framework/operator-registry/pkg/image/containersimageregistry"
-	libimage "github.com/operator-framework/operator-registry/pkg/lib/image"
 )
 
 // cleanupFunc is a function that cleans up after some test infra.
@@ -66,7 +66,7 @@ func TestRegistries(t *testing.T) {
 				DockerCertPath:           caDir,
 				DockerPerHostCertDirPath: caDir,
 			}
-			r, err := containersimageregistry.New(sourceCtx, containersimageregistry.ForceTemporaryImageCache())
+			r, err := containersimageregistry.New(sourceCtx, containersimageregistry.WithTemporaryImageCache())
 			require.NoError(t, err)
 			cleanup := func() {
 				require.NoError(t, os.RemoveAll(caDir))

pkg/image/registry_test.go

@@ -15,7 +15,7 @@ import (
 
 	"golang.org/x/mod/sumdb/dirhash"
 
-	libimage "github.com/operator-framework/operator-registry/pkg/lib/image"
+	libimage "github.com/operator-framework/operator-registry/internal/testutil/image"
 )
 
 var _ = Describe("opm alpha bundle", func() {