Fixes #37433 - Set indentation when calling subscription_manager_setup #10153
Conversation
|
The problem I'm trying to solve is the final rendered result of cloud_init_default.erb. subscription_manager_setup.erb is fine. redhat_register.erb is also fine and generates valid bash script. However, when rendered, redhat_register.erb result does not have the same indentation. Code that comes from redhat_register.rb have 2 space indentation, but what is generated by the snippet has no indentation at all. That's fine if that result is simply being processed by bash. The problem is that cloud_init_default.erb (which consumes redhat_register.erb) is supposed to generate a valid yaml as result. With that difference on indentation coming from redhat_register.erb its result is not a valid yaml. I wouldn't mind if we removed all the indentation from redhat_register.erb. That would do the trick too. What matters is that the rendered result should have the same indentation. |
|
@ekohl , this is how the template looks like when it's rendered without the indentation: If we indent the internal snippet, it will pass the validation: |
|
@jpasqualetto can you update the snapshots of templates as well? The rails command is |
github-actions
bot
added
UI
Legacy JS
|
I messed up while trying to push the snapshots. I rebased my code to run the generate snapshots and pushed it into the issue branch. Trying to fix this mess now. |
and add snapshot of templates
jpasqualetto
force-pushed
the
issue_37433
branch
from
ff2e885 to
3812121
Compare
|
I added the snapshots and fixed my mess. Let me know if you need anything else. |
| @@ -96,7 +96,7 @@ description: | | |||
| echo "Starting the subscription-manager registration process" | |||
|
|
|||
| # Set up subscription-manager | |||
| <%= snippet("subscription_manager_setup", variables: { subman_setup_scenario: 'provisioning' }).strip -%> | |||
| <%= indent(2) { snippet("subscription_manager_setup", variables: { subman_setup_scenario: 'provisioning' }).strip } -%> | |||
There was a problem hiding this comment.
I think, skip1 is necessary so that the first line (# select...) is indented correctly.
|
@ekohl Apparently the indentation breaks templates that have heredoc in them. Created a ticket for it: |
|
Given my concern in #10153 (review) I'm leaning to reverting the change. Or are you working on a fix @ShimShtein? |
Adding proper indentation when calling snippet subscription_manager_setup