Fixes #37998 - deb-repos not shown on host repo-set #11212
Conversation
| @@ -16,6 +16,7 @@ def initialize(params = {}) | |||
| def product_content | |||
| if match_environment | |||
| versions = consumable.content_view_environments.select(:content_view_version_id).map(&:content_view_version_id) | |||
| environment = consumable.respond_to?(:environment) ? consumable.environment : consumable.content_view_environments.select(:environment_id).map(&:environment_id) | |||
There was a problem hiding this comment.
I am afraid this looks a little bit hacky. I would rather implement environment() on SubscriptionFacet as well so we do not have to differentiate, here.
Problem there is that I am unsure on if we can determine a single value for environment for SubscriptionFacet as it gets content_version_environments through ContentFacet, which is a has_many relation.
There was a problem hiding this comment.
What about putting that in a condition to only evaluate if structured apt is enabled? The risk of breaking something for other OSes would be lower.
There was a problem hiding this comment.
You could even move the line to line 29 such that it will only be in the structured apt block.
The code itself works fine for content views and also the Default Organization view.
There was a problem hiding this comment.
Even if we move it into the structured APT block, we still need to consider the case where some of the content uses structured APT, and some of it does not. In that case we enter the block, which should then not influence how the non structured APT content is handled.
There was a problem hiding this comment.
This is exactly the reason to move the code into the structured apt block. If we have the structured apt code in one block, that will significantly simplify testing because the rest of the code is not affected.
m-bucher
force-pushed
the
fix_host_deb_rep_set
branch
from
f33bac3
to
ff31685
Compare
m-bucher
force-pushed
the
fix_host_deb_rep_set
branch
from
ff31685
to
06025be
Compare
m-bucher
force-pushed
the
fix_host_deb_rep_set
branch
from
06025be
to
11b82ea
Compare
What are the changes introduced in this pull request?
Host did not show any debian repositories on Content->RepositorySet tab.
Error-toast is shown.
Todo:
Considerations taken when implementing this change?
We have to make sure that we do not show duplicate repo-entries in case structured-apt feature is enabled.
That is the reason to also check the environment.
What are the testing steps for this pull request?