diff --git a/pkg/cel/libs/context/impl_test.go b/pkg/cel/libs/context/impl_test.go index ae9dc44bec..885f4274ed 100644 --- a/pkg/cel/libs/context/impl_test.go +++ b/pkg/cel/libs/context/impl_test.go @@ -191,9 +191,7 @@ func Test_impl_parse_image_ref_string(t *testing.T) { data := map[string]any{ "context": Context{&MockCtx{ ParseImageReferenceFunc: func(image string) (imagedataloader.ImageReference, error) { - idl, err := imagedataloader.New(nil) - assert.NoError(t, err) - return idl.ParseImageReference(image) + return imagedataloader.ParseImageReference(image) }, }, }, @@ -225,7 +223,7 @@ func Test_impl_get_resource_string_string_string_string(t *testing.T) { assert.NotNil(t, prog) data := map[string]any{ "context": Context{&MockCtx{ - GetResourcesFunc: func(apiVersion, resource, namespace, name string) (*unstructured.Unstructured, error) { + GetResourceFunc: func(apiVersion, resource, namespace, name string) (*unstructured.Unstructured, error) { return &unstructured.Unstructured{ Object: map[string]any{ "apiVersion": "apps/v1", diff --git a/pkg/cel/libs/context/mock.go b/pkg/cel/libs/context/mock.go index 490c80c80c..a0fac0ce6f 100644 --- a/pkg/cel/libs/context/mock.go +++ b/pkg/cel/libs/context/mock.go @@ -13,7 +13,7 @@ type MockCtx struct { GetImageDataFunc func(string) (*imagedataloader.ImageData, error) ParseImageReferenceFunc func(string) (imagedataloader.ImageReference, error) ListResourcesFunc func(string, string, string) (*unstructured.UnstructuredList, error) - GetResourcesFunc func(string, string, string, string) (*unstructured.Unstructured, error) + GetResourceFunc func(string, string, string, string) (*unstructured.Unstructured, error) } func (mock *MockCtx) GetConfigMap(ns string, n string) (*unstructured.Unstructured, error) { @@ -37,7 +37,7 @@ func (mock *MockCtx) ListResources(apiVersion, resource, namespace string) (*uns } func (mock *MockCtx) GetResource(apiVersion, resource, namespace, name string) (*unstructured.Unstructured, error) { - return mock.GetResourcesFunc(apiVersion, resource, namespace, name) + return mock.GetResourceFunc(apiVersion, resource, namespace, name) } type mockGctxStore struct { diff --git a/pkg/cel/policy/context.go b/pkg/cel/policy/context.go index 8e7cb27fd6..ebf7e2e442 100644 --- a/pkg/cel/policy/context.go +++ b/pkg/cel/policy/context.go @@ -151,5 +151,5 @@ func (cp *contextProvider) GetResource(apiVersion, resource, namespace, name str } func (cp *contextProvider) ParseImageReference(image string) (imagedataloader.ImageReference, error) { - return cp.imagedata.ParseImageReference(image) + return imagedataloader.ParseImageReference(image) } diff --git a/pkg/cel/policy/fake_context.go b/pkg/cel/policy/fake_context.go index 6672076589..b2ed82abac 100644 --- a/pkg/cel/policy/fake_context.go +++ b/pkg/cel/policy/fake_context.go @@ -50,8 +50,8 @@ func (cp *FakeContextProvider) GetImageData(string) (*imagedataloader.ImageData, panic("not implemented") } -func (cp *FakeContextProvider) ParseImageReference(string) (imagedataloader.ImageReference, error) { - panic("not implemented") +func (cp *FakeContextProvider) ParseImageReference(image string) (imagedataloader.ImageReference, error) { + return imagedataloader.ParseImageReference(image) } func (cp *FakeContextProvider) ListResources(apiVersion, resource, namespace string) (*unstructured.UnstructuredList, error) { diff --git a/pkg/imageverification/imagedataloader/loader.go b/pkg/imageverification/imagedataloader/loader.go index cdc5c49e21..cdff814dae 100644 --- a/pkg/imageverification/imagedataloader/loader.go +++ b/pkg/imageverification/imagedataloader/loader.go @@ -26,7 +26,6 @@ type imagedatafetcher struct { type Fetcher interface { FetchImageData(ctx context.Context, image string, options ...Option) (*ImageData, error) - ParseImageReference(image string, options ...Option) (ImageReference, error) } func New(lister k8scorev1.SecretInterface, opts ...Option) (*imagedatafetcher, error) { @@ -41,7 +40,7 @@ func New(lister k8scorev1.SecretInterface, opts ...Option) (*imagedatafetcher, e }, nil } -func (i *imagedatafetcher) ParseImageReference(image string, options ...Option) (ImageReference, error) { +func ParseImageReference(image string, options ...Option) (ImageReference, error) { var img ImageReference nameOpts := nameOptions(options...) ref, err := name.ParseReference(image, nameOpts...) @@ -74,7 +73,7 @@ func (i *imagedatafetcher) FetchImageData(ctx context.Context, image string, opt return nil, err } - img.ImageReference, err = i.ParseImageReference(image, options...) + img.ImageReference, err = ParseImageReference(image, options...) if err != nil { return nil, err }