Add terraform template catalog #9194
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GilbertCherrie
force-pushed
the
add_terraform_catalog
branch
2 times, most recently
from
6fdc81e to
f2b5373
Compare
agrare
reviewed
May 22, 2024
agrare
reviewed
May 22, 2024
GilbertCherrie
force-pushed
the
add_terraform_catalog
branch
from
72ec4b0 to
0a27776
Compare
jrafanie
reviewed
May 22, 2024
| if prov_type == 'generic_terraform_template' | ||
| @current_region = MiqRegion.my_region.region | ||
| end | ||
| prov_type == 'generic_terraform_template' |
Member
There was a problem hiding this comment.
These methods are nearly identical. Can we try to refactor them? It's also odd that a predicate/query/boolean method would set the @current_region as a side effect. I understand if this was the existing code for ansible but we should really try to fix that.
Member
Author
There was a problem hiding this comment.
I can fix this in a follow up pr since I don't want to risk breaking the Ansible Playbook forms and the rest of this pr is pretty much done
jrafanie
reviewed
May 22, 2024
GilbertCherrie
force-pushed
the
add_terraform_catalog
branch
from
a81b6fe to
0d02c09
Compare
GilbertCherrie
changed the title
GilbertCherrie
force-pushed
the
add_terraform_catalog
branch
3 times, most recently
from
04f603f to
c7c63b5
Compare
Member
|
kicking failed ci jobs |
agrare
reviewed
May 23, 2024
Comment on lines
+2233
to
+2248
| # if @record.config_info[:retirement] | ||
| # retirement = @record.config_info[:retirement] | ||
| # terraform_template_details[:retirement] = {} | ||
| # terraform_template_details[:retirement][:remove_resources] = retirement[:remove_resources] | ||
| # if retirement[:repository_id] | ||
| # terraform_template_details[:retirement][:repository] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::ConfigurationScriptSource, retirement[:repository_id]) | ||
| # terraform_template_details[:retirement][:template] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::ConfigurationScriptPayload, retirement[:configuration_script_payload_id]) | ||
| # terraform_template_details[:retirement][:credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::Credential, retirement[:credential_id]) | ||
| # terraform_template_details[:retirement][:network_credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::NetworkCredential, retirement[:network_credential_id]) if retirement[:network_credential_id] | ||
| # end | ||
| # terraform_template_details[:retirement][:execution_ttl] = retirement[:execution_ttl] | ||
| # terraform_template_details[:retirement][:verbosity] = retirement[:verbosity] | ||
| # terraform_template_details[:retirement][:log_output] = retirement[:log_output] | ||
| # terraform_template_details[:retirement][:become_enabled] = retirement[:become_enabled] == true ? _('Yes') : _('No') | ||
| # end |
Member
There was a problem hiding this comment.
Minor but I think we should add a comment here about why this block of code is commented out
Member
|
@GilbertCherrie can you add some screenshots of the new page to the PR description? |
Member
|
Also the spec failures look related to these changes |
GilbertCherrie
force-pushed
the
add_terraform_catalog
branch
2 times, most recently
from
913a6d6 to
3ce5e2a
Compare
GilbertCherrie
force-pushed
the
add_terraform_catalog
branch
from
3ce5e2a to
1cb6906
Compare
Member
|
Checked commit GilbertCherrie@1cb6906 with ruby 2.7.8, rubocop 1.56.3, haml-lint 0.51.0, and yamllint app/views/catalog/_tt_react_form.html.haml |
jrafanie
changed the title
agrare
approved these changes
May 23, 2024
40 tasks
Member
|
Backported to |
Fryguy
pushed a commit
that referenced
this pull request
May 24, 2024
Add terraform template catalog (cherry picked from commit 64b9d6d)
jeffibm
reviewed
May 29, 2024
Comment on lines
+96
to
+111
| /** button component used as a mapper to copy the provision details into retirement */ | ||
| // export const CopyFromProvisonButton = (props) => { | ||
| // const { label, copyFrom, copyTo } = useFieldApi(props); | ||
| // const formOptions = useFormApi(); | ||
| // const handleClick = () => { | ||
| // copyFrom.forEach((fromItem, i) => { | ||
| // const destination = `config_info.retirement.${copyTo[i]}`; | ||
| // formOptions.change(destination, formOptions.getState().values.config_info.provision[fromItem]); | ||
| // }); | ||
| // }; | ||
| // return ( | ||
| // <div> | ||
| // <Button kind="secondary" onClick={handleClick}>{label}</Button> | ||
| // </div> | ||
| // ); | ||
| // }; |
Member
There was a problem hiding this comment.
Hey @GilbertCherrie , we can remove this if not needed..
jeffibm
reviewed
May 29, 2024
Comment on lines
+19
to
+21
| // if (Object.prototype.hasOwnProperty.call(catalogData.config_info.retirement, 'extra_vars')) { | ||
| // catalogData.config_info.retirement.extra_vars = convertObject(catalogData.config_info.retirement.extra_vars); | ||
| // } |
84 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added the add / edit and summary screen for the terraform template catalog item.
Add Terraform Template Catalog Item:
Edit Terraform Template Catalog Item:
Summary Screen:
