Skip to content

Conversation

@joelanford
Copy link
Member

Signed-off-by: Joe Lanford joe.lanford@gmail.com

Description of the change:
When opm validate (or any code that requires a file-based catalog to be converted to the registry's internal model) encounters a duplicate blob olm.package, olm.channel, or olm.bundle blob, emit an error.

Motivation for the change:
To prevent ambiguity in the way a file-based catalog is presented to consumers when there are duplicates. FBC is declarative, so it doesn't make sense to attempt to declare the same thing twice.

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot requested review from anik120 and ecordell November 10, 2021 19:26
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 10, 2021
@codecov
Copy link

codecov bot commented Nov 10, 2021

Codecov Report

Merging #824 (271fbf2) into master (7c8187a) will increase coverage by 0.52%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #824      +/-   ##
==========================================
+ Coverage   50.93%   51.46%   +0.52%     
==========================================
  Files         103      103              
  Lines        9001     9032      +31     
==========================================
+ Hits         4585     4648      +63     
+ Misses       3552     3510      -42     
- Partials      864      874      +10     
Impacted Files Coverage Δ
alpha/declcfg/declcfg_to_model.go 93.06% <100.00%> (+0.93%) ⬆️
alpha/declcfg/diff.go 77.48% <0.00%> (+0.02%) ⬆️
alpha/action/diff.go 77.04% <0.00%> (+0.38%) ⬆️
pkg/registry/query.go 60.93% <0.00%> (+0.52%) ⬆️
alpha/declcfg/diff_include.go 61.32% <0.00%> (+33.01%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7c8187a...271fbf2. Read the comment docs.

Copy link
Member

@estroz estroz left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2021
@estroz
Copy link
Member

estroz commented Nov 10, 2021

This will need backporting correct?

@openshift-merge-robot openshift-merge-robot merged commit 7a789fe into operator-framework:master Nov 10, 2021
@joelanford joelanford deleted the validate-fail-duplicate branch November 16, 2021 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants