Skip to content

Commit d9fdd73

Browse files
committed
remove catalog variables (extra_vars) for terraform-template
1 parent 6e3fa2b commit d9fdd73

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

app/helpers/catalog_helper.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ def catalog_tab_conditions(record)
268268
:resource => record.composite?,
269269
:request => !record.prov_type || (record.prov_type && need_prov_dialogs?(record.prov_type)),
270270
:provision => record.prov_type == catalog_provision_types[:playbook] || record.prov_type == catalog_provision_types[:terraform_template],
271-
:retirement => record.prov_type == catalog_provision_types[:terraform_template] ? nil : record.config_info.fetch_path(:retirement)
271+
:retirement => record.prov_type == catalog_provision_types[:terraform_template] ? nil : record.config_info.fetch_path(:retirement),
272+
:variables => record.prov_type != catalog_provision_types[:terraform_template]
272273
}
273274
end
274275

app/javascript/components/terraform-template-catalog-form/terraform-template-catalog-form.schema.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,14 @@ const provisionTabSchema = (
198198
label: __('Verbosity'),
199199
options: transformObjectToSelectOptions(verbosityTypes),
200200
},
201-
{
202-
component: 'key-value-list',
203-
id: 'config_info.provision.extra_vars',
204-
name: 'config_info.provision.extra_vars',
205-
label: __('Variables & Default Values'),
206-
keyLabel: __('Variable'),
207-
valueLabel: __('Default value'),
208-
},
201+
// {
202+
// component: 'key-value-list',
203+
// id: 'config_info.provision.extra_vars',
204+
// name: 'config_info.provision.extra_vars',
205+
// label: __('Variables & Default Values'),
206+
// keyLabel: __('Variable'),
207+
// valueLabel: __('Default value'),
208+
// },
209209
{
210210
component: componentTypes.RADIO,
211211
id: 'config_info.provision.dialog_type',

app/views/catalog/_sandt_tree_show.html.haml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
- if condition[:provision]
2727
= catalog_tab_content(:provision) do
2828
= catalog_generic_template_info(:provision, record, provisioning)
29-
= catalog_variables_default_data(:provision, record)
29+
- if condition[:variables]
30+
= catalog_variables_default_data(:provision, record)
3031
= catalog_dialog(provisioning)
3132

3233
- if condition[:retirement]
3334
= catalog_tab_content(:retirement) do
3435
= catalog_generic_template_info(:retirement, record, retirement)
35-
= catalog_variables_default_data(:retirement, record)
36+
- if condition[:variables]
37+
= catalog_variables_default_data(:retirement, record)

0 commit comments

Comments
 (0)