Skip to content

Fix duplicate package import for gcr/v1#2486

Merged
simonbaird merged 1 commit intoconforma:mainfrom
simonbaird:remove-dupe-import
Apr 23, 2025
Merged

Fix duplicate package import for gcr/v1#2486
simonbaird merged 1 commit intoconforma:mainfrom
simonbaird:remove-dupe-import

Conversation

@simonbaird
Copy link
Copy Markdown
Member

I rebased the commit from #2482, which should get the Konflux checks green, and pushed a new PR.

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 22, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.27%. Comparing base (0dbd18f) to head (51c2037).
Report is 2 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2486   +/-   ##
=======================================
  Coverage   68.27%   68.27%           
=======================================
  Files         101      101           
  Lines        8409     8409           
=======================================
  Hits         5741     5741           
  Misses       2668     2668           
Flag Coverage Δ
generative 68.27% <ø> (ø)
integration 68.27% <ø> (ø)
unit 68.27% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@simonbaird
Copy link
Copy Markdown
Member Author

/retest

@simonbaird
Copy link
Copy Markdown
Member Author

It's a trivial change and the CI is green, so I'll merge without further review.

@simonbaird
Copy link
Copy Markdown
Member Author

Actually I was just grepping the code, and everywhere else we use v1.Descriptor. So actually I want to make a revision to use that here also.

@@ -311,7 +310,7 @@ func TestEvaluatorLifecycle(t *testing.T) {
client.On("Head", mock.Anything).Return(&v1.Descriptor{MediaType: types.OCIManifestSchema1}, nil)
Copy link
Copy Markdown
Member Author

@simonbaird simonbaird Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is the one use of v1.Descriptor that was already present.

@simonbaird simonbaird changed the title chore: remove duplicate package imports Fix duplicate package import for gcr/v1 Apr 23, 2025
Copy link
Copy Markdown
Contributor

@robnester-rh robnester-rh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@simonbaird simonbaird merged commit 68c71c9 into conforma:main Apr 23, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants