From 5e275599630c4a228b3f2b8d2029ce51bf774a65 Mon Sep 17 00:00:00 2001 From: hkavya26 Date: Tue, 19 Jul 2022 14:44:20 +0530 Subject: [PATCH] Generated with latest terraform provider 1.43.0 --- plugins/modules/ibm_account_info.py | 4 +- plugins/modules/ibm_api_gateway_endpoint.py | 58 +-- .../ibm_api_gateway_endpoint_subscription.py | 44 +- plugins/modules/ibm_api_gateway_info.py | 4 +- plugins/modules/ibm_app.py | 174 +++---- plugins/modules/ibm_app_config_environment.py | 56 +-- .../ibm_app_config_environment_info.py | 22 +- .../ibm_app_config_environments_info.py | 34 +- plugins/modules/ibm_app_config_feature.py | 100 ++-- .../modules/ibm_app_config_feature_info.py | 30 +- .../modules/ibm_app_config_features_info.py | 100 ++-- plugins/modules/ibm_app_domain_private.py | 6 +- .../modules/ibm_app_domain_private_info.py | 4 +- plugins/modules/ibm_app_domain_shared.py | 24 +- plugins/modules/ibm_app_domain_shared_info.py | 4 +- plugins/modules/ibm_app_info.py | 20 +- plugins/modules/ibm_app_route.py | 30 +- plugins/modules/ibm_app_route_info.py | 22 +- plugins/modules/ibm_appid_action_url.py | 26 +- plugins/modules/ibm_appid_action_url_info.py | 4 +- plugins/modules/ibm_appid_apm.py | 70 +-- plugins/modules/ibm_appid_apm_info.py | 4 +- plugins/modules/ibm_appid_application.py | 10 +- plugins/modules/ibm_appid_application_info.py | 20 +- .../modules/ibm_appid_application_roles.py | 6 +- .../ibm_appid_application_roles_info.py | 4 +- .../modules/ibm_appid_application_scopes.py | 30 +- .../ibm_appid_application_scopes_info.py | 4 +- .../modules/ibm_appid_applications_info.py | 4 +- plugins/modules/ibm_appid_audit_status.py | 6 +- .../modules/ibm_appid_audit_status_info.py | 4 +- .../ibm_appid_cloud_directory_template.py | 28 +- ...ibm_appid_cloud_directory_template_info.py | 24 +- .../modules/ibm_appid_cloud_directory_user.py | 60 +-- .../ibm_appid_cloud_directory_user_info.py | 4 +- .../modules/ibm_appid_idp_cloud_directory.py | 78 +-- .../ibm_appid_idp_cloud_directory_info.py | 4 +- plugins/modules/ibm_appid_idp_custom.py | 26 +- plugins/modules/ibm_appid_idp_custom_info.py | 4 +- plugins/modules/ibm_appid_idp_facebook.py | 6 +- .../modules/ibm_appid_idp_facebook_info.py | 4 +- plugins/modules/ibm_appid_idp_google.py | 6 +- plugins/modules/ibm_appid_idp_google_info.py | 4 +- plugins/modules/ibm_appid_idp_saml.py | 6 +- plugins/modules/ibm_appid_idp_saml_info.py | 4 +- .../ibm_appid_idp_saml_metadata_info.py | 4 +- plugins/modules/ibm_appid_languages.py | 6 +- plugins/modules/ibm_appid_languages_info.py | 4 +- plugins/modules/ibm_appid_mfa.py | 6 +- plugins/modules/ibm_appid_mfa_channel.py | 26 +- plugins/modules/ibm_appid_mfa_channel_info.py | 4 +- plugins/modules/ibm_appid_mfa_info.py | 4 +- plugins/modules/ibm_appid_password_regex.py | 6 +- .../modules/ibm_appid_password_regex_info.py | 4 +- plugins/modules/ibm_appid_redirect_urls.py | 6 +- .../modules/ibm_appid_redirect_urls_info.py | 4 +- plugins/modules/ibm_appid_role.py | 28 +- plugins/modules/ibm_appid_role_info.py | 4 +- plugins/modules/ibm_appid_roles_info.py | 4 +- plugins/modules/ibm_appid_theme_color.py | 6 +- plugins/modules/ibm_appid_theme_color_info.py | 4 +- plugins/modules/ibm_appid_theme_text.py | 6 +- plugins/modules/ibm_appid_theme_text_info.py | 4 +- plugins/modules/ibm_appid_token_config.py | 84 ++-- .../modules/ibm_appid_token_config_info.py | 4 +- plugins/modules/ibm_appid_user_roles.py | 30 +- plugins/modules/ibm_appid_user_roles_info.py | 4 +- .../modules/ibm_atracker_endpoints_info.py | 4 +- plugins/modules/ibm_atracker_route.py | 4 +- plugins/modules/ibm_atracker_routes_info.py | 4 +- plugins/modules/ibm_atracker_settings.py | 4 +- plugins/modules/ibm_atracker_target.py | 4 +- plugins/modules/ibm_atracker_targets_info.py | 4 +- plugins/modules/ibm_cbr_rule.py | 58 ++- plugins/modules/ibm_cbr_rule_info.py | 4 +- plugins/modules/ibm_cbr_zone.py | 52 +- plugins/modules/ibm_cbr_zone_info.py | 4 +- plugins/modules/ibm_cd_tekton_pipeline.py | 216 +++++++++ .../ibm_cd_tekton_pipeline_definition.py | 207 ++++++++ .../ibm_cd_tekton_pipeline_definition_info.py | 141 ++++++ .../modules/ibm_cd_tekton_pipeline_info.py | 131 +++++ .../ibm_cd_tekton_pipeline_property.py | 254 ++++++++++ .../ibm_cd_tekton_pipeline_property_info.py | 141 ++++++ .../modules/ibm_cd_tekton_pipeline_trigger.py | 208 ++++++++ .../ibm_cd_tekton_pipeline_trigger_info.py | 141 ++++++ ...ibm_cd_tekton_pipeline_trigger_property.py | 266 ++++++++++ ...d_tekton_pipeline_trigger_property_info.py | 151 ++++++ plugins/modules/ibm_cd_toolchain.py | 213 ++++++++ plugins/modules/ibm_cd_toolchain_info.py | 131 +++++ .../ibm_cd_toolchain_tool_appconfig.py | 217 +++++++++ .../ibm_cd_toolchain_tool_appconfig_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_artifactory.py | 217 +++++++++ .../ibm_cd_toolchain_tool_artifactory_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_bitbucketgit.py | 229 +++++++++ ...ibm_cd_toolchain_tool_bitbucketgit_info.py | 141 ++++++ .../modules/ibm_cd_toolchain_tool_custom.py | 217 +++++++++ .../ibm_cd_toolchain_tool_custom_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_devopsinsights.py | 205 ++++++++ ...m_cd_toolchain_tool_devopsinsights_info.py | 141 ++++++ ...bm_cd_toolchain_tool_githubconsolidated.py | 229 +++++++++ ..._toolchain_tool_githubconsolidated_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_githubintegrated.py | 229 +++++++++ ...cd_toolchain_tool_githubintegrated_info.py | 141 ++++++ .../modules/ibm_cd_toolchain_tool_gitlab.py | 229 +++++++++ .../ibm_cd_toolchain_tool_gitlab_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_hashicorpvault.py | 217 +++++++++ ...m_cd_toolchain_tool_hashicorpvault_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_hostedgit.py | 229 +++++++++ .../ibm_cd_toolchain_tool_hostedgit_info.py | 141 ++++++ .../modules/ibm_cd_toolchain_tool_jenkins.py | 217 +++++++++ .../ibm_cd_toolchain_tool_jenkins_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_keyprotect.py | 217 +++++++++ .../ibm_cd_toolchain_tool_keyprotect_info.py | 141 ++++++ .../modules/ibm_cd_toolchain_tool_nexus.py | 217 +++++++++ .../ibm_cd_toolchain_tool_nexus_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_pagerduty.py | 217 +++++++++ .../ibm_cd_toolchain_tool_pagerduty_info.py | 141 ++++++ .../modules/ibm_cd_toolchain_tool_pipeline.py | 217 +++++++++ .../ibm_cd_toolchain_tool_pipeline_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_privateworker.py | 217 +++++++++ ...bm_cd_toolchain_tool_privateworker_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_saucelabs.py | 217 +++++++++ .../ibm_cd_toolchain_tool_saucelabs_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_secretsmanager.py | 217 +++++++++ ...m_cd_toolchain_tool_secretsmanager_info.py | 141 ++++++ ...bm_cd_toolchain_tool_securitycompliance.py | 217 +++++++++ ..._toolchain_tool_securitycompliance_info.py | 141 ++++++ .../modules/ibm_cd_toolchain_tool_slack.py | 217 +++++++++ .../ibm_cd_toolchain_tool_slack_info.py | 141 ++++++ .../ibm_cd_toolchain_tool_sonarqube.py | 217 +++++++++ .../ibm_cd_toolchain_tool_sonarqube_info.py | 141 ++++++ plugins/modules/ibm_cdn.py | 150 +++--- ...bm_certificate_manager_certificate_info.py | 4 +- ...m_certificate_manager_certificates_info.py | 4 +- .../modules/ibm_certificate_manager_import.py | 34 +- .../modules/ibm_certificate_manager_order.py | 100 ++-- plugins/modules/ibm_cis.py | 30 +- plugins/modules/ibm_cis_alert.py | 66 +-- plugins/modules/ibm_cis_alerts_info.py | 4 +- plugins/modules/ibm_cis_cache_settings.py | 94 ++-- .../modules/ibm_cis_cache_settings_info.py | 20 +- plugins/modules/ibm_cis_certificate_order.py | 42 +- plugins/modules/ibm_cis_certificate_upload.py | 50 +- plugins/modules/ibm_cis_certificates_info.py | 4 +- .../ibm_cis_custom_certificates_info.py | 4 +- plugins/modules/ibm_cis_custom_page.py | 24 +- plugins/modules/ibm_cis_custom_pages_info.py | 16 +- plugins/modules/ibm_cis_dns_record.py | 58 +-- plugins/modules/ibm_cis_dns_records_import.py | 24 +- plugins/modules/ibm_cis_dns_records_info.py | 4 +- plugins/modules/ibm_cis_domain.py | 6 +- plugins/modules/ibm_cis_domain_info.py | 4 +- plugins/modules/ibm_cis_domain_settings.py | 282 +++++------ .../modules/ibm_cis_edge_functions_action.py | 4 +- .../ibm_cis_edge_functions_actions_info.py | 20 +- .../modules/ibm_cis_edge_functions_trigger.py | 24 +- .../ibm_cis_edge_functions_triggers_info.py | 4 +- plugins/modules/ibm_cis_filter.py | 4 +- plugins/modules/ibm_cis_filters_info.py | 4 +- plugins/modules/ibm_cis_firewall.py | 50 +- plugins/modules/ibm_cis_firewall_info.py | 4 +- plugins/modules/ibm_cis_firewall_rule.py | 4 +- .../modules/ibm_cis_firewall_rules_info.py | 20 +- .../modules/ibm_cis_global_load_balancer.py | 140 +++--- .../ibm_cis_global_load_balancers_info.py | 4 +- plugins/modules/ibm_cis_healthcheck.py | 144 +++--- plugins/modules/ibm_cis_healthchecks_info.py | 4 +- plugins/modules/ibm_cis_info.py | 22 +- plugins/modules/ibm_cis_ip_addresses_info.py | 4 +- plugins/modules/ibm_cis_logpush_job.py | 42 +- plugins/modules/ibm_cis_logpush_jobs_info.py | 20 +- plugins/modules/ibm_cis_origin_pool.py | 66 +-- plugins/modules/ibm_cis_origin_pools_info.py | 4 +- plugins/modules/ibm_cis_page_rule.py | 24 +- plugins/modules/ibm_cis_page_rules_info.py | 4 +- plugins/modules/ibm_cis_range_app.py | 120 ++--- plugins/modules/ibm_cis_range_apps_info.py | 4 +- plugins/modules/ibm_cis_rate_limit.py | 58 +-- plugins/modules/ibm_cis_rate_limit_info.py | 4 +- plugins/modules/ibm_cis_routing.py | 24 +- plugins/modules/ibm_cis_tls_settings.py | 4 +- plugins/modules/ibm_cis_waf_group.py | 52 +- plugins/modules/ibm_cis_waf_groups_info.py | 24 +- plugins/modules/ibm_cis_waf_package.py | 4 +- plugins/modules/ibm_cis_waf_packages_info.py | 4 +- plugins/modules/ibm_cis_waf_rule.py | 34 +- plugins/modules/ibm_cis_waf_rules_info.py | 4 +- plugins/modules/ibm_cis_webhook.py | 24 +- plugins/modules/ibm_cis_webhooks_info.py | 4 +- .../ibm_cloud_shell_account_settings.py | 64 +-- .../ibm_cloud_shell_account_settings_info.py | 4 +- plugins/modules/ibm_cloudant.py | 144 +++--- plugins/modules/ibm_cloudant_database.py | 6 +- plugins/modules/ibm_cloudant_database_info.py | 4 +- plugins/modules/ibm_cloudant_info.py | 22 +- plugins/modules/ibm_cm_catalog.py | 62 +-- plugins/modules/ibm_cm_catalog_info.py | 4 +- plugins/modules/ibm_cm_offering.py | 28 +- plugins/modules/ibm_cm_offering_info.py | 4 +- plugins/modules/ibm_cm_offering_instance.py | 132 ++--- .../modules/ibm_cm_offering_instance_info.py | 4 +- plugins/modules/ibm_cm_version.py | 64 +-- plugins/modules/ibm_cm_version_info.py | 4 +- .../modules/ibm_compute_autoscale_group.py | 108 ++--- .../modules/ibm_compute_autoscale_policy.py | 46 +- plugins/modules/ibm_compute_bare_metal.py | 382 +++++++-------- .../modules/ibm_compute_bare_metal_info.py | 42 +- plugins/modules/ibm_compute_dedicated_host.py | 68 +-- .../ibm_compute_image_template_info.py | 4 +- plugins/modules/ibm_compute_monitor.py | 24 +- .../modules/ibm_compute_placement_group.py | 6 +- .../ibm_compute_placement_group_info.py | 4 +- .../modules/ibm_compute_provisioning_hook.py | 24 +- .../modules/ibm_compute_reserved_capacity.py | 44 +- .../ibm_compute_reserved_capacity_info.py | 4 +- plugins/modules/ibm_compute_ssh_key.py | 26 +- plugins/modules/ibm_compute_ssh_key_info.py | 22 +- .../modules/ibm_compute_ssl_certificate.py | 40 +- plugins/modules/ibm_compute_user.py | 168 +++---- plugins/modules/ibm_compute_vm_instance.py | 454 +++++++++--------- .../modules/ibm_compute_vm_instance_info.py | 22 +- plugins/modules/ibm_container_addons.py | 6 +- plugins/modules/ibm_container_addons_info.py | 4 +- plugins/modules/ibm_container_alb.py | 40 +- plugins/modules/ibm_container_alb_cert.py | 44 +- .../modules/ibm_container_alb_cert_info.py | 24 +- plugins/modules/ibm_container_alb_create.py | 76 +-- plugins/modules/ibm_container_alb_info.py | 4 +- .../modules/ibm_container_api_key_reset.py | 24 +- plugins/modules/ibm_container_bind_service.py | 66 +-- .../ibm_container_bind_service_info.py | 4 +- plugins/modules/ibm_container_cluster.py | 340 ++++++------- .../ibm_container_cluster_config_info.py | 42 +- .../modules/ibm_container_cluster_feature.py | 22 +- plugins/modules/ibm_container_cluster_info.py | 22 +- .../ibm_container_cluster_versions_info.py | 4 +- .../ibm_container_cluster_worker_info.py | 4 +- .../modules/ibm_container_dedicated_host.py | 191 ++++++++ ...bm_container_dedicated_host_flavor_info.py | 107 +++++ ...m_container_dedicated_host_flavors_info.py | 97 ++++ .../ibm_container_dedicated_host_info.py | 107 +++++ .../ibm_container_dedicated_host_pool.py | 189 ++++++++ .../ibm_container_dedicated_host_pool_info.py | 97 ++++ plugins/modules/ibm_container_nlb_dns.py | 24 +- plugins/modules/ibm_container_nlb_dns_info.py | 4 +- .../ibm_container_storage_attachment.py | 6 +- .../ibm_container_storage_attachment_info.py | 4 +- plugins/modules/ibm_container_vpc_alb.py | 6 +- .../modules/ibm_container_vpc_alb_create.py | 24 +- plugins/modules/ibm_container_vpc_alb_info.py | 4 +- plugins/modules/ibm_container_vpc_cluster.py | 260 +++++----- .../ibm_container_vpc_cluster_alb_info.py | 4 +- .../modules/ibm_container_vpc_cluster_info.py | 20 +- .../ibm_container_vpc_cluster_worker_info.py | 22 +- ..._container_vpc_cluster_worker_pool_info.py | 20 +- .../modules/ibm_container_vpc_worker_pool.py | 138 +++--- .../ibm_container_vpc_worker_pool_info.py | 20 +- plugins/modules/ibm_container_worker_pool.py | 108 ++--- .../modules/ibm_container_worker_pool_info.py | 4 +- ...m_container_worker_pool_zone_attachment.py | 58 +-- plugins/modules/ibm_cos_bucket.py | 203 ++++---- plugins/modules/ibm_cos_bucket_info.py | 37 +- plugins/modules/ibm_cos_bucket_object.py | 82 ++-- plugins/modules/ibm_cos_bucket_object_info.py | 24 +- plugins/modules/ibm_cr_namespace.py | 22 +- plugins/modules/ibm_cr_namespaces_info.py | 4 +- plugins/modules/ibm_cr_retention_policy.py | 4 +- plugins/modules/ibm_database.py | 184 +++---- plugins/modules/ibm_database_backup_info.py | 4 +- plugins/modules/ibm_database_backups_info.py | 4 +- .../modules/ibm_database_connection_info.py | 24 +- plugins/modules/ibm_database_info.py | 42 +- ...bm_database_point_in_time_recovery_info.py | 4 +- plugins/modules/ibm_database_remotes_info.py | 4 +- plugins/modules/ibm_dl_gateway.py | 242 +++++----- plugins/modules/ibm_dl_gateway_info.py | 4 +- plugins/modules/ibm_dl_gateways_info.py | 4 +- plugins/modules/ibm_dl_locations_info.py | 4 +- .../modules/ibm_dl_offering_speeds_info.py | 4 +- plugins/modules/ibm_dl_port_info.py | 4 +- plugins/modules/ibm_dl_ports_info.py | 4 +- plugins/modules/ibm_dl_provider_gateway.py | 90 ++-- .../modules/ibm_dl_provider_gateways_info.py | 4 +- plugins/modules/ibm_dl_provider_ports_info.py | 4 +- plugins/modules/ibm_dl_routers_info.py | 4 +- plugins/modules/ibm_dl_virtual_connection.py | 36 +- plugins/modules/ibm_dns_custom_resolver.py | 56 +-- ...ibm_dns_custom_resolver_forwarding_rule.py | 4 +- ...s_custom_resolver_forwarding_rules_info.py | 4 +- .../ibm_dns_custom_resolver_location.py | 44 +- .../modules/ibm_dns_custom_resolvers_info.py | 4 +- plugins/modules/ibm_dns_domain.py | 6 +- plugins/modules/ibm_dns_domain_info.py | 4 +- .../ibm_dns_domain_registration_info.py | 4 +- ...ibm_dns_domain_registration_nameservers.py | 4 +- plugins/modules/ibm_dns_glb.py | 80 +-- plugins/modules/ibm_dns_glb_monitor.py | 122 ++--- plugins/modules/ibm_dns_glb_monitors_info.py | 4 +- plugins/modules/ibm_dns_glb_pool.py | 62 +-- plugins/modules/ibm_dns_glb_pools_info.py | 4 +- plugins/modules/ibm_dns_glbs_info.py | 4 +- plugins/modules/ibm_dns_permitted_network.py | 4 +- .../ibm_dns_permitted_networks_info.py | 4 +- plugins/modules/ibm_dns_record.py | 178 +++---- plugins/modules/ibm_dns_resource_record.py | 104 ++-- .../modules/ibm_dns_resource_records_info.py | 4 +- plugins/modules/ibm_dns_reverse_record.py | 4 +- plugins/modules/ibm_dns_secondary.py | 6 +- plugins/modules/ibm_dns_secondary_info.py | 4 +- plugins/modules/ibm_dns_zone.py | 4 +- plugins/modules/ibm_dns_zones_info.py | 4 +- plugins/modules/ibm_en_destination.py | 52 +- plugins/modules/ibm_en_destination_android.py | 30 +- .../ibm_en_destination_android_info.py | 20 +- plugins/modules/ibm_en_destination_chrome.py | 48 +- .../modules/ibm_en_destination_chrome_info.py | 4 +- plugins/modules/ibm_en_destination_firefox.py | 6 +- .../ibm_en_destination_firefox_info.py | 4 +- plugins/modules/ibm_en_destination_info.py | 20 +- plugins/modules/ibm_en_destination_ios.py | 64 +-- .../modules/ibm_en_destination_ios_info.py | 4 +- plugins/modules/ibm_en_destination_safari.py | 354 ++++++++++++++ .../modules/ibm_en_destination_safari_info.py | 141 ++++++ plugins/modules/ibm_en_destination_slack.py | 236 +++++++++ .../modules/ibm_en_destination_slack_info.py | 141 ++++++ plugins/modules/ibm_en_destination_webhook.py | 52 +- .../ibm_en_destination_webhook_info.py | 20 +- plugins/modules/ibm_en_destinations_info.py | 4 +- plugins/modules/ibm_en_source.py | 225 +++++++++ plugins/modules/ibm_en_source_info.py | 141 ++++++ plugins/modules/ibm_en_subscription.py | 46 +- .../modules/ibm_en_subscription_android.py | 22 +- .../ibm_en_subscription_android_info.py | 4 +- plugins/modules/ibm_en_subscription_chrome.py | 48 +- .../ibm_en_subscription_chrome_info.py | 20 +- plugins/modules/ibm_en_subscription_email.py | 52 +- .../modules/ibm_en_subscription_email_info.py | 20 +- .../modules/ibm_en_subscription_firefox.py | 26 +- .../ibm_en_subscription_firefox_info.py | 4 +- plugins/modules/ibm_en_subscription_info.py | 4 +- plugins/modules/ibm_en_subscription_ios.py | 44 +- .../modules/ibm_en_subscription_ios_info.py | 4 +- plugins/modules/ibm_en_subscription_safari.py | 235 +++++++++ .../ibm_en_subscription_safari_info.py | 141 ++++++ plugins/modules/ibm_en_subscription_slack.py | 246 ++++++++++ .../modules/ibm_en_subscription_slack_info.py | 141 ++++++ plugins/modules/ibm_en_subscription_sms.py | 50 +- .../modules/ibm_en_subscription_sms_info.py | 20 +- .../modules/ibm_en_subscription_webhook.py | 56 +-- .../ibm_en_subscription_webhook_info.py | 4 +- plugins/modules/ibm_en_subscriptions_info.py | 4 +- plugins/modules/ibm_en_topic.py | 50 +- plugins/modules/ibm_en_topic_info.py | 4 +- plugins/modules/ibm_en_topics_info.py | 4 +- plugins/modules/ibm_enterprise.py | 22 +- plugins/modules/ibm_enterprise_account.py | 50 +- .../modules/ibm_enterprise_account_group.py | 4 +- .../ibm_enterprise_account_groups_info.py | 4 +- .../modules/ibm_enterprise_accounts_info.py | 4 +- plugins/modules/ibm_enterprises_info.py | 4 +- plugins/modules/ibm_event_streams_schema.py | 10 +- .../modules/ibm_event_streams_schema_info.py | 20 +- plugins/modules/ibm_event_streams_topic.py | 28 +- .../modules/ibm_event_streams_topic_info.py | 20 +- plugins/modules/ibm_firewall.py | 24 +- plugins/modules/ibm_firewall_policy.py | 4 +- plugins/modules/ibm_function_action.py | 86 ++-- plugins/modules/ibm_function_action_info.py | 20 +- plugins/modules/ibm_function_namespace.py | 26 +- .../modules/ibm_function_namespace_info.py | 4 +- plugins/modules/ibm_function_package.py | 36 +- plugins/modules/ibm_function_package_info.py | 4 +- plugins/modules/ibm_function_rule.py | 26 +- plugins/modules/ibm_function_rule_info.py | 4 +- plugins/modules/ibm_function_trigger.py | 26 +- plugins/modules/ibm_function_trigger_info.py | 4 +- .../modules/ibm_hardware_firewall_shared.py | 4 +- plugins/modules/ibm_hpcs.py | 124 ++--- plugins/modules/ibm_hpcs_info.py | 22 +- plugins/modules/ibm_hpcs_key_template.py | 275 +++++++++++ plugins/modules/ibm_hpcs_key_template_info.py | 161 +++++++ plugins/modules/ibm_hpcs_keystore.py | 424 ++++++++++++++++ plugins/modules/ibm_hpcs_keystore_info.py | 161 +++++++ plugins/modules/ibm_hpcs_managed_key.py | 280 +++++++++++ plugins/modules/ibm_hpcs_managed_key_info.py | 161 +++++++ plugins/modules/ibm_hpcs_vault.py | 227 +++++++++ plugins/modules/ibm_hpcs_vault_info.py | 151 ++++++ plugins/modules/ibm_iam_access_group.py | 24 +- .../ibm_iam_access_group_dynamic_rule.py | 24 +- plugins/modules/ibm_iam_access_group_info.py | 4 +- .../modules/ibm_iam_access_group_members.py | 4 +- .../modules/ibm_iam_access_group_policy.py | 58 +-- .../ibm_iam_access_group_policy_info.py | 4 +- plugins/modules/ibm_iam_account_settings.py | 60 +-- .../modules/ibm_iam_account_settings_info.py | 4 +- plugins/modules/ibm_iam_api_key.py | 54 +-- plugins/modules/ibm_iam_api_key_info.py | 4 +- plugins/modules/ibm_iam_auth_token_info.py | 4 +- .../ibm_iam_authorization_policies_info.py | 22 +- .../modules/ibm_iam_authorization_policy.py | 148 +++--- .../ibm_iam_authorization_policy_detach.py | 4 +- plugins/modules/ibm_iam_custom_role.py | 44 +- plugins/modules/ibm_iam_role_actions_info.py | 4 +- plugins/modules/ibm_iam_roles_info.py | 4 +- plugins/modules/ibm_iam_service_api_key.py | 22 +- plugins/modules/ibm_iam_service_id.py | 6 +- plugins/modules/ibm_iam_service_id_info.py | 4 +- plugins/modules/ibm_iam_service_policy.py | 70 +-- .../modules/ibm_iam_service_policy_info.py | 32 +- plugins/modules/ibm_iam_trusted_profile.py | 6 +- .../ibm_iam_trusted_profile_claim_rule.py | 40 +- ...ibm_iam_trusted_profile_claim_rule_info.py | 4 +- ...bm_iam_trusted_profile_claim_rules_info.py | 4 +- .../modules/ibm_iam_trusted_profile_info.py | 4 +- .../modules/ibm_iam_trusted_profile_link.py | 10 +- .../ibm_iam_trusted_profile_link_info.py | 20 +- .../ibm_iam_trusted_profile_links_info.py | 4 +- .../modules/ibm_iam_trusted_profile_policy.py | 108 ++--- .../ibm_iam_trusted_profile_policy_info.py | 32 +- .../modules/ibm_iam_trusted_profiles_info.py | 22 +- plugins/modules/ibm_iam_user_invite.py | 4 +- plugins/modules/ibm_iam_user_policy.py | 80 +-- plugins/modules/ibm_iam_user_policy_info.py | 22 +- plugins/modules/ibm_iam_user_profile_info.py | 4 +- plugins/modules/ibm_iam_user_settings.py | 4 +- plugins/modules/ibm_iam_users_info.py | 4 +- plugins/modules/ibm_ipsec_vpn.py | 82 ++-- plugins/modules/ibm_is_bare_metal_server.py | 90 ++-- .../ibm_is_bare_metal_server_action.py | 24 +- .../modules/ibm_is_bare_metal_server_disk.py | 24 +- .../ibm_is_bare_metal_server_disk_info.py | 4 +- .../ibm_is_bare_metal_server_disks_info.py | 4 +- .../modules/ibm_is_bare_metal_server_info.py | 20 +- ...s_bare_metal_server_initialization_info.py | 4 +- ..._is_bare_metal_server_network_interface.py | 110 ++--- ...al_server_network_interface_allow_float.py | 74 +-- ...al_server_network_interface_floating_ip.py | 14 +- ...rver_network_interface_floating_ip_info.py | 24 +- ...ver_network_interface_floating_ips_info.py | 4 +- ...are_metal_server_network_interface_info.py | 20 +- ...re_metal_server_network_interfaces_info.py | 4 +- .../ibm_is_bare_metal_server_profile_info.py | 4 +- .../ibm_is_bare_metal_server_profiles_info.py | 4 +- .../modules/ibm_is_bare_metal_servers_info.py | 4 +- plugins/modules/ibm_is_dedicated_host.py | 42 +- .../ibm_is_dedicated_host_disk_info.py | 20 +- .../ibm_is_dedicated_host_disk_management.py | 4 +- .../ibm_is_dedicated_host_disks_info.py | 4 +- .../modules/ibm_is_dedicated_host_group.py | 46 +- .../ibm_is_dedicated_host_group_info.py | 4 +- .../ibm_is_dedicated_host_groups_info.py | 4 +- plugins/modules/ibm_is_dedicated_host_info.py | 22 +- .../ibm_is_dedicated_host_profile_info.py | 4 +- .../ibm_is_dedicated_host_profiles_info.py | 4 +- .../modules/ibm_is_dedicated_hosts_info.py | 4 +- .../ibm_is_endpoint_gateway_targets_info.py | 4 +- plugins/modules/ibm_is_floating_ip.py | 44 +- plugins/modules/ibm_is_floating_ip_info.py | 4 +- plugins/modules/ibm_is_floating_ips_info.py | 4 +- plugins/modules/ibm_is_flow_log.py | 44 +- plugins/modules/ibm_is_flow_log_info.py | 4 +- plugins/modules/ibm_is_flow_logs_info.py | 4 +- plugins/modules/ibm_is_ike_policies_info.py | 4 +- plugins/modules/ibm_is_ike_policy.py | 60 +-- plugins/modules/ibm_is_ike_policy_info.py | 4 +- plugins/modules/ibm_is_image.py | 78 +-- plugins/modules/ibm_is_image_info.py | 22 +- plugins/modules/ibm_is_images_info.py | 27 +- plugins/modules/ibm_is_instance.py | 272 +++++------ plugins/modules/ibm_is_instance_action.py | 24 +- plugins/modules/ibm_is_instance_disk_info.py | 4 +- .../ibm_is_instance_disk_management.py | 4 +- plugins/modules/ibm_is_instance_disks_info.py | 4 +- plugins/modules/ibm_is_instance_group.py | 88 ++-- plugins/modules/ibm_is_instance_group_info.py | 4 +- .../modules/ibm_is_instance_group_manager.py | 44 +- .../ibm_is_instance_group_manager_action.py | 76 +-- ...m_is_instance_group_manager_action_info.py | 24 +- ..._is_instance_group_manager_actions_info.py | 4 +- .../ibm_is_instance_group_manager_info.py | 4 +- ...is_instance_group_manager_policies_info.py | 4 +- .../ibm_is_instance_group_manager_policy.py | 50 +- ...m_is_instance_group_manager_policy_info.py | 24 +- .../ibm_is_instance_group_managers_info.py | 4 +- .../ibm_is_instance_group_membership.py | 42 +- .../ibm_is_instance_group_membership_info.py | 4 +- .../ibm_is_instance_group_memberships_info.py | 4 +- plugins/modules/ibm_is_instance_info.py | 22 +- .../ibm_is_instance_network_interface.py | 58 +-- .../ibm_is_instance_network_interface_info.py | 4 +- ...ance_network_interface_reserved_ip_info.py | 4 +- ...nce_network_interface_reserved_ips_info.py | 4 +- ...ibm_is_instance_network_interfaces_info.py | 4 +- .../modules/ibm_is_instance_profile_info.py | 4 +- .../modules/ibm_is_instance_profiles_info.py | 4 +- plugins/modules/ibm_is_instance_template.py | 196 ++++---- .../modules/ibm_is_instance_template_info.py | 4 +- .../modules/ibm_is_instance_templates_info.py | 4 +- .../ibm_is_instance_volume_attachment.py | 102 ++-- .../ibm_is_instance_volume_attachment_info.py | 20 +- ...ibm_is_instance_volume_attachments_info.py | 4 +- plugins/modules/ibm_is_instances_info.py | 78 +-- plugins/modules/ibm_is_ipsec_policies_info.py | 4 +- plugins/modules/ibm_is_ipsec_policy.py | 24 +- plugins/modules/ibm_is_ipsec_policy_info.py | 4 +- plugins/modules/ibm_is_lb.py | 84 ++-- plugins/modules/ibm_is_lb_info.py | 4 +- plugins/modules/ibm_is_lb_listener.py | 116 ++--- plugins/modules/ibm_is_lb_listener_info.py | 4 +- .../ibm_is_lb_listener_policies_info.py | 20 +- plugins/modules/ibm_is_lb_listener_policy.py | 98 ++-- .../modules/ibm_is_lb_listener_policy_info.py | 4 +- .../modules/ibm_is_lb_listener_policy_rule.py | 50 +- .../ibm_is_lb_listener_policy_rule_info.py | 24 +- .../ibm_is_lb_listener_policy_rules_info.py | 24 +- plugins/modules/ibm_is_lb_listeners_info.py | 4 +- plugins/modules/ibm_is_lb_pool.py | 134 +++--- plugins/modules/ibm_is_lb_pool_info.py | 20 +- plugins/modules/ibm_is_lb_pool_member.py | 62 +-- plugins/modules/ibm_is_lb_pool_member_info.py | 24 +- .../modules/ibm_is_lb_pool_members_info.py | 4 +- plugins/modules/ibm_is_lb_pools_info.py | 4 +- plugins/modules/ibm_is_lb_profiles_info.py | 4 +- plugins/modules/ibm_is_lbs_info.py | 4 +- plugins/modules/ibm_is_network_acl.py | 26 +- plugins/modules/ibm_is_network_acl_info.py | 22 +- plugins/modules/ibm_is_network_acl_rule.py | 82 ++-- .../modules/ibm_is_network_acl_rule_info.py | 4 +- .../modules/ibm_is_network_acl_rules_info.py | 4 +- plugins/modules/ibm_is_network_acls_info.py | 4 +- .../modules/ibm_is_operating_system_info.py | 4 +- .../modules/ibm_is_operating_systems_info.py | 4 +- plugins/modules/ibm_is_placement_group.py | 46 +- .../modules/ibm_is_placement_group_info.py | 4 +- .../modules/ibm_is_placement_groups_info.py | 4 +- plugins/modules/ibm_is_public_gateway.py | 44 +- plugins/modules/ibm_is_public_gateway_info.py | 4 +- .../modules/ibm_is_public_gateways_info.py | 4 +- plugins/modules/ibm_is_region_info.py | 4 +- plugins/modules/ibm_is_regions_info.py | 4 +- plugins/modules/ibm_is_security_group.py | 28 +- plugins/modules/ibm_is_security_group_info.py | 4 +- ...rity_group_network_interface_attachment.py | 20 +- plugins/modules/ibm_is_security_group_rule.py | 62 +-- .../ibm_is_security_group_rule_info.py | 20 +- .../ibm_is_security_group_rules_info.py | 4 +- .../modules/ibm_is_security_group_target.py | 22 +- .../ibm_is_security_group_target_info.py | 4 +- .../ibm_is_security_group_targets_info.py | 4 +- .../modules/ibm_is_security_groups_info.py | 22 +- plugins/modules/ibm_is_snapshot.py | 8 +- plugins/modules/ibm_is_snapshot_info.py | 18 +- plugins/modules/ibm_is_snapshots_info.py | 4 +- plugins/modules/ibm_is_ssh_key.py | 24 +- plugins/modules/ibm_is_ssh_key_info.py | 4 +- plugins/modules/ibm_is_ssh_keys_info.py | 4 +- plugins/modules/ibm_is_subnet.py | 108 ++--- plugins/modules/ibm_is_subnet_info.py | 4 +- .../ibm_is_subnet_network_acl_attachment.py | 4 +- ...ibm_is_subnet_public_gateway_attachment.py | 20 +- plugins/modules/ibm_is_subnet_reserved_ip.py | 42 +- .../modules/ibm_is_subnet_reserved_ip_info.py | 4 +- .../ibm_is_subnet_reserved_ips_info.py | 4 +- .../ibm_is_subnet_routing_table_attachment.py | 4 +- plugins/modules/ibm_is_subnets_info.py | 4 +- .../ibm_is_virtual_endpoint_gateway.py | 48 +- .../ibm_is_virtual_endpoint_gateway_info.py | 4 +- .../ibm_is_virtual_endpoint_gateway_ip.py | 4 +- ...bm_is_virtual_endpoint_gateway_ips_info.py | 4 +- .../ibm_is_virtual_endpoint_gateways_info.py | 4 +- plugins/modules/ibm_is_volume.py | 56 +-- plugins/modules/ibm_is_volume_info.py | 4 +- plugins/modules/ibm_is_volume_profile_info.py | 4 +- .../modules/ibm_is_volume_profiles_info.py | 4 +- plugins/modules/ibm_is_volumes_info.py | 4 +- plugins/modules/ibm_is_vpc.py | 62 +-- plugins/modules/ibm_is_vpc_address_prefix.py | 48 +- .../modules/ibm_is_vpc_address_prefix_info.py | 22 +- .../ibm_is_vpc_address_prefixes_info.py | 4 +- .../ibm_is_vpc_default_routing_table_info.py | 4 +- plugins/modules/ibm_is_vpc_info.py | 4 +- plugins/modules/ibm_is_vpc_route.py | 42 +- plugins/modules/ibm_is_vpc_routing_table.py | 8 +- .../modules/ibm_is_vpc_routing_table_info.py | 22 +- .../modules/ibm_is_vpc_routing_table_route.py | 66 +-- .../ibm_is_vpc_routing_table_route_info.py | 40 +- .../ibm_is_vpc_routing_table_routes_info.py | 4 +- .../modules/ibm_is_vpc_routing_tables_info.py | 4 +- plugins/modules/ibm_is_vpcs_info.py | 4 +- plugins/modules/ibm_is_vpn_gateway.py | 34 +- .../modules/ibm_is_vpn_gateway_connection.py | 110 ++--- .../ibm_is_vpn_gateway_connection_info.py | 18 +- .../ibm_is_vpn_gateway_connections_info.py | 4 +- plugins/modules/ibm_is_vpn_gateway_info.py | 18 +- plugins/modules/ibm_is_vpn_gateways_info.py | 4 +- plugins/modules/ibm_is_zone_info.py | 4 +- plugins/modules/ibm_is_zones_info.py | 4 +- plugins/modules/ibm_kms_key.py | 100 ++-- plugins/modules/ibm_kms_key_alias.py | 24 +- plugins/modules/ibm_kms_key_info.py | 4 +- plugins/modules/ibm_kms_key_policies.py | 42 +- plugins/modules/ibm_kms_key_policies_info.py | 4 +- plugins/modules/ibm_kms_key_rings.py | 6 +- plugins/modules/ibm_kms_key_rings_info.py | 4 +- plugins/modules/ibm_kms_keys_info.py | 4 +- plugins/modules/ibm_kp_key.py | 54 +-- plugins/modules/ibm_kp_key_info.py | 4 +- plugins/modules/ibm_lb.py | 52 +- plugins/modules/ibm_lb_service.py | 24 +- plugins/modules/ibm_lb_service_group.py | 38 +- plugins/modules/ibm_lb_vpx.py | 78 +-- plugins/modules/ibm_lb_vpx_ha.py | 24 +- plugins/modules/ibm_lb_vpx_service.py | 94 ++-- plugins/modules/ibm_lb_vpx_vip.py | 76 +-- plugins/modules/ibm_lbaas.py | 92 ++-- plugins/modules/ibm_lbaas_health_monitor.py | 80 +-- plugins/modules/ibm_lbaas_info.py | 4 +- .../ibm_lbaas_server_instance_attachment.py | 24 +- plugins/modules/ibm_multi_vlan_firewall.py | 40 +- plugins/modules/ibm_network_gateway.py | 34 +- .../ibm_network_gateway_vlan_association.py | 4 +- .../ibm_network_interface_sg_attachment.py | 4 +- plugins/modules/ibm_network_public_ip.py | 4 +- plugins/modules/ibm_network_vlan.py | 30 +- plugins/modules/ibm_network_vlan_info.py | 22 +- plugins/modules/ibm_network_vlan_spanning.py | 4 +- plugins/modules/ibm_ob_logging.py | 36 +- plugins/modules/ibm_ob_monitoring.py | 30 +- plugins/modules/ibm_object_storage_account.py | 4 +- plugins/modules/ibm_org.py | 50 +- plugins/modules/ibm_org_info.py | 4 +- plugins/modules/ibm_org_quota_info.py | 4 +- plugins/modules/ibm_pi_capture.py | 62 +-- plugins/modules/ibm_pi_catalog_images_info.py | 22 +- plugins/modules/ibm_pi_cloud_connection.py | 56 +-- .../modules/ibm_pi_cloud_connection_info.py | 4 +- .../ibm_pi_cloud_connection_network_attach.py | 4 +- .../modules/ibm_pi_cloud_connections_info.py | 4 +- plugins/modules/ibm_pi_cloud_instance_info.py | 4 +- plugins/modules/ibm_pi_console_language.py | 24 +- .../modules/ibm_pi_console_languages_info.py | 4 +- plugins/modules/ibm_pi_dhcp.py | 6 +- plugins/modules/ibm_pi_dhcp_info.py | 4 +- plugins/modules/ibm_pi_dhcps_info.py | 4 +- plugins/modules/ibm_pi_ike_policy.py | 62 +-- plugins/modules/ibm_pi_image.py | 154 +++--- plugins/modules/ibm_pi_image_export.py | 52 +- plugins/modules/ibm_pi_image_info.py | 4 +- plugins/modules/ibm_pi_images_info.py | 4 +- plugins/modules/ibm_pi_instance.py | 310 ++++++------ plugins/modules/ibm_pi_instance_info.py | 4 +- plugins/modules/ibm_pi_instance_ip_info.py | 24 +- .../modules/ibm_pi_instance_snapshots_info.py | 4 +- .../modules/ibm_pi_instance_volumes_info.py | 4 +- plugins/modules/ibm_pi_instances_info.py | 4 +- plugins/modules/ibm_pi_ipsec_policy.py | 64 +-- plugins/modules/ibm_pi_key.py | 30 +- plugins/modules/ibm_pi_key_info.py | 20 +- plugins/modules/ibm_pi_keys_info.py | 4 +- plugins/modules/ibm_pi_network.py | 94 ++-- plugins/modules/ibm_pi_network_info.py | 4 +- plugins/modules/ibm_pi_network_port.py | 10 +- plugins/modules/ibm_pi_network_port_attach.py | 36 +- plugins/modules/ibm_pi_network_port_info.py | 20 +- plugins/modules/ibm_pi_operations.py | 4 +- plugins/modules/ibm_pi_placement_group.py | 6 +- .../modules/ibm_pi_placement_group_info.py | 4 +- .../modules/ibm_pi_placement_groups_info.py | 4 +- plugins/modules/ibm_pi_public_network_info.py | 4 +- plugins/modules/ibm_pi_pvm_snapshots_info.py | 4 +- plugins/modules/ibm_pi_sap_profile_info.py | 4 +- plugins/modules/ibm_pi_sap_profiles_info.py | 4 +- plugins/modules/ibm_pi_snapshot.py | 56 +-- .../ibm_pi_storage_pool_capacity_info.py | 4 +- .../ibm_pi_storage_pools_capacity_info.py | 4 +- .../ibm_pi_storage_type_capacity_info.py | 20 +- .../ibm_pi_storage_types_capacity_info.py | 4 +- plugins/modules/ibm_pi_system_pools_info.py | 4 +- plugins/modules/ibm_pi_tenant_info.py | 4 +- plugins/modules/ibm_pi_volume.py | 102 ++-- plugins/modules/ibm_pi_volume_attach.py | 4 +- plugins/modules/ibm_pi_volume_info.py | 4 +- plugins/modules/ibm_pi_vpn_connection.py | 68 +-- plugins/modules/ibm_pn_application_chrome.py | 6 +- .../modules/ibm_pn_application_chrome_info.py | 4 +- plugins/modules/ibm_resource_group.py | 6 +- plugins/modules/ibm_resource_group_info.py | 4 +- plugins/modules/ibm_resource_instance.py | 90 ++-- plugins/modules/ibm_resource_instance_info.py | 20 +- plugins/modules/ibm_resource_key.py | 60 +-- plugins/modules/ibm_resource_key_info.py | 22 +- plugins/modules/ibm_resource_quota_info.py | 4 +- plugins/modules/ibm_resource_tag.py | 8 +- plugins/modules/ibm_resource_tag_info.py | 24 +- .../ibm_satellite_attach_host_script_info.py | 40 +- plugins/modules/ibm_satellite_cluster.py | 182 +++---- plugins/modules/ibm_satellite_cluster_info.py | 22 +- .../ibm_satellite_cluster_worker_pool.py | 116 ++--- .../ibm_satellite_cluster_worker_pool_info.py | 34 +- ...ite_cluster_worker_pool_zone_attachment.py | 6 +- ...luster_worker_pool_zone_attachment_info.py | 4 +- plugins/modules/ibm_satellite_endpoint.py | 112 ++--- .../modules/ibm_satellite_endpoint_info.py | 4 +- plugins/modules/ibm_satellite_host.py | 70 +-- plugins/modules/ibm_satellite_link.py | 6 +- plugins/modules/ibm_satellite_link_info.py | 4 +- plugins/modules/ibm_satellite_location.py | 62 +-- .../modules/ibm_satellite_location_info.py | 4 +- .../modules/ibm_satellite_location_nlb_dns.py | 6 +- .../ibm_satellite_location_nlb_dns_info.py | 4 +- .../modules/ibm_scc_account_location_info.py | 4 +- .../ibm_scc_account_location_settings_info.py | 4 +- .../modules/ibm_scc_account_locations_info.py | 4 +- ..._scc_account_notification_settings_info.py | 4 +- plugins/modules/ibm_scc_account_settings.py | 4 +- plugins/modules/ibm_scc_posture_collector.py | 40 +- plugins/modules/ibm_scc_posture_credential.py | 72 +-- .../ibm_scc_posture_group_profile_info.py | 4 +- .../ibm_scc_posture_latest_scans_info.py | 4 +- .../modules/ibm_scc_posture_profile_info.py | 20 +- .../modules/ibm_scc_posture_profiles_info.py | 4 +- .../ibm_scc_posture_scan_summaries_info.py | 4 +- .../ibm_scc_posture_scan_summary_info.py | 4 +- plugins/modules/ibm_scc_posture_scope.py | 4 +- .../ibm_scc_posture_scope_correlation_info.py | 4 +- .../modules/ibm_scc_posture_scopes_info.py | 4 +- plugins/modules/ibm_scc_rule.py | 54 +-- plugins/modules/ibm_scc_rule_attachment.py | 24 +- plugins/modules/ibm_scc_si_note.py | 136 +++--- plugins/modules/ibm_scc_si_note_info.py | 24 +- plugins/modules/ibm_scc_si_notes_info.py | 22 +- plugins/modules/ibm_scc_si_occurrence.py | 96 ++-- plugins/modules/ibm_scc_si_occurrence_info.py | 22 +- .../modules/ibm_scc_si_occurrences_info.py | 4 +- plugins/modules/ibm_scc_si_providers_info.py | 4 +- plugins/modules/ibm_scc_template.py | 28 +- .../modules/ibm_scc_template_attachment.py | 26 +- plugins/modules/ibm_schematics_action.py | 164 +++---- plugins/modules/ibm_schematics_action_info.py | 4 +- plugins/modules/ibm_schematics_inventory.py | 48 +- .../modules/ibm_schematics_inventory_info.py | 4 +- plugins/modules/ibm_schematics_job.py | 96 ++-- plugins/modules/ibm_schematics_job_info.py | 4 +- plugins/modules/ibm_schematics_output_info.py | 22 +- .../modules/ibm_schematics_resource_query.py | 6 +- .../ibm_schematics_resource_query_info.py | 4 +- plugins/modules/ibm_schematics_state_info.py | 4 +- plugins/modules/ibm_schematics_workspace.py | 264 +++++----- .../modules/ibm_schematics_workspace_info.py | 22 +- .../ibm_secrets_manager_secret_info.py | 44 +- .../ibm_secrets_manager_secrets_info.py | 4 +- plugins/modules/ibm_security_group.py | 6 +- plugins/modules/ibm_security_group_info.py | 4 +- plugins/modules/ibm_security_group_rule.py | 24 +- plugins/modules/ibm_service_instance.py | 68 +-- plugins/modules/ibm_service_instance_info.py | 4 +- plugins/modules/ibm_service_key.py | 24 +- plugins/modules/ibm_service_key_info.py | 4 +- plugins/modules/ibm_service_plan_info.py | 4 +- plugins/modules/ibm_space.py | 6 +- plugins/modules/ibm_space_info.py | 4 +- plugins/modules/ibm_ssl_certificate.py | 144 +++--- plugins/modules/ibm_storage_block.py | 82 ++-- plugins/modules/ibm_storage_evault.py | 24 +- plugins/modules/ibm_storage_file.py | 114 ++--- plugins/modules/ibm_subnet.py | 78 +-- plugins/modules/ibm_tg_connection.py | 70 +-- .../ibm_tg_connection_prefix_filter.py | 40 +- .../ibm_tg_connection_prefix_filter_info.py | 24 +- .../ibm_tg_connection_prefix_filters_info.py | 4 +- plugins/modules/ibm_tg_gateway.py | 50 +- plugins/modules/ibm_tg_gateway_info.py | 4 +- plugins/modules/ibm_tg_gateways_info.py | 4 +- plugins/modules/ibm_tg_location_info.py | 4 +- plugins/modules/ibm_tg_locations_info.py | 4 +- plugins/modules/ibm_tg_route_report.py | 6 +- plugins/modules/ibm_tg_route_report_info.py | 4 +- plugins/modules/ibm_tg_route_reports_info.py | 4 +- 778 files changed, 24962 insertions(+), 10470 deletions(-) create mode 100644 plugins/modules/ibm_cd_tekton_pipeline.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_definition.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_definition_info.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_info.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_property.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_property_info.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_trigger.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_trigger_info.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_trigger_property.py create mode 100644 plugins/modules/ibm_cd_tekton_pipeline_trigger_property_info.py create mode 100644 plugins/modules/ibm_cd_toolchain.py create mode 100644 plugins/modules/ibm_cd_toolchain_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_appconfig.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_appconfig_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_artifactory.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_artifactory_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_bitbucketgit.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_bitbucketgit_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_custom.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_custom_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_devopsinsights.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_devopsinsights_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_githubconsolidated.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_githubconsolidated_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_githubintegrated.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_githubintegrated_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_gitlab.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_gitlab_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_hashicorpvault.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_hashicorpvault_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_hostedgit.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_hostedgit_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_jenkins.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_jenkins_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_keyprotect.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_keyprotect_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_nexus.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_nexus_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_pagerduty.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_pagerduty_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_pipeline.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_pipeline_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_privateworker.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_privateworker_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_saucelabs.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_saucelabs_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_secretsmanager.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_secretsmanager_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_securitycompliance.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_securitycompliance_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_slack.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_slack_info.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_sonarqube.py create mode 100644 plugins/modules/ibm_cd_toolchain_tool_sonarqube_info.py create mode 100644 plugins/modules/ibm_container_dedicated_host.py create mode 100644 plugins/modules/ibm_container_dedicated_host_flavor_info.py create mode 100644 plugins/modules/ibm_container_dedicated_host_flavors_info.py create mode 100644 plugins/modules/ibm_container_dedicated_host_info.py create mode 100644 plugins/modules/ibm_container_dedicated_host_pool.py create mode 100644 plugins/modules/ibm_container_dedicated_host_pool_info.py create mode 100644 plugins/modules/ibm_en_destination_safari.py create mode 100644 plugins/modules/ibm_en_destination_safari_info.py create mode 100644 plugins/modules/ibm_en_destination_slack.py create mode 100644 plugins/modules/ibm_en_destination_slack_info.py create mode 100644 plugins/modules/ibm_en_source.py create mode 100644 plugins/modules/ibm_en_source_info.py create mode 100644 plugins/modules/ibm_en_subscription_safari.py create mode 100644 plugins/modules/ibm_en_subscription_safari_info.py create mode 100644 plugins/modules/ibm_en_subscription_slack.py create mode 100644 plugins/modules/ibm_en_subscription_slack_info.py create mode 100644 plugins/modules/ibm_hpcs_key_template.py create mode 100644 plugins/modules/ibm_hpcs_key_template_info.py create mode 100644 plugins/modules/ibm_hpcs_keystore.py create mode 100644 plugins/modules/ibm_hpcs_keystore_info.py create mode 100644 plugins/modules/ibm_hpcs_managed_key.py create mode 100644 plugins/modules/ibm_hpcs_managed_key_info.py create mode 100644 plugins/modules/ibm_hpcs_vault.py create mode 100644 plugins/modules/ibm_hpcs_vault_info.py diff --git a/plugins/modules/ibm_account_info.py b/plugins/modules/ibm_account_info.py index 89fb78aa9..ea4a42fc7 100644 --- a/plugins/modules/ibm_account_info.py +++ b/plugins/modules/ibm_account_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_account' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_account', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_api_gateway_endpoint.py b/plugins/modules/ibm_api_gateway_endpoint.py index d55a1dd27..9731b22d1 100644 --- a/plugins/modules/ibm_api_gateway_endpoint.py +++ b/plugins/modules/ibm_api_gateway_endpoint.py @@ -18,43 +18,43 @@ - Create, update or destroy an IBM Cloud 'ibm_api_gateway_endpoint' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - service_instance_crn: - description: - - (Required for new resource) Api Gateway Service Instance Crn - required: True - type: str open_api_doc_name: description: - (Required for new resource) Json File path required: True type: str - name: - description: - - (Required for new resource) Endpoint name - required: True - type: str - managed: - description: - - Managed indicates if endpoint is online or offline. - required: False - type: bool - default: False provider_id: description: - Provider ID of an endpoint allowable values user-defined and whisk required: False type: str default: user-defined + service_instance_crn: + description: + - (Required for new resource) Api Gateway Service Instance Crn + required: True + type: str + name: + description: + - (Required for new resource) Endpoint name + required: True + type: str routes: description: - Invokable routes for an endpoint required: False type: list elements: str + managed: + description: + - Managed indicates if endpoint is online or offline. + required: False + type: bool + default: False type: description: - Action type of Endpoint ALoowable values are share, unshare, manage, unmanage @@ -107,19 +107,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('service_instance_crn', 'str'), ('open_api_doc_name', 'str'), + ('service_instance_crn', 'str'), ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'service_instance_crn', 'open_api_doc_name', - 'name', - 'managed', 'provider_id', + 'service_instance_crn', + 'name', 'routes', + 'managed', 'type', ] @@ -137,25 +137,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - service_instance_crn=dict( - required=False, - type='str'), open_api_doc_name=dict( required=False, type='str'), - name=dict( + provider_id=dict( required=False, type='str'), - managed=dict( + service_instance_crn=dict( required=False, - type='bool'), - provider_id=dict( + type='str'), + name=dict( required=False, type='str'), routes=dict( required=False, elements='', type='list'), + managed=dict( + required=False, + type='bool'), type=dict( required=False, type='str'), @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_api_gateway_endpoint', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_api_gateway_endpoint_subscription.py b/plugins/modules/ibm_api_gateway_endpoint_subscription.py index aae3c8a56..ba2f37364 100644 --- a/plugins/modules/ibm_api_gateway_endpoint_subscription.py +++ b/plugins/modules/ibm_api_gateway_endpoint_subscription.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_api_gateway_endpoint_subscription' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + type: + description: + - (Required for new resource) Subscription type. Allowable values are external, internal + required: True + type: str + client_secret: + description: + - Client Sercret of a Subscription + required: False + type: str generate_secret: description: - Indicates if Client Sercret has to be autogenerated @@ -42,16 +52,6 @@ - (Required for new resource) Subscription name required: True type: str - type: - description: - - (Required for new resource) Subscription type. Allowable values are external, internal - required: True - type: str - client_secret: - description: - - Client Sercret of a Subscription - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -98,19 +98,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('type', 'str'), ('artifact_id', 'str'), ('name', 'str'), - ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'type', + 'client_secret', 'generate_secret', 'artifact_id', 'client_id', 'name', - 'type', - 'client_secret', ] # Params for Data source @@ -121,14 +121,20 @@ ] TL_CONFLICTS_MAP = { - 'generate_secret': ['client_secret'], 'client_secret': ['generate_secret'], + 'generate_secret': ['client_secret'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + type=dict( + required=False, + type='str'), + client_secret=dict( + required=False, + type='str'), generate_secret=dict( required=False, type='bool'), @@ -141,12 +147,6 @@ name=dict( required=False, type='str'), - type=dict( - required=False, - type='str'), - client_secret=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -212,7 +212,7 @@ def run_module(): resource_type='ibm_api_gateway_endpoint_subscription', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_api_gateway_info.py b/plugins/modules/ibm_api_gateway_info.py index 8c72bec38..be50701ad 100644 --- a/plugins/modules/ibm_api_gateway_info.py +++ b/plugins/modules/ibm_api_gateway_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_api_gateway' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_api_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app.py b/plugins/modules/ibm_app.py index 493d9637b..af24d2d1e 100644 --- a/plugins/modules/ibm_app.py +++ b/plugins/modules/ibm_app.py @@ -18,43 +18,32 @@ - Create, update or destroy an IBM Cloud 'ibm_app' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + memory: + description: + - The amount of memory each instance should have. In megabytes. + required: False + type: int instances: description: - The number of instances required: False type: int default: 1 - buildpack: - description: - - Buildpack to build the app. 3 options: a) Blank means autodetection; b) A Git Url pointing to a buildpack; c) Name of an installed buildpack. - required: False - type: str - service_instance_guid: - description: - - Define the service instance guids that should be bound to this application. - required: False - type: list - elements: str - app_path: - description: - - (Required for new resource) Define the path of the zip file of the application. - required: True - type: str app_version: description: - Version of the application required: False type: str - wait_time_minutes: + tags: description: - - Define timeout to wait for the app instances to start/update/restage etc. + - None required: False - type: int - default: 20 + type: list + elements: str health_check_http_endpoint: description: - Endpoint called to determine if the app is healthy. @@ -65,54 +54,65 @@ - Timeout in seconds for health checking of an staged app when starting up. required: False type: int - disk_quota: - description: - - The maximum amount of disk available to an instance of an app. In megabytes. - required: False - type: int - space_guid: + name: description: - - (Required for new resource) Define space guid to which app belongs + - (Required for new resource) The name for the app required: True type: str - environment_json: + route_guid: description: - - Key/value pairs of all the environment variables to run in your app. Does not include any system or service variables. + - Define the route guids which should be bound to the application. required: False - type: dict + type: list + elements: str + service_instance_guid: + description: + - Define the service instance guids that should be bound to this application. + required: False + type: list + elements: str + command: + description: + - The initial command for the app + required: False + type: str health_check_type: description: - Type of health check to perform. required: False type: str default: port - memory: + wait_time_minutes: description: - - The amount of memory each instance should have. In megabytes. + - Define timeout to wait for the app instances to start/update/restage etc. required: False type: int - command: + default: 20 + disk_quota: description: - - The initial command for the app + - The maximum amount of disk available to an instance of an app. In megabytes. required: False - type: str - name: + type: int + space_guid: description: - - (Required for new resource) The name for the app + - (Required for new resource) Define space guid to which app belongs required: True type: str - route_guid: + buildpack: description: - - Define the route guids which should be bound to the application. + - Buildpack to build the app. 3 options: a) Blank means autodetection; b) A Git Url pointing to a buildpack; c) Name of an installed buildpack. required: False - type: list - elements: str - tags: + type: str + environment_json: description: - - None + - Key/value pairs of all the environment variables to run in your app. Does not include any system or service variables. required: False - type: list - elements: str + type: dict + app_path: + description: + - (Required for new resource) Define the path of the zip file of the application. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -159,41 +159,41 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('app_path', 'str'), - ('space_guid', 'str'), ('name', 'str'), + ('space_guid', 'str'), + ('app_path', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'memory', 'instances', - 'buildpack', - 'service_instance_guid', - 'app_path', 'app_version', - 'wait_time_minutes', + 'tags', 'health_check_http_endpoint', 'health_check_timeout', + 'name', + 'route_guid', + 'service_instance_guid', + 'command', + 'health_check_type', + 'wait_time_minutes', 'disk_quota', 'space_guid', + 'buildpack', 'environment_json', - 'health_check_type', - 'memory', - 'command', - 'name', - 'route_guid', - 'tags', + 'app_path', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('name', 'str'), ('space_guid', 'str'), + ('name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'name', 'space_guid', + 'name', ] TL_CONFLICTS_MAP = { @@ -203,60 +203,60 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + memory=dict( + required=False, + type='int'), instances=dict( required=False, type='int'), - buildpack=dict( + app_version=dict( required=False, type='str'), - service_instance_guid=dict( + tags=dict( required=False, elements='', type='list'), - app_path=dict( - required=False, - type='str'), - app_version=dict( + health_check_http_endpoint=dict( required=False, type='str'), - wait_time_minutes=dict( + health_check_timeout=dict( required=False, type='int'), - health_check_http_endpoint=dict( + name=dict( required=False, type='str'), - health_check_timeout=dict( + route_guid=dict( required=False, - type='int'), - disk_quota=dict( + elements='', + type='list'), + service_instance_guid=dict( required=False, - type='int'), - space_guid=dict( + elements='', + type='list'), + command=dict( required=False, type='str'), - environment_json=dict( - required=False, - type='dict'), health_check_type=dict( required=False, type='str'), - memory=dict( + wait_time_minutes=dict( required=False, type='int'), - command=dict( + disk_quota=dict( + required=False, + type='int'), + space_guid=dict( required=False, type='str'), - name=dict( + buildpack=dict( required=False, type='str'), - route_guid=dict( + environment_json=dict( required=False, - elements='', - type='list'), - tags=dict( + type='dict'), + app_path=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -322,7 +322,7 @@ def run_module(): resource_type='ibm_app', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -331,7 +331,7 @@ def run_module(): resource_type='ibm_app', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_app_config_environment.py b/plugins/modules/ibm_app_config_environment.py index 02c310406..c0df654f1 100644 --- a/plugins/modules/ibm_app_config_environment.py +++ b/plugins/modules/ibm_app_config_environment.py @@ -18,33 +18,23 @@ - Create, update or destroy an IBM Cloud 'ibm_app_config_environment' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + environment_id: description: - - (Required for new resource) Environment name. + - (Required for new resource) Environment Id. required: True type: str - color_code: - description: - - Color code to distinguish the environment. - required: False - type: str tags: description: - Tags associated with the environment required: False type: str - guid: - description: - - (Required for new resource) GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. - required: True - type: str - environment_id: + name: description: - - (Required for new resource) Environment Id. + - (Required for new resource) Environment name. required: True type: str description: @@ -52,6 +42,16 @@ - Environment description required: False type: str + color_code: + description: + - Color code to distinguish the environment. + required: False + type: str + guid: + description: + - (Required for new resource) GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -98,19 +98,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('environment_id', 'str'), ('name', 'str'), ('guid', 'str'), - ('environment_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'environment_id', + 'tags', 'name', + 'description', 'color_code', - 'tags', 'guid', - 'environment_id', - 'description', ] # Params for Data source @@ -120,9 +120,9 @@ ] TL_ALL_PARAMETERS_DS = [ + 'expand', 'guid', 'environment_id', - 'expand', ] TL_CONFLICTS_MAP = { @@ -132,22 +132,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + environment_id=dict( required=False, type='str'), - color_code=dict( + tags=dict( required=False, type='str'), - tags=dict( + name=dict( required=False, type='str'), - guid=dict( + description=dict( required=False, type='str'), - environment_id=dict( + color_code=dict( required=False, type='str'), - description=dict( + guid=dict( required=False, type='str'), id=dict( @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_app_config_environment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_app_config_environment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_app_config_environment_info.py b/plugins/modules/ibm_app_config_environment_info.py index 1587d228c..5af527b6d 100644 --- a/plugins/modules/ibm_app_config_environment_info.py +++ b/plugins/modules/ibm_app_config_environment_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_environment' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + expand: + description: + - If set to `true`, returns expanded view of the resource details. + required: False + type: bool guid: description: - GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. @@ -31,11 +36,6 @@ - Environment Id. required: True type: str - expand: - description: - - If set to `true`, returns expanded view of the resource details. - required: False - type: bool iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -75,9 +75,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'expand', 'guid', 'environment_id', - 'expand', ] @@ -88,15 +88,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + expand=dict( + required=False, + type='bool'), guid=dict( required=True, type='str'), environment_id=dict( required=True, type='str'), - expand=dict( - required=False, - type='bool'), iaas_classic_username=dict( type='str', no_log=True, @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_app_config_environment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app_config_environments_info.py b/plugins/modules/ibm_app_config_environments_info.py index d071b12d6..3dc1bcb45 100644 --- a/plugins/modules/ibm_app_config_environments_info.py +++ b/plugins/modules/ibm_app_config_environments_info.py @@ -17,24 +17,19 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_environments' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - filter the resources to be returned based on the associated tags. Returns resources associated with any of the specified tags. - required: False - type: str offset: description: - The number of records to skip. By specifying `offset`, you retrieve a subset of items that starts with the `offset` value. Use `offset` with `limit` to page through the available records. required: False type: int - guid: + tags: description: - - GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. - required: True + - filter the resources to be returned based on the associated tags. Returns resources associated with any of the specified tags. + required: False type: str expand: description: @@ -46,6 +41,11 @@ - The number of records to retrieve. By default, the list operation return the first 10 records. To retrieve different set of records, use `limit` with `offset` to page through the available records. required: False type: int + guid: + description: + - GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. + required: True + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -84,11 +84,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'offset', - 'guid', + 'tags', 'expand', 'limit', + 'guid', ] @@ -99,14 +99,11 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - type='str'), offset=dict( required=False, type='int'), - guid=dict( - required=True, + tags=dict( + required=False, type='str'), expand=dict( required=False, @@ -114,6 +111,9 @@ limit=dict( required=False, type='int'), + guid=dict( + required=True, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -148,7 +148,7 @@ def run_module(): resource_type='ibm_app_config_environments', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app_config_feature.py b/plugins/modules/ibm_app_config_feature.py index 925b3c7e6..fd13a3b46 100644 --- a/plugins/modules/ibm_app_config_feature.py +++ b/plugins/modules/ibm_app_config_feature.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_app_config_feature' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,9 +27,9 @@ - (Required for new resource) GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. required: True type: str - name: + disabled_value: description: - - (Required for new resource) Feature name. + - (Required for new resource) Value of the feature when it is disabled. The value can be BOOLEAN, STRING or a NUMERIC value as per the `type` attribute. required: True type: str enabled_value: @@ -37,14 +37,19 @@ - (Required for new resource) Value of the feature when it is enabled. The value can be BOOLEAN, STRING or a NUMERIC value as per the `type` attribute. required: True type: str - type: + description: description: - - (Required for new resource) Type of the feature (BOOLEAN, STRING, NUMERIC). + - Feature description. + required: False + type: str + name: + description: + - (Required for new resource) Feature name. required: True type: str - disabled_value: + type: description: - - (Required for new resource) Value of the feature when it is disabled. The value can be BOOLEAN, STRING or a NUMERIC value as per the `type` attribute. + - (Required for new resource) Type of the feature (BOOLEAN, STRING, NUMERIC). required: True type: str tags: @@ -52,38 +57,33 @@ - Tags associated with the feature. required: False type: str - environment_id: - description: - - (Required for new resource) Environment Id. - required: True - type: str - feature_id: - description: - - (Required for new resource) Feature id. - required: True - type: str rollout_percentage: description: - Rollout percentage of the feature. required: False type: int + segment_rules: + description: + - Specify the targeting rules that is used to set different feature flag values for different segments. + required: False + type: list + elements: dict collections: description: - List of collection id representing the collections that are associated with the specified feature flag. required: False type: list elements: dict - description: + environment_id: description: - - Feature description. - required: False + - (Required for new resource) Environment Id. + required: True type: str - segment_rules: + feature_id: description: - - Specify the targeting rules that is used to set different feature flag values for different segments. - required: False - type: list - elements: dict + - (Required for new resource) Feature id. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -131,10 +131,10 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('guid', 'str'), - ('name', 'str'), + ('disabled_value', 'str'), ('enabled_value', 'str'), + ('name', 'str'), ('type', 'str'), - ('disabled_value', 'str'), ('environment_id', 'str'), ('feature_id', 'str'), ] @@ -142,30 +142,30 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'guid', - 'name', + 'disabled_value', 'enabled_value', + 'description', + 'name', 'type', - 'disabled_value', 'tags', - 'environment_id', - 'feature_id', 'rollout_percentage', - 'collections', - 'description', 'segment_rules', + 'collections', + 'environment_id', + 'feature_id', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('environment_id', 'str'), ('guid', 'str'), + ('environment_id', 'str'), ('feature_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'includes', - 'environment_id', 'guid', + 'environment_id', + 'includes', 'feature_id', ] @@ -179,41 +179,41 @@ guid=dict( required=False, type='str'), - name=dict( + disabled_value=dict( required=False, type='str'), enabled_value=dict( required=False, type='str'), - type=dict( - required=False, - type='str'), - disabled_value=dict( + description=dict( required=False, type='str'), - tags=dict( + name=dict( required=False, type='str'), - environment_id=dict( + type=dict( required=False, type='str'), - feature_id=dict( + tags=dict( required=False, type='str'), rollout_percentage=dict( required=False, type='int'), + segment_rules=dict( + required=False, + elements='', + type='list'), collections=dict( required=False, elements='', type='list'), - description=dict( + environment_id=dict( required=False, type='str'), - segment_rules=dict( + feature_id=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -279,7 +279,7 @@ def run_module(): resource_type='ibm_app_config_feature', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -288,7 +288,7 @@ def run_module(): resource_type='ibm_app_config_feature', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_app_config_feature_info.py b/plugins/modules/ibm_app_config_feature_info.py index f86d64584..b46b6ce5f 100644 --- a/plugins/modules/ibm_app_config_feature_info.py +++ b/plugins/modules/ibm_app_config_feature_info.py @@ -17,24 +17,24 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_feature' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - includes: + guid: description: - - Include the associated collections in the response. - required: False + - GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. + required: True type: str environment_id: description: - Environment Id. required: True type: str - guid: + includes: description: - - GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. - required: True + - Include the associated collections in the response. + required: False type: str feature_id: description: @@ -74,16 +74,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('environment_id', 'str'), ('guid', 'str'), + ('environment_id', 'str'), ('feature_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'includes', - 'environment_id', 'guid', + 'environment_id', + 'includes', 'feature_id', ] @@ -95,14 +95,14 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - includes=dict( - required=False, + guid=dict( + required=True, type='str'), environment_id=dict( required=True, type='str'), - guid=dict( - required=True, + includes=dict( + required=False, type='str'), feature_id=dict( required=True, @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_app_config_feature', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app_config_features_info.py b/plugins/modules/ibm_app_config_features_info.py index 22fa11947..b294c9eb5 100644 --- a/plugins/modules/ibm_app_config_features_info.py +++ b/plugins/modules/ibm_app_config_features_info.py @@ -17,15 +17,32 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_features' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - offset: + limit: description: - - The number of records to skip. By specifying `offset`, you retrieve a subset of items that starts with the `offset` value. Use `offset` with `limit` to page through the available records. + - The number of records to retrieve. By default, the list operation return the first 10 records. To retrieve different set of records, use `limit` with `offset` to page through the available records. required: False type: int + sort: + description: + - Sort the feature details based on the specified attribute. + required: False + type: str + segments: + description: + - Filter features by a list of comma separated segments. + required: False + type: list + elements: str + includes: + description: + - Include the associated collections or targeting rules details in the response. + required: False + type: list + elements: str environment_id: description: - Environment Id. @@ -36,44 +53,27 @@ - Filter the resources to be returned based on the associated tags. Specify the parameter as a list of comma separated tags. Returns resources associated with any of the specified tags. required: False type: str - collections: - description: - - Filter features by a list of comma separated collections. - required: False - type: list - elements: str - limit: + offset: description: - - The number of records to retrieve. By default, the list operation return the first 10 records. To retrieve different set of records, use `limit` with `offset` to page through the available records. + - The number of records to skip. By specifying `offset`, you retrieve a subset of items that starts with the `offset` value. Use `offset` with `limit` to page through the available records. required: False type: int - expand: - description: - - If set to `true`, returns expanded view of the resource details. - required: False - type: bool guid: description: - GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. required: True type: str - sort: - description: - - Sort the feature details based on the specified attribute. - required: False - type: str - segments: + collections: description: - - Filter features by a list of comma separated segments. + - Filter features by a list of comma separated collections. required: False type: list elements: str - includes: + expand: description: - - Include the associated collections or targeting rules details in the response. + - If set to `true`, returns expanded view of the resource details. required: False - type: list - elements: str + type: bool iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -113,16 +113,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'offset', - 'environment_id', - 'tags', - 'collections', 'limit', - 'expand', - 'guid', 'sort', 'segments', 'includes', + 'environment_id', + 'tags', + 'offset', + 'guid', + 'collections', + 'expand', ] @@ -133,39 +133,39 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - offset=dict( + limit=dict( required=False, type='int'), + sort=dict( + required=False, + type='str'), + segments=dict( + required=False, + elements='', + type='list'), + includes=dict( + required=False, + elements='', + type='list'), environment_id=dict( required=True, type='str'), tags=dict( required=False, type='str'), - collections=dict( - required=False, - elements='', - type='list'), - limit=dict( + offset=dict( required=False, type='int'), - expand=dict( - required=False, - type='bool'), guid=dict( required=True, type='str'), - sort=dict( - required=False, - type='str'), - segments=dict( + collections=dict( required=False, elements='', type='list'), - includes=dict( + expand=dict( required=False, - elements='', - type='list'), + type='bool'), iaas_classic_username=dict( type='str', no_log=True, @@ -200,7 +200,7 @@ def run_module(): resource_type='ibm_app_config_features', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app_domain_private.py b/plugins/modules/ibm_app_domain_private.py index b4e5453ac..b51b0068f 100644 --- a/plugins/modules/ibm_app_domain_private.py +++ b/plugins/modules/ibm_app_domain_private.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_app_domain_private' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_app_domain_private', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_app_domain_private', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_app_domain_private_info.py b/plugins/modules/ibm_app_domain_private_info.py index dbf122f10..bc0621f9b 100644 --- a/plugins/modules/ibm_app_domain_private_info.py +++ b/plugins/modules/ibm_app_domain_private_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_app_domain_private' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_app_domain_private', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app_domain_shared.py b/plugins/modules/ibm_app_domain_shared.py index feb646673..5c1c0a079 100644 --- a/plugins/modules/ibm_app_domain_shared.py +++ b/plugins/modules/ibm_app_domain_shared.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_app_domain_shared' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - router_group_guid: - description: - - The guid of the router group. - required: False - type: str tags: description: - None @@ -38,6 +33,11 @@ - (Required for new resource) The name of the domain required: True type: str + router_group_guid: + description: + - The guid of the router group. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,9 +89,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'router_group_guid', 'tags', 'name', + 'router_group_guid', ] # Params for Data source @@ -110,9 +110,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - router_group_guid=dict( - required=False, - type='str'), tags=dict( required=False, elements='', @@ -120,6 +117,9 @@ name=dict( required=False, type='str'), + router_group_guid=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_app_domain_shared', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -194,7 +194,7 @@ def run_module(): resource_type='ibm_app_domain_shared', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_app_domain_shared_info.py b/plugins/modules/ibm_app_domain_shared_info.py index 1b083891d..64a016bcd 100644 --- a/plugins/modules/ibm_app_domain_shared_info.py +++ b/plugins/modules/ibm_app_domain_shared_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_app_domain_shared' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_app_domain_shared', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app_info.py b/plugins/modules/ibm_app_info.py index 694e6762a..6e5203731 100644 --- a/plugins/modules/ibm_app_info.py +++ b/plugins/modules/ibm_app_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_app' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + space_guid: description: - - The name for the app + - Define space guid to which app belongs required: True type: str - space_guid: + name: description: - - Define space guid to which app belongs + - The name for the app required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('space_guid', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'space_guid', + 'name', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + space_guid=dict( required=True, type='str'), - space_guid=dict( + name=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_app', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_app_route.py b/plugins/modules/ibm_app_route.py index 8e1a662a3..81d604dd2 100644 --- a/plugins/modules/ibm_app_route.py +++ b/plugins/modules/ibm_app_route.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_app_route' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - None - required: False - type: list - elements: str host: description: - The host portion of the route. Required for shared-domains. @@ -53,6 +47,12 @@ - The path for a route as raw text.Paths must be between 2 and 128 characters.Paths must start with a forward slash '/'.Paths must not contain a '?' required: False type: str + tags: + description: + - None + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -105,12 +105,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'host', 'space_guid', 'domain_guid', 'port', 'path', + 'tags', ] # Params for Data source @@ -120,11 +120,11 @@ ] TL_ALL_PARAMETERS_DS = [ - 'host', 'path', 'port', 'space_guid', 'domain_guid', + 'host', ] TL_CONFLICTS_MAP = { @@ -134,10 +134,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - elements='', - type='list'), host=dict( required=False, type='str'), @@ -153,6 +149,10 @@ path=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_app_route', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_app_route', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_app_route_info.py b/plugins/modules/ibm_app_route_info.py index 5d862c4c0..1e733e527 100644 --- a/plugins/modules/ibm_app_route_info.py +++ b/plugins/modules/ibm_app_route_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_app_route' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - host: - description: - - The host of the route - required: False - type: str path: description: - The path of the route @@ -46,6 +41,11 @@ - The guid of the domain required: True type: str + host: + description: + - The host of the route + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -85,11 +85,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'host', 'path', 'port', 'space_guid', 'domain_guid', + 'host', ] @@ -100,9 +100,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - host=dict( - required=False, - type='str'), path=dict( required=False, type='str'), @@ -115,6 +112,9 @@ domain_guid=dict( required=True, type='str'), + host=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -149,7 +149,7 @@ def run_module(): resource_type='ibm_app_route', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_action_url.py b/plugins/modules/ibm_appid_action_url.py index d824287f5..6b9933b59 100644 --- a/plugins/modules/ibm_appid_action_url.py +++ b/plugins/modules/ibm_appid_action_url.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_action_url' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + tenant_id: + description: + - (Required for new resource) The AppID instance GUID + required: True + type: str action: description: - (Required for new resource) The type of the action: `on_user_verified` - the URL of your custom user verified page, `on_reset_password` - the URL of your custom reset password page @@ -32,11 +37,6 @@ - (Required for new resource) The action URL required: True type: str - tenant_id: - description: - - (Required for new resource) The AppID instance GUID - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,16 +83,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('tenant_id', 'str'), ('action', 'str'), ('url', 'str'), - ('tenant_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tenant_id', 'action', 'url', - 'tenant_id', ] # Params for Data source @@ -113,13 +113,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - action=dict( + tenant_id=dict( required=False, type='str'), - url=dict( + action=dict( required=False, type='str'), - tenant_id=dict( + url=dict( required=False, type='str'), id=dict( @@ -187,7 +187,7 @@ def run_module(): resource_type='ibm_appid_action_url', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_appid_action_url', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_action_url_info.py b/plugins/modules/ibm_appid_action_url_info.py index 1336a42d2..912f2bf8b 100644 --- a/plugins/modules/ibm_appid_action_url_info.py +++ b/plugins/modules/ibm_appid_action_url_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_action_url' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_action_url', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_apm.py b/plugins/modules/ibm_appid_apm.py index 33c894fe3..ac3ee9e92 100644 --- a/plugins/modules/ibm_appid_apm.py +++ b/plugins/modules/ibm_appid_apm.py @@ -18,10 +18,27 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_apm' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + enabled: + description: + - (Required for new resource) `true` if APM is enabled + required: True + type: bool + prevent_password_with_username: + description: + - None + required: False + type: bool + default: False + password_reuse: + description: + - (Required for new resource) + required: True + type: list + elements: dict password_expiration: description: - (Required for new resource) @@ -45,23 +62,6 @@ - (Required for new resource) The AppID instance GUID required: True type: str - enabled: - description: - - (Required for new resource) `true` if APM is enabled - required: True - type: bool - prevent_password_with_username: - description: - - None - required: False - type: bool - default: False - password_reuse: - description: - - (Required for new resource) - required: True - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -108,23 +108,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('enabled', 'bool'), + ('password_reuse', 'list'), ('password_expiration', 'list'), ('lockout_policy', 'list'), ('min_password_change_interval', 'list'), ('tenant_id', 'str'), - ('enabled', 'bool'), - ('password_reuse', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'enabled', + 'prevent_password_with_username', + 'password_reuse', 'password_expiration', 'lockout_policy', 'min_password_change_interval', 'tenant_id', - 'enabled', - 'prevent_password_with_username', - 'password_reuse', ] # Params for Data source @@ -143,6 +143,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + enabled=dict( + required=False, + type='bool'), + prevent_password_with_username=dict( + required=False, + type='bool'), + password_reuse=dict( + required=False, + elements='', + type='list'), password_expiration=dict( required=False, elements='', @@ -158,16 +168,6 @@ tenant_id=dict( required=False, type='str'), - enabled=dict( - required=False, - type='bool'), - prevent_password_with_username=dict( - required=False, - type='bool'), - password_reuse=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -233,7 +233,7 @@ def run_module(): resource_type='ibm_appid_apm', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -242,7 +242,7 @@ def run_module(): resource_type='ibm_appid_apm', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_apm_info.py b/plugins/modules/ibm_appid_apm_info.py index 214e2be19..3d4f1f312 100644 --- a/plugins/modules/ibm_appid_apm_info.py +++ b/plugins/modules/ibm_appid_apm_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_apm' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_apm', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_application.py b/plugins/modules/ibm_appid_application.py index 6af23db75..177689b63 100644 --- a/plugins/modules/ibm_appid_application.py +++ b/plugins/modules/ibm_appid_application.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_application' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -97,13 +97,13 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('tenant_id', 'str'), ('client_id', 'str'), + ('tenant_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'tenant_id', 'client_id', + 'tenant_id', ] TL_CONFLICTS_MAP = { @@ -187,7 +187,7 @@ def run_module(): resource_type='ibm_appid_application', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_appid_application', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_application_info.py b/plugins/modules/ibm_appid_application_info.py index 0ad7e7c95..bf9fc4066 100644 --- a/plugins/modules/ibm_appid_application_info.py +++ b/plugins/modules/ibm_appid_application_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_appid_application' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tenant_id: + client_id: description: - - The service `tenantId` + - The `client_id` is a public identifier for applications required: True type: str - client_id: + tenant_id: description: - - The `client_id` is a public identifier for applications + - The service `tenantId` required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('tenant_id', 'str'), ('client_id', 'str'), + ('tenant_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tenant_id', 'client_id', + 'tenant_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tenant_id=dict( + client_id=dict( required=True, type='str'), - client_id=dict( + tenant_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_application', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_application_roles.py b/plugins/modules/ibm_appid_application_roles.py index ed095eb05..3b9b62a52 100644 --- a/plugins/modules/ibm_appid_application_roles.py +++ b/plugins/modules/ibm_appid_application_roles.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_application_roles' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -189,7 +189,7 @@ def run_module(): resource_type='ibm_appid_application_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -198,7 +198,7 @@ def run_module(): resource_type='ibm_appid_application_roles', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_application_roles_info.py b/plugins/modules/ibm_appid_application_roles_info.py index 821c3f8bd..e2b75e638 100644 --- a/plugins/modules/ibm_appid_application_roles_info.py +++ b/plugins/modules/ibm_appid_application_roles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_application_roles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_application_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_application_scopes.py b/plugins/modules/ibm_appid_application_scopes.py index 7aab3a146..6425cf2d1 100644 --- a/plugins/modules/ibm_appid_application_scopes.py +++ b/plugins/modules/ibm_appid_application_scopes.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_application_scopes' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + scopes: + description: + - (Required for new resource) A `scope` is a runtime action in your application that you register with IBM Cloud App ID to create an access permission + required: True + type: list + elements: str tenant_id: description: - (Required for new resource) The service `tenantId` @@ -32,12 +38,6 @@ - (Required for new resource) The `client_id` is a public identifier for applications required: True type: str - scopes: - description: - - (Required for new resource) A `scope` is a runtime action in your application that you register with IBM Cloud App ID to create an access permission - required: True - type: list - elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,16 +84,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('scopes', 'list'), ('tenant_id', 'str'), ('client_id', 'str'), - ('scopes', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'scopes', 'tenant_id', 'client_id', - 'scopes', ] # Params for Data source @@ -114,16 +114,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + scopes=dict( + required=False, + elements='', + type='list'), tenant_id=dict( required=False, type='str'), client_id=dict( required=False, type='str'), - scopes=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -189,7 +189,7 @@ def run_module(): resource_type='ibm_appid_application_scopes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -198,7 +198,7 @@ def run_module(): resource_type='ibm_appid_application_scopes', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_application_scopes_info.py b/plugins/modules/ibm_appid_application_scopes_info.py index e4339c54f..ee6ca0f0a 100644 --- a/plugins/modules/ibm_appid_application_scopes_info.py +++ b/plugins/modules/ibm_appid_application_scopes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_application_scopes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_application_scopes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_applications_info.py b/plugins/modules/ibm_appid_applications_info.py index 127be68c4..cecc12b25 100644 --- a/plugins/modules/ibm_appid_applications_info.py +++ b/plugins/modules/ibm_appid_applications_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_applications' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_applications', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_audit_status.py b/plugins/modules/ibm_appid_audit_status.py index 81f4c861e..70900e09b 100644 --- a/plugins/modules/ibm_appid_audit_status.py +++ b/plugins/modules/ibm_appid_audit_status.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_audit_status' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -175,7 +175,7 @@ def run_module(): resource_type='ibm_appid_audit_status', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_appid_audit_status', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_audit_status_info.py b/plugins/modules/ibm_appid_audit_status_info.py index cb15915da..210a5e6f5 100644 --- a/plugins/modules/ibm_appid_audit_status_info.py +++ b/plugins/modules/ibm_appid_audit_status_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_audit_status' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_audit_status', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_cloud_directory_template.py b/plugins/modules/ibm_appid_cloud_directory_template.py index bc3d1fc89..0dfef46a6 100644 --- a/plugins/modules/ibm_appid_cloud_directory_template.py +++ b/plugins/modules/ibm_appid_cloud_directory_template.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_cloud_directory_template' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - subject: - description: - - (Required for new resource) The subject of the email - required: True - type: str html_body: description: - The HTML body of the email @@ -53,6 +48,11 @@ required: False type: str default: en + subject: + description: + - (Required for new resource) The subject of the email + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -99,19 +99,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('subject', 'str'), ('tenant_id', 'str'), ('template_name', 'str'), + ('subject', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'subject', 'html_body', 'plain_text_body', 'tenant_id', 'template_name', 'language', + 'subject', ] # Params for Data source @@ -121,9 +121,9 @@ ] TL_ALL_PARAMETERS_DS = [ + 'language', 'tenant_id', 'template_name', - 'language', ] TL_CONFLICTS_MAP = { @@ -133,9 +133,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - subject=dict( - required=False, - type='str'), html_body=dict( required=False, type='str'), @@ -151,6 +148,9 @@ language=dict( required=False, type='str'), + subject=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -216,7 +216,7 @@ def run_module(): resource_type='ibm_appid_cloud_directory_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -225,7 +225,7 @@ def run_module(): resource_type='ibm_appid_cloud_directory_template', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_cloud_directory_template_info.py b/plugins/modules/ibm_appid_cloud_directory_template_info.py index 611b53870..0b88d645f 100644 --- a/plugins/modules/ibm_appid_cloud_directory_template_info.py +++ b/plugins/modules/ibm_appid_cloud_directory_template_info.py @@ -17,10 +17,16 @@ description: - Retrieve an IBM Cloud 'ibm_appid_cloud_directory_template' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + language: + description: + - Preferred language for resource. Format as described at RFC5646. According to the configured languages codes returned from the `GET /management/v4/{tenantId}/config/ui/languages API`. + required: False + type: str + default: en tenant_id: description: - The AppID instance GUID @@ -31,12 +37,6 @@ - The type of email template. This can be `USER_VERIFICATION`, `WELCOME`, `PASSWORD_CHANGED`, `RESET_PASSWORD` or `MFA_VERIFICATION` required: True type: str - language: - description: - - Preferred language for resource. Format as described at RFC5646. According to the configured languages codes returned from the `GET /management/v4/{tenantId}/config/ui/languages API`. - required: False - type: str - default: en iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -76,9 +76,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'language', 'tenant_id', 'template_name', - 'language', ] @@ -89,15 +89,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + language=dict( + required=False, + type='str'), tenant_id=dict( required=True, type='str'), template_name=dict( required=True, type='str'), - language=dict( - required=False, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_appid_cloud_directory_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_cloud_directory_user.py b/plugins/modules/ibm_appid_cloud_directory_user.py index 5d2608a05..392dc5479 100644 --- a/plugins/modules/ibm_appid_cloud_directory_user.py +++ b/plugins/modules/ibm_appid_cloud_directory_user.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_cloud_directory_user' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - create_profile: + active: description: - - A boolean indication if a profile should be created for the Cloud Directory user + - Determines if the user account is active or not required: False type: bool default: True @@ -38,6 +38,16 @@ - Cloud Directory user display name required: False type: str + user_name: + description: + - Optional username + required: False + type: str + password: + description: + - (Required for new resource) User password + required: True + type: str status: description: - Accepted values `PENDING` or `CONFIRMED` @@ -55,22 +65,12 @@ - (Required for new resource) The AppID instance GUID required: True type: str - active: + create_profile: description: - - Determines if the user account is active or not + - A boolean indication if a profile should be created for the Cloud Directory user required: False type: bool default: True - user_name: - description: - - Optional username - required: False - type: str - password: - description: - - (Required for new resource) User password - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -117,22 +117,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('password', 'str'), ('email', 'list'), ('tenant_id', 'str'), - ('password', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'create_profile', + 'active', 'locked_until', 'display_name', + 'user_name', + 'password', 'status', 'email', 'tenant_id', - 'active', - 'user_name', - 'password', + 'create_profile', ] # Params for Data source @@ -153,7 +153,7 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - create_profile=dict( + active=dict( required=False, type='bool'), locked_until=dict( @@ -162,6 +162,12 @@ display_name=dict( required=False, type='str'), + user_name=dict( + required=False, + type='str'), + password=dict( + required=False, + type='str'), status=dict( required=False, type='str'), @@ -172,15 +178,9 @@ tenant_id=dict( required=False, type='str'), - active=dict( + create_profile=dict( required=False, type='bool'), - user_name=dict( - required=False, - type='str'), - password=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -246,7 +246,7 @@ def run_module(): resource_type='ibm_appid_cloud_directory_user', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -255,7 +255,7 @@ def run_module(): resource_type='ibm_appid_cloud_directory_user', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_cloud_directory_user_info.py b/plugins/modules/ibm_appid_cloud_directory_user_info.py index cf985e1ee..98e838cd2 100644 --- a/plugins/modules/ibm_appid_cloud_directory_user_info.py +++ b/plugins/modules/ibm_appid_cloud_directory_user_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_cloud_directory_user' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_cloud_directory_user', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_idp_cloud_directory.py b/plugins/modules/ibm_appid_idp_cloud_directory.py index 7feed00df..c3d825369 100644 --- a/plugins/modules/ibm_appid_idp_cloud_directory.py +++ b/plugins/modules/ibm_appid_idp_cloud_directory.py @@ -18,28 +18,33 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_idp_cloud_directory' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - self_service_enabled: + signup_enabled: description: - None required: False type: bool default: True - signup_enabled: + reset_password_enabled: description: - None required: False type: bool default: True - welcome_enabled: + reset_password_notification_enabled: description: - None required: False type: bool default: True + identity_field: + description: + - None + required: False + type: str tenant_id: description: - (Required for new resource) @@ -50,35 +55,30 @@ - (Required for new resource) required: True type: bool - identity_confirm_access_mode: + self_service_enabled: description: - None required: False - type: str - default: FULL - identity_confirm_methods: + type: bool + default: True + welcome_enabled: description: - None required: False - type: list - elements: str - identity_field: + type: bool + default: True + identity_confirm_access_mode: description: - None required: False type: str - reset_password_enabled: - description: - - None - required: False - type: bool - default: True - reset_password_notification_enabled: + default: FULL + identity_confirm_methods: description: - None required: False - type: bool - default: True + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -131,16 +131,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'self_service_enabled', 'signup_enabled', - 'welcome_enabled', + 'reset_password_enabled', + 'reset_password_notification_enabled', + 'identity_field', 'tenant_id', 'is_active', + 'self_service_enabled', + 'welcome_enabled', 'identity_confirm_access_mode', 'identity_confirm_methods', - 'identity_field', - 'reset_password_enabled', - 'reset_password_notification_enabled', ] # Params for Data source @@ -159,21 +159,30 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - self_service_enabled=dict( + signup_enabled=dict( required=False, type='bool'), - signup_enabled=dict( + reset_password_enabled=dict( required=False, type='bool'), - welcome_enabled=dict( + reset_password_notification_enabled=dict( required=False, type='bool'), + identity_field=dict( + required=False, + type='str'), tenant_id=dict( required=False, type='str'), is_active=dict( required=False, type='bool'), + self_service_enabled=dict( + required=False, + type='bool'), + welcome_enabled=dict( + required=False, + type='bool'), identity_confirm_access_mode=dict( required=False, type='str'), @@ -181,15 +190,6 @@ required=False, elements='', type='list'), - identity_field=dict( - required=False, - type='str'), - reset_password_enabled=dict( - required=False, - type='bool'), - reset_password_notification_enabled=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -255,7 +255,7 @@ def run_module(): resource_type='ibm_appid_idp_cloud_directory', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -264,7 +264,7 @@ def run_module(): resource_type='ibm_appid_idp_cloud_directory', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_idp_cloud_directory_info.py b/plugins/modules/ibm_appid_idp_cloud_directory_info.py index 0376ba2b0..ba0d0f6ef 100644 --- a/plugins/modules/ibm_appid_idp_cloud_directory_info.py +++ b/plugins/modules/ibm_appid_idp_cloud_directory_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_idp_cloud_directory' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_idp_cloud_directory', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_idp_custom.py b/plugins/modules/ibm_appid_idp_custom.py index ec4c3951c..b20696726 100644 --- a/plugins/modules/ibm_appid_idp_custom.py +++ b/plugins/modules/ibm_appid_idp_custom.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_idp_custom' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + tenant_id: + description: + - (Required for new resource) The service `tenantId` + required: True + type: str is_active: description: - (Required for new resource) @@ -32,11 +37,6 @@ - This is the public key used to validate your signed JWT. It is required to be a PEM in the RS256 or greater format. required: False type: str - tenant_id: - description: - - (Required for new resource) The service `tenantId` - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,15 +83,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('is_active', 'bool'), ('tenant_id', 'str'), + ('is_active', 'bool'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tenant_id', 'is_active', 'public_key', - 'tenant_id', ] # Params for Data source @@ -110,15 +110,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + tenant_id=dict( + required=False, + type='str'), is_active=dict( required=False, type='bool'), public_key=dict( required=False, type='str'), - tenant_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_appid_idp_custom', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_appid_idp_custom', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_idp_custom_info.py b/plugins/modules/ibm_appid_idp_custom_info.py index 3d2cb1390..2986752a2 100644 --- a/plugins/modules/ibm_appid_idp_custom_info.py +++ b/plugins/modules/ibm_appid_idp_custom_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_idp_custom' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_idp_custom', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_idp_facebook.py b/plugins/modules/ibm_appid_idp_facebook.py index 52a65901b..381853c9b 100644 --- a/plugins/modules/ibm_appid_idp_facebook.py +++ b/plugins/modules/ibm_appid_idp_facebook.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_idp_facebook' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_appid_idp_facebook', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_appid_idp_facebook', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_idp_facebook_info.py b/plugins/modules/ibm_appid_idp_facebook_info.py index d42d5f105..295250de2 100644 --- a/plugins/modules/ibm_appid_idp_facebook_info.py +++ b/plugins/modules/ibm_appid_idp_facebook_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_idp_facebook' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_idp_facebook', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_idp_google.py b/plugins/modules/ibm_appid_idp_google.py index ac8bb8c05..f3e6367aa 100644 --- a/plugins/modules/ibm_appid_idp_google.py +++ b/plugins/modules/ibm_appid_idp_google.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_idp_google' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_appid_idp_google', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_appid_idp_google', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_idp_google_info.py b/plugins/modules/ibm_appid_idp_google_info.py index 03273b846..ccedd14e6 100644 --- a/plugins/modules/ibm_appid_idp_google_info.py +++ b/plugins/modules/ibm_appid_idp_google_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_idp_google' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_idp_google', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_idp_saml.py b/plugins/modules/ibm_appid_idp_saml.py index 8993c6d71..61bf479e2 100644 --- a/plugins/modules/ibm_appid_idp_saml.py +++ b/plugins/modules/ibm_appid_idp_saml.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_idp_saml' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_appid_idp_saml', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_appid_idp_saml', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_idp_saml_info.py b/plugins/modules/ibm_appid_idp_saml_info.py index 64ce89ff9..190a0f69a 100644 --- a/plugins/modules/ibm_appid_idp_saml_info.py +++ b/plugins/modules/ibm_appid_idp_saml_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_idp_saml' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_idp_saml', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_idp_saml_metadata_info.py b/plugins/modules/ibm_appid_idp_saml_metadata_info.py index a179f182a..519b0e4d5 100644 --- a/plugins/modules/ibm_appid_idp_saml_metadata_info.py +++ b/plugins/modules/ibm_appid_idp_saml_metadata_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_idp_saml_metadata' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_idp_saml_metadata', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_languages.py b/plugins/modules/ibm_appid_languages.py index bf1dcdd29..be1b44077 100644 --- a/plugins/modules/ibm_appid_languages.py +++ b/plugins/modules/ibm_appid_languages.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_languages' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -177,7 +177,7 @@ def run_module(): resource_type='ibm_appid_languages', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_appid_languages', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_languages_info.py b/plugins/modules/ibm_appid_languages_info.py index 6e614c33d..e11061af4 100644 --- a/plugins/modules/ibm_appid_languages_info.py +++ b/plugins/modules/ibm_appid_languages_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_languages' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_languages', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_mfa.py b/plugins/modules/ibm_appid_mfa.py index 69233c4c8..a05a0f21f 100644 --- a/plugins/modules/ibm_appid_mfa.py +++ b/plugins/modules/ibm_appid_mfa.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_mfa' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -175,7 +175,7 @@ def run_module(): resource_type='ibm_appid_mfa', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_appid_mfa', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_mfa_channel.py b/plugins/modules/ibm_appid_mfa_channel.py index bc35d67ad..fcfd6b22f 100644 --- a/plugins/modules/ibm_appid_mfa_channel.py +++ b/plugins/modules/ibm_appid_mfa_channel.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_mfa_channel' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - active: - description: - - (Required for new resource) Allowed values: `email`, `sms` - required: True - type: str sms_config: description: - Configuration for `sms` channel. Create Vonage account (https://dashboard.nexmo.com/sign-up) to get an API key @@ -38,6 +33,11 @@ - (Required for new resource) The AppID instance GUID required: True type: str + active: + description: + - (Required for new resource) Allowed values: `email`, `sms` + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,15 +84,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('active', 'str'), ('tenant_id', 'str'), + ('active', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'active', 'sms_config', 'tenant_id', + 'active', ] # Params for Data source @@ -111,9 +111,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - active=dict( - required=False, - type='str'), sms_config=dict( required=False, elements='', @@ -121,6 +118,9 @@ tenant_id=dict( required=False, type='str'), + active=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_appid_mfa_channel', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_appid_mfa_channel', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_mfa_channel_info.py b/plugins/modules/ibm_appid_mfa_channel_info.py index f2d4c7819..9895404dc 100644 --- a/plugins/modules/ibm_appid_mfa_channel_info.py +++ b/plugins/modules/ibm_appid_mfa_channel_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_mfa_channel' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_mfa_channel', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_mfa_info.py b/plugins/modules/ibm_appid_mfa_info.py index 3e64b033f..cfd20da4a 100644 --- a/plugins/modules/ibm_appid_mfa_info.py +++ b/plugins/modules/ibm_appid_mfa_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_mfa' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_mfa', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_password_regex.py b/plugins/modules/ibm_appid_password_regex.py index 3f8e1a36a..b9fe36e73 100644 --- a/plugins/modules/ibm_appid_password_regex.py +++ b/plugins/modules/ibm_appid_password_regex.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_password_regex' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_appid_password_regex', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_appid_password_regex', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_password_regex_info.py b/plugins/modules/ibm_appid_password_regex_info.py index 8c2d3158b..63b49f08f 100644 --- a/plugins/modules/ibm_appid_password_regex_info.py +++ b/plugins/modules/ibm_appid_password_regex_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_password_regex' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_password_regex', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_redirect_urls.py b/plugins/modules/ibm_appid_redirect_urls.py index dfcdabe81..4b0cd7a89 100644 --- a/plugins/modules/ibm_appid_redirect_urls.py +++ b/plugins/modules/ibm_appid_redirect_urls.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_redirect_urls' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -177,7 +177,7 @@ def run_module(): resource_type='ibm_appid_redirect_urls', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_appid_redirect_urls', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_redirect_urls_info.py b/plugins/modules/ibm_appid_redirect_urls_info.py index 5fb2176cd..37da14b20 100644 --- a/plugins/modules/ibm_appid_redirect_urls_info.py +++ b/plugins/modules/ibm_appid_redirect_urls_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_redirect_urls' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_redirect_urls', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_role.py b/plugins/modules/ibm_appid_role.py index 73c32581b..6d6bea165 100644 --- a/plugins/modules/ibm_appid_role.py +++ b/plugins/modules/ibm_appid_role.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_role' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - access: - description: - - None - required: False - type: list - elements: dict tenant_id: description: - (Required for new resource) The service `tenantId` @@ -43,6 +37,12 @@ - Optional role description required: False type: str + access: + description: + - None + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,10 +95,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'access', 'tenant_id', 'name', 'description', + 'access', ] # Params for Data source @@ -119,10 +119,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - access=dict( - required=False, - elements='', - type='list'), tenant_id=dict( required=False, type='str'), @@ -132,6 +128,10 @@ description=dict( required=False, type='str'), + access=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -197,7 +197,7 @@ def run_module(): resource_type='ibm_appid_role', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_appid_role', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_role_info.py b/plugins/modules/ibm_appid_role_info.py index b5f49de76..4d4e629a0 100644 --- a/plugins/modules/ibm_appid_role_info.py +++ b/plugins/modules/ibm_appid_role_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_role' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_role', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_roles_info.py b/plugins/modules/ibm_appid_roles_info.py index 639e68aa8..a79413351 100644 --- a/plugins/modules/ibm_appid_roles_info.py +++ b/plugins/modules/ibm_appid_roles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_roles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_theme_color.py b/plugins/modules/ibm_appid_theme_color.py index 632e534d0..45d35b4cc 100644 --- a/plugins/modules/ibm_appid_theme_color.py +++ b/plugins/modules/ibm_appid_theme_color.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_theme_color' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -175,7 +175,7 @@ def run_module(): resource_type='ibm_appid_theme_color', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_appid_theme_color', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_theme_color_info.py b/plugins/modules/ibm_appid_theme_color_info.py index 4bde3dd5f..ddd9fbd31 100644 --- a/plugins/modules/ibm_appid_theme_color_info.py +++ b/plugins/modules/ibm_appid_theme_color_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_theme_color' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_theme_color', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_theme_text.py b/plugins/modules/ibm_appid_theme_text.py index 9253fd41a..ad5a8d200 100644 --- a/plugins/modules/ibm_appid_theme_text.py +++ b/plugins/modules/ibm_appid_theme_text.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_theme_text' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_appid_theme_text', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_appid_theme_text', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_theme_text_info.py b/plugins/modules/ibm_appid_theme_text_info.py index 685ed9825..9075c4c67 100644 --- a/plugins/modules/ibm_appid_theme_text_info.py +++ b/plugins/modules/ibm_appid_theme_text_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_theme_text' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_theme_text', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_token_config.py b/plugins/modules/ibm_appid_token_config.py index a07b8aefb..69b5af720 100644 --- a/plugins/modules/ibm_appid_token_config.py +++ b/plugins/modules/ibm_appid_token_config.py @@ -18,32 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_token_config' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - id_token_claim: - description: - - A set of objects that are created when claims that are related to identity tokens are mapped - required: False - type: list - elements: dict - tenant_id: - description: - - (Required for new resource) The service `tenantId` - required: True - type: str - access_token_expires_in: - description: - - The length of time for which access tokens are valid in seconds - required: False - type: int - refresh_token_expires_in: - description: - - The length of time for which refresh tokens are valid in seconds - required: False - type: int - default: 2592000 anonymous_token_expires_in: description: - None @@ -66,6 +44,28 @@ required: False type: list elements: dict + id_token_claim: + description: + - A set of objects that are created when claims that are related to identity tokens are mapped + required: False + type: list + elements: dict + tenant_id: + description: + - (Required for new resource) The service `tenantId` + required: True + type: str + access_token_expires_in: + description: + - The length of time for which access tokens are valid in seconds + required: False + type: int + refresh_token_expires_in: + description: + - The length of time for which refresh tokens are valid in seconds + required: False + type: int + default: 2592000 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -117,14 +117,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'id_token_claim', - 'tenant_id', - 'access_token_expires_in', - 'refresh_token_expires_in', 'anonymous_token_expires_in', 'anonymous_access_enabled', 'refresh_token_enabled', 'access_token_claim', + 'id_token_claim', + 'tenant_id', + 'access_token_expires_in', + 'refresh_token_expires_in', ] # Params for Data source @@ -143,19 +143,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - id_token_claim=dict( - required=False, - elements='', - type='list'), - tenant_id=dict( - required=False, - type='str'), - access_token_expires_in=dict( - required=False, - type='int'), - refresh_token_expires_in=dict( - required=False, - type='int'), anonymous_token_expires_in=dict( required=False, type='int'), @@ -169,6 +156,19 @@ required=False, elements='', type='list'), + id_token_claim=dict( + required=False, + elements='', + type='list'), + tenant_id=dict( + required=False, + type='str'), + access_token_expires_in=dict( + required=False, + type='int'), + refresh_token_expires_in=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -234,7 +234,7 @@ def run_module(): resource_type='ibm_appid_token_config', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -243,7 +243,7 @@ def run_module(): resource_type='ibm_appid_token_config', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_token_config_info.py b/plugins/modules/ibm_appid_token_config_info.py index 9ad99fb5d..abf8abaef 100644 --- a/plugins/modules/ibm_appid_token_config_info.py +++ b/plugins/modules/ibm_appid_token_config_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_token_config' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_appid_token_config', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_appid_user_roles.py b/plugins/modules/ibm_appid_user_roles.py index 7a3cfd916..b09e01bd6 100644 --- a/plugins/modules/ibm_appid_user_roles.py +++ b/plugins/modules/ibm_appid_user_roles.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_user_roles' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + role_ids: + description: + - (Required for new resource) A set of AppID role IDs that should be assigned to the user + required: True + type: list + elements: str tenant_id: description: - (Required for new resource) The AppID instance GUID @@ -32,12 +38,6 @@ - (Required for new resource) The user's identifier ('subject' in identity token) required: True type: str - role_ids: - description: - - (Required for new resource) A set of AppID role IDs that should be assigned to the user - required: True - type: list - elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,16 +84,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('role_ids', 'list'), ('tenant_id', 'str'), ('subject', 'str'), - ('role_ids', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'role_ids', 'tenant_id', 'subject', - 'role_ids', ] # Params for Data source @@ -114,16 +114,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + role_ids=dict( + required=False, + elements='', + type='list'), tenant_id=dict( required=False, type='str'), subject=dict( required=False, type='str'), - role_ids=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -189,7 +189,7 @@ def run_module(): resource_type='ibm_appid_user_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -198,7 +198,7 @@ def run_module(): resource_type='ibm_appid_user_roles', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_appid_user_roles_info.py b/plugins/modules/ibm_appid_user_roles_info.py index 00e5f7dce..95d0230ed 100644 --- a/plugins/modules/ibm_appid_user_roles_info.py +++ b/plugins/modules/ibm_appid_user_roles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_user_roles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_user_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_atracker_endpoints_info.py b/plugins/modules/ibm_atracker_endpoints_info.py index 9630b2211..d06049078 100644 --- a/plugins/modules/ibm_atracker_endpoints_info.py +++ b/plugins/modules/ibm_atracker_endpoints_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_atracker_endpoints' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_atracker_endpoints', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_atracker_route.py b/plugins/modules/ibm_atracker_route.py index fb4242974..c979c4bde 100644 --- a/plugins/modules/ibm_atracker_route.py +++ b/plugins/modules/ibm_atracker_route.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_atracker_route' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -175,7 +175,7 @@ def run_module(): resource_type='ibm_atracker_route', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_atracker_routes_info.py b/plugins/modules/ibm_atracker_routes_info.py index 3905e6c82..6b93d49b2 100644 --- a/plugins/modules/ibm_atracker_routes_info.py +++ b/plugins/modules/ibm_atracker_routes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_atracker_routes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_atracker_routes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_atracker_settings.py b/plugins/modules/ibm_atracker_settings.py index b07858caf..b61d8d483 100644 --- a/plugins/modules/ibm_atracker_settings.py +++ b/plugins/modules/ibm_atracker_settings.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_atracker_settings' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_atracker_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_atracker_target.py b/plugins/modules/ibm_atracker_target.py index 9b124efce..a512477dc 100644 --- a/plugins/modules/ibm_atracker_target.py +++ b/plugins/modules/ibm_atracker_target.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_atracker_target' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_atracker_target', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_atracker_targets_info.py b/plugins/modules/ibm_atracker_targets_info.py index fcc02e2de..0baa91fd5 100644 --- a/plugins/modules/ibm_atracker_targets_info.py +++ b/plugins/modules/ibm_atracker_targets_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_atracker_targets' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_atracker_targets', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cbr_rule.py b/plugins/modules/ibm_cbr_rule.py index aa6804c41..fcb23f8d4 100644 --- a/plugins/modules/ibm_cbr_rule.py +++ b/plugins/modules/ibm_cbr_rule.py @@ -18,27 +18,43 @@ - Create, update or destroy an IBM Cloud 'ibm_cbr_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resources: - description: - - (Required for new resource) The resources this rule apply to. - required: True - type: list - elements: dict description: description: - The description of the rule. required: False type: str + transaction_id: + description: + - The `Transaction-Id` header behaves as the `X-Correlation-Id` header. It is supported for backward compatibility with other IBM platform services that support the `Transaction-Id` header only. If both `X-Correlation-Id` and `Transaction-Id` are provided, `X-Correlation-Id` has the precedence over `Transaction-Id`. + required: False + type: str contexts: description: - (Required for new resource) The contexts this rule applies to. required: True type: list elements: dict + resources: + description: + - (Required for new resource) The resources this rule apply to. + required: True + type: list + elements: dict + enforcement_mode: + description: + - The rule enforcement mode: * `enabled` - The restrictions are enforced and reported. This is the default. * `disabled` - The restrictions are disabled. Nothing is enforced or reported. * `report` - The restrictions are evaluated and reported, but not enforced. + required: False + type: str + default: enabled + x_correlation_id: + description: + - The supplied or generated value of this header is logged for a request and repeated in a response header for the corresponding response. The same value is used for downstream requests and retries of those requests. If a value of this headers is not supplied in a request, the service generates a random (version 4) UUID. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -85,15 +101,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('resources', 'list'), ('contexts', 'list'), + ('resources', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resources', 'description', + 'transaction_id', 'contexts', + 'resources', + 'enforcement_mode', + 'x_correlation_id', ] # Params for Data source @@ -112,17 +131,26 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resources=dict( - required=False, - elements='', - type='list'), description=dict( required=False, type='str'), + transaction_id=dict( + required=False, + type='str'), contexts=dict( required=False, elements='', type='list'), + resources=dict( + required=False, + elements='', + type='list'), + enforcement_mode=dict( + required=False, + type='str'), + x_correlation_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -188,7 +216,7 @@ def run_module(): resource_type='ibm_cbr_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -197,7 +225,7 @@ def run_module(): resource_type='ibm_cbr_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cbr_rule_info.py b/plugins/modules/ibm_cbr_rule_info.py index fc5d59c43..e7c05ff5b 100644 --- a/plugins/modules/ibm_cbr_rule_info.py +++ b/plugins/modules/ibm_cbr_rule_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cbr_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cbr_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cbr_zone.py b/plugins/modules/ibm_cbr_zone.py index ce62e6b99..c835a4e4e 100644 --- a/plugins/modules/ibm_cbr_zone.py +++ b/plugins/modules/ibm_cbr_zone.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cbr_zone' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -28,14 +28,14 @@ required: False type: list elements: dict - description: + x_correlation_id: description: - - The description of the zone. + - The supplied or generated value of this header is logged for a request and repeated in a response header for the corresponding response. The same value is used for downstream requests and retries of those requests. If a value of this headers is not supplied in a request, the service generates a random (version 4) UUID. required: False type: str - name: + account_id: description: - - (Required for new resource) The name of the zone. + - (Required for new resource) The id of the account owning this zone. required: True type: str addresses: @@ -44,6 +44,21 @@ required: True type: list elements: dict + transaction_id: + description: + - The `Transaction-Id` header behaves as the `X-Correlation-Id` header. It is supported for backward compatibility with other IBM platform services that support the `Transaction-Id` header only. If both `X-Correlation-Id` and `Transaction-Id` are provided, `X-Correlation-Id` has the precedence over `Transaction-Id`. + required: False + type: str + name: + description: + - (Required for new resource) The name of the zone. + required: True + type: str + description: + description: + - The description of the zone. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,16 +105,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), + ('account_id', 'str'), ('addresses', 'list'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'excluded', - 'description', - 'name', + 'x_correlation_id', + 'account_id', 'addresses', + 'transaction_id', + 'name', + 'description', ] # Params for Data source @@ -122,16 +141,25 @@ required=False, elements='', type='list'), - description=dict( + x_correlation_id=dict( required=False, type='str'), - name=dict( + account_id=dict( required=False, type='str'), addresses=dict( required=False, elements='', type='list'), + transaction_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -197,7 +225,7 @@ def run_module(): resource_type='ibm_cbr_zone', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -206,7 +234,7 @@ def run_module(): resource_type='ibm_cbr_zone', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cbr_zone_info.py b/plugins/modules/ibm_cbr_zone_info.py index b765c5a51..ebea4c203 100644 --- a/plugins/modules/ibm_cbr_zone_info.py +++ b/plugins/modules/ibm_cbr_zone_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cbr_zone' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cbr_zone', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cd_tekton_pipeline.py b/plugins/modules/ibm_cd_tekton_pipeline.py new file mode 100644 index 000000000..7635c1d77 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline.py @@ -0,0 +1,216 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_tekton_pipeline + +short_description: Configure IBM Cloud 'ibm_cd_tekton_pipeline' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_tekton_pipeline' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + pipeline_id: + description: + - (Required for new resource) String. + required: True + type: str + pipeline_definition: + description: + - Tekton pipeline definition document detail object. If this property is absent, the pipeline has no definitions added. + required: False + type: list + elements: dict + worker: + description: + - Worker object with worker ID only. + required: False + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('pipeline_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pipeline_id', + 'pipeline_definition', + 'worker', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('pipeline_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'pipeline_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + pipeline_id=dict( + required=False, + type='str'), + pipeline_definition=dict( + required=False, + elements='', + type='list'), + worker=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_definition.py b/plugins/modules/ibm_cd_tekton_pipeline_definition.py new file mode 100644 index 000000000..aedc54fc2 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_definition.py @@ -0,0 +1,207 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_definition +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_tekton_pipeline_definition + +short_description: Configure IBM Cloud 'ibm_cd_tekton_pipeline_definition' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_tekton_pipeline_definition' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + pipeline_id: + description: + - (Required for new resource) The tekton pipeline ID. + required: True + type: str + scm_source: + description: + - Scm source for tekton pipeline defintion. + required: False + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('pipeline_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pipeline_id', + 'scm_source', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('pipeline_id', 'str'), + ('definition_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'pipeline_id', + 'definition_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + pipeline_id=dict( + required=False, + type='str'), + scm_source=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_definition', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_definition', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_definition_info.py b/plugins/modules/ibm_cd_tekton_pipeline_definition_info.py new file mode 100644 index 000000000..28216afab --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_definition_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_definition_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_tekton_pipeline_definition + +short_description: Retrieve IBM Cloud 'ibm_cd_tekton_pipeline_definition' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_tekton_pipeline_definition' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + pipeline_id: + description: + - The tekton pipeline ID. + required: True + type: str + definition_id: + description: + - The definition ID. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('pipeline_id', 'str'), + ('definition_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pipeline_id', + 'definition_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + pipeline_id=dict( + required=True, + type='str'), + definition_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_definition', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_info.py b/plugins/modules/ibm_cd_tekton_pipeline_info.py new file mode 100644 index 000000000..4501d8156 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_info.py @@ -0,0 +1,131 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_tekton_pipeline + +short_description: Retrieve IBM Cloud 'ibm_cd_tekton_pipeline' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_tekton_pipeline' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + pipeline_id: + description: + - ID of current instance. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('pipeline_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pipeline_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + pipeline_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_property.py b/plugins/modules/ibm_cd_tekton_pipeline_property.py new file mode 100644 index 000000000..868ebf5e3 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_property.py @@ -0,0 +1,254 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_property +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_tekton_pipeline_property + +short_description: Configure IBM Cloud 'ibm_cd_tekton_pipeline_property' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_tekton_pipeline_property' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + pipeline_id: + description: + - (Required for new resource) The tekton pipeline ID. + required: True + type: str + name: + description: + - (Required for new resource) Property name. + required: True + type: str + value: + description: + - String format property value. + required: False + type: str + enum: + description: + - Options for SINGLE_SELECT property type. + required: False + type: list + elements: str + default: + description: + - Default option for SINGLE_SELECT property type. + required: False + type: str + type: + description: + - (Required for new resource) Property type. + required: True + type: str + path: + description: + - property path for INTEGRATION type properties. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('pipeline_id', 'str'), + ('name', 'str'), + ('type', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pipeline_id', + 'name', + 'value', + 'enum', + 'default', + 'type', + 'path', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('pipeline_id', 'str'), + ('property_name', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'pipeline_id', + 'property_name', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + pipeline_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + value=dict( + required=False, + type='str'), + enum=dict( + required=False, + elements='', + type='list'), + default=dict( + required=False, + type='str'), + type=dict( + required=False, + type='str'), + path=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_property', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_property', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_property_info.py b/plugins/modules/ibm_cd_tekton_pipeline_property_info.py new file mode 100644 index 000000000..2da2b85fc --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_property_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_property_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_tekton_pipeline_property + +short_description: Retrieve IBM Cloud 'ibm_cd_tekton_pipeline_property' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_tekton_pipeline_property' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + pipeline_id: + description: + - The tekton pipeline ID. + required: True + type: str + property_name: + description: + - The property's name. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('pipeline_id', 'str'), + ('property_name', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pipeline_id', + 'property_name', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + pipeline_id=dict( + required=True, + type='str'), + property_name=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_property', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_trigger.py b/plugins/modules/ibm_cd_tekton_pipeline_trigger.py new file mode 100644 index 000000000..5a695cea8 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_trigger.py @@ -0,0 +1,208 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_trigger +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_tekton_pipeline_trigger + +short_description: Configure IBM Cloud 'ibm_cd_tekton_pipeline_trigger' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_tekton_pipeline_trigger' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + trigger: + description: + - (Required for new resource) Tekton pipeline trigger object. + required: True + type: list + elements: dict + pipeline_id: + description: + - (Required for new resource) The tekton pipeline ID. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('trigger', 'list'), + ('pipeline_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'trigger', + 'pipeline_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('trigger_id', 'str'), + ('pipeline_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'trigger_id', + 'pipeline_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + trigger=dict( + required=False, + elements='', + type='list'), + pipeline_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_trigger', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_trigger', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_trigger_info.py b/plugins/modules/ibm_cd_tekton_pipeline_trigger_info.py new file mode 100644 index 000000000..976525957 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_trigger_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_trigger_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_tekton_pipeline_trigger + +short_description: Retrieve IBM Cloud 'ibm_cd_tekton_pipeline_trigger' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_tekton_pipeline_trigger' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + trigger_id: + description: + - The trigger ID. + required: True + type: str + pipeline_id: + description: + - The tekton pipeline ID. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('trigger_id', 'str'), + ('pipeline_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'trigger_id', + 'pipeline_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + trigger_id=dict( + required=True, + type='str'), + pipeline_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_trigger', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_trigger_property.py b/plugins/modules/ibm_cd_tekton_pipeline_trigger_property.py new file mode 100644 index 000000000..be7f515c7 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_trigger_property.py @@ -0,0 +1,266 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_trigger_property +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_tekton_pipeline_trigger_property + +short_description: Configure IBM Cloud 'ibm_cd_tekton_pipeline_trigger_property' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_tekton_pipeline_trigger_property' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + value: + description: + - String format property value. + required: False + type: str + enum: + description: + - Options for SINGLE_SELECT property type. + required: False + type: list + elements: str + default: + description: + - Default option for SINGLE_SELECT property type. + required: False + type: str + type: + description: + - (Required for new resource) Property type. + required: True + type: str + path: + description: + - property path for INTEGRATION type properties. + required: False + type: str + pipeline_id: + description: + - (Required for new resource) The tekton pipeline ID. + required: True + type: str + trigger_id: + description: + - (Required for new resource) The trigger ID. + required: True + type: str + name: + description: + - (Required for new resource) Property name. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('type', 'str'), + ('pipeline_id', 'str'), + ('trigger_id', 'str'), + ('name', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'value', + 'enum', + 'default', + 'type', + 'path', + 'pipeline_id', + 'trigger_id', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('pipeline_id', 'str'), + ('trigger_id', 'str'), + ('property_name', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'pipeline_id', + 'trigger_id', + 'property_name', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + value=dict( + required=False, + type='str'), + enum=dict( + required=False, + elements='', + type='list'), + default=dict( + required=False, + type='str'), + type=dict( + required=False, + type='str'), + path=dict( + required=False, + type='str'), + pipeline_id=dict( + required=False, + type='str'), + trigger_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_trigger_property', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_trigger_property', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_tekton_pipeline_trigger_property_info.py b/plugins/modules/ibm_cd_tekton_pipeline_trigger_property_info.py new file mode 100644 index 000000000..cd46679c7 --- /dev/null +++ b/plugins/modules/ibm_cd_tekton_pipeline_trigger_property_info.py @@ -0,0 +1,151 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_tekton_pipeline_trigger_property_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_tekton_pipeline_trigger_property + +short_description: Retrieve IBM Cloud 'ibm_cd_tekton_pipeline_trigger_property' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_tekton_pipeline_trigger_property' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + pipeline_id: + description: + - The tekton pipeline ID. + required: True + type: str + trigger_id: + description: + - The trigger ID. + required: True + type: str + property_name: + description: + - The property's name. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('pipeline_id', 'str'), + ('trigger_id', 'str'), + ('property_name', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pipeline_id', + 'trigger_id', + 'property_name', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + pipeline_id=dict( + required=True, + type='str'), + trigger_id=dict( + required=True, + type='str'), + property_name=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_tekton_pipeline_trigger_property', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain.py b/plugins/modules/ibm_cd_toolchain.py new file mode 100644 index 000000000..fe5430d7d --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain.py @@ -0,0 +1,213 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain + +short_description: Configure IBM Cloud 'ibm_cd_toolchain' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + resource_group_id: + description: + - (Required for new resource) Resource group where toolchain will be created. + required: True + type: str + name: + description: + - (Required for new resource) Toolchain name. + required: True + type: str + description: + description: + - Describes the toolchain. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('resource_group_id', 'str'), + ('name', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'resource_group_id', + 'name', + 'description', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + resource_group_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_info.py b/plugins/modules/ibm_cd_toolchain_info.py new file mode 100644 index 000000000..643797ef8 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_info.py @@ -0,0 +1,131 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_appconfig.py b/plugins/modules/ibm_cd_toolchain_tool_appconfig.py new file mode 100644 index 000000000..8017e8dfe --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_appconfig.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_appconfig +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_appconfig + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_appconfig' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_appconfig' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'toolchain_id', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + toolchain_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_appconfig', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_appconfig', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_appconfig_info.py b/plugins/modules/ibm_cd_toolchain_tool_appconfig_info.py new file mode 100644 index 000000000..27022b65e --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_appconfig_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_appconfig_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_appconfig + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_appconfig' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_appconfig' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_appconfig', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_artifactory.py b/plugins/modules/ibm_cd_toolchain_tool_artifactory.py new file mode 100644 index 000000000..78d705df7 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_artifactory.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_artifactory +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_artifactory + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_artifactory' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_artifactory' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'name', + 'toolchain_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_artifactory', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_artifactory', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_artifactory_info.py b/plugins/modules/ibm_cd_toolchain_tool_artifactory_info.py new file mode 100644 index 000000000..c84119154 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_artifactory_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_artifactory_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_artifactory + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_artifactory' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_artifactory' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_artifactory', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_bitbucketgit.py b/plugins/modules/ibm_cd_toolchain_tool_bitbucketgit.py new file mode 100644 index 000000000..0470e9ec2 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_bitbucketgit.py @@ -0,0 +1,229 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_bitbucketgit +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_bitbucketgit + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_bitbucketgit' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_bitbucketgit' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + initialization: + description: + - (Required for new resource) + required: True + type: list + elements: dict + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('initialization', 'list'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'initialization', + 'parameters', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + initialization=dict( + required=False, + elements='', + type='list'), + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_bitbucketgit', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_bitbucketgit', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_bitbucketgit_info.py b/plugins/modules/ibm_cd_toolchain_tool_bitbucketgit_info.py new file mode 100644 index 000000000..c7c363b4c --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_bitbucketgit_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_bitbucketgit_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_bitbucketgit + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_bitbucketgit' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_bitbucketgit' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_bitbucketgit', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_custom.py b/plugins/modules/ibm_cd_toolchain_tool_custom.py new file mode 100644 index 000000000..15200a100 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_custom.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_custom +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_custom + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_custom' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_custom' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + name: + description: + - Name of tool. + required: False + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'name', + 'parameters', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_custom', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_custom', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_custom_info.py b/plugins/modules/ibm_cd_toolchain_tool_custom_info.py new file mode 100644 index 000000000..5c94c2203 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_custom_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_custom_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_custom + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_custom' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_custom' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_custom', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_devopsinsights.py b/plugins/modules/ibm_cd_toolchain_tool_devopsinsights.py new file mode 100644 index 000000000..89a2609e8 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_devopsinsights.py @@ -0,0 +1,205 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_devopsinsights +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_devopsinsights + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_devopsinsights' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_devopsinsights' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'toolchain_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_devopsinsights', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_devopsinsights', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_devopsinsights_info.py b/plugins/modules/ibm_cd_toolchain_tool_devopsinsights_info.py new file mode 100644 index 000000000..b438fcfc6 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_devopsinsights_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_devopsinsights_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_devopsinsights + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_devopsinsights' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_devopsinsights' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_devopsinsights', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_githubconsolidated.py b/plugins/modules/ibm_cd_toolchain_tool_githubconsolidated.py new file mode 100644 index 000000000..9c1a86fb5 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_githubconsolidated.py @@ -0,0 +1,229 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_githubconsolidated +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_githubconsolidated + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_githubconsolidated' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_githubconsolidated' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + initialization: + description: + - (Required for new resource) + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), + ('initialization', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'toolchain_id', + 'parameters', + 'initialization', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + initialization=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_githubconsolidated', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_githubconsolidated', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_githubconsolidated_info.py b/plugins/modules/ibm_cd_toolchain_tool_githubconsolidated_info.py new file mode 100644 index 000000000..84d2dee34 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_githubconsolidated_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_githubconsolidated_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_githubconsolidated + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_githubconsolidated' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_githubconsolidated' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_githubconsolidated', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_githubintegrated.py b/plugins/modules/ibm_cd_toolchain_tool_githubintegrated.py new file mode 100644 index 000000000..e36b901f8 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_githubintegrated.py @@ -0,0 +1,229 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_githubintegrated +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_githubintegrated + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_githubintegrated' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_githubintegrated' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + initialization: + description: + - (Required for new resource) + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), + ('initialization', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'parameters', + 'initialization', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + initialization=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_githubintegrated', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_githubintegrated', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_githubintegrated_info.py b/plugins/modules/ibm_cd_toolchain_tool_githubintegrated_info.py new file mode 100644 index 000000000..8ddfee537 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_githubintegrated_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_githubintegrated_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_githubintegrated + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_githubintegrated' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_githubintegrated' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_githubintegrated', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_gitlab.py b/plugins/modules/ibm_cd_toolchain_tool_gitlab.py new file mode 100644 index 000000000..715405201 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_gitlab.py @@ -0,0 +1,229 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_gitlab +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_gitlab + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_gitlab' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_gitlab' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + initialization: + description: + - (Required for new resource) + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), + ('initialization', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'name', + 'toolchain_id', + 'initialization', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + initialization=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_gitlab', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_gitlab', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_gitlab_info.py b/plugins/modules/ibm_cd_toolchain_tool_gitlab_info.py new file mode 100644 index 000000000..29d6f5c27 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_gitlab_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_gitlab_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_gitlab + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_gitlab' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_gitlab' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_gitlab', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_hashicorpvault.py b/plugins/modules/ibm_cd_toolchain_tool_hashicorpvault.py new file mode 100644 index 000000000..dc38c8677 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_hashicorpvault.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_hashicorpvault +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_hashicorpvault + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_hashicorpvault' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_hashicorpvault' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'name', + 'toolchain_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_hashicorpvault', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_hashicorpvault', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_hashicorpvault_info.py b/plugins/modules/ibm_cd_toolchain_tool_hashicorpvault_info.py new file mode 100644 index 000000000..d005609b5 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_hashicorpvault_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_hashicorpvault_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_hashicorpvault + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_hashicorpvault' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_hashicorpvault' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_hashicorpvault', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_hostedgit.py b/plugins/modules/ibm_cd_toolchain_tool_hostedgit.py new file mode 100644 index 000000000..cfe0b0c4b --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_hostedgit.py @@ -0,0 +1,229 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_hostedgit +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_hostedgit + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_hostedgit' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_hostedgit' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + name: + description: + - Name of tool. + required: False + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + initialization: + description: + - (Required for new resource) + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), + ('initialization', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'name', + 'parameters', + 'initialization', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + initialization=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_hostedgit', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_hostedgit', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_hostedgit_info.py b/plugins/modules/ibm_cd_toolchain_tool_hostedgit_info.py new file mode 100644 index 000000000..b6aa84252 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_hostedgit_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_hostedgit_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_hostedgit + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_hostedgit' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_hostedgit' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_hostedgit', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_jenkins.py b/plugins/modules/ibm_cd_toolchain_tool_jenkins.py new file mode 100644 index 000000000..6fdc51fc8 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_jenkins.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_jenkins +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_jenkins + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_jenkins' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_jenkins' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'name', + 'toolchain_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_jenkins', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_jenkins', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_jenkins_info.py b/plugins/modules/ibm_cd_toolchain_tool_jenkins_info.py new file mode 100644 index 000000000..e5b5f991c --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_jenkins_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_jenkins_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_jenkins + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_jenkins' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_jenkins' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_jenkins', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_keyprotect.py b/plugins/modules/ibm_cd_toolchain_tool_keyprotect.py new file mode 100644 index 000000000..3eb7ed63a --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_keyprotect.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_keyprotect +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_keyprotect + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_keyprotect' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_keyprotect' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'toolchain_id', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + toolchain_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_keyprotect', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_keyprotect', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_keyprotect_info.py b/plugins/modules/ibm_cd_toolchain_tool_keyprotect_info.py new file mode 100644 index 000000000..1dce35585 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_keyprotect_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_keyprotect_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_keyprotect + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_keyprotect' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_keyprotect' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_keyprotect', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_nexus.py b/plugins/modules/ibm_cd_toolchain_tool_nexus.py new file mode 100644 index 000000000..94216e0e8 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_nexus.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_nexus +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_nexus + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_nexus' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_nexus' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'parameters', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_nexus', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_nexus', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_nexus_info.py b/plugins/modules/ibm_cd_toolchain_tool_nexus_info.py new file mode 100644 index 000000000..a970f7888 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_nexus_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_nexus_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_nexus + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_nexus' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_nexus' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_nexus', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_pagerduty.py b/plugins/modules/ibm_cd_toolchain_tool_pagerduty.py new file mode 100644 index 000000000..46688babe --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_pagerduty.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_pagerduty +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_pagerduty + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_pagerduty' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_pagerduty' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'toolchain_id', + 'parameters', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_pagerduty', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_pagerduty', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_pagerduty_info.py b/plugins/modules/ibm_cd_toolchain_tool_pagerduty_info.py new file mode 100644 index 000000000..18c6ad661 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_pagerduty_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_pagerduty_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_pagerduty + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_pagerduty' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_pagerduty' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_pagerduty', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_pipeline.py b/plugins/modules/ibm_cd_toolchain_tool_pipeline.py new file mode 100644 index 000000000..f4031d50d --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_pipeline.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_pipeline +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_pipeline + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_pipeline' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_pipeline' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'toolchain_id', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + toolchain_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_pipeline', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_pipeline', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_pipeline_info.py b/plugins/modules/ibm_cd_toolchain_tool_pipeline_info.py new file mode 100644 index 000000000..68ad460db --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_pipeline_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_pipeline_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_pipeline + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_pipeline' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_pipeline' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_pipeline', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_privateworker.py b/plugins/modules/ibm_cd_toolchain_tool_privateworker.py new file mode 100644 index 000000000..c68439a1b --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_privateworker.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_privateworker +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_privateworker + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_privateworker' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_privateworker' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + name: + description: + - Name of tool. + required: False + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'name', + 'parameters', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_privateworker', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_privateworker', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_privateworker_info.py b/plugins/modules/ibm_cd_toolchain_tool_privateworker_info.py new file mode 100644 index 000000000..d9d75cdf0 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_privateworker_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_privateworker_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_privateworker + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_privateworker' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_privateworker' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_privateworker', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_saucelabs.py b/plugins/modules/ibm_cd_toolchain_tool_saucelabs.py new file mode 100644 index 000000000..b72abb918 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_saucelabs.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_saucelabs +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_saucelabs + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_saucelabs' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_saucelabs' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'toolchain_id', + 'parameters', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_saucelabs', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_saucelabs', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_saucelabs_info.py b/plugins/modules/ibm_cd_toolchain_tool_saucelabs_info.py new file mode 100644 index 000000000..6dc5f2475 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_saucelabs_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_saucelabs_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_saucelabs + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_saucelabs' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_saucelabs' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_saucelabs', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_secretsmanager.py b/plugins/modules/ibm_cd_toolchain_tool_secretsmanager.py new file mode 100644 index 000000000..a78745976 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_secretsmanager.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_secretsmanager +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_secretsmanager + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_secretsmanager' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_secretsmanager' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'parameters', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_secretsmanager', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_secretsmanager', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_secretsmanager_info.py b/plugins/modules/ibm_cd_toolchain_tool_secretsmanager_info.py new file mode 100644 index 000000000..ae9edb183 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_secretsmanager_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_secretsmanager_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_secretsmanager + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_secretsmanager' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_secretsmanager' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_secretsmanager', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_securitycompliance.py b/plugins/modules/ibm_cd_toolchain_tool_securitycompliance.py new file mode 100644 index 000000000..028aafa63 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_securitycompliance.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_securitycompliance +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_securitycompliance + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_securitycompliance' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_securitycompliance' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'parameters', + 'name', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_securitycompliance', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_securitycompliance', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_securitycompliance_info.py b/plugins/modules/ibm_cd_toolchain_tool_securitycompliance_info.py new file mode 100644 index 000000000..594bd111c --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_securitycompliance_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_securitycompliance_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_securitycompliance + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_securitycompliance' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_securitycompliance' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_securitycompliance', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_slack.py b/plugins/modules/ibm_cd_toolchain_tool_slack.py new file mode 100644 index 000000000..0718b06ed --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_slack.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_slack +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_slack + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_slack' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_slack' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('parameters', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'toolchain_id', + 'parameters', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'toolchain_id', + 'tool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + parameters=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_slack', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_slack', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_slack_info.py b/plugins/modules/ibm_cd_toolchain_tool_slack_info.py new file mode 100644 index 000000000..43137be9f --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_slack_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_slack_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_slack + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_slack' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_slack' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('toolchain_id', 'str'), + ('tool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'toolchain_id', + 'tool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + toolchain_id=dict( + required=True, + type='str'), + tool_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_slack', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_sonarqube.py b/plugins/modules/ibm_cd_toolchain_tool_sonarqube.py new file mode 100644 index 000000000..282d0cc9d --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_sonarqube.py @@ -0,0 +1,217 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_sonarqube +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cd_toolchain_tool_sonarqube + +short_description: Configure IBM Cloud 'ibm_cd_toolchain_tool_sonarqube' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cd_toolchain_tool_sonarqube' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + parameters: + description: + - (Required for new resource) Parameters to be used to create the tool. + required: True + type: list + elements: dict + name: + description: + - Name of tool. + required: False + type: str + toolchain_id: + description: + - (Required for new resource) ID of the toolchain to bind tool to. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('parameters', 'list'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'parameters', + 'name', + 'toolchain_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'tool_id', + 'toolchain_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + parameters=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + toolchain_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_sonarqube', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_sonarqube', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cd_toolchain_tool_sonarqube_info.py b/plugins/modules/ibm_cd_toolchain_tool_sonarqube_info.py new file mode 100644 index 000000000..6fc692043 --- /dev/null +++ b/plugins/modules/ibm_cd_toolchain_tool_sonarqube_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cd_toolchain_tool_sonarqube_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cd_toolchain_tool_sonarqube + +short_description: Retrieve IBM Cloud 'ibm_cd_toolchain_tool_sonarqube' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cd_toolchain_tool_sonarqube' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + tool_id: + description: + - ID of the tool bound to the toolchain. + required: True + type: str + toolchain_id: + description: + - ID of the toolchain. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('tool_id', 'str'), + ('toolchain_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'tool_id', + 'toolchain_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + tool_id=dict( + required=True, + type='str'), + toolchain_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_cd_toolchain_tool_sonarqube', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_cdn.py b/plugins/modules/ibm_cdn.py index 23fdfed69..3ddf84023 100644 --- a/plugins/modules/ibm_cdn.py +++ b/plugins/modules/ibm_cdn.py @@ -18,58 +18,36 @@ - Create, update or destroy an IBM Cloud 'ibm_cdn' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - host_name: - description: - - (Required for new resource) Host name - required: True - type: str - origin_type: - description: - - Origin type info - required: False - type: str - default: HOST_SERVER - file_extension: - description: - - File extension info - required: False - type: str - certificate_type: + vendor_name: description: - - Certificate type + - Vendor name required: False type: str - protocol: + default: akamai + bucket_name: description: - - Protocol name + - Bucket name required: False type: str - default: HTTP http_port: description: - HTTP port number required: False type: int default: 80 - cache_key_query_rule: - description: - - query rule info - required: False - type: str - default: include-all - path: + performance_configuration: description: - - Path details + - performance configuration info required: False type: str - default: /* - origin_address: + default: General web delivery + host_name: description: - - (Required for new resource) origin address info + - (Required for new resource) Host name required: True type: str cname: @@ -82,35 +60,57 @@ - Header info required: False type: str - performance_configuration: + respect_headers: description: - - performance configuration info + - respect headers info + required: False + type: bool + default: True + path: + description: + - Path details required: False type: str - default: General web delivery - vendor_name: + default: /* + origin_type: description: - - Vendor name + - Origin type info required: False type: str - default: akamai - bucket_name: + default: HOST_SERVER + origin_address: description: - - Bucket name + - (Required for new resource) origin address info + required: True + type: str + file_extension: + description: + - File extension info + required: False + type: str + certificate_type: + description: + - Certificate type + required: False + type: str + protocol: + description: + - Protocol name required: False type: str + default: HTTP https_port: description: - HTTPS port number required: False type: int default: 443 - respect_headers: + cache_key_query_rule: description: - - respect headers info + - query rule info required: False - type: bool - default: True + type: str + default: include-all id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -163,22 +163,22 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'vendor_name', + 'bucket_name', + 'http_port', + 'performance_configuration', 'host_name', + 'cname', + 'header', + 'respect_headers', + 'path', 'origin_type', + 'origin_address', 'file_extension', 'certificate_type', 'protocol', - 'http_port', - 'cache_key_query_rule', - 'path', - 'origin_address', - 'cname', - 'header', - 'performance_configuration', - 'vendor_name', - 'bucket_name', 'https_port', - 'respect_headers', + 'cache_key_query_rule', ] # Params for Data source @@ -195,54 +195,54 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - host_name=dict( + vendor_name=dict( required=False, type='str'), - origin_type=dict( + bucket_name=dict( required=False, type='str'), - file_extension=dict( + http_port=dict( required=False, - type='str'), - certificate_type=dict( + type='int'), + performance_configuration=dict( required=False, type='str'), - protocol=dict( + host_name=dict( required=False, type='str'), - http_port=dict( - required=False, - type='int'), - cache_key_query_rule=dict( + cname=dict( required=False, type='str'), - path=dict( + header=dict( required=False, type='str'), - origin_address=dict( + respect_headers=dict( + required=False, + type='bool'), + path=dict( required=False, type='str'), - cname=dict( + origin_type=dict( required=False, type='str'), - header=dict( + origin_address=dict( required=False, type='str'), - performance_configuration=dict( + file_extension=dict( required=False, type='str'), - vendor_name=dict( + certificate_type=dict( required=False, type='str'), - bucket_name=dict( + protocol=dict( required=False, type='str'), https_port=dict( required=False, type='int'), - respect_headers=dict( + cache_key_query_rule=dict( required=False, - type='bool'), + type='str'), id=dict( required=False, type='str'), @@ -308,7 +308,7 @@ def run_module(): resource_type='ibm_cdn', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_certificate_manager_certificate_info.py b/plugins/modules/ibm_certificate_manager_certificate_info.py index efa77d06f..17a766d2d 100644 --- a/plugins/modules/ibm_certificate_manager_certificate_info.py +++ b/plugins/modules/ibm_certificate_manager_certificate_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_certificate_manager_certificate' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_certificate_manager_certificate', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_certificate_manager_certificates_info.py b/plugins/modules/ibm_certificate_manager_certificates_info.py index adf919a50..0778a918f 100644 --- a/plugins/modules/ibm_certificate_manager_certificates_info.py +++ b/plugins/modules/ibm_certificate_manager_certificates_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_certificate_manager_certificates' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_certificate_manager_certificates', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_certificate_manager_import.py b/plugins/modules/ibm_certificate_manager_import.py index a498dbbff..154dec2c2 100644 --- a/plugins/modules/ibm_certificate_manager_import.py +++ b/plugins/modules/ibm_certificate_manager_import.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_certificate_manager_import' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,21 +27,21 @@ - (Required for new resource) Name of the instance required: True type: str - description: + data: description: - - Description of the certificate instance - required: False - type: str + - (Required for new resource) certificate data + required: True + type: dict certificate_manager_instance_id: description: - (Required for new resource) Instance ID of the certificate manager resource required: True type: str - data: + description: description: - - (Required for new resource) certificate data - required: True - type: dict + - Description of the certificate instance + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,16 +89,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('name', 'str'), - ('certificate_manager_instance_id', 'str'), ('data', 'dict'), + ('certificate_manager_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'description', - 'certificate_manager_instance_id', 'data', + 'certificate_manager_instance_id', + 'description', ] # Params for Data source @@ -118,15 +118,15 @@ name=dict( required=False, type='str'), - description=dict( + data=dict( required=False, - type='str'), + type='dict'), certificate_manager_instance_id=dict( required=False, type='str'), - data=dict( + description=dict( required=False, - type='dict'), + type='str'), id=dict( required=False, type='str'), @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_certificate_manager_import', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_certificate_manager_order.py b/plugins/modules/ibm_certificate_manager_order.py index 02175ce97..a4d7efbab 100644 --- a/plugins/modules/ibm_certificate_manager_order.py +++ b/plugins/modules/ibm_certificate_manager_order.py @@ -18,66 +18,66 @@ - Create, update or destroy an IBM Cloud 'ibm_certificate_manager_order' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - auto_renew_enabled: - description: - - None - required: False - type: bool - default: False - name: + certificate_manager_instance_id: description: - - (Required for new resource) Certificate name + - (Required for new resource) Certificate manager instance ID required: True type: str - renew_certificate: - description: - - Invokes renew functionality - required: False - type: bool - default: False description: description: - Certicate description required: False type: str - dns_provider_instance_crn: + domain_validation_method: description: - - DNS provider instance CRN + - Domain validation methods required: False type: str + default: dns-01 key_algorithm: description: - Keyalgorithm info required: False type: str default: rsaEncryption 2048 bit - certificate_manager_instance_id: + domains: description: - - (Required for new resource) Certificate manager instance ID + - (Required for new resource) List of domain names required: True - type: str + type: list + elements: str + renew_certificate: + description: + - Invokes renew functionality + required: False + type: bool + default: False + auto_renew_enabled: + description: + - None + required: False + type: bool + default: False rotate_keys: description: - Keys are sorated if set to true required: False type: bool default: False - domains: + name: description: - - (Required for new resource) List of domain names + - (Required for new resource) Certificate name required: True - type: list - elements: str - domain_validation_method: + type: str + dns_provider_instance_crn: description: - - Domain validation methods + - DNS provider instance CRN required: False type: str - default: dns-01 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -124,23 +124,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('certificate_manager_instance_id', 'str'), ('domains', 'list'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'auto_renew_enabled', - 'name', - 'renew_certificate', + 'certificate_manager_instance_id', 'description', - 'dns_provider_instance_crn', + 'domain_validation_method', 'key_algorithm', - 'certificate_manager_instance_id', - 'rotate_keys', 'domains', - 'domain_validation_method', + 'renew_certificate', + 'auto_renew_enabled', + 'rotate_keys', + 'name', + 'dns_provider_instance_crn', ] # Params for Data source @@ -157,35 +157,35 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - auto_renew_enabled=dict( - required=False, - type='bool'), - name=dict( + certificate_manager_instance_id=dict( required=False, type='str'), - renew_certificate=dict( - required=False, - type='bool'), description=dict( required=False, type='str'), - dns_provider_instance_crn=dict( + domain_validation_method=dict( required=False, type='str'), key_algorithm=dict( required=False, type='str'), - certificate_manager_instance_id=dict( + domains=dict( required=False, - type='str'), + elements='', + type='list'), + renew_certificate=dict( + required=False, + type='bool'), + auto_renew_enabled=dict( + required=False, + type='bool'), rotate_keys=dict( required=False, type='bool'), - domains=dict( + name=dict( required=False, - elements='', - type='list'), - domain_validation_method=dict( + type='str'), + dns_provider_instance_crn=dict( required=False, type='str'), id=dict( @@ -253,7 +253,7 @@ def run_module(): resource_type='ibm_certificate_manager_order', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis.py b/plugins/modules/ibm_cis.py index 356bfc33b..5765650df 100644 --- a/plugins/modules/ibm_cis.py +++ b/plugins/modules/ibm_cis.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,12 +27,6 @@ - The resource group id required: False type: str - tags: - description: - - None - required: False - type: list - elements: str name: description: - (Required for new resource) A name for the resource instance @@ -43,6 +37,12 @@ - (Required for new resource) The plan type of the service required: True type: str + tags: + description: + - None + required: False + type: list + elements: str location: description: - (Required for new resource) The location where the instance available @@ -107,9 +107,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'resource_group_id', - 'tags', 'name', 'plan', + 'tags', 'location', 'parameters', ] @@ -120,8 +120,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'resource_group_id', 'name', + 'resource_group_id', ] TL_CONFLICTS_MAP = { @@ -134,16 +134,16 @@ resource_group_id=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), name=dict( required=False, type='str'), plan=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), location=dict( required=False, type='str'), @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_cis', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_cis', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cis_alert.py b/plugins/modules/ibm_cis_alert.py index b043bc34d..114c3a232 100644 --- a/plugins/modules/ibm_cis_alert.py +++ b/plugins/modules/ibm_cis_alert.py @@ -18,20 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_alert' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - description: - description: - - Policy Description - required: False - type: str - enabled: - description: - - (Required for new resource) Is the alert policy active - required: True - type: bool conditions: description: - Conditions based on filter type @@ -42,17 +32,16 @@ - (Required for new resource) CIS instance crn required: True type: str + enabled: + description: + - (Required for new resource) Is the alert policy active + required: True + type: bool alert_type: description: - (Required for new resource) Condition for the alert required: True type: str - mechanisms: - description: - - (Required for new resource) Delivery mechanisms for the alert, can include an email, a webhook, or both. - required: True - type: list - elements: dict filters: description: - Filters based on filter type @@ -63,6 +52,17 @@ - (Required for new resource) Policy name required: True type: str + description: + description: + - Policy Description + required: False + type: str + mechanisms: + description: + - (Required for new resource) Delivery mechanisms for the alert, can include an email, a webhook, or both. + required: True + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -109,23 +109,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('enabled', 'bool'), ('cis_id', 'str'), + ('enabled', 'bool'), ('alert_type', 'str'), - ('mechanisms', 'list'), ('name', 'str'), + ('mechanisms', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'enabled', 'conditions', 'cis_id', + 'enabled', 'alert_type', - 'mechanisms', 'filters', 'name', + 'description', + 'mechanisms', ] # Params for Data source @@ -142,31 +142,31 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - description=dict( - required=False, - type='str'), - enabled=dict( - required=False, - type='bool'), conditions=dict( required=False, type='str'), cis_id=dict( required=False, type='str'), + enabled=dict( + required=False, + type='bool'), alert_type=dict( required=False, type='str'), - mechanisms=dict( - required=False, - elements='', - type='list'), filters=dict( required=False, type='str'), name=dict( required=False, type='str'), + description=dict( + required=False, + type='str'), + mechanisms=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -232,7 +232,7 @@ def run_module(): resource_type='ibm_cis_alert', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_alerts_info.py b/plugins/modules/ibm_cis_alerts_info.py index a8472f5b4..609efef20 100644 --- a/plugins/modules/ibm_cis_alerts_info.py +++ b/plugins/modules/ibm_cis_alerts_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_alerts' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cis_alerts', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_cache_settings.py b/plugins/modules/ibm_cis_cache_settings.py index 3514bda63..1cdf17574 100644 --- a/plugins/modules/ibm_cis_cache_settings.py +++ b/plugins/modules/ibm_cis_cache_settings.py @@ -18,15 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_cache_settings' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - domain_id: + purge_by_tags: description: - - (Required for new resource) Associated CIS domain - required: True + - Purge by tags + required: False + type: list + elements: str + purge_by_hosts: + description: + - Purge by hosts + required: False + type: list + elements: str + serve_stale_content: + description: + - Serve Stale Content + required: False type: str + default: on browser_expiration: description: - Browser Expiration setting @@ -47,15 +60,9 @@ - Purge all setting required: False type: bool - purge_by_tags: - description: - - Purge by tags - required: False - type: list - elements: str - purge_by_hosts: + purge_by_urls: description: - - Purge by hosts + - Purge by URLs required: False type: list elements: str @@ -64,23 +71,16 @@ - (Required for new resource) CIS instance crn required: True type: str - caching_level: + domain_id: description: - - Cache level setting - required: False + - (Required for new resource) Associated CIS domain + required: True type: str - serve_stale_content: + caching_level: description: - - Serve Stale Content + - Cache level setting required: False type: str - default: on - purge_by_urls: - description: - - Purge by URLs - required: False - type: list - elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -127,40 +127,40 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('domain_id', 'str'), ('cis_id', 'str'), + ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'domain_id', + 'purge_by_tags', + 'purge_by_hosts', + 'serve_stale_content', 'browser_expiration', 'development_mode', 'query_string_sort', 'purge_all', - 'purge_by_tags', - 'purge_by_hosts', + 'purge_by_urls', 'cis_id', + 'domain_id', 'caching_level', - 'serve_stale_content', - 'purge_by_urls', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('domain_id', 'str'), ('cis_id', 'str'), + ('domain_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'domain_id', 'cis_id', + 'domain_id', ] TL_CONFLICTS_MAP = { - 'purge_all': ['purge_by_urls', 'purge_by_tags', 'purge_by_hosts'], 'purge_by_tags': ['purge_all', 'purge_by_urls', 'purge_by_hosts'], 'purge_by_hosts': ['purge_all', 'purge_by_urls', 'purge_by_tags'], + 'purge_all': ['purge_by_urls', 'purge_by_tags', 'purge_by_hosts'], 'purge_by_urls': ['purge_all', 'purge_by_tags', 'purge_by_hosts'], } @@ -168,7 +168,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - domain_id=dict( + purge_by_tags=dict( + required=False, + elements='', + type='list'), + purge_by_hosts=dict( + required=False, + elements='', + type='list'), + serve_stale_content=dict( required=False, type='str'), browser_expiration=dict( @@ -183,27 +191,19 @@ purge_all=dict( required=False, type='bool'), - purge_by_tags=dict( - required=False, - elements='', - type='list'), - purge_by_hosts=dict( + purge_by_urls=dict( required=False, elements='', type='list'), cis_id=dict( required=False, type='str'), - caching_level=dict( + domain_id=dict( required=False, type='str'), - serve_stale_content=dict( + caching_level=dict( required=False, type='str'), - purge_by_urls=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -269,7 +269,7 @@ def run_module(): resource_type='ibm_cis_cache_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -278,7 +278,7 @@ def run_module(): resource_type='ibm_cis_cache_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cis_cache_settings_info.py b/plugins/modules/ibm_cis_cache_settings_info.py index dd679b561..f0c4b69ea 100644 --- a/plugins/modules/ibm_cis_cache_settings_info.py +++ b/plugins/modules/ibm_cis_cache_settings_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_cis_cache_settings' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - domain_id: + cis_id: description: - - Associated CIS domain + - CIS instance crn required: True type: str - cis_id: + domain_id: description: - - CIS instance crn + - Associated CIS domain required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('domain_id', 'str'), ('cis_id', 'str'), + ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'domain_id', 'cis_id', + 'domain_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - domain_id=dict( + cis_id=dict( required=True, type='str'), - cis_id=dict( + domain_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_cache_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_certificate_order.py b/plugins/modules/ibm_cis_certificate_order.py index 683037dee..b1f5790ce 100644 --- a/plugins/modules/ibm_cis_certificate_order.py +++ b/plugins/modules/ibm_cis_certificate_order.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_certificate_order' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + cis_id: + description: + - (Required for new resource) CIS object id or CRN + required: True + type: str + domain_id: + description: + - (Required for new resource) Associated CIS domain + required: True + type: str type: description: - certificate type @@ -34,16 +44,6 @@ required: True type: list elements: str - cis_id: - description: - - (Required for new resource) CIS object id or CRN - required: True - type: str - domain_id: - description: - - (Required for new resource) Associated CIS domain - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,17 +90,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('hosts', 'list'), ('cis_id', 'str'), ('domain_id', 'str'), + ('hosts', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'type', - 'hosts', 'cis_id', 'domain_id', + 'type', + 'hosts', ] # Params for Data source @@ -117,6 +117,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + cis_id=dict( + required=False, + type='str'), + domain_id=dict( + required=False, + type='str'), type=dict( required=False, type='str'), @@ -124,12 +130,6 @@ required=False, elements='', type='list'), - cis_id=dict( - required=False, - type='str'), - domain_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_cis_certificate_order', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_certificate_upload.py b/plugins/modules/ibm_cis_certificate_upload.py index 50e58ef21..b7a880b15 100644 --- a/plugins/modules/ibm_cis_certificate_upload.py +++ b/plugins/modules/ibm_cis_certificate_upload.py @@ -18,18 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_certificate_upload' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - private_key: - description: - - (Required for new resource) Certificate private key - required: True - type: str - certificate: + cis_id: description: - - (Required for new resource) Certificate key + - (Required for new resource) CIS instance crn required: True type: str priority: @@ -37,14 +32,14 @@ - Certificate priority required: False type: int - cis_id: + certificate: description: - - (Required for new resource) CIS instance crn + - (Required for new resource) Certificate key required: True type: str - domain_id: + private_key: description: - - (Required for new resource) Associated CIS domain + - (Required for new resource) Certificate private key required: True type: str bundle_method: @@ -53,6 +48,11 @@ required: False type: str default: ubiquitous + domain_id: + description: + - (Required for new resource) Associated CIS domain + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -99,20 +99,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('private_key', 'str'), - ('certificate', 'str'), ('cis_id', 'str'), + ('certificate', 'str'), + ('private_key', 'str'), ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'private_key', - 'certificate', - 'priority', 'cis_id', - 'domain_id', + 'priority', + 'certificate', + 'private_key', 'bundle_method', + 'domain_id', ] # Params for Data source @@ -129,24 +129,24 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - private_key=dict( - required=False, - type='str'), - certificate=dict( + cis_id=dict( required=False, type='str'), priority=dict( required=False, type='int'), - cis_id=dict( + certificate=dict( required=False, type='str'), - domain_id=dict( + private_key=dict( required=False, type='str'), bundle_method=dict( required=False, type='str'), + domain_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -212,7 +212,7 @@ def run_module(): resource_type='ibm_cis_certificate_upload', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_certificates_info.py b/plugins/modules/ibm_cis_certificates_info.py index a2780842a..cff248d65 100644 --- a/plugins/modules/ibm_cis_certificates_info.py +++ b/plugins/modules/ibm_cis_certificates_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_certificates' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_certificates', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_custom_certificates_info.py b/plugins/modules/ibm_cis_custom_certificates_info.py index e594f9e72..f6c9a2fc0 100644 --- a/plugins/modules/ibm_cis_custom_certificates_info.py +++ b/plugins/modules/ibm_cis_custom_certificates_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_custom_certificates' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_custom_certificates', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_custom_page.py b/plugins/modules/ibm_cis_custom_page.py index 53cbd3a2b..99a3c5d1a 100644 --- a/plugins/modules/ibm_cis_custom_page.py +++ b/plugins/modules/ibm_cis_custom_page.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_custom_page' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + cis_id: + description: + - (Required for new resource) CIS instance crn + required: True + type: str domain_id: description: - (Required for new resource) Associated CIS domain @@ -32,11 +37,6 @@ - (Required for new resource) Custom page identifier required: True type: str - cis_id: - description: - - (Required for new resource) CIS instance crn - required: True - type: str url: description: - (Required for new resource) Custom page url @@ -88,17 +88,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('cis_id', 'str'), ('domain_id', 'str'), ('page_id', 'str'), - ('cis_id', 'str'), ('url', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cis_id', 'domain_id', 'page_id', - 'cis_id', 'url', ] @@ -116,13 +116,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - domain_id=dict( + cis_id=dict( required=False, type='str'), - page_id=dict( + domain_id=dict( required=False, type='str'), - cis_id=dict( + page_id=dict( required=False, type='str'), url=dict( @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_cis_custom_page', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_custom_pages_info.py b/plugins/modules/ibm_cis_custom_pages_info.py index c18a44b1f..fdfcb9da3 100644 --- a/plugins/modules/ibm_cis_custom_pages_info.py +++ b/plugins/modules/ibm_cis_custom_pages_info.py @@ -17,16 +17,16 @@ description: - Retrieve an IBM Cloud 'ibm_cis_custom_pages' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cis_id: + domain_id: description: - None required: True type: str - domain_id: + cis_id: description: - None required: True @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cis_id', 'str'), ('domain_id', 'str'), + ('cis_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cis_id', 'domain_id', + 'cis_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cis_id=dict( + domain_id=dict( required=True, type='str'), - domain_id=dict( + cis_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_custom_pages', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_dns_record.py b/plugins/modules/ibm_cis_dns_record.py index f58c8913f..3739019e5 100644 --- a/plugins/modules/ibm_cis_dns_record.py +++ b/plugins/modules/ibm_cis_dns_record.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_dns_record' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,21 +27,11 @@ - (Required for new resource) CIS object id or CRN required: True type: str - name: - description: - - DNS record name - required: False - type: str content: description: - DNS record content required: False type: str - priority: - description: - - Priority Value - required: False - type: int proxied: description: - Boolean value true if proxied else flase @@ -53,6 +43,21 @@ - (Required for new resource) Associated CIS domain required: True type: str + data: + description: + - None + required: False + type: dict + priority: + description: + - Priority Value + required: False + type: int + name: + description: + - DNS record name + required: False + type: str type: description: - (Required for new resource) Record type @@ -64,11 +69,6 @@ required: False type: int default: 1 - data: - description: - - None - required: False - type: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -123,14 +123,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'cis_id', - 'name', 'content', - 'priority', 'proxied', 'domain_id', + 'data', + 'priority', + 'name', 'type', 'ttl', - 'data', ] # Params for Data source @@ -152,30 +152,30 @@ cis_id=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), content=dict( required=False, type='str'), - priority=dict( - required=False, - type='int'), proxied=dict( required=False, type='bool'), domain_id=dict( required=False, type='str'), + data=dict( + required=False, + type='dict'), + priority=dict( + required=False, + type='int'), + name=dict( + required=False, + type='str'), type=dict( required=False, type='str'), ttl=dict( required=False, type='int'), - data=dict( - required=False, - type='dict'), id=dict( required=False, type='str'), @@ -241,7 +241,7 @@ def run_module(): resource_type='ibm_cis_dns_record', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_dns_records_import.py b/plugins/modules/ibm_cis_dns_records_import.py index 2d7bbb5e9..af1a0ce40 100644 --- a/plugins/modules/ibm_cis_dns_records_import.py +++ b/plugins/modules/ibm_cis_dns_records_import.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_dns_records_import' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + file: + description: + - (Required for new resource) File to import + required: True + type: str cis_id: description: - (Required for new resource) CIS instance crn @@ -32,11 +37,6 @@ - (Required for new resource) Associated CIS domain required: True type: str - file: - description: - - (Required for new resource) File to import - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,16 +83,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('file', 'str'), ('cis_id', 'str'), ('domain_id', 'str'), - ('file', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'file', 'cis_id', 'domain_id', - 'file', ] # Params for Data source @@ -109,13 +109,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cis_id=dict( + file=dict( required=False, type='str'), - domain_id=dict( + cis_id=dict( required=False, type='str'), - file=dict( + domain_id=dict( required=False, type='str'), id=dict( @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_cis_dns_records_import', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_dns_records_info.py b/plugins/modules/ibm_cis_dns_records_info.py index 1b51960ce..72f09654d 100644 --- a/plugins/modules/ibm_cis_dns_records_info.py +++ b/plugins/modules/ibm_cis_dns_records_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_dns_records' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_cis_dns_records', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_domain.py b/plugins/modules/ibm_cis_domain.py index 6d81fa782..48958441e 100644 --- a/plugins/modules/ibm_cis_domain.py +++ b/plugins/modules/ibm_cis_domain.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_domain' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -177,7 +177,7 @@ def run_module(): resource_type='ibm_cis_domain', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_cis_domain', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cis_domain_info.py b/plugins/modules/ibm_cis_domain_info.py index f499a2601..3734dc758 100644 --- a/plugins/modules/ibm_cis_domain_info.py +++ b/plugins/modules/ibm_cis_domain_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_domain' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_domain', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_domain_settings.py b/plugins/modules/ibm_cis_domain_settings.py index 828e7f45c..7603fa58e 100644 --- a/plugins/modules/ibm_cis_domain_settings.py +++ b/plugins/modules/ibm_cis_domain_settings.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_domain_settings' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - server_side_exclude: + tls_client_auth: description: - - server_side_exclude setting + - tls_client_auth setting required: False type: str true_client_ip_header: @@ -32,102 +32,96 @@ - true_client_ip_header setting required: False type: str - websockets: + dnssec: description: - - websockets setting + - DNS Sec setting required: False type: str - waf: + cname_flattening: description: - - WAF setting + - cname_flattening setting required: False type: str - cname_flattening: + ip_geolocation: description: - - cname_flattening setting + - ip_geolocation setting required: False type: str - ipv6: + browser_check: description: - - ipv6 setting + - browser_check setting required: False type: str - hotlink_protection: + origin_error_page_pass_thru: description: - - hotlink_protection setting + - origin_error_page_pass_thru setting required: False type: str - ip_geolocation: + script_load_optimization: description: - - ip_geolocation setting + - script_load_optimization setting required: False type: str - domain_id: + max_upload: description: - - (Required for new resource) Associated CIS domain + - Maximum upload + required: False + type: int + cis_id: + description: + - (Required for new resource) CIS instance crn required: True type: str - dnssec: + domain_id: description: - - DNS Sec setting - required: False + - (Required for new resource) Associated CIS domain + required: True type: str - http2: + min_tls_version: description: - - http2 setting + - Minimum version of TLS required required: False type: str - brotli: + default: 1.1 + opportunistic_encryption: description: - - brotli setting + - opportunistic_encryption setting required: False type: str - mobile_redirect: + cipher: description: - - None + - Cipher settings required: False type: list - elements: dict - always_use_https: + elements: str + waf: description: - - always_use_https setting + - WAF setting required: False type: str - tls_client_auth: + ipv6: description: - - tls_client_auth setting + - ipv6 setting required: False type: str - minify: - description: - - Minify setting - required: False - type: list - elements: dict - security_header: - description: - - Security Header Setting - required: False - type: list - elements: dict - image_size_optimization: + brotli: description: - - image_size_optimization setting + - brotli setting required: False type: str - pseudo_ipv4: + server_side_exclude: description: - - pseudo_ipv4 setting + - server_side_exclude setting required: False type: str - prefetch_preload: + automatic_https_rewrites: description: - - prefetch_preload setting + - automatic_https_rewrites setting required: False type: str - opportunistic_encryption: + http2: description: - - opportunistic_encryption setting + - http2 setting required: False type: str challenge_ttl: @@ -135,63 +129,69 @@ - Challenge TTL setting required: False type: int - automatic_https_rewrites: + always_use_https: description: - - automatic_https_rewrites setting + - always_use_https setting required: False type: str - response_buffering: + image_size_optimization: description: - - response_buffering setting + - image_size_optimization setting required: False type: str - script_load_optimization: + response_buffering: description: - - script_load_optimization setting + - response_buffering setting required: False type: str - max_upload: + mobile_redirect: description: - - Maximum upload + - None required: False - type: int - cis_id: - description: - - (Required for new resource) CIS instance crn - required: True - type: str + type: list + elements: dict ssl: description: - SSL/TLS setting required: False type: str - min_tls_version: + hotlink_protection: description: - - Minimum version of TLS required + - hotlink_protection setting required: False type: str - default: 1.1 - origin_error_page_pass_thru: + security_header: description: - - origin_error_page_pass_thru setting + - Security Header Setting + required: False + type: list + elements: dict + image_load_optimization: + description: + - image_load_optimization setting required: False type: str - browser_check: + pseudo_ipv4: description: - - browser_check setting + - pseudo_ipv4 setting required: False type: str - image_load_optimization: + prefetch_preload: description: - - image_load_optimization setting + - prefetch_preload setting required: False type: str - cipher: + minify: description: - - Cipher settings + - Minify setting required: False type: list - elements: str + elements: dict + websockets: + description: + - websockets setting + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -238,45 +238,45 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('domain_id', 'str'), ('cis_id', 'str'), + ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'server_side_exclude', + 'tls_client_auth', 'true_client_ip_header', - 'websockets', - 'waf', + 'dnssec', 'cname_flattening', - 'ipv6', - 'hotlink_protection', 'ip_geolocation', + 'browser_check', + 'origin_error_page_pass_thru', + 'script_load_optimization', + 'max_upload', + 'cis_id', 'domain_id', - 'dnssec', - 'http2', + 'min_tls_version', + 'opportunistic_encryption', + 'cipher', + 'waf', + 'ipv6', 'brotli', - 'mobile_redirect', + 'server_side_exclude', + 'automatic_https_rewrites', + 'http2', + 'challenge_ttl', 'always_use_https', - 'tls_client_auth', - 'minify', - 'security_header', 'image_size_optimization', - 'pseudo_ipv4', - 'prefetch_preload', - 'opportunistic_encryption', - 'challenge_ttl', - 'automatic_https_rewrites', 'response_buffering', - 'script_load_optimization', - 'max_upload', - 'cis_id', + 'mobile_redirect', 'ssl', - 'min_tls_version', - 'origin_error_page_pass_thru', - 'browser_check', + 'hotlink_protection', + 'security_header', 'image_load_optimization', - 'cipher', + 'pseudo_ipv4', + 'prefetch_preload', + 'minify', + 'websockets', ] # Params for Data source @@ -293,109 +293,109 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - server_side_exclude=dict( + tls_client_auth=dict( required=False, type='str'), true_client_ip_header=dict( required=False, type='str'), - websockets=dict( + dnssec=dict( required=False, type='str'), - waf=dict( + cname_flattening=dict( required=False, type='str'), - cname_flattening=dict( + ip_geolocation=dict( required=False, type='str'), - ipv6=dict( + browser_check=dict( required=False, type='str'), - hotlink_protection=dict( + origin_error_page_pass_thru=dict( required=False, type='str'), - ip_geolocation=dict( + script_load_optimization=dict( required=False, type='str'), - domain_id=dict( + max_upload=dict( + required=False, + type='int'), + cis_id=dict( required=False, type='str'), - dnssec=dict( + domain_id=dict( required=False, type='str'), - http2=dict( + min_tls_version=dict( required=False, type='str'), - brotli=dict( + opportunistic_encryption=dict( required=False, type='str'), - mobile_redirect=dict( + cipher=dict( required=False, elements='', type='list'), - always_use_https=dict( + waf=dict( required=False, type='str'), - tls_client_auth=dict( + ipv6=dict( required=False, type='str'), - minify=dict( - required=False, - elements='', - type='list'), - security_header=dict( - required=False, - elements='', - type='list'), - image_size_optimization=dict( + brotli=dict( required=False, type='str'), - pseudo_ipv4=dict( + server_side_exclude=dict( required=False, type='str'), - prefetch_preload=dict( + automatic_https_rewrites=dict( required=False, type='str'), - opportunistic_encryption=dict( + http2=dict( required=False, type='str'), challenge_ttl=dict( required=False, type='int'), - automatic_https_rewrites=dict( + always_use_https=dict( required=False, type='str'), - response_buffering=dict( + image_size_optimization=dict( required=False, type='str'), - script_load_optimization=dict( + response_buffering=dict( required=False, type='str'), - max_upload=dict( - required=False, - type='int'), - cis_id=dict( + mobile_redirect=dict( required=False, - type='str'), + elements='', + type='list'), ssl=dict( required=False, type='str'), - min_tls_version=dict( + hotlink_protection=dict( required=False, type='str'), - origin_error_page_pass_thru=dict( + security_header=dict( + required=False, + elements='', + type='list'), + image_load_optimization=dict( required=False, type='str'), - browser_check=dict( + pseudo_ipv4=dict( required=False, type='str'), - image_load_optimization=dict( + prefetch_preload=dict( required=False, type='str'), - cipher=dict( + minify=dict( required=False, elements='', type='list'), + websockets=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -461,7 +461,7 @@ def run_module(): resource_type='ibm_cis_domain_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_edge_functions_action.py b/plugins/modules/ibm_cis_edge_functions_action.py index c9a465707..6951f7f3e 100644 --- a/plugins/modules/ibm_cis_edge_functions_action.py +++ b/plugins/modules/ibm_cis_edge_functions_action.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_edge_functions_action' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_cis_edge_functions_action', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_edge_functions_actions_info.py b/plugins/modules/ibm_cis_edge_functions_actions_info.py index b1eb979d5..aa8b4059c 100644 --- a/plugins/modules/ibm_cis_edge_functions_actions_info.py +++ b/plugins/modules/ibm_cis_edge_functions_actions_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_cis_edge_functions_actions' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - domain_id: + cis_id: description: - - CIS Domain ID + - CIS Intance CRN required: True type: str - cis_id: + domain_id: description: - - CIS Intance CRN + - CIS Domain ID required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('domain_id', 'str'), ('cis_id', 'str'), + ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'domain_id', 'cis_id', + 'domain_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - domain_id=dict( + cis_id=dict( required=True, type='str'), - cis_id=dict( + domain_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_edge_functions_actions', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_edge_functions_trigger.py b/plugins/modules/ibm_cis_edge_functions_trigger.py index 973e1bfa9..1d975a8b1 100644 --- a/plugins/modules/ibm_cis_edge_functions_trigger.py +++ b/plugins/modules/ibm_cis_edge_functions_trigger.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_edge_functions_trigger' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + domain_id: + description: + - (Required for new resource) CIS Domain ID + required: True + type: str pattern_url: description: - (Required for new resource) Edge function trigger pattern @@ -37,11 +42,6 @@ - (Required for new resource) CIS Intance CRN required: True type: str - domain_id: - description: - - (Required for new resource) CIS Domain ID - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -88,17 +88,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('domain_id', 'str'), ('pattern_url', 'str'), ('cis_id', 'str'), - ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'domain_id', 'pattern_url', 'action_name', 'cis_id', - 'domain_id', ] # Params for Data source @@ -115,6 +115,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + domain_id=dict( + required=False, + type='str'), pattern_url=dict( required=False, type='str'), @@ -124,9 +127,6 @@ cis_id=dict( required=False, type='str'), - domain_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_cis_edge_functions_trigger', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_edge_functions_triggers_info.py b/plugins/modules/ibm_cis_edge_functions_triggers_info.py index 45067e6fa..1082bcc9c 100644 --- a/plugins/modules/ibm_cis_edge_functions_triggers_info.py +++ b/plugins/modules/ibm_cis_edge_functions_triggers_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_edge_functions_triggers' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_edge_functions_triggers', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_filter.py b/plugins/modules/ibm_cis_filter.py index 5c4a71720..589e666b2 100644 --- a/plugins/modules/ibm_cis_filter.py +++ b/plugins/modules/ibm_cis_filter.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_filter' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -201,7 +201,7 @@ def run_module(): resource_type='ibm_cis_filter', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_filters_info.py b/plugins/modules/ibm_cis_filters_info.py index 935e59f03..88f523232 100644 --- a/plugins/modules/ibm_cis_filters_info.py +++ b/plugins/modules/ibm_cis_filters_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_filters' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_filters', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_firewall.py b/plugins/modules/ibm_cis_firewall.py index 248fb029a..0d1ecb443 100644 --- a/plugins/modules/ibm_cis_firewall.py +++ b/plugins/modules/ibm_cis_firewall.py @@ -18,22 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_firewall' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - access_rule: - description: - - Access Rule Data - required: False - type: list - elements: dict - ua_rule: - description: - - User Agent Rule Data - required: False - type: list - elements: dict cis_id: description: - (Required for new resource) CIS object id @@ -55,6 +43,18 @@ required: False type: list elements: dict + access_rule: + description: + - Access Rule Data + required: False + type: list + elements: dict + ua_rule: + description: + - User Agent Rule Data + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -108,12 +108,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'access_rule', - 'ua_rule', 'cis_id', 'domain_id', 'firewall_type', 'lockdown', + 'access_rule', + 'ua_rule', ] # Params for Data source @@ -136,14 +136,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - access_rule=dict( - required=False, - elements='', - type='list'), - ua_rule=dict( - required=False, - elements='', - type='list'), cis_id=dict( required=False, type='str'), @@ -157,6 +149,14 @@ required=False, elements='', type='list'), + access_rule=dict( + required=False, + elements='', + type='list'), + ua_rule=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -222,7 +222,7 @@ def run_module(): resource_type='ibm_cis_firewall', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -231,7 +231,7 @@ def run_module(): resource_type='ibm_cis_firewall', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cis_firewall_info.py b/plugins/modules/ibm_cis_firewall_info.py index d12075666..539b8db89 100644 --- a/plugins/modules/ibm_cis_firewall_info.py +++ b/plugins/modules/ibm_cis_firewall_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_firewall' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_cis_firewall', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_firewall_rule.py b/plugins/modules/ibm_cis_firewall_rule.py index d57cba4f6..49dd21efd 100644 --- a/plugins/modules/ibm_cis_firewall_rule.py +++ b/plugins/modules/ibm_cis_firewall_rule.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_firewall_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -220,7 +220,7 @@ def run_module(): resource_type='ibm_cis_firewall_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_firewall_rules_info.py b/plugins/modules/ibm_cis_firewall_rules_info.py index d7b7492a4..b18d7be37 100644 --- a/plugins/modules/ibm_cis_firewall_rules_info.py +++ b/plugins/modules/ibm_cis_firewall_rules_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_cis_firewall_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cis_id: + domain_id: description: - - Full url-encoded cloud resource name (CRN) of resource instance. + - Zone identifier of the zone for which firewall rules are listed. required: True type: str - domain_id: + cis_id: description: - - Zone identifier of the zone for which firewall rules are listed. + - Full url-encoded cloud resource name (CRN) of resource instance. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cis_id', 'str'), ('domain_id', 'str'), + ('cis_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cis_id', 'domain_id', + 'cis_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cis_id=dict( + domain_id=dict( required=True, type='str'), - domain_id=dict( + cis_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_firewall_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_global_load_balancer.py b/plugins/modules/ibm_cis_global_load_balancer.py index 55e88d13c..c622a2551 100644 --- a/plugins/modules/ibm_cis_global_load_balancer.py +++ b/plugins/modules/ibm_cis_global_load_balancer.py @@ -18,28 +18,31 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_global_load_balancer' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - enabled: + domain_id: description: - - set to true of LB needs to enabled - required: False - type: bool - default: True - region_pools: + - (Required for new resource) Associated CIS domain + required: True + type: str + fallback_pool_id: description: - - None - required: False + - (Required for new resource) fallback pool ID + required: True + type: str + default_pool_ids: + description: + - (Required for new resource) List of default Pool IDs + required: True type: list - elements: dict - ttl: + elements: str + description: description: - - TTL value + - Description for the load balancer instance required: False - type: int - default: 60 + type: str session_affinity: description: - Session affinity info @@ -56,44 +59,41 @@ - (Required for new resource) name required: True type: str - fallback_pool_id: - description: - - (Required for new resource) fallback pool ID - required: True - type: str - default_pool_ids: - description: - - (Required for new resource) List of default Pool IDs - required: True - type: list - elements: str - pop_pools: - description: - - None - required: False - type: list - elements: dict - domain_id: - description: - - (Required for new resource) Associated CIS domain - required: True - type: str - description: + ttl: description: - - Description for the load balancer instance + - TTL value required: False - type: str + type: int + default: 60 steering_policy: description: - Steering policy info required: False type: str + region_pools: + description: + - None + required: False + type: list + elements: dict proxied: description: - set to true if proxy needs to be enabled required: False type: bool default: False + enabled: + description: + - set to true of LB needs to enabled + required: False + type: bool + default: True + pop_pools: + description: + - None + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -140,28 +140,28 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cis_id', 'str'), - ('name', 'str'), + ('domain_id', 'str'), ('fallback_pool_id', 'str'), ('default_pool_ids', 'list'), - ('domain_id', 'str'), + ('cis_id', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'enabled', - 'region_pools', - 'ttl', - 'session_affinity', - 'cis_id', - 'name', + 'domain_id', 'fallback_pool_id', 'default_pool_ids', - 'pop_pools', - 'domain_id', 'description', + 'session_affinity', + 'cis_id', + 'name', + 'ttl', 'steering_policy', + 'region_pools', 'proxied', + 'enabled', + 'pop_pools', ] # Params for Data source @@ -180,16 +180,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - enabled=dict( + domain_id=dict( required=False, - type='bool'), - region_pools=dict( + type='str'), + fallback_pool_id=dict( + required=False, + type='str'), + default_pool_ids=dict( required=False, elements='', type='list'), - ttl=dict( + description=dict( required=False, - type='int'), + type='str'), session_affinity=dict( required=False, type='str'), @@ -199,29 +202,26 @@ name=dict( required=False, type='str'), - fallback_pool_id=dict( + ttl=dict( + required=False, + type='int'), + steering_policy=dict( required=False, type='str'), - default_pool_ids=dict( + region_pools=dict( required=False, elements='', type='list'), + proxied=dict( + required=False, + type='bool'), + enabled=dict( + required=False, + type='bool'), pop_pools=dict( required=False, elements='', type='list'), - domain_id=dict( - required=False, - type='str'), - description=dict( - required=False, - type='str'), - steering_policy=dict( - required=False, - type='str'), - proxied=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -287,7 +287,7 @@ def run_module(): resource_type='ibm_cis_global_load_balancer', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_global_load_balancers_info.py b/plugins/modules/ibm_cis_global_load_balancers_info.py index fd7506127..f43a70efe 100644 --- a/plugins/modules/ibm_cis_global_load_balancers_info.py +++ b/plugins/modules/ibm_cis_global_load_balancers_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_global_load_balancers' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_global_load_balancers', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_healthcheck.py b/plugins/modules/ibm_cis_healthcheck.py index 1b6417843..a6b2b9cb5 100644 --- a/plugins/modules/ibm_cis_healthcheck.py +++ b/plugins/modules/ibm_cis_healthcheck.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_healthcheck' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - interval: - description: - - interval - required: False - type: int - default: 60 - port: - description: - - port number - required: False - type: int path: description: - path @@ -45,63 +34,74 @@ required: False type: str default: - timeout: + type: description: - - timeout + - type required: False - type: int - default: 5 - method: + type: str + default: http + expected_codes: description: - - method + - expected_codes required: False type: str - default: GET - allow_insecure: + follow_redirects: description: - - allow_insecure + - follow_redirects required: False type: bool default: False - cis_id: - description: - - (Required for new resource) CIS instance crn - required: True - type: str - expected_body: - description: - - expected_body - required: False - type: str - type: + port: description: - - type + - port number required: False - type: str - default: http + type: int retries: description: - retries required: False type: int default: 2 + allow_insecure: + description: + - allow_insecure + required: False + type: bool + default: False headers: description: - None required: False type: list elements: dict - expected_codes: + cis_id: description: - - expected_codes + - (Required for new resource) CIS instance crn + required: True + type: str + timeout: + description: + - timeout + required: False + type: int + default: 5 + expected_body: + description: + - expected_body required: False type: str - follow_redirects: + method: description: - - follow_redirects + - method required: False - type: bool - default: False + type: str + default: GET + interval: + description: + - interval + required: False + type: int + default: 60 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -153,20 +153,20 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'interval', - 'port', 'path', 'description', - 'timeout', - 'method', - 'allow_insecure', - 'cis_id', - 'expected_body', 'type', - 'retries', - 'headers', 'expected_codes', 'follow_redirects', + 'port', + 'retries', + 'allow_insecure', + 'headers', + 'cis_id', + 'timeout', + 'expected_body', + 'method', + 'interval', ] # Params for Data source @@ -183,49 +183,49 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - interval=dict( - required=False, - type='int'), - port=dict( - required=False, - type='int'), path=dict( required=False, type='str'), description=dict( required=False, type='str'), - timeout=dict( - required=False, - type='int'), - method=dict( + type=dict( required=False, type='str'), - allow_insecure=dict( - required=False, - type='bool'), - cis_id=dict( + expected_codes=dict( required=False, type='str'), - expected_body=dict( + follow_redirects=dict( required=False, - type='str'), - type=dict( + type='bool'), + port=dict( required=False, - type='str'), + type='int'), retries=dict( required=False, type='int'), + allow_insecure=dict( + required=False, + type='bool'), headers=dict( required=False, elements='', type='list'), - expected_codes=dict( + cis_id=dict( required=False, type='str'), - follow_redirects=dict( + timeout=dict( required=False, - type='bool'), + type='int'), + expected_body=dict( + required=False, + type='str'), + method=dict( + required=False, + type='str'), + interval=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -291,7 +291,7 @@ def run_module(): resource_type='ibm_cis_healthcheck', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_healthchecks_info.py b/plugins/modules/ibm_cis_healthchecks_info.py index cb991c4b0..06d70301a 100644 --- a/plugins/modules/ibm_cis_healthchecks_info.py +++ b/plugins/modules/ibm_cis_healthchecks_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_healthchecks' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cis_healthchecks', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_info.py b/plugins/modules/ibm_cis_info.py index 8811ec09a..775af7ba3 100644 --- a/plugins/modules/ibm_cis_info.py +++ b/plugins/modules/ibm_cis_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_cis' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_group_id: - description: - - The id of the resource group in which the cis instance is present - required: False - type: str name: description: - Resource instance name for example, my cis instance required: True type: str + resource_group_id: + description: + - The id of the resource group in which the cis instance is present + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -69,8 +69,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group_id', 'name', + 'resource_group_id', ] @@ -81,12 +81,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_group_id=dict( - required=False, - type='str'), name=dict( required=True, type='str'), + resource_group_id=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_cis', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_ip_addresses_info.py b/plugins/modules/ibm_cis_ip_addresses_info.py index b9e9a4ad0..9d7a0c681 100644 --- a/plugins/modules/ibm_cis_ip_addresses_info.py +++ b/plugins/modules/ibm_cis_ip_addresses_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_ip_addresses' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_cis_ip_addresses', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_logpush_job.py b/plugins/modules/ibm_cis_logpush_job.py index cdfee86d7..9ee4fdbc0 100644 --- a/plugins/modules/ibm_cis_logpush_job.py +++ b/plugins/modules/ibm_cis_logpush_job.py @@ -18,23 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_logpush_job' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - domain_id: + cis_id: description: - - (Required for new resource) Associated CIS domain + - (Required for new resource) CIS instance crn required: True type: str + name: + description: + - Logpush Job Name + required: False + type: str dataset: description: - (Required for new resource) Dataset to be pulled required: True type: str - cis_id: + domain_id: description: - - (Required for new resource) CIS instance crn + - (Required for new resource) Associated CIS domain required: True type: str logdna: @@ -42,11 +47,6 @@ - (Required for new resource) Information to identify the LogDNA instance the data will be pushed. required: True type: str - name: - description: - - Logpush Job Name - required: False - type: str enabled: description: - Whether the logpush job enabled or not @@ -108,19 +108,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('domain_id', 'str'), - ('dataset', 'str'), ('cis_id', 'str'), + ('dataset', 'str'), + ('domain_id', 'str'), ('logdna', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'domain_id', - 'dataset', 'cis_id', - 'logdna', 'name', + 'dataset', + 'domain_id', + 'logdna', 'enabled', 'logpull_options', 'frequency', @@ -140,19 +140,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - domain_id=dict( + cis_id=dict( required=False, type='str'), - dataset=dict( + name=dict( required=False, type='str'), - cis_id=dict( + dataset=dict( required=False, type='str'), - logdna=dict( + domain_id=dict( required=False, type='str'), - name=dict( + logdna=dict( required=False, type='str'), enabled=dict( @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_cis_logpush_job', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_logpush_jobs_info.py b/plugins/modules/ibm_cis_logpush_jobs_info.py index 12502907e..196d62eb7 100644 --- a/plugins/modules/ibm_cis_logpush_jobs_info.py +++ b/plugins/modules/ibm_cis_logpush_jobs_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_cis_logpush_jobs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - domain_id: + cis_id: description: - - Associated CIS domain + - CIS instance crn required: True type: str - cis_id: + domain_id: description: - - CIS instance crn + - Associated CIS domain required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('domain_id', 'str'), ('cis_id', 'str'), + ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'domain_id', 'cis_id', + 'domain_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - domain_id=dict( + cis_id=dict( required=True, type='str'), - cis_id=dict( + domain_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_logpush_jobs', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_origin_pool.py b/plugins/modules/ibm_cis_origin_pool.py index af0c9564b..cd8e062c4 100644 --- a/plugins/modules/ibm_cis_origin_pool.py +++ b/plugins/modules/ibm_cis_origin_pool.py @@ -18,20 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_origin_pool' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - description: - description: - - Description of the CIS Origin Pool - required: False - type: str - enabled: - description: - - (Required for new resource) Boolean value set to true if cis origin pool needs to be enabled - required: True - type: bool minimum_origins: description: - Minimum number of Origins @@ -49,6 +39,17 @@ required: True type: list elements: dict + check_regions: + description: + - (Required for new resource) List of regions + required: True + type: list + elements: str + description: + description: + - Description of the CIS Origin Pool + required: False + type: str name: description: - (Required for new resource) name @@ -59,17 +60,16 @@ - (Required for new resource) CIS instance crn required: True type: str - check_regions: - description: - - (Required for new resource) List of regions - required: True - type: list - elements: str monitor: description: - Monitor value required: False type: str + enabled: + description: + - (Required for new resource) Boolean value set to true if cis origin pool needs to be enabled + required: True + type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -116,24 +116,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('enabled', 'bool'), ('origins', 'list'), + ('check_regions', 'list'), ('name', 'str'), ('cis_id', 'str'), - ('check_regions', 'list'), + ('enabled', 'bool'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'enabled', 'minimum_origins', 'notification_email', 'origins', + 'check_regions', + 'description', 'name', 'cis_id', - 'check_regions', 'monitor', + 'enabled', ] # Params for Data source @@ -150,12 +150,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - description=dict( - required=False, - type='str'), - enabled=dict( - required=False, - type='bool'), minimum_origins=dict( required=False, type='int'), @@ -166,19 +160,25 @@ required=False, elements='', type='list'), + check_regions=dict( + required=False, + elements='', + type='list'), + description=dict( + required=False, + type='str'), name=dict( required=False, type='str'), cis_id=dict( required=False, type='str'), - check_regions=dict( - required=False, - elements='', - type='list'), monitor=dict( required=False, type='str'), + enabled=dict( + required=False, + type='bool'), id=dict( required=False, type='str'), @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_cis_origin_pool', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_origin_pools_info.py b/plugins/modules/ibm_cis_origin_pools_info.py index e89d408d2..9c5fbe5b9 100644 --- a/plugins/modules/ibm_cis_origin_pools_info.py +++ b/plugins/modules/ibm_cis_origin_pools_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_origin_pools' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cis_origin_pools', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_page_rule.py b/plugins/modules/ibm_cis_page_rule.py index 2a0e6434e..46f21ef4b 100644 --- a/plugins/modules/ibm_cis_page_rule.py +++ b/plugins/modules/ibm_cis_page_rule.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_page_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + cis_id: + description: + - (Required for new resource) CIS instance crn + required: True + type: str domain_id: description: - (Required for new resource) Associated CIS domain @@ -51,11 +56,6 @@ required: True type: list elements: dict - cis_id: - description: - - (Required for new resource) CIS instance crn - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -102,20 +102,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('cis_id', 'str'), ('domain_id', 'str'), ('targets', 'list'), ('actions', 'list'), - ('cis_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cis_id', 'domain_id', 'priority', 'status', 'targets', 'actions', - 'cis_id', ] # Params for Data source @@ -132,6 +132,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + cis_id=dict( + required=False, + type='str'), domain_id=dict( required=False, type='str'), @@ -149,9 +152,6 @@ required=False, elements='', type='list'), - cis_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_cis_page_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_page_rules_info.py b/plugins/modules/ibm_cis_page_rules_info.py index efc5f02c5..5145e2fe5 100644 --- a/plugins/modules/ibm_cis_page_rules_info.py +++ b/plugins/modules/ibm_cis_page_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_page_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_page_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_range_app.py b/plugins/modules/ibm_cis_range_app.py index 67e59ada1..d6e8ddbb6 100644 --- a/plugins/modules/ibm_cis_range_app.py +++ b/plugins/modules/ibm_cis_range_app.py @@ -18,59 +18,63 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_range_app' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - origin_direct: - description: - - IP address and port of the origin for this Range application. - required: False - type: list - elements: str dns: description: - (Required for new resource) Name of the DNS record for this application required: True type: str - origin_dns: + proxy_protocol: description: - - DNS record pointing to the origin for this Range application. + - Allows for the true client IP to be passed to the service. required: False type: str - origin_port: - description: - - Port at the origin that listens to traffic - required: False - type: int dns_type: description: - (Required for new resource) Type of the DNS record for this application required: True type: str - proxy_protocol: + origin_dns: description: - - Allows for the true client IP to be passed to the service. + - DNS record pointing to the origin for this Range application. required: False type: str - edge_ips_type: + edge_ips_connectivity: description: - - The type of edge IP configuration. + - Specifies the IP version. required: False type: str - default: dynamic + default: all traffic_type: description: - Configure how traffic is handled at the edge. required: False type: str default: direct - tls: + domain_id: description: - - Configure if and how TLS connections are terminated at the edge. + - (Required for new resource) CIS Domain ID + required: True + type: str + origin_port: + description: + - Port at the origin that listens to traffic + required: False + type: int + ip_firewall: + description: + - Enables the IP Firewall for this application. Only available for TCP applications. + required: False + type: bool + edge_ips_type: + description: + - The type of edge IP configuration. required: False type: str - default: off + default: dynamic cis_id: description: - (Required for new resource) CIS Intance CRN @@ -81,22 +85,18 @@ - (Required for new resource) Defines the protocol and port for this application required: True type: str - ip_firewall: + origin_direct: description: - - Enables the IP Firewall for this application. Only available for TCP applications. + - IP address and port of the origin for this Range application. required: False - type: bool - edge_ips_connectivity: + type: list + elements: str + tls: description: - - Specifies the IP version. + - Configure if and how TLS connections are terminated at the edge. required: False type: str - default: all - domain_id: - description: - - (Required for new resource) CIS Domain ID - required: True - type: str + default: off id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -145,27 +145,27 @@ TL_REQUIRED_PARAMETERS = [ ('dns', 'str'), ('dns_type', 'str'), + ('domain_id', 'str'), ('cis_id', 'str'), ('protocol', 'str'), - ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'origin_direct', 'dns', + 'proxy_protocol', + 'dns_type', 'origin_dns', + 'edge_ips_connectivity', + 'traffic_type', + 'domain_id', 'origin_port', - 'dns_type', - 'proxy_protocol', + 'ip_firewall', 'edge_ips_type', - 'traffic_type', - 'tls', 'cis_id', 'protocol', - 'ip_firewall', - 'edge_ips_connectivity', - 'domain_id', + 'origin_direct', + 'tls', ] # Params for Data source @@ -183,32 +183,34 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - origin_direct=dict( - required=False, - elements='', - type='list'), dns=dict( required=False, type='str'), - origin_dns=dict( + proxy_protocol=dict( required=False, type='str'), - origin_port=dict( - required=False, - type='int'), dns_type=dict( required=False, type='str'), - proxy_protocol=dict( + origin_dns=dict( required=False, type='str'), - edge_ips_type=dict( + edge_ips_connectivity=dict( required=False, type='str'), traffic_type=dict( required=False, type='str'), - tls=dict( + domain_id=dict( + required=False, + type='str'), + origin_port=dict( + required=False, + type='int'), + ip_firewall=dict( + required=False, + type='bool'), + edge_ips_type=dict( required=False, type='str'), cis_id=dict( @@ -217,13 +219,11 @@ protocol=dict( required=False, type='str'), - ip_firewall=dict( - required=False, - type='bool'), - edge_ips_connectivity=dict( + origin_direct=dict( required=False, - type='str'), - domain_id=dict( + elements='', + type='list'), + tls=dict( required=False, type='str'), id=dict( @@ -291,7 +291,7 @@ def run_module(): resource_type='ibm_cis_range_app', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_range_apps_info.py b/plugins/modules/ibm_cis_range_apps_info.py index 66c1143cf..4dd65a572 100644 --- a/plugins/modules/ibm_cis_range_apps_info.py +++ b/plugins/modules/ibm_cis_range_apps_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_range_apps' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_range_apps', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_rate_limit.py b/plugins/modules/ibm_cis_rate_limit.py index 168f7300a..b568ca425 100644 --- a/plugins/modules/ibm_cis_rate_limit.py +++ b/plugins/modules/ibm_cis_rate_limit.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_rate_limit' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,10 +27,10 @@ - (Required for new resource) CIS Intance CRN required: True type: str - domain_id: + description: description: - - (Required for new resource) CIS Domain ID - required: True + - A note that you can use to describe the reason for a rate limiting rule. + required: False type: str action: description: @@ -38,17 +38,23 @@ required: True type: list elements: dict + match: + description: + - Rate Limiting Match + required: False + type: list + elements: dict + domain_id: + description: + - (Required for new resource) CIS Domain ID + required: True + type: str disabled: description: - Whether this rate limiting rule is currently disabled. required: False type: bool default: False - description: - description: - - A note that you can use to describe the reason for a rate limiting rule. - required: False - type: str bypass: description: - Bypass URL @@ -71,12 +77,6 @@ required: False type: list elements: dict - match: - description: - - Rate Limiting Match - required: False - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -124,8 +124,8 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('cis_id', 'str'), - ('domain_id', 'str'), ('action', 'list'), + ('domain_id', 'str'), ('threshold', 'int'), ('period', 'int'), ] @@ -133,15 +133,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'cis_id', - 'domain_id', + 'description', 'action', + 'match', + 'domain_id', 'disabled', - 'description', 'bypass', 'threshold', 'period', 'correlate', - 'match', ] # Params for Data source @@ -165,19 +165,23 @@ cis_id=dict( required=False, type='str'), - domain_id=dict( + description=dict( required=False, type='str'), action=dict( required=False, elements='', type='list'), - disabled=dict( + match=dict( required=False, - type='bool'), - description=dict( + elements='', + type='list'), + domain_id=dict( required=False, type='str'), + disabled=dict( + required=False, + type='bool'), bypass=dict( required=False, elements='', @@ -192,10 +196,6 @@ required=False, elements='', type='list'), - match=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -261,7 +261,7 @@ def run_module(): resource_type='ibm_cis_rate_limit', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -270,7 +270,7 @@ def run_module(): resource_type='ibm_cis_rate_limit', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cis_rate_limit_info.py b/plugins/modules/ibm_cis_rate_limit_info.py index af791b2e0..440c921eb 100644 --- a/plugins/modules/ibm_cis_rate_limit_info.py +++ b/plugins/modules/ibm_cis_rate_limit_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_rate_limit' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_rate_limit', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_routing.py b/plugins/modules/ibm_cis_routing.py index b4959926f..8545315b0 100644 --- a/plugins/modules/ibm_cis_routing.py +++ b/plugins/modules/ibm_cis_routing.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_routing' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cis_id: - description: - - (Required for new resource) CIS Intance CRN - required: True - type: str domain_id: description: - (Required for new resource) CIS Domain ID @@ -37,6 +32,11 @@ - Smart Routing value required: False type: str + cis_id: + description: + - (Required for new resource) CIS Intance CRN + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,15 +83,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cis_id', 'str'), ('domain_id', 'str'), + ('cis_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cis_id', 'domain_id', 'smart_routing', + 'cis_id', ] # Params for Data source @@ -108,15 +108,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cis_id=dict( - required=False, - type='str'), domain_id=dict( required=False, type='str'), smart_routing=dict( required=False, type='str'), + cis_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -182,7 +182,7 @@ def run_module(): resource_type='ibm_cis_routing', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_tls_settings.py b/plugins/modules/ibm_cis_tls_settings.py index e12a29b6b..cd45cf715 100644 --- a/plugins/modules/ibm_cis_tls_settings.py +++ b/plugins/modules/ibm_cis_tls_settings.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_tls_settings' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -201,7 +201,7 @@ def run_module(): resource_type='ibm_cis_tls_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_waf_group.py b/plugins/modules/ibm_cis_waf_group.py index 83c926e93..5e972f885 100644 --- a/plugins/modules/ibm_cis_waf_group.py +++ b/plugins/modules/ibm_cis_waf_group.py @@ -18,33 +18,39 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_waf_group' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cis_id: + group_id: description: - - (Required for new resource) CIS Intance CRN + - (Required for new resource) WAF Rule group id required: True type: str - domain_id: + mode: description: - - (Required for new resource) CIS Domain ID + - (Required for new resource) WAF Rule group mode on/off required: True type: str - package_id: + check_mode: description: - - (Required for new resource) WAF Rule package id + - Check Mode before making a create/update request + required: False + type: bool + default: False + cis_id: + description: + - (Required for new resource) CIS Intance CRN required: True type: str - mode: + domain_id: description: - - (Required for new resource) WAF Rule group mode on/off + - (Required for new resource) CIS Domain ID required: True type: str - group_id: + package_id: description: - - (Required for new resource) WAF Rule group id + - (Required for new resource) WAF Rule package id required: True type: str id: @@ -93,20 +99,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('group_id', 'str'), + ('mode', 'str'), ('cis_id', 'str'), ('domain_id', 'str'), ('package_id', 'str'), - ('mode', 'str'), - ('group_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'group_id', + 'mode', + 'check_mode', 'cis_id', 'domain_id', 'package_id', - 'mode', - 'group_id', ] # Params for Data source @@ -123,19 +130,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cis_id=dict( + group_id=dict( required=False, type='str'), - domain_id=dict( + mode=dict( required=False, type='str'), - package_id=dict( + check_mode=dict( + required=False, + type='bool'), + cis_id=dict( required=False, type='str'), - mode=dict( + domain_id=dict( required=False, type='str'), - group_id=dict( + package_id=dict( required=False, type='str'), id=dict( @@ -203,7 +213,7 @@ def run_module(): resource_type='ibm_cis_waf_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_waf_groups_info.py b/plugins/modules/ibm_cis_waf_groups_info.py index ba447cfa0..955ef2a3a 100644 --- a/plugins/modules/ibm_cis_waf_groups_info.py +++ b/plugins/modules/ibm_cis_waf_groups_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_cis_waf_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cis_id: - description: - - CIS Intance CRN - required: True - type: str domain_id: description: - CIS Domain ID @@ -36,6 +31,11 @@ - WAF Rule package id required: True type: str + cis_id: + description: + - CIS Intance CRN + required: True + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cis_id', 'str'), ('domain_id', 'str'), ('package_id', 'str'), + ('cis_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cis_id', 'domain_id', 'package_id', + 'cis_id', ] @@ -89,15 +89,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cis_id=dict( - required=True, - type='str'), domain_id=dict( required=True, type='str'), package_id=dict( required=True, type='str'), + cis_id=dict( + required=True, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_cis_waf_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_waf_package.py b/plugins/modules/ibm_cis_waf_package.py index 577f677ec..e26f88081 100644 --- a/plugins/modules/ibm_cis_waf_package.py +++ b/plugins/modules/ibm_cis_waf_package.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_waf_package' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -203,7 +203,7 @@ def run_module(): resource_type='ibm_cis_waf_package', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_waf_packages_info.py b/plugins/modules/ibm_cis_waf_packages_info.py index cfec0f24c..942dfe701 100644 --- a/plugins/modules/ibm_cis_waf_packages_info.py +++ b/plugins/modules/ibm_cis_waf_packages_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_waf_packages' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_waf_packages', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_waf_rule.py b/plugins/modules/ibm_cis_waf_rule.py index d8b123443..3df0044d2 100644 --- a/plugins/modules/ibm_cis_waf_rule.py +++ b/plugins/modules/ibm_cis_waf_rule.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_waf_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cis_id: + package_id: description: - - (Required for new resource) CIS Intance CRN + - (Required for new resource) CIS WAF Rule package id required: True type: str mode: @@ -32,9 +32,9 @@ - (Required for new resource) CIS WAF Rule mode required: True type: str - domain_id: + cis_id: description: - - (Required for new resource) CIS Domain ID + - (Required for new resource) CIS Intance CRN required: True type: str rule_id: @@ -42,9 +42,9 @@ - (Required for new resource) CIS WAF Rule id required: True type: str - package_id: + domain_id: description: - - (Required for new resource) CIS WAF Rule package id + - (Required for new resource) CIS Domain ID required: True type: str id: @@ -93,20 +93,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cis_id', 'str'), + ('package_id', 'str'), ('mode', 'str'), - ('domain_id', 'str'), + ('cis_id', 'str'), ('rule_id', 'str'), - ('package_id', 'str'), + ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cis_id', + 'package_id', 'mode', - 'domain_id', + 'cis_id', 'rule_id', - 'package_id', + 'domain_id', ] # Params for Data source @@ -123,19 +123,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cis_id=dict( + package_id=dict( required=False, type='str'), mode=dict( required=False, type='str'), - domain_id=dict( + cis_id=dict( required=False, type='str'), rule_id=dict( required=False, type='str'), - package_id=dict( + domain_id=dict( required=False, type='str'), id=dict( @@ -203,7 +203,7 @@ def run_module(): resource_type='ibm_cis_waf_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_waf_rules_info.py b/plugins/modules/ibm_cis_waf_rules_info.py index e4b9dc5d1..788675c12 100644 --- a/plugins/modules/ibm_cis_waf_rules_info.py +++ b/plugins/modules/ibm_cis_waf_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_waf_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_cis_waf_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_webhook.py b/plugins/modules/ibm_cis_webhook.py index cc93e5e59..59169ea60 100644 --- a/plugins/modules/ibm_cis_webhook.py +++ b/plugins/modules/ibm_cis_webhook.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_webhook' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + cis_id: + description: + - (Required for new resource) CIS instance crn + required: True + type: str name: description: - (Required for new resource) Webhook Name @@ -37,11 +42,6 @@ - API key needed to use the webhook required: False type: str - cis_id: - description: - - (Required for new resource) CIS instance crn - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -88,16 +88,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('cis_id', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cis_id', 'name', 'url', 'secret', - 'cis_id', ] # Params for Data source @@ -114,6 +114,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + cis_id=dict( + required=False, + type='str'), name=dict( required=False, type='str'), @@ -123,9 +126,6 @@ secret=dict( required=False, type='str'), - cis_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_cis_webhook', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cis_webhooks_info.py b/plugins/modules/ibm_cis_webhooks_info.py index 81f547ad6..6235a9540 100644 --- a/plugins/modules/ibm_cis_webhooks_info.py +++ b/plugins/modules/ibm_cis_webhooks_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_webhooks' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cis_webhooks', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cloud_shell_account_settings.py b/plugins/modules/ibm_cloud_shell_account_settings.py index 60b0fe969..8a251d987 100644 --- a/plugins/modules/ibm_cloud_shell_account_settings.py +++ b/plugins/modules/ibm_cloud_shell_account_settings.py @@ -18,21 +18,37 @@ - Create, update or destroy an IBM Cloud 'ibm_cloud_shell_account_settings' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + rev: + description: + - Unique revision number for the settings object. + required: False + type: str default_enable_new_features: description: - You can choose which Cloud Shell features are available in the account and whether any new features are enabled as they become available. The feature settings apply only to the enabled Cloud Shell locations. required: False type: bool + enabled: + description: + - When enabled, Cloud Shell is available to all users in the account. + required: False + type: bool features: description: - List of Cloud Shell features. required: False type: list elements: dict + regions: + description: + - List of Cloud Shell region settings. + required: False + type: list + elements: dict account_id: description: - (Required for new resource) The account ID in which the account settings belong to. @@ -43,22 +59,6 @@ - Set whether Cloud Shell is enabled in a specific location for the account. The location determines where user and session data are stored. By default, users are routed to the nearest available location. required: False type: bool - enabled: - description: - - When enabled, Cloud Shell is available to all users in the account. - required: False - type: bool - regions: - description: - - List of Cloud Shell region settings. - required: False - type: list - elements: dict - rev: - description: - - Unique revision number for the settings object. - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -110,13 +110,13 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'rev', 'default_enable_new_features', + 'enabled', 'features', + 'regions', 'account_id', 'default_enable_new_regions', - 'enabled', - 'regions', - 'rev', ] # Params for Data source @@ -135,29 +135,29 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - default_enable_new_features=dict( - required=False, - type='bool'), - features=dict( - required=False, - elements='', - type='list'), - account_id=dict( + rev=dict( required=False, type='str'), - default_enable_new_regions=dict( + default_enable_new_features=dict( required=False, type='bool'), enabled=dict( required=False, type='bool'), + features=dict( + required=False, + elements='', + type='list'), regions=dict( required=False, elements='', type='list'), - rev=dict( + account_id=dict( required=False, type='str'), + default_enable_new_regions=dict( + required=False, + type='bool'), id=dict( required=False, type='str'), @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_cloud_shell_account_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -232,7 +232,7 @@ def run_module(): resource_type='ibm_cloud_shell_account_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cloud_shell_account_settings_info.py b/plugins/modules/ibm_cloud_shell_account_settings_info.py index 8758feee8..e6dc0590b 100644 --- a/plugins/modules/ibm_cloud_shell_account_settings_info.py +++ b/plugins/modules/ibm_cloud_shell_account_settings_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cloud_shell_account_settings' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cloud_shell_account_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cloudant.py b/plugins/modules/ibm_cloudant.py index 4b822d333..b3127db0b 100644 --- a/plugins/modules/ibm_cloudant.py +++ b/plugins/modules/ibm_cloudant.py @@ -18,86 +18,86 @@ - Create, update or destroy an IBM Cloud 'ibm_cloudant' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - include_data_events: - description: - - Include data event types in events sent to IBM Cloud Activity Tracker with LogDNA for the IBM Cloudant instance. By default only emitted events are of "management" type. - required: False - type: bool - default: False - name: - description: - - (Required for new resource) A name for the resource instance - required: True - type: str - parameters: - description: - - Arbitrary parameters to pass. Must be a JSON object - required: False - type: dict - tags: - description: - - None - required: False - type: list - elements: str capacity: description: - A number of blocks of throughput units. A block consists of 100 reads/sec, 50 writes/sec, and 5 global queries/sec of provisioned throughput capacity. required: False type: int default: 1 - enable_cors: + parameters: description: - - Boolean value to turn CORS on and off. + - Arbitrary parameters to pass. Must be a JSON object required: False - type: bool - default: True + type: dict plan: description: - (Required for new resource) The plan type of the service required: True type: str - location: - description: - - (Required for new resource) The location where the instance available - required: True - type: str resource_group_id: description: - The resource group id required: False type: str + parameters_json: + description: + - Arbitrary parameters to pass in Json string format + required: False + type: str legacy_credentials: description: - Use both legacy credentials and IAM for authentication required: False type: bool default: False - environment_crn: - description: - - CRN of the IBM Cloudant Dedicated Hardware plan instance - required: False - type: str - parameters_json: + include_data_events: description: - - Arbitrary parameters to pass in Json string format + - Include data event types in events sent to IBM Cloud Activity Tracker with LogDNA for the IBM Cloudant instance. By default only emitted events are of "management" type. required: False - type: str + type: bool + default: False cors_config: description: - Configuration for CORS. required: False type: list elements: dict + location: + description: + - (Required for new resource) The location where the instance available + required: True + type: str + name: + description: + - (Required for new resource) A name for the resource instance + required: True + type: str + tags: + description: + - None + required: False + type: list + elements: str service_endpoints: description: - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. required: False type: str + environment_crn: + description: + - CRN of the IBM Cloudant Dedicated Hardware plan instance + required: False + type: str + enable_cors: + description: + - Boolean value to turn CORS on and off. + required: False + type: bool + default: True id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -144,27 +144,27 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('plan', 'str'), ('location', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'include_data_events', - 'name', - 'parameters', - 'tags', 'capacity', - 'enable_cors', + 'parameters', 'plan', - 'location', 'resource_group_id', - 'legacy_credentials', - 'environment_crn', 'parameters_json', + 'legacy_credentials', + 'include_data_events', 'cors_config', + 'location', + 'name', + 'tags', 'service_endpoints', + 'environment_crn', + 'enable_cors', ] # Params for Data source @@ -174,8 +174,8 @@ TL_ALL_PARAMETERS_DS = [ 'resource_group_id', - 'name', 'location', + 'name', ] TL_CONFLICTS_MAP = { @@ -187,50 +187,50 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - include_data_events=dict( - required=False, - type='bool'), - name=dict( - required=False, - type='str'), - parameters=dict( - required=False, - type='dict'), - tags=dict( - required=False, - elements='', - type='list'), capacity=dict( required=False, type='int'), - enable_cors=dict( + parameters=dict( required=False, - type='bool'), + type='dict'), plan=dict( required=False, type='str'), - location=dict( + resource_group_id=dict( required=False, type='str'), - resource_group_id=dict( + parameters_json=dict( required=False, type='str'), legacy_credentials=dict( required=False, type='bool'), - environment_crn=dict( + include_data_events=dict( + required=False, + type='bool'), + cors_config=dict( + required=False, + elements='', + type='list'), + location=dict( required=False, type='str'), - parameters_json=dict( + name=dict( required=False, type='str'), - cors_config=dict( + tags=dict( required=False, elements='', type='list'), service_endpoints=dict( required=False, type='str'), + environment_crn=dict( + required=False, + type='str'), + enable_cors=dict( + required=False, + type='bool'), id=dict( required=False, type='str'), @@ -296,7 +296,7 @@ def run_module(): resource_type='ibm_cloudant', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -305,7 +305,7 @@ def run_module(): resource_type='ibm_cloudant', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cloudant_database.py b/plugins/modules/ibm_cloudant_database.py index 7ba1211b8..0e692b031 100644 --- a/plugins/modules/ibm_cloudant_database.py +++ b/plugins/modules/ibm_cloudant_database.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cloudant_database' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_cloudant_database', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_cloudant_database', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cloudant_database_info.py b/plugins/modules/ibm_cloudant_database_info.py index d644b066b..fca0ed002 100644 --- a/plugins/modules/ibm_cloudant_database_info.py +++ b/plugins/modules/ibm_cloudant_database_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cloudant_database' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cloudant_database', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cloudant_info.py b/plugins/modules/ibm_cloudant_info.py index cfb806f4a..bf215fa57 100644 --- a/plugins/modules/ibm_cloudant_info.py +++ b/plugins/modules/ibm_cloudant_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cloudant' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,16 +26,16 @@ - The id of the resource group in which the instance is present required: False type: str - name: - description: - - Resource instance name for example, myobjectstorage - required: True - type: str location: description: - The location or the environment in which instance exists required: False type: str + name: + description: + - Resource instance name for example, myobjectstorage + required: True + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -75,8 +75,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'resource_group_id', - 'name', 'location', + 'name', ] @@ -90,12 +90,12 @@ resource_group_id=dict( required=False, type='str'), - name=dict( - required=True, - type='str'), location=dict( required=False, type='str'), + name=dict( + required=True, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -130,7 +130,7 @@ def run_module(): resource_type='ibm_cloudant', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cm_catalog.py b/plugins/modules/ibm_cm_catalog.py index e47c933c7..fd756ac29 100644 --- a/plugins/modules/ibm_cm_catalog.py +++ b/plugins/modules/ibm_cm_catalog.py @@ -18,26 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_catalog' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - catalog_icon_url: - description: - - URL for an icon associated with this catalog. - required: False - type: str - resource_group_id: - description: - - Resource Group ID - required: False - type: str - kind: - description: - - Kind of catalog, offering or vpe. - required: False - type: str - default: offering label: description: - (Required for new resource) Display Name in the requested language. @@ -48,12 +32,28 @@ - Description in the requested language. required: False type: str + catalog_icon_url: + description: + - URL for an icon associated with this catalog. + required: False + type: str tags: description: - List of tags associated with this catalog. required: False type: list elements: str + resource_group_id: + description: + - Resource Group ID + required: False + type: str + kind: + description: + - Kind of catalog, offering or vpe. + required: False + type: str + default: offering id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -105,12 +105,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'catalog_icon_url', - 'resource_group_id', - 'kind', 'label', 'short_description', + 'catalog_icon_url', 'tags', + 'resource_group_id', + 'kind', ] # Params for Data source @@ -129,25 +129,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - catalog_icon_url=dict( - required=False, - type='str'), - resource_group_id=dict( - required=False, - type='str'), - kind=dict( - required=False, - type='str'), label=dict( required=False, type='str'), short_description=dict( required=False, type='str'), + catalog_icon_url=dict( + required=False, + type='str'), tags=dict( required=False, elements='', type='list'), + resource_group_id=dict( + required=False, + type='str'), + kind=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -213,7 +213,7 @@ def run_module(): resource_type='ibm_cm_catalog', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -222,7 +222,7 @@ def run_module(): resource_type='ibm_cm_catalog', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cm_catalog_info.py b/plugins/modules/ibm_cm_catalog_info.py index 8c73c720d..bf1ca38f1 100644 --- a/plugins/modules/ibm_cm_catalog_info.py +++ b/plugins/modules/ibm_cm_catalog_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cm_catalog' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cm_catalog', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cm_offering.py b/plugins/modules/ibm_cm_offering.py index 21ded49c4..d840d6476 100644 --- a/plugins/modules/ibm_cm_offering.py +++ b/plugins/modules/ibm_cm_offering.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_offering' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - List of tags associated with this catalog. - required: False - type: list - elements: str catalog_id: description: - (Required for new resource) The id of the catalog containing this offering. @@ -38,6 +32,12 @@ - (Required for new resource) Display Name in the requested language. required: True type: str + tags: + description: + - List of tags associated with this catalog. + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,9 +90,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'catalog_id', 'label', + 'tags', ] # Params for Data source @@ -113,16 +113,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - elements='', - type='list'), catalog_id=dict( required=False, type='str'), label=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -188,7 +188,7 @@ def run_module(): resource_type='ibm_cm_offering', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -197,7 +197,7 @@ def run_module(): resource_type='ibm_cm_offering', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cm_offering_info.py b/plugins/modules/ibm_cm_offering_info.py index 8e87f59fb..e285baa5e 100644 --- a/plugins/modules/ibm_cm_offering_info.py +++ b/plugins/modules/ibm_cm_offering_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cm_offering' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cm_offering', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cm_offering_instance.py b/plugins/modules/ibm_cm_offering_instance.py index eebb60140..13819a32a 100644 --- a/plugins/modules/ibm_cm_offering_instance.py +++ b/plugins/modules/ibm_cm_offering_instance.py @@ -18,75 +18,75 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_offering_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - catalog_id: + offering_id: description: - - (Required for new resource) Catalog ID this instance was created from. + - (Required for new resource) Offering ID this instance was created from. required: True type: str - cluster_all_namespaces: + cluster_id: description: - - (Required for new resource) designate to install into all namespaces. + - (Required for new resource) Cluster ID. required: True - type: bool - channel: - description: - - channel to target for the operator subscription. Required for operator bundles - required: False type: str cluster_region: description: - (Required for new resource) Cluster region (e.g., us-south). required: True type: str + version: + description: + - (Required for new resource) The version this instance was installed from (not version id). + required: True + type: str + cluster_all_namespaces: + description: + - (Required for new resource) designate to install into all namespaces. + required: True + type: bool wait_until_successful: description: - Whether to wait until the offering instance successfully provisions, or to return when accepted required: False type: bool default: True - label: + cluster_namespaces: description: - - (Required for new resource) the label for this instance. + - (Required for new resource) List of target namespaces to install into. required: True - type: str - offering_id: + type: list + elements: str + resource_group_id: description: - - (Required for new resource) Offering ID this instance was created from. - required: True + - id of the resource group + required: False type: str - kind_format: + install_plan: description: - - (Required for new resource) the format this instance has (helm, operator, ova...). - required: True + - install plan for the subscription of the operator- can be either automatic or manual. Required for operator bundles + required: False type: str - version: + label: description: - - (Required for new resource) The version this instance was installed from (not version id). + - (Required for new resource) the label for this instance. required: True type: str - cluster_id: + kind_format: description: - - (Required for new resource) Cluster ID. + - (Required for new resource) the format this instance has (helm, operator, ova...). required: True type: str - cluster_namespaces: + catalog_id: description: - - (Required for new resource) List of target namespaces to install into. + - (Required for new resource) Catalog ID this instance was created from. required: True - type: list - elements: str - resource_group_id: - description: - - id of the resource group - required: False type: str - install_plan: + channel: description: - - install plan for the subscription of the operator- can be either automatic or manual. Required for operator bundles + - channel to target for the operator subscription. Required for operator bundles required: False type: str id: @@ -135,32 +135,32 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('catalog_id', 'str'), - ('cluster_all_namespaces', 'bool'), - ('cluster_region', 'str'), - ('label', 'str'), ('offering_id', 'str'), - ('kind_format', 'str'), - ('version', 'str'), ('cluster_id', 'str'), + ('cluster_region', 'str'), + ('version', 'str'), + ('cluster_all_namespaces', 'bool'), ('cluster_namespaces', 'list'), + ('label', 'str'), + ('kind_format', 'str'), + ('catalog_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'catalog_id', - 'cluster_all_namespaces', - 'channel', - 'cluster_region', - 'wait_until_successful', - 'label', 'offering_id', - 'kind_format', - 'version', 'cluster_id', + 'cluster_region', + 'version', + 'cluster_all_namespaces', + 'wait_until_successful', 'cluster_namespaces', 'resource_group_id', 'install_plan', + 'label', + 'kind_format', + 'catalog_id', + 'channel', ] # Params for Data source @@ -179,44 +179,44 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - catalog_id=dict( + offering_id=dict( required=False, type='str'), - cluster_all_namespaces=dict( - required=False, - type='bool'), - channel=dict( + cluster_id=dict( required=False, type='str'), cluster_region=dict( required=False, type='str'), + version=dict( + required=False, + type='str'), + cluster_all_namespaces=dict( + required=False, + type='bool'), wait_until_successful=dict( required=False, type='bool'), - label=dict( + cluster_namespaces=dict( required=False, - type='str'), - offering_id=dict( + elements='', + type='list'), + resource_group_id=dict( required=False, type='str'), - kind_format=dict( + install_plan=dict( required=False, type='str'), - version=dict( + label=dict( required=False, type='str'), - cluster_id=dict( + kind_format=dict( required=False, type='str'), - cluster_namespaces=dict( - required=False, - elements='', - type='list'), - resource_group_id=dict( + catalog_id=dict( required=False, type='str'), - install_plan=dict( + channel=dict( required=False, type='str'), id=dict( @@ -284,7 +284,7 @@ def run_module(): resource_type='ibm_cm_offering_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -293,7 +293,7 @@ def run_module(): resource_type='ibm_cm_offering_instance', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cm_offering_instance_info.py b/plugins/modules/ibm_cm_offering_instance_info.py index 1b401a738..613318fcc 100644 --- a/plugins/modules/ibm_cm_offering_instance_info.py +++ b/plugins/modules/ibm_cm_offering_instance_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cm_offering_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cm_offering_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cm_version.py b/plugins/modules/ibm_cm_version.py index fc6137e58..ad1cb05d0 100644 --- a/plugins/modules/ibm_cm_version.py +++ b/plugins/modules/ibm_cm_version.py @@ -18,13 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_version' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - target_version: + tags: description: - - The semver value for this new version, if not found in the zip url package content. + - Tags array. + required: False + type: list + elements: str + content: + description: + - byte array representing the content to be imported. Only supported for OVA images at this time. required: False type: str catalog_identifier: @@ -32,33 +38,27 @@ - (Required for new resource) Catalog identifier. required: True type: str - offering_id: - description: - - (Required for new resource) Offering identification. - required: True - type: str target_kinds: description: - Target kinds. Current valid values are 'iks', 'roks', 'vcenter', and 'terraform'. required: False type: list elements: str - tags: - description: - - Tags array. - required: False - type: list - elements: str - content: + offering_id: description: - - byte array representing the content to be imported. Only supported for OVA images at this time. - required: False + - (Required for new resource) Offering identification. + required: True type: str zipurl: description: - URL path to zip location. If not specified, must provide content in the body of this call. required: False type: str + target_version: + description: + - The semver value for this new version, if not found in the zip url package content. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -111,13 +111,13 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'target_version', - 'catalog_identifier', - 'offering_id', - 'target_kinds', 'tags', 'content', + 'catalog_identifier', + 'target_kinds', + 'offering_id', 'zipurl', + 'target_version', ] # Params for Data source @@ -136,29 +136,29 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - target_version=dict( + tags=dict( required=False, - type='str'), - catalog_identifier=dict( + elements='', + type='list'), + content=dict( required=False, type='str'), - offering_id=dict( + catalog_identifier=dict( required=False, type='str'), target_kinds=dict( required=False, elements='', type='list'), - tags=dict( - required=False, - elements='', - type='list'), - content=dict( + offering_id=dict( required=False, type='str'), zipurl=dict( required=False, type='str'), + target_version=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_cm_version', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -233,7 +233,7 @@ def run_module(): resource_type='ibm_cm_version', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cm_version_info.py b/plugins/modules/ibm_cm_version_info.py index eedf29676..cd4bc24d0 100644 --- a/plugins/modules/ibm_cm_version_info.py +++ b/plugins/modules/ibm_cm_version_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cm_version' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_cm_version', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_autoscale_group.py b/plugins/modules/ibm_compute_autoscale_group.py index 89a72a4a5..6c406c56e 100644 --- a/plugins/modules/ibm_compute_autoscale_group.py +++ b/plugins/modules/ibm_compute_autoscale_group.py @@ -18,26 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_autoscale_group' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - List of tags - required: False - type: list - elements: str - minimum_member_count: - description: - - (Required for new resource) Minimum member count - required: True - type: int - maximum_member_count: - description: - - (Required for new resource) Maximum member count - required: True - type: int health_check: description: - None @@ -49,17 +33,6 @@ required: True type: list elements: dict - network_vlan_ids: - description: - - List of network VLAN ids - required: False - type: list - elements: int - port: - description: - - Port number - required: False - type: int name: description: - (Required for new resource) Name @@ -70,6 +43,33 @@ - (Required for new resource) regional group required: True type: str + minimum_member_count: + description: + - (Required for new resource) Minimum member count + required: True + type: int + virtual_server_id: + description: + - virtual server ID + required: False + type: int + network_vlan_ids: + description: + - List of network VLAN ids + required: False + type: list + elements: int + tags: + description: + - List of tags + required: False + type: list + elements: str + maximum_member_count: + description: + - (Required for new resource) Maximum member count + required: True + type: int cooldown: description: - (Required for new resource) Cooldown value @@ -80,9 +80,9 @@ - (Required for new resource) Termination policy required: True type: str - virtual_server_id: + port: description: - - virtual server ID + - Port number required: False type: int id: @@ -131,29 +131,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('minimum_member_count', 'int'), - ('maximum_member_count', 'int'), ('virtual_guest_member_template', 'list'), ('name', 'str'), ('regional_group', 'str'), + ('minimum_member_count', 'int'), + ('maximum_member_count', 'int'), ('cooldown', 'int'), ('termination_policy', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', - 'minimum_member_count', - 'maximum_member_count', 'health_check', 'virtual_guest_member_template', - 'network_vlan_ids', - 'port', 'name', 'regional_group', + 'minimum_member_count', + 'virtual_server_id', + 'network_vlan_ids', + 'tags', + 'maximum_member_count', 'cooldown', 'termination_policy', - 'virtual_server_id', + 'port', ] # Params for Data source @@ -170,43 +170,43 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( + health_check=dict( + required=False, + type='dict'), + virtual_guest_member_template=dict( required=False, elements='', type='list'), + name=dict( + required=False, + type='str'), + regional_group=dict( + required=False, + type='str'), minimum_member_count=dict( required=False, type='int'), - maximum_member_count=dict( + virtual_server_id=dict( required=False, type='int'), - health_check=dict( - required=False, - type='dict'), - virtual_guest_member_template=dict( + network_vlan_ids=dict( required=False, elements='', type='list'), - network_vlan_ids=dict( + tags=dict( required=False, elements='', type='list'), - port=dict( + maximum_member_count=dict( required=False, type='int'), - name=dict( - required=False, - type='str'), - regional_group=dict( - required=False, - type='str'), cooldown=dict( required=False, type='int'), termination_policy=dict( required=False, type='str'), - virtual_server_id=dict( + port=dict( required=False, type='int'), id=dict( @@ -274,7 +274,7 @@ def run_module(): resource_type='ibm_compute_autoscale_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_autoscale_policy.py b/plugins/modules/ibm_compute_autoscale_policy.py index 3c2e4a678..dfaf2bf39 100644 --- a/plugins/modules/ibm_compute_autoscale_policy.py +++ b/plugins/modules/ibm_compute_autoscale_policy.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_autoscale_policy' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - scale_group_id: - description: - - (Required for new resource) scale group ID - required: True - type: int - triggers: - description: - - None - required: False - type: list - elements: dict tags: description: - List of tags @@ -59,6 +48,17 @@ - cooldown value required: False type: int + scale_group_id: + description: + - (Required for new resource) scale group ID + required: True + type: int + triggers: + description: + - None + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -105,21 +105,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('scale_group_id', 'int'), ('name', 'str'), ('scale_type', 'str'), ('scale_amount', 'int'), + ('scale_group_id', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'scale_group_id', - 'triggers', 'tags', 'name', 'scale_type', 'scale_amount', 'cooldown', + 'scale_group_id', + 'triggers', ] # Params for Data source @@ -136,13 +136,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - scale_group_id=dict( - required=False, - type='int'), - triggers=dict( - required=False, - elements='', - type='list'), tags=dict( required=False, elements='', @@ -159,6 +152,13 @@ cooldown=dict( required=False, type='int'), + scale_group_id=dict( + required=False, + type='int'), + triggers=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_compute_autoscale_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_bare_metal.py b/plugins/modules/ibm_compute_bare_metal.py index 2f0dfdcf9..ce3bebc92 100644 --- a/plugins/modules/ibm_compute_bare_metal.py +++ b/plugins/modules/ibm_compute_bare_metal.py @@ -18,91 +18,70 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_bare_metal' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - redundant_power_supply: - description: - - None - required: False - type: bool - public_bandwidth: - description: - - None - required: False - type: int - private_vlan_id: + public_subnet: description: - None required: False - type: int - post_install_script_uri: + type: str + domain: description: - - None - required: False + - (Required for new resource) Domain name + required: True type: str - network_speed: + hourly_billing: description: - - Network speed in MBPS + - Enables hourly billing required: False - type: int - default: 100 - gpu_key_name: + type: bool + default: True + software_guard_extensions: description: - None required: False - type: str + type: bool + default: False restricted_network: description: - None required: False type: bool default: False - storage_groups: + quote_id: description: - - None + - Quote ID for Quote based provisioning required: False - type: list - elements: dict - ipv6_static_enabled: + type: int + ssh_key_ids: description: - - boolean value true if ipv6 static is enabled else false + - SSH KEY IDS list required: False - type: bool - default: False - notes: + type: list + elements: int + fixed_config_preset: description: - - Optional notes info + - Fixed config preset value required: False type: str - package_key_name: + os_reference_code: description: - - None + - OS refernece code value required: False type: str - gpu_secondary_key_name: + package_key_name: description: - None required: False type: str - disk_key_names: + private_vlan_id: description: - None required: False - type: list - elements: str - secondary_ip_count: - description: - - Secondary IP addresses count - required: False type: int - user_metadata: - description: - - User metadata info - required: False - type: str - os_key_name: + post_install_script_uri: description: - None required: False @@ -113,132 +92,153 @@ required: False type: bool default: False - quote_id: + storage_groups: description: - - Quote ID for Quote based provisioning + - None required: False - type: int + type: list + elements: dict ipv6_enabled: description: - Boolean value true if IPV6 ia enabled or false required: False type: bool default: False - domain: + datacenter: description: - - (Required for new resource) Domain name - required: True + - None + required: False type: str - ssh_key_ids: + block_storage_ids: description: - - SSH KEY IDS list + - None required: False type: list elements: int - private_network_only: + network_speed: description: - - only private network configured if is true + - Network speed in MBPS required: False - type: bool - default: False - public_subnet: + type: int + default: 100 + process_key_name: description: - None required: False type: str - fixed_config_preset: + public_bandwidth: description: - - Fixed config preset value + - None required: False - type: str - hourly_billing: + type: int + ipv6_static_enabled: description: - - Enables hourly billing + - boolean value true if ipv6 static is enabled else false required: False type: bool - default: True - tags: + default: False + file_storage_ids: description: - None required: False type: list - elements: str - image_template_id: + elements: int + unbonded_network: description: - - OS image template ID + - None required: False - type: int - datacenter: + type: bool + default: False + notes: description: - - None + - Optional notes info required: False type: str - software_guard_extensions: + gpu_secondary_key_name: description: - None required: False - type: bool - default: False - redundant_network: + type: str + disk_key_names: description: - None required: False - type: bool - default: False + type: list + elements: str extended_hardware_testing: description: - None required: False type: bool default: False - hostname: + public_vlan_id: description: - - Host name + - None required: False - type: str - file_storage_ids: + type: int + private_subnet: description: - None required: False - type: list - elements: int - memory: + type: str + secondary_ip_count: description: - - None + - Secondary IP addresses count required: False type: int - private_subnet: + user_metadata: description: - - None + - User metadata info required: False type: str - block_storage_ids: + tags: description: - None required: False type: list - elements: int - process_key_name: + elements: str + image_template_id: + description: + - OS image template ID + required: False + type: int + private_network_only: + description: + - only private network configured if is true + required: False + type: bool + default: False + redundant_power_supply: description: - None required: False - type: str - public_vlan_id: + type: bool + os_key_name: description: - None required: False - type: int - os_reference_code: + type: str + gpu_key_name: description: - - OS refernece code value + - None required: False type: str - unbonded_network: + redundant_network: description: - None required: False type: bool default: False + hostname: + description: + - Host name + required: False + type: str + memory: + description: + - None + required: False + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -290,46 +290,46 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'redundant_power_supply', - 'public_bandwidth', + 'public_subnet', + 'domain', + 'hourly_billing', + 'software_guard_extensions', + 'restricted_network', + 'quote_id', + 'ssh_key_ids', + 'fixed_config_preset', + 'os_reference_code', + 'package_key_name', 'private_vlan_id', 'post_install_script_uri', - 'network_speed', - 'gpu_key_name', - 'restricted_network', + 'tcp_monitoring', 'storage_groups', + 'ipv6_enabled', + 'datacenter', + 'block_storage_ids', + 'network_speed', + 'process_key_name', + 'public_bandwidth', 'ipv6_static_enabled', + 'file_storage_ids', + 'unbonded_network', 'notes', - 'package_key_name', 'gpu_secondary_key_name', 'disk_key_names', + 'extended_hardware_testing', + 'public_vlan_id', + 'private_subnet', 'secondary_ip_count', 'user_metadata', - 'os_key_name', - 'tcp_monitoring', - 'quote_id', - 'ipv6_enabled', - 'domain', - 'ssh_key_ids', - 'private_network_only', - 'public_subnet', - 'fixed_config_preset', - 'hourly_billing', 'tags', 'image_template_id', - 'datacenter', - 'software_guard_extensions', + 'private_network_only', + 'redundant_power_supply', + 'os_key_name', + 'gpu_key_name', 'redundant_network', - 'extended_hardware_testing', 'hostname', - 'file_storage_ids', 'memory', - 'private_subnet', - 'block_storage_ids', - 'process_key_name', - 'public_vlan_id', - 'os_reference_code', - 'unbonded_network', ] # Params for Data source @@ -337,147 +337,147 @@ ] TL_ALL_PARAMETERS_DS = [ - 'most_recent', 'domain', - 'hostname', 'global_identifier', + 'most_recent', + 'hostname', ] TL_CONFLICTS_MAP = { - 'image_template_id': ['os_reference_code'], 'os_reference_code': ['image_template_id'], + 'image_template_id': ['os_reference_code'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - redundant_power_supply=dict( - required=False, - type='bool'), - public_bandwidth=dict( - required=False, - type='int'), - private_vlan_id=dict( + public_subnet=dict( required=False, - type='int'), - post_install_script_uri=dict( + type='str'), + domain=dict( required=False, type='str'), - network_speed=dict( + hourly_billing=dict( required=False, - type='int'), - gpu_key_name=dict( + type='bool'), + software_guard_extensions=dict( required=False, - type='str'), + type='bool'), restricted_network=dict( required=False, type='bool'), - storage_groups=dict( + quote_id=dict( + required=False, + type='int'), + ssh_key_ids=dict( required=False, elements='', type='list'), - ipv6_static_enabled=dict( - required=False, - type='bool'), - notes=dict( + fixed_config_preset=dict( required=False, type='str'), - package_key_name=dict( + os_reference_code=dict( required=False, type='str'), - gpu_secondary_key_name=dict( + package_key_name=dict( required=False, type='str'), - disk_key_names=dict( - required=False, - elements='', - type='list'), - secondary_ip_count=dict( + private_vlan_id=dict( required=False, type='int'), - user_metadata=dict( - required=False, - type='str'), - os_key_name=dict( + post_install_script_uri=dict( required=False, type='str'), tcp_monitoring=dict( required=False, type='bool'), - quote_id=dict( + storage_groups=dict( required=False, - type='int'), + elements='', + type='list'), ipv6_enabled=dict( required=False, type='bool'), - domain=dict( + datacenter=dict( required=False, type='str'), - ssh_key_ids=dict( + block_storage_ids=dict( required=False, elements='', type='list'), - private_network_only=dict( + network_speed=dict( required=False, - type='bool'), - public_subnet=dict( + type='int'), + process_key_name=dict( required=False, type='str'), - fixed_config_preset=dict( + public_bandwidth=dict( required=False, - type='str'), - hourly_billing=dict( + type='int'), + ipv6_static_enabled=dict( required=False, type='bool'), - tags=dict( + file_storage_ids=dict( required=False, elements='', type='list'), - image_template_id=dict( + unbonded_network=dict( required=False, - type='int'), - datacenter=dict( + type='bool'), + notes=dict( required=False, type='str'), - software_guard_extensions=dict( + gpu_secondary_key_name=dict( required=False, - type='bool'), - redundant_network=dict( + type='str'), + disk_key_names=dict( required=False, - type='bool'), + elements='', + type='list'), extended_hardware_testing=dict( required=False, type='bool'), - hostname=dict( + public_vlan_id=dict( required=False, - type='str'), - file_storage_ids=dict( + type='int'), + private_subnet=dict( required=False, - elements='', - type='list'), - memory=dict( + type='str'), + secondary_ip_count=dict( required=False, type='int'), - private_subnet=dict( + user_metadata=dict( required=False, type='str'), - block_storage_ids=dict( + tags=dict( required=False, elements='', type='list'), - process_key_name=dict( - required=False, - type='str'), - public_vlan_id=dict( + image_template_id=dict( required=False, type='int'), - os_reference_code=dict( + private_network_only=dict( + required=False, + type='bool'), + redundant_power_supply=dict( + required=False, + type='bool'), + os_key_name=dict( required=False, type='str'), - unbonded_network=dict( + gpu_key_name=dict( + required=False, + type='str'), + redundant_network=dict( required=False, type='bool'), + hostname=dict( + required=False, + type='str'), + memory=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -543,7 +543,7 @@ def run_module(): resource_type='ibm_compute_bare_metal', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -552,7 +552,7 @@ def run_module(): resource_type='ibm_compute_bare_metal', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_compute_bare_metal_info.py b/plugins/modules/ibm_compute_bare_metal_info.py index 54b3614ed..a6ee29173 100644 --- a/plugins/modules/ibm_compute_bare_metal_info.py +++ b/plugins/modules/ibm_compute_bare_metal_info.py @@ -17,29 +17,29 @@ description: - Retrieve an IBM Cloud 'ibm_compute_bare_metal' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - most_recent: - description: - - If true and multiple entries are found, the most recently created bare metal is used. If false, an error is returned - required: False - type: bool - default: False domain: description: - The domain of the bare metal server required: False type: str - hostname: + global_identifier: description: - - The hostname of the bare metal server + - The unique global identifier of the bare metal server required: False type: str - global_identifier: + most_recent: description: - - The unique global identifier of the bare metal server + - If true and multiple entries are found, the most recently created bare metal is used. If false, an error is returned + required: False + type: bool + default: False + hostname: + description: + - The hostname of the bare metal server required: False type: str iaas_classic_username: @@ -79,34 +79,34 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'most_recent', 'domain', - 'hostname', 'global_identifier', + 'most_recent', + 'hostname', ] TL_CONFLICTS_MAP = { - 'most_recent': ['global_identifier'], 'domain': ['global_identifier'], - 'hostname': ['global_identifier'], 'global_identifier': ['hostname', 'domain', 'most_recent'], + 'most_recent': ['global_identifier'], + 'hostname': ['global_identifier'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - most_recent=dict( - required=False, - type='bool'), domain=dict( required=False, type='str'), - hostname=dict( + global_identifier=dict( required=False, type='str'), - global_identifier=dict( + most_recent=dict( + required=False, + type='bool'), + hostname=dict( required=False, type='str'), iaas_classic_username=dict( @@ -143,7 +143,7 @@ def run_module(): resource_type='ibm_compute_bare_metal', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_dedicated_host.py b/plugins/modules/ibm_compute_dedicated_host.py index 69b419da9..0965ee50a 100644 --- a/plugins/modules/ibm_compute_dedicated_host.py +++ b/plugins/modules/ibm_compute_dedicated_host.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_dedicated_host' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + datacenter: + description: + - (Required for new resource) The data center in which the dedicatated host is to be provisioned. + required: True + type: str + flavor: + description: + - The flavor of the dedicatated host. + required: False + type: str + default: 56_CORES_X_242_RAM_X_1_4_TB router_hostname: description: - (Required for new resource) The hostname of the primary router that the dedicated host is associated with. @@ -33,9 +44,9 @@ required: False type: int default: 90 - datacenter: + hostname: description: - - (Required for new resource) The data center in which the dedicatated host is to be provisioned. + - (Required for new resource) The host name of dedicatated host. required: True type: str domain: @@ -43,29 +54,18 @@ - (Required for new resource) The domain of dedicatated host. required: True type: str - flavor: + tags: description: - - The flavor of the dedicatated host. + - None required: False - type: str - default: 56_CORES_X_242_RAM_X_1_4_TB + type: list + elements: str hourly_billing: description: - The billing type for the dedicatated host. required: False type: bool default: True - tags: - description: - - None - required: False - type: list - elements: str - hostname: - description: - - (Required for new resource) The host name of dedicatated host. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -112,22 +112,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('router_hostname', 'str'), ('datacenter', 'str'), - ('domain', 'str'), + ('router_hostname', 'str'), ('hostname', 'str'), + ('domain', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'datacenter', + 'flavor', 'router_hostname', 'wait_time_minutes', - 'datacenter', + 'hostname', 'domain', - 'flavor', - 'hourly_billing', 'tags', - 'hostname', + 'hourly_billing', ] # Params for Data source @@ -144,31 +144,31 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + datacenter=dict( + required=False, + type='str'), + flavor=dict( + required=False, + type='str'), router_hostname=dict( required=False, type='str'), wait_time_minutes=dict( required=False, type='int'), - datacenter=dict( + hostname=dict( required=False, type='str'), domain=dict( required=False, type='str'), - flavor=dict( - required=False, - type='str'), - hourly_billing=dict( - required=False, - type='bool'), tags=dict( required=False, elements='', type='list'), - hostname=dict( + hourly_billing=dict( required=False, - type='str'), + type='bool'), id=dict( required=False, type='str'), @@ -234,7 +234,7 @@ def run_module(): resource_type='ibm_compute_dedicated_host', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_image_template_info.py b/plugins/modules/ibm_compute_image_template_info.py index 78a2c1cd9..2dad2da36 100644 --- a/plugins/modules/ibm_compute_image_template_info.py +++ b/plugins/modules/ibm_compute_image_template_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_compute_image_template' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_compute_image_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_monitor.py b/plugins/modules/ibm_compute_monitor.py index 055d1fc8e..cff8fd07b 100644 --- a/plugins/modules/ibm_compute_monitor.py +++ b/plugins/modules/ibm_compute_monitor.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_monitor' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + guest_id: + description: + - (Required for new resource) Guest ID + required: True + type: int ip_address: description: - IP Address @@ -54,11 +59,6 @@ required: False type: list elements: str - guest_id: - description: - - (Required for new resource) Guest ID - required: True - type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -105,20 +105,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('guest_id', 'int'), ('query_type_id', 'int'), ('response_action_id', 'int'), - ('guest_id', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'guest_id', 'ip_address', 'query_type_id', 'response_action_id', 'wait_cycles', 'notified_users', 'tags', - 'guest_id', ] # Params for Data source @@ -135,6 +135,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + guest_id=dict( + required=False, + type='int'), ip_address=dict( required=False, type='str'), @@ -155,9 +158,6 @@ required=False, elements='', type='list'), - guest_id=dict( - required=False, - type='int'), id=dict( required=False, type='str'), @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_compute_monitor', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_placement_group.py b/plugins/modules/ibm_compute_placement_group.py index 26a32cccd..c0971756a 100644 --- a/plugins/modules/ibm_compute_placement_group.py +++ b/plugins/modules/ibm_compute_placement_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_placement_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_compute_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_compute_placement_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_compute_placement_group_info.py b/plugins/modules/ibm_compute_placement_group_info.py index 5e0da4311..7e5cf2825 100644 --- a/plugins/modules/ibm_compute_placement_group_info.py +++ b/plugins/modules/ibm_compute_placement_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_compute_placement_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_compute_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_provisioning_hook.py b/plugins/modules/ibm_compute_provisioning_hook.py index 6b37565d2..88e2c50c1 100644 --- a/plugins/modules/ibm_compute_provisioning_hook.py +++ b/plugins/modules/ibm_compute_provisioning_hook.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_provisioning_hook' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + uri: + description: + - (Required for new resource) URI of the hook + required: True + type: str tags: description: - Tags associated with resource @@ -33,11 +38,6 @@ - (Required for new resource) Provision hook name required: True type: str - uri: - description: - - (Required for new resource) URI of the hook - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,15 +84,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('uri', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'uri', 'tags', 'name', - 'uri', ] # Params for Data source @@ -109,6 +109,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + uri=dict( + required=False, + type='str'), tags=dict( required=False, elements='', @@ -116,9 +119,6 @@ name=dict( required=False, type='str'), - uri=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_compute_provisioning_hook', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_reserved_capacity.py b/plugins/modules/ibm_compute_reserved_capacity.py index e7c002ba1..8d50b38e4 100644 --- a/plugins/modules/ibm_compute_reserved_capacity.py +++ b/plugins/modules/ibm_compute_reserved_capacity.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_reserved_capacity' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + force_create: + description: + - Force the creation of reserved capacity with same name + required: False + type: bool + datacenter: + description: + - (Required for new resource) Dataceneter name + required: True + type: str pod: description: - (Required for new resource) Pod name @@ -48,16 +58,6 @@ required: False type: list elements: str - force_create: - description: - - Force the creation of reserved capacity with same name - required: False - type: bool - datacenter: - description: - - (Required for new resource) Dataceneter name - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,22 +104,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('datacenter', 'str'), ('pod', 'str'), ('name', 'str'), ('instances', 'int'), ('flavor', 'str'), - ('datacenter', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'force_create', + 'datacenter', 'pod', 'name', 'instances', 'flavor', 'tags', - 'force_create', - 'datacenter', ] # Params for Data source @@ -139,6 +139,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + force_create=dict( + required=False, + type='bool'), + datacenter=dict( + required=False, + type='str'), pod=dict( required=False, type='str'), @@ -155,12 +161,6 @@ required=False, elements='', type='list'), - force_create=dict( - required=False, - type='bool'), - datacenter=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_compute_reserved_capacity', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -235,7 +235,7 @@ def run_module(): resource_type='ibm_compute_reserved_capacity', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_compute_reserved_capacity_info.py b/plugins/modules/ibm_compute_reserved_capacity_info.py index a8c4801d1..0215e5747 100644 --- a/plugins/modules/ibm_compute_reserved_capacity_info.py +++ b/plugins/modules/ibm_compute_reserved_capacity_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_compute_reserved_capacity' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_compute_reserved_capacity', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_ssh_key.py b/plugins/modules/ibm_compute_ssh_key.py index b356cf724..9956726f0 100644 --- a/plugins/modules/ibm_compute_ssh_key.py +++ b/plugins/modules/ibm_compute_ssh_key.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_ssh_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - notes: - description: - - Additional notes - required: False - type: str tags: description: - List of tags for the resource @@ -43,6 +38,11 @@ - (Required for new resource) Plublic Key info required: True type: str + notes: + description: + - Additional notes + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,10 +95,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'notes', 'tags', 'label', 'public_key', + 'notes', ] # Params for Data source @@ -107,8 +107,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'most_recent', 'label', + 'most_recent', ] TL_CONFLICTS_MAP = { @@ -118,9 +118,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - notes=dict( - required=False, - type='str'), tags=dict( required=False, elements='', @@ -131,6 +128,9 @@ public_key=dict( required=False, type='str'), + notes=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_compute_ssh_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_compute_ssh_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_compute_ssh_key_info.py b/plugins/modules/ibm_compute_ssh_key_info.py index 2d09fab58..18f6f3a66 100644 --- a/plugins/modules/ibm_compute_ssh_key_info.py +++ b/plugins/modules/ibm_compute_ssh_key_info.py @@ -17,21 +17,21 @@ description: - Retrieve an IBM Cloud 'ibm_compute_ssh_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + label: + description: + - The label associated with the ssh key + required: True + type: str most_recent: description: - If true and multiple entries are found, the most recently created key is used. If false, an error is returned required: False type: bool default: False - label: - description: - - The label associated with the ssh key - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -70,8 +70,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'most_recent', 'label', + 'most_recent', ] @@ -82,12 +82,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - most_recent=dict( - required=False, - type='bool'), label=dict( required=True, type='str'), + most_recent=dict( + required=False, + type='bool'), iaas_classic_username=dict( type='str', no_log=True, @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_compute_ssh_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_ssl_certificate.py b/plugins/modules/ibm_compute_ssl_certificate.py index fcd8c1c21..ce2a706dd 100644 --- a/plugins/modules/ibm_compute_ssl_certificate.py +++ b/plugins/modules/ibm_compute_ssl_certificate.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_ssl_certificate' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - intermediate_certificate: - description: - - Intermediate certificate value - required: False - type: str - tags: - description: - - Tags set for resource - required: False - type: list - elements: str certificate: description: - (Required for new resource) SSL Certifcate @@ -43,6 +32,17 @@ - (Required for new resource) SSL Private Key required: True type: str + tags: + description: + - Tags set for resource + required: False + type: list + elements: str + intermediate_certificate: + description: + - Intermediate certificate value + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,10 +95,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'intermediate_certificate', - 'tags', 'certificate', 'private_key', + 'tags', + 'intermediate_certificate', ] # Params for Data source @@ -115,17 +115,17 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - intermediate_certificate=dict( + certificate=dict( + required=False, + type='str'), + private_key=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - certificate=dict( - required=False, - type='str'), - private_key=dict( + intermediate_certificate=dict( required=False, type='str'), id=dict( @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_compute_ssl_certificate', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_user.py b/plugins/modules/ibm_compute_user.py index 0bc435766..94e738b17 100644 --- a/plugins/modules/ibm_compute_user.py +++ b/plugins/modules/ibm_compute_user.py @@ -18,28 +18,45 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_user' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + city: + description: + - (Required for new resource) City name + required: True + type: str + country: + description: + - (Required for new resource) Country name + required: True + type: str + has_api_key: + description: + - API Key info of the user + required: False + type: bool + default: False first_name: description: - (Required for new resource) First name of the user required: True type: str - company_name: + email: description: - - (Required for new resource) comapany name + - (Required for new resource) email address of the user required: True type: str - address2: + tags: description: - - Address info of the user + - Tags set for the resources required: False - type: str - country: + type: list + elements: str + address1: description: - - (Required for new resource) Country name + - (Required for new resource) Address info of the user required: True type: str api_key: @@ -47,9 +64,20 @@ - API key for the user required: False type: str - tags: + address2: description: - - Tags set for the resources + - Address info of the user + required: False + type: str + user_status: + description: + - user status info + required: False + type: str + default: ACTIVE + permissions: + description: + - set of persmissions assigned for the user required: False type: list elements: str @@ -63,14 +91,9 @@ - (Required for new resource) Last name of the user required: True type: str - state_: - description: - - (Required for new resource) Satate name - required: True - type: str - address1: + timezone: description: - - (Required for new resource) Address info of the user + - (Required for new resource) time zone info required: True type: str password: @@ -78,39 +101,16 @@ - password for the user required: False type: str - has_api_key: - description: - - API Key info of the user - required: False - type: bool - default: False - email: - description: - - (Required for new resource) email address of the user - required: True - type: str - city: + company_name: description: - - (Required for new resource) City name + - (Required for new resource) comapany name required: True type: str - timezone: + state_: description: - - (Required for new resource) time zone info + - (Required for new resource) Satate name required: True type: str - user_status: - description: - - user status info - required: False - type: str - default: ACTIVE - permissions: - description: - - set of persmissions assigned for the user - required: False - type: list - elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -157,36 +157,36 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('first_name', 'str'), - ('company_name', 'str'), + ('city', 'str'), ('country', 'str'), - ('last_name', 'str'), - ('state_', 'str'), - ('address1', 'str'), + ('first_name', 'str'), ('email', 'str'), - ('city', 'str'), + ('address1', 'str'), + ('last_name', 'str'), ('timezone', 'str'), + ('company_name', 'str'), + ('state_', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'first_name', - 'company_name', - 'address2', + 'city', 'country', - 'api_key', - 'tags', - 'username', - 'last_name', - 'state_', - 'address1', - 'password', 'has_api_key', + 'first_name', 'email', - 'city', - 'timezone', + 'tags', + 'address1', + 'api_key', + 'address2', 'user_status', 'permissions', + 'username', + 'last_name', + 'timezone', + 'password', + 'company_name', + 'state_', ] # Params for Data source @@ -203,59 +203,59 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - first_name=dict( + city=dict( required=False, type='str'), - company_name=dict( + country=dict( required=False, type='str'), - address2=dict( + has_api_key=dict( required=False, - type='str'), - country=dict( + type='bool'), + first_name=dict( required=False, type='str'), - api_key=dict( + email=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - username=dict( - required=False, - type='str'), - last_name=dict( + address1=dict( required=False, type='str'), - state_=dict( + api_key=dict( required=False, type='str'), - address1=dict( + address2=dict( required=False, type='str'), - password=dict( + user_status=dict( required=False, type='str'), - has_api_key=dict( + permissions=dict( required=False, - type='bool'), - email=dict( + elements='', + type='list'), + username=dict( required=False, type='str'), - city=dict( + last_name=dict( required=False, type='str'), timezone=dict( required=False, type='str'), - user_status=dict( + password=dict( required=False, type='str'), - permissions=dict( + company_name=dict( required=False, - elements='', - type='list'), + type='str'), + state_=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -321,7 +321,7 @@ def run_module(): resource_type='ibm_compute_user', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_compute_vm_instance.py b/plugins/modules/ibm_compute_vm_instance.py index c59dd5783..e4e3fa1c6 100644 --- a/plugins/modules/ibm_compute_vm_instance.py +++ b/plugins/modules/ibm_compute_vm_instance.py @@ -18,246 +18,246 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_vm_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - post_install_script_uri: - description: - - None - required: False - type: str - os_reference_code: + bulk_vms: description: - None required: False - type: str - datacenter_choice: - description: - - The user provided datacenter options - required: False type: list elements: dict - reserved_instance_primary_disk: - description: - - The primary disk of reserved instance - required: False - type: int - reserved_capacity_id: - description: - - The reserved group id - required: False - type: int - memory: + network_speed: description: - None required: False type: int - dedicated_acct_host_only: + default: 100 + private_network_only: description: - None required: False type: bool - ipv6_static_enabled: + default: False + placement_group_name: + description: + - The placement group name + required: False + type: str + ssh_key_ids: description: - None required: False - type: bool - default: False - public_bandwidth_unlimited: + type: list + elements: int + dedicated_host_name: description: - None required: False - type: bool - default: False - domain: + type: str + private_subnet: description: - None required: False type: str - placement_group_id: + cores: description: - - The placement group id + - None required: False type: int - private_vlan_id: + block_storage_ids: description: - None required: False - type: int - placement_group_name: + type: list + elements: int + user_metadata: description: - - The placement group name + - None required: False type: str - hourly_billing: + ipv6_enabled: description: - None required: False type: bool - default: True - datacenter: + default: False + secondary_ip_count: description: - None required: False - type: str + type: int file_storage_ids: description: - None required: False type: list elements: int - bulk_vms: + post_install_script_uri: description: - None required: False - type: list - elements: dict - private_network_only: + type: str + os_reference_code: description: - None required: False - type: bool - default: False - public_subnet: + type: str + flavor_key_name: description: - - None + - Flavor key name used to provision vm. required: False type: str - block_storage_ids: + local_disk: description: - None required: False - type: list - elements: int - cores: + type: bool + default: True + public_bandwidth_limited: description: - None required: False type: int - dedicated_host_id: + public_bandwidth_unlimited: description: - None required: False - type: int - disks: + type: bool + default: False + memory: description: - None required: False - type: list - elements: int - network_speed: + type: int + public_vlan_id: description: - None required: False type: int - default: 100 - reserved_capacity_name: - description: - - The reserved group id - required: False - type: str - notes: + ipv6_static_enabled: description: - None required: False - type: str - transient: + type: bool + default: False + dedicated_acct_host_only: description: - None required: False type: bool - tags: + public_security_group_ids: description: - None required: False type: list - elements: str - dedicated_host_name: - description: - - None - required: False - type: str - local_disk: + elements: int + private_vlan_id: description: - None required: False - type: bool - default: True + type: int quote_id: description: - Quote ID for Quote based provisioning required: False type: int - public_vlan_id: + domain: description: - None required: False - type: int - private_subnet: + type: str + datacenter: description: - None required: False type: str - evault: + datacenter_choice: + description: + - The user provided datacenter options + required: False + type: list + elements: dict + notes: description: - None required: False - type: int + type: str hostname: description: - None required: False type: str - secondary_ip_count: + hourly_billing: description: - None required: False - type: int - ssh_key_ids: + type: bool + default: True + disks: description: - None required: False type: list elements: int - user_metadata: + tags: description: - None required: False - type: str - public_security_group_ids: + type: list + elements: str + reserved_capacity_id: + description: + - The reserved group id + required: False + type: int + image_id: description: - None required: False - type: list - elements: int - ipv6_enabled: + type: int + dedicated_host_id: + description: + - None + required: False + type: int + transient: description: - None required: False type: bool - default: False - public_bandwidth_limited: + private_security_group_ids: description: - None required: False + type: list + elements: int + placement_group_id: + description: + - The placement group id + required: False type: int - flavor_key_name: + reserved_instance_primary_disk: description: - - Flavor key name used to provision vm. + - The primary disk of reserved instance + required: False + type: int + reserved_capacity_name: + description: + - The reserved group id required: False type: str - image_id: + public_subnet: description: - None required: False - type: int - private_security_group_ids: + type: str + evault: description: - None required: False - type: list - elements: int + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -308,50 +308,50 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'bulk_vms', + 'network_speed', + 'private_network_only', + 'placement_group_name', + 'ssh_key_ids', + 'dedicated_host_name', + 'private_subnet', + 'cores', + 'block_storage_ids', + 'user_metadata', + 'ipv6_enabled', + 'secondary_ip_count', + 'file_storage_ids', 'post_install_script_uri', 'os_reference_code', - 'datacenter_choice', - 'reserved_instance_primary_disk', - 'reserved_capacity_id', + 'flavor_key_name', + 'local_disk', + 'public_bandwidth_limited', + 'public_bandwidth_unlimited', 'memory', - 'dedicated_acct_host_only', + 'public_vlan_id', 'ipv6_static_enabled', - 'public_bandwidth_unlimited', - 'domain', - 'placement_group_id', + 'dedicated_acct_host_only', + 'public_security_group_ids', 'private_vlan_id', - 'placement_group_name', - 'hourly_billing', + 'quote_id', + 'domain', 'datacenter', - 'file_storage_ids', - 'bulk_vms', - 'private_network_only', - 'public_subnet', - 'block_storage_ids', - 'cores', - 'dedicated_host_id', - 'disks', - 'network_speed', - 'reserved_capacity_name', + 'datacenter_choice', 'notes', - 'transient', - 'tags', - 'dedicated_host_name', - 'local_disk', - 'quote_id', - 'public_vlan_id', - 'private_subnet', - 'evault', 'hostname', - 'secondary_ip_count', - 'ssh_key_ids', - 'user_metadata', - 'public_security_group_ids', - 'ipv6_enabled', - 'public_bandwidth_limited', - 'flavor_key_name', + 'hourly_billing', + 'disks', + 'tags', + 'reserved_capacity_id', 'image_id', + 'dedicated_host_id', + 'transient', 'private_security_group_ids', + 'placement_group_id', + 'reserved_instance_primary_disk', + 'reserved_capacity_name', + 'public_subnet', + 'evault', ] # Params for Data source @@ -362,180 +362,180 @@ TL_ALL_PARAMETERS_DS = [ 'domain', - 'most_recent', 'hostname', + 'most_recent', ] TL_CONFLICTS_MAP = { + 'bulk_vms': ['hostname', 'domain'], + 'placement_group_name': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_id', 'reserved_capacity_id', 'reserved_capacity_name'], + 'dedicated_host_name': ['dedicated_acct_host_only', 'dedicated_host_id', 'placement_group_name', 'placement_group_id'], + 'cores': ['flavor_key_name'], 'os_reference_code': ['image_id'], - 'datacenter_choice': ['datacenter', 'public_vlan_id', 'private_vlan_id', 'placement_group_name', 'placement_group_id', 'reserved_capacity_id', 'reserved_capacity_name'], - 'reserved_capacity_id': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_name', 'placement_group_id', 'reserved_capacity_name', 'flavor_key_name', 'cores', 'memory'], + 'flavor_key_name': ['cores', 'memory'], + 'public_bandwidth_limited': ['private_network_only', 'public_bandwidth_unlimited'], + 'public_bandwidth_unlimited': ['private_network_only', 'public_bandwidth_limited'], 'memory': ['flavor_key_name'], + 'public_vlan_id': ['datacenter_choice'], 'dedicated_acct_host_only': ['dedicated_host_name', 'dedicated_host_id', 'placement_group_id', 'placement_group_name'], - 'public_bandwidth_unlimited': ['private_network_only', 'public_bandwidth_limited'], - 'domain': ['bulk_vms'], - 'placement_group_id': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_name', 'reserved_capacity_id', 'reserved_capacity_name'], 'private_vlan_id': ['datacenter_choice'], - 'placement_group_name': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_id', 'reserved_capacity_id', 'reserved_capacity_name'], + 'domain': ['bulk_vms'], 'datacenter': ['datacenter_choice'], - 'bulk_vms': ['hostname', 'domain'], - 'cores': ['flavor_key_name'], - 'dedicated_host_id': ['dedicated_acct_host_only', 'dedicated_host_name', 'placement_group_name', 'placement_group_id'], - 'reserved_capacity_name': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_name', 'placement_group_id', 'reserved_capacity_id', 'flavor_key_name', 'cores', 'memory'], - 'transient': ['dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'cores', 'memory', 'public_bandwidth_limited', 'public_bandwidth_unlimited'], - 'dedicated_host_name': ['dedicated_acct_host_only', 'dedicated_host_id', 'placement_group_name', 'placement_group_id'], - 'public_vlan_id': ['datacenter_choice'], + 'datacenter_choice': ['datacenter', 'public_vlan_id', 'private_vlan_id', 'placement_group_name', 'placement_group_id', 'reserved_capacity_id', 'reserved_capacity_name'], 'hostname': ['bulk_vms'], - 'public_bandwidth_limited': ['private_network_only', 'public_bandwidth_unlimited'], - 'flavor_key_name': ['cores', 'memory'], + 'reserved_capacity_id': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_name', 'placement_group_id', 'reserved_capacity_name', 'flavor_key_name', 'cores', 'memory'], 'image_id': ['os_reference_code'], + 'dedicated_host_id': ['dedicated_acct_host_only', 'dedicated_host_name', 'placement_group_name', 'placement_group_id'], + 'transient': ['dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'cores', 'memory', 'public_bandwidth_limited', 'public_bandwidth_unlimited'], + 'placement_group_id': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_name', 'reserved_capacity_id', 'reserved_capacity_name'], + 'reserved_capacity_name': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_name', 'placement_group_id', 'reserved_capacity_id', 'flavor_key_name', 'cores', 'memory'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - post_install_script_uri=dict( - required=False, - type='str'), - os_reference_code=dict( - required=False, - type='str'), - datacenter_choice=dict( + bulk_vms=dict( required=False, elements='', type='list'), - reserved_instance_primary_disk=dict( - required=False, - type='int'), - reserved_capacity_id=dict( - required=False, - type='int'), - memory=dict( + network_speed=dict( required=False, type='int'), - dedicated_acct_host_only=dict( + private_network_only=dict( required=False, type='bool'), - ipv6_static_enabled=dict( + placement_group_name=dict( required=False, - type='bool'), - public_bandwidth_unlimited=dict( + type='str'), + ssh_key_ids=dict( required=False, - type='bool'), - domain=dict( + elements='', + type='list'), + dedicated_host_name=dict( required=False, type='str'), - placement_group_id=dict( + private_subnet=dict( required=False, - type='int'), - private_vlan_id=dict( + type='str'), + cores=dict( required=False, type='int'), - placement_group_name=dict( + block_storage_ids=dict( + required=False, + elements='', + type='list'), + user_metadata=dict( required=False, type='str'), - hourly_billing=dict( + ipv6_enabled=dict( required=False, type='bool'), - datacenter=dict( + secondary_ip_count=dict( required=False, - type='str'), + type='int'), file_storage_ids=dict( required=False, elements='', type='list'), - bulk_vms=dict( - required=False, - elements='', - type='list'), - private_network_only=dict( + post_install_script_uri=dict( required=False, - type='bool'), - public_subnet=dict( + type='str'), + os_reference_code=dict( required=False, type='str'), - block_storage_ids=dict( + flavor_key_name=dict( required=False, - elements='', - type='list'), - cores=dict( + type='str'), + local_disk=dict( required=False, - type='int'), - dedicated_host_id=dict( + type='bool'), + public_bandwidth_limited=dict( required=False, type='int'), - disks=dict( + public_bandwidth_unlimited=dict( required=False, - elements='', - type='list'), - network_speed=dict( + type='bool'), + memory=dict( required=False, type='int'), - reserved_capacity_name=dict( + public_vlan_id=dict( required=False, - type='str'), - notes=dict( + type='int'), + ipv6_static_enabled=dict( required=False, - type='str'), - transient=dict( + type='bool'), + dedicated_acct_host_only=dict( required=False, type='bool'), - tags=dict( + public_security_group_ids=dict( required=False, elements='', type='list'), - dedicated_host_name=dict( - required=False, - type='str'), - local_disk=dict( + private_vlan_id=dict( required=False, - type='bool'), + type='int'), quote_id=dict( required=False, type='int'), - public_vlan_id=dict( + domain=dict( required=False, - type='int'), - private_subnet=dict( + type='str'), + datacenter=dict( required=False, type='str'), - evault=dict( + datacenter_choice=dict( required=False, - type='int'), + elements='', + type='list'), + notes=dict( + required=False, + type='str'), hostname=dict( required=False, type='str'), - secondary_ip_count=dict( + hourly_billing=dict( required=False, - type='int'), - ssh_key_ids=dict( + type='bool'), + disks=dict( required=False, elements='', type='list'), - user_metadata=dict( - required=False, - type='str'), - public_security_group_ids=dict( + tags=dict( required=False, elements='', type='list'), - ipv6_enabled=dict( - required=False, - type='bool'), - public_bandwidth_limited=dict( + reserved_capacity_id=dict( required=False, type='int'), - flavor_key_name=dict( - required=False, - type='str'), image_id=dict( required=False, type='int'), + dedicated_host_id=dict( + required=False, + type='int'), + transient=dict( + required=False, + type='bool'), private_security_group_ids=dict( required=False, elements='', type='list'), + placement_group_id=dict( + required=False, + type='int'), + reserved_instance_primary_disk=dict( + required=False, + type='int'), + reserved_capacity_name=dict( + required=False, + type='str'), + public_subnet=dict( + required=False, + type='str'), + evault=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -601,7 +601,7 @@ def run_module(): resource_type='ibm_compute_vm_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -610,7 +610,7 @@ def run_module(): resource_type='ibm_compute_vm_instance', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_compute_vm_instance_info.py b/plugins/modules/ibm_compute_vm_instance_info.py index 21e753b8e..0f12efe9c 100644 --- a/plugins/modules/ibm_compute_vm_instance_info.py +++ b/plugins/modules/ibm_compute_vm_instance_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_compute_vm_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,17 +26,17 @@ - The domain of the virtual guest required: True type: str + hostname: + description: + - The hostname of the virtual guest + required: True + type: str most_recent: description: - If true and multiple entries are found, the most recently created virtual guest is used. If false, an error is returned required: False type: bool default: False - hostname: - description: - - The hostname of the virtual guest - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -77,8 +77,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'domain', - 'most_recent', 'hostname', + 'most_recent', ] @@ -92,12 +92,12 @@ domain=dict( required=True, type='str'), - most_recent=dict( - required=False, - type='bool'), hostname=dict( required=True, type='str'), + most_recent=dict( + required=False, + type='bool'), iaas_classic_username=dict( type='str', no_log=True, @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_compute_vm_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_addons.py b/plugins/modules/ibm_container_addons.py index 02da9bfee..0819dc1db 100644 --- a/plugins/modules/ibm_container_addons.py +++ b/plugins/modules/ibm_container_addons.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_container_addons' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -152,7 +152,7 @@ def run_module(): resource_type='ibm_container_addons', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -161,7 +161,7 @@ def run_module(): resource_type='ibm_container_addons', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_addons_info.py b/plugins/modules/ibm_container_addons_info.py index 429deb2a8..a76e71d9b 100644 --- a/plugins/modules/ibm_container_addons_info.py +++ b/plugins/modules/ibm_container_addons_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_addons' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -78,7 +78,7 @@ def run_module(): resource_type='ibm_container_addons', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_alb.py b/plugins/modules/ibm_container_alb.py index 90454b962..37700b49b 100644 --- a/plugins/modules/ibm_container_alb.py +++ b/plugins/modules/ibm_container_alb.py @@ -18,28 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_container_alb' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + alb_id: + description: + - (Required for new resource) ALB ID + required: True + type: str user_ip: description: - IP assigned by the user required: False type: str - disable_deployment: + enable: description: - - Set to true if ALB needs to be disabled + - set to true if ALB needs to be enabled required: False type: bool - alb_id: - description: - - (Required for new resource) ALB ID - required: True - type: str - enable: + disable_deployment: description: - - set to true if ALB needs to be enabled + - Set to true if ALB needs to be disabled required: False type: bool id: @@ -73,10 +73,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'user_ip', - 'disable_deployment', 'alb_id', + 'user_ip', 'enable', + 'disable_deployment', ] # Params for Data source @@ -89,26 +89,26 @@ ] TL_CONFLICTS_MAP = { - 'disable_deployment': ['enable'], 'enable': ['disable_deployment'], + 'disable_deployment': ['enable'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - user_ip=dict( + alb_id=dict( required=False, type='str'), - disable_deployment=dict( - required=False, - type='bool'), - alb_id=dict( + user_ip=dict( required=False, type='str'), enable=dict( required=False, type='bool'), + disable_deployment=dict( + required=False, + type='bool'), id=dict( required=False, type='str'), @@ -160,7 +160,7 @@ def run_module(): resource_type='ibm_container_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -169,7 +169,7 @@ def run_module(): resource_type='ibm_container_alb', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_alb_cert.py b/plugins/modules/ibm_container_alb_cert.py index 4a57ebf09..bba6848e3 100644 --- a/plugins/modules/ibm_container_alb_cert.py +++ b/plugins/modules/ibm_container_alb_cert.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_container_alb_cert' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + cluster_id: + description: + - (Required for new resource) Cluster ID + required: True + type: str secret_name: description: - (Required for new resource) Secret name @@ -33,21 +38,16 @@ required: False type: str default: ibm-cert-store - persistence: - description: - - Persistence of secret - required: False - type: bool cert_crn: description: - (Required for new resource) Certificate CRN id required: True type: str - cluster_id: + persistence: description: - - (Required for new resource) Cluster ID - required: True - type: str + - Persistence of secret + required: False + type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -74,30 +74,30 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('cluster_id', 'str'), ('secret_name', 'str'), ('cert_crn', 'str'), - ('cluster_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cluster_id', 'secret_name', 'namespace', - 'persistence', 'cert_crn', - 'cluster_id', + 'persistence', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('cluster_id', 'str'), ('secret_name', 'str'), + ('cluster_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'cluster_id', 'secret_name', 'namespace', + 'cluster_id', ] TL_CONFLICTS_MAP = { @@ -107,21 +107,21 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + cluster_id=dict( + required=False, + type='str'), secret_name=dict( required=False, type='str'), namespace=dict( required=False, type='str'), - persistence=dict( - required=False, - type='bool'), cert_crn=dict( required=False, type='str'), - cluster_id=dict( + persistence=dict( required=False, - type='str'), + type='bool'), id=dict( required=False, type='str'), @@ -173,7 +173,7 @@ def run_module(): resource_type='ibm_container_alb_cert', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -182,7 +182,7 @@ def run_module(): resource_type='ibm_container_alb_cert', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_alb_cert_info.py b/plugins/modules/ibm_container_alb_cert_info.py index 2815681ec..480ed9f71 100644 --- a/plugins/modules/ibm_container_alb_cert_info.py +++ b/plugins/modules/ibm_container_alb_cert_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_container_alb_cert' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cluster_id: - description: - - Cluster ID - required: True - type: str secret_name: description: - Secret name @@ -37,6 +32,11 @@ required: False type: str default: ibm-cert-store + cluster_id: + description: + - Cluster ID + required: True + type: str ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -50,15 +50,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cluster_id', 'str'), ('secret_name', 'str'), + ('cluster_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cluster_id', 'secret_name', 'namespace', + 'cluster_id', ] @@ -69,15 +69,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cluster_id=dict( - required=True, - type='str'), secret_name=dict( required=True, type='str'), namespace=dict( required=False, type='str'), + cluster_id=dict( + required=True, + type='str'), ibmcloud_api_key=dict( type='str', no_log=True, @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_container_alb_cert', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_alb_create.py b/plugins/modules/ibm_container_alb_create.py index 87a24b31e..327269251 100644 --- a/plugins/modules/ibm_container_alb_create.py +++ b/plugins/modules/ibm_container_alb_create.py @@ -18,13 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_container_alb_create' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - alb_type: + nlb_version: description: - - (Required for new resource) The type of ALB that you want to create. + - The version of the network load balancer that you want to use for the ALB. + required: False + type: str + vlan_id: + description: + - (Required for new resource) The VLAN ID that you want to use for your ALBs. + required: True + type: str + zone: + description: + - (Required for new resource) The zone where you want to deploy the ALB. + required: True + type: str + cluster: + description: + - (Required for new resource) The ID of the cluster that the ALB belongs to. required: True type: str enable: @@ -38,29 +53,14 @@ - The type of Ingress image that you want to use for your ALB deployment. required: False type: str - nlb_version: - description: - - The version of the network load balancer that you want to use for the ALB. - required: False - type: str - zone: - description: - - (Required for new resource) The zone where you want to deploy the ALB. - required: True - type: str ip: description: - The IP address that you want to assign to the ALB. required: False type: str - vlan_id: - description: - - (Required for new resource) The VLAN ID that you want to use for your ALBs. - required: True - type: str - cluster: + alb_type: description: - - (Required for new resource) The ID of the cluster that the ALB belongs to. + - (Required for new resource) The type of ALB that you want to create. required: True type: str id: @@ -89,22 +89,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('alb_type', 'str'), - ('zone', 'str'), ('vlan_id', 'str'), + ('zone', 'str'), ('cluster', 'str'), + ('alb_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'alb_type', - 'enable', - 'ingress_image', 'nlb_version', - 'zone', - 'ip', 'vlan_id', + 'zone', 'cluster', + 'enable', + 'ingress_image', + 'ip', + 'alb_type', ] # Params for Data source @@ -121,28 +121,28 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - alb_type=dict( + nlb_version=dict( required=False, type='str'), - enable=dict( - required=False, - type='bool'), - ingress_image=dict( + vlan_id=dict( required=False, type='str'), - nlb_version=dict( + zone=dict( required=False, type='str'), - zone=dict( + cluster=dict( required=False, type='str'), - ip=dict( + enable=dict( + required=False, + type='bool'), + ingress_image=dict( required=False, type='str'), - vlan_id=dict( + ip=dict( required=False, type='str'), - cluster=dict( + alb_type=dict( required=False, type='str'), id=dict( @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_container_alb_create', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_alb_info.py b/plugins/modules/ibm_container_alb_info.py index 810e107c9..d29fb9b16 100644 --- a/plugins/modules/ibm_container_alb_info.py +++ b/plugins/modules/ibm_container_alb_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_alb' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -78,7 +78,7 @@ def run_module(): resource_type='ibm_container_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_api_key_reset.py b/plugins/modules/ibm_container_api_key_reset.py index 5d55fbeec..a38870239 100644 --- a/plugins/modules/ibm_container_api_key_reset.py +++ b/plugins/modules/ibm_container_api_key_reset.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_container_api_key_reset' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + reset_api_key: + description: + - Determines if apikey has to be reset or not + required: False + type: int + default: 1 region: description: - (Required for new resource) Region which api key has to be reset @@ -32,12 +38,6 @@ - ID of Resource Group required: False type: str - reset_api_key: - description: - - Determines if apikey has to be reset or not - required: False - type: int - default: 1 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -69,9 +69,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'reset_api_key', 'region', 'resource_group_id', - 'reset_api_key', ] # Params for Data source @@ -88,15 +88,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + reset_api_key=dict( + required=False, + type='int'), region=dict( required=False, type='str'), resource_group_id=dict( required=False, type='str'), - reset_api_key=dict( - required=False, - type='int'), id=dict( required=False, type='str'), @@ -148,7 +148,7 @@ def run_module(): resource_type='ibm_container_api_key_reset', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_bind_service.py b/plugins/modules/ibm_container_bind_service.py index b315f6e94..65a68fff3 100644 --- a/plugins/modules/ibm_container_bind_service.py +++ b/plugins/modules/ibm_container_bind_service.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_container_bind_service' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,22 +27,6 @@ - Service instance ID required: False type: str - namespace_id: - description: - - (Required for new resource) namespace ID - required: True - type: str - role: - description: - - Role info - required: False - type: str - tags: - description: - - List of tags for the resource - required: False - type: list - elements: str cluster_name_id: description: - (Required for new resource) Cluster name or ID @@ -58,11 +42,27 @@ - Key info required: False type: str + role: + description: + - Role info + required: False + type: str resource_group_id: description: - ID of the resource group. required: False type: str + tags: + description: + - List of tags for the resource + required: False + type: list + elements: str + namespace_id: + description: + - (Required for new resource) namespace ID + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,20 +89,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('namespace_id', 'str'), ('cluster_name_id', 'str'), + ('namespace_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'service_instance_id', - 'namespace_id', - 'role', - 'tags', 'cluster_name_id', 'service_instance_name', 'key', + 'role', 'resource_group_id', + 'tags', + 'namespace_id', ] # Params for Data source @@ -130,16 +130,6 @@ service_instance_id=dict( required=False, type='str'), - namespace_id=dict( - required=False, - type='str'), - role=dict( - required=False, - type='str'), - tags=dict( - required=False, - elements='', - type='list'), cluster_name_id=dict( required=False, type='str'), @@ -149,9 +139,19 @@ key=dict( required=False, type='str'), + role=dict( + required=False, + type='str'), resource_group_id=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), + namespace_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -203,7 +203,7 @@ def run_module(): resource_type='ibm_container_bind_service', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -212,7 +212,7 @@ def run_module(): resource_type='ibm_container_bind_service', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_bind_service_info.py b/plugins/modules/ibm_container_bind_service_info.py index a83977264..0f0cc86d7 100644 --- a/plugins/modules/ibm_container_bind_service_info.py +++ b/plugins/modules/ibm_container_bind_service_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_bind_service' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -108,7 +108,7 @@ def run_module(): resource_type='ibm_container_bind_service', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_cluster.py b/plugins/modules/ibm_container_cluster.py index 612aabfd6..5e90063c9 100644 --- a/plugins/modules/ibm_container_cluster.py +++ b/plugins/modules/ibm_container_cluster.py @@ -18,102 +18,123 @@ - Create, update or destroy an IBM Cloud 'ibm_container_cluster' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - datacenter: - description: - - (Required for new resource) The datacenter where this cluster will be deployed - required: True - type: str - disk_encryption: + labels: description: - - disc encryption done, if set to true. + - list of labels to the default worker pool required: False - type: bool - default: True - patch_version: + type: dict + elements: str + workers_info: description: - - Kubernetes patch version + - The IDs of the worker node required: False - type: str - retry_patch_version: + type: list + elements: dict + machine_type: description: - - Argument which helps to retry the patch version updates on worker nodes. Increment the value to retry the patch updates if the previous apply fails + - Machine type required: False - type: int - pod_subnet: + type: str + public_vlan_id: description: - - Custom subnet CIDR to provide private IP addresses for pods + - Public VLAN ID required: False type: str - kms_config: + entitlement: description: - - Enables KMS on a given cluster + - Entitlement option reduces additional OCP Licence cost in Openshift Clusters required: False - type: list - elements: dict - wait_for_worker_update: + type: str + service_subnet: description: - - Wait for worker node to update during kube version update. + - Custom subnet CIDR to provide private IP addresses for services required: False - type: bool - default: True + type: str no_subnet: description: - Boolean value set to true when subnet creation is not required. required: False type: bool default: False - image_security_enforcement: + resource_group_id: description: - - Set true to enable image security enforcement policies + - ID of the resource group. required: False - type: bool - default: False - service_subnet: + type: str + private_service_endpoint: description: - - Custom subnet CIDR to provide private IP addresses for services + - None required: False - type: str - subnet_id: + type: bool + kms_config: description: - - List of subnet IDs + - Enables KMS on a given cluster required: False type: list - elements: str - public_service_endpoint: + elements: dict + default_pool_size: description: - - None + - The size of the default worker pool required: False - type: bool - gateway_enabled: + type: int + default: 1 + pod_subnet: description: - - Set true for gateway enabled clusters + - Custom subnet CIDR to provide private IP addresses for pods required: False - type: bool - default: False + type: str + name: + description: + - (Required for new resource) The cluster name + required: True + type: str + hardware: + description: + - (Required for new resource) Hardware type + required: True + type: str + wait_till: + description: + - wait_till can be configured for Master Ready, One worker Ready or Ingress Ready + required: False + type: str + default: IngressReady webhook: description: - None required: False type: list elements: dict - private_service_endpoint: + disk_encryption: description: - - None + - disc encryption done, if set to true. required: False type: bool - labels: + default: True + retry_patch_version: description: - - list of labels to the default worker pool + - Argument which helps to retry the patch version updates on worker nodes. Increment the value to retry the patch updates if the previous apply fails required: False - type: dict + type: int + wait_for_worker_update: + description: + - Wait for worker node to update during kube version update. + required: False + type: bool + default: True + subnet_id: + description: + - List of subnet IDs + required: False + type: list elements: str - update_all_workers: + force_delete_storage: description: - - Updates all the woker nodes if sets to true + - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered required: False type: bool default: False @@ -122,77 +143,56 @@ - Kubernetes version info required: False type: str - public_vlan_id: - description: - - Public VLAN ID - required: False - type: str - entitlement: + private_vlan_id: description: - - Entitlement option reduces additional OCP Licence cost in Openshift Clusters + - Private VLAN ID required: False type: str - resource_group_id: + gateway_enabled: description: - - ID of the resource group. + - Set true for gateway enabled clusters required: False - type: str + type: bool + default: False tags: description: - Tags for the resource required: False type: list elements: str - default_pool_size: + public_service_endpoint: description: - - The size of the default worker pool + - None required: False - type: int - default: 1 - hardware: - description: - - (Required for new resource) Hardware type - required: True - type: str - private_vlan_id: + type: bool + image_security_enforcement: description: - - Private VLAN ID + - Set true to enable image security enforcement policies required: False - type: str - force_delete_storage: + type: bool + default: False + update_all_workers: description: - - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered + - Updates all the woker nodes if sets to true required: False type: bool default: False - name: - description: - - (Required for new resource) The cluster name - required: True - type: str taints: description: - WorkerPool Taints required: False type: list elements: dict - workers_info: - description: - - The IDs of the worker node - required: False - type: list - elements: dict - machine_type: + patch_version: description: - - Machine type + - Kubernetes patch version required: False type: str - wait_till: + datacenter: description: - - wait_till can be configured for Master Ready, One worker Ready or Ingress Ready - required: False + - (Required for new resource) The datacenter where this cluster will be deployed + required: True type: str - default: IngressReady id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -219,44 +219,44 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('datacenter', 'str'), - ('hardware', 'str'), ('name', 'str'), + ('hardware', 'str'), + ('datacenter', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'datacenter', - 'disk_encryption', - 'patch_version', - 'retry_patch_version', - 'pod_subnet', - 'kms_config', - 'wait_for_worker_update', - 'no_subnet', - 'image_security_enforcement', - 'service_subnet', - 'subnet_id', - 'public_service_endpoint', - 'gateway_enabled', - 'webhook', - 'private_service_endpoint', 'labels', - 'update_all_workers', - 'kube_version', + 'workers_info', + 'machine_type', 'public_vlan_id', 'entitlement', + 'service_subnet', + 'no_subnet', 'resource_group_id', - 'tags', + 'private_service_endpoint', + 'kms_config', 'default_pool_size', + 'pod_subnet', + 'name', 'hardware', - 'private_vlan_id', + 'wait_till', + 'webhook', + 'disk_encryption', + 'retry_patch_version', + 'wait_for_worker_update', + 'subnet_id', 'force_delete_storage', - 'name', + 'kube_version', + 'private_vlan_id', + 'gateway_enabled', + 'tags', + 'public_service_endpoint', + 'image_security_enforcement', + 'update_all_workers', 'taints', - 'workers_info', - 'machine_type', - 'wait_till', + 'patch_version', + 'datacenter', ] # Params for Data source @@ -265,14 +265,14 @@ TL_ALL_PARAMETERS_DS = [ 'org_guid', - 'account_guid', 'space_guid', - 'resource_group_id', - 'alb_type', 'cluster_name_id', + 'alb_type', 'name', 'region', 'list_bounded_services', + 'account_guid', + 'resource_group_id', ] TL_CONFLICTS_MAP = { @@ -282,104 +282,104 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - datacenter=dict( + labels=dict( + required=False, + elements='', + type='dict'), + workers_info=dict( + required=False, + elements='', + type='list'), + machine_type=dict( required=False, type='str'), - disk_encryption=dict( + public_vlan_id=dict( required=False, - type='bool'), - patch_version=dict( + type='str'), + entitlement=dict( required=False, type='str'), - retry_patch_version=dict( + service_subnet=dict( required=False, - type='int'), - pod_subnet=dict( + type='str'), + no_subnet=dict( + required=False, + type='bool'), + resource_group_id=dict( required=False, type='str'), + private_service_endpoint=dict( + required=False, + type='bool'), kms_config=dict( required=False, elements='', type='list'), - wait_for_worker_update=dict( + default_pool_size=dict( required=False, - type='bool'), - no_subnet=dict( + type='int'), + pod_subnet=dict( required=False, - type='bool'), - image_security_enforcement=dict( + type='str'), + name=dict( required=False, - type='bool'), - service_subnet=dict( + type='str'), + hardware=dict( required=False, type='str'), - subnet_id=dict( + wait_till=dict( + required=False, + type='str'), + webhook=dict( required=False, elements='', type='list'), - public_service_endpoint=dict( - required=False, - type='bool'), - gateway_enabled=dict( + disk_encryption=dict( required=False, type='bool'), - webhook=dict( + retry_patch_version=dict( required=False, - elements='', - type='list'), - private_service_endpoint=dict( + type='int'), + wait_for_worker_update=dict( required=False, type='bool'), - labels=dict( + subnet_id=dict( required=False, elements='', - type='dict'), - update_all_workers=dict( + type='list'), + force_delete_storage=dict( required=False, type='bool'), kube_version=dict( required=False, type='str'), - public_vlan_id=dict( - required=False, - type='str'), - entitlement=dict( + private_vlan_id=dict( required=False, type='str'), - resource_group_id=dict( + gateway_enabled=dict( required=False, - type='str'), + type='bool'), tags=dict( required=False, elements='', type='list'), - default_pool_size=dict( - required=False, - type='int'), - hardware=dict( - required=False, - type='str'), - private_vlan_id=dict( + public_service_endpoint=dict( required=False, - type='str'), - force_delete_storage=dict( + type='bool'), + image_security_enforcement=dict( required=False, type='bool'), - name=dict( + update_all_workers=dict( required=False, - type='str'), + type='bool'), taints=dict( required=False, elements='', type='list'), - workers_info=dict( - required=False, - elements='', - type='list'), - machine_type=dict( + patch_version=dict( required=False, type='str'), - wait_till=dict( + datacenter=dict( required=False, type='str'), id=dict( @@ -433,7 +433,7 @@ def run_module(): resource_type='ibm_container_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -442,7 +442,7 @@ def run_module(): resource_type='ibm_container_cluster', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_cluster_config_info.py b/plugins/modules/ibm_container_cluster_config_info.py index 05136ef40..1f56fd97a 100644 --- a/plugins/modules/ibm_container_cluster_config_info.py +++ b/plugins/modules/ibm_container_cluster_config_info.py @@ -17,15 +17,26 @@ description: - Retrieve an IBM Cloud 'ibm_container_cluster_config' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + cluster_name_id: + description: + - The name/id of the cluster + required: True + type: str resource_group_id: description: - ID of the resource group. required: False type: str + admin: + description: + - If set to true will download the config for admin + required: False + type: bool + default: False config_dir: description: - The directory where the cluster config to be downloaded. Default is home directory @@ -37,17 +48,6 @@ required: False type: bool default: True - admin: - description: - - If set to true will download the config for admin - required: False - type: bool - default: False - cluster_name_id: - description: - - The name/id of the cluster - required: True - type: str network: description: - If set to true will download the Calico network config with the Admin config @@ -72,11 +72,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cluster_name_id', 'resource_group_id', + 'admin', 'config_dir', 'download', - 'admin', - 'cluster_name_id', 'network', ] @@ -88,21 +88,21 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + cluster_name_id=dict( + required=True, + type='str'), resource_group_id=dict( required=False, type='str'), + admin=dict( + required=False, + type='bool'), config_dir=dict( required=False, type='str'), download=dict( required=False, type='bool'), - admin=dict( - required=False, - type='bool'), - cluster_name_id=dict( - required=True, - type='str'), network=dict( required=False, type='bool'), @@ -126,7 +126,7 @@ def run_module(): resource_type='ibm_container_cluster_config', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_cluster_feature.py b/plugins/modules/ibm_container_cluster_feature.py index 35559b504..d1bd5ae3d 100644 --- a/plugins/modules/ibm_container_cluster_feature.py +++ b/plugins/modules/ibm_container_cluster_feature.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_container_cluster_feature' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + private_service_endpoint: + description: + - None + required: False + type: bool refresh_api_servers: description: - Boolean value true of API server to be refreshed in K8S cluster @@ -49,11 +54,6 @@ - None required: False type: bool - private_service_endpoint: - description: - - None - required: False - type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -85,12 +85,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'private_service_endpoint', 'refresh_api_servers', 'reload_workers', 'resource_group_id', 'cluster', 'public_service_endpoint', - 'private_service_endpoint', ] # Params for Data source @@ -107,6 +107,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + private_service_endpoint=dict( + required=False, + type='bool'), refresh_api_servers=dict( required=False, type='bool'), @@ -122,9 +125,6 @@ public_service_endpoint=dict( required=False, type='bool'), - private_service_endpoint=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_container_cluster_feature', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_cluster_info.py b/plugins/modules/ibm_container_cluster_info.py index 3b8eee74b..f15e1d269 100644 --- a/plugins/modules/ibm_container_cluster_info.py +++ b/plugins/modules/ibm_container_cluster_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_container_cluster' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_group_id: - description: - - ID of the resource group. - required: False - type: str alb_type: description: - None @@ -43,6 +38,11 @@ required: False type: bool default: True + resource_group_id: + description: + - ID of the resource group. + required: False + type: str ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -60,10 +60,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group_id', 'alb_type', 'name', 'list_bounded_services', + 'resource_group_id', ] @@ -74,9 +74,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_group_id=dict( - required=False, - type='str'), alb_type=dict( required=False, type='str'), @@ -86,6 +83,9 @@ list_bounded_services=dict( required=False, type='bool'), + resource_group_id=dict( + required=False, + type='str'), ibmcloud_api_key=dict( type='str', no_log=True, @@ -106,7 +106,7 @@ def run_module(): resource_type='ibm_container_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_cluster_versions_info.py b/plugins/modules/ibm_container_cluster_versions_info.py index d10f24208..39093196e 100644 --- a/plugins/modules/ibm_container_cluster_versions_info.py +++ b/plugins/modules/ibm_container_cluster_versions_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_cluster_versions' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -77,7 +77,7 @@ def run_module(): resource_type='ibm_container_cluster_versions', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_cluster_worker_info.py b/plugins/modules/ibm_container_cluster_worker_info.py index 683a00b82..43977f0b2 100644 --- a/plugins/modules/ibm_container_cluster_worker_info.py +++ b/plugins/modules/ibm_container_cluster_worker_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_cluster_worker' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -87,7 +87,7 @@ def run_module(): resource_type='ibm_container_cluster_worker', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_dedicated_host.py b/plugins/modules/ibm_container_dedicated_host.py new file mode 100644 index 000000000..1a5f05b69 --- /dev/null +++ b/plugins/modules/ibm_container_dedicated_host.py @@ -0,0 +1,191 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_container_dedicated_host +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/container_dedicated_host + +short_description: Configure IBM Cloud 'ibm_container_dedicated_host' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_container_dedicated_host' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + flavor: + description: + - (Required for new resource) The flavor of the dedicated host + required: True + type: str + host_pool_id: + description: + - (Required for new resource) The id of the dedicated host pool the dedicated host is associated with + required: True + type: str + zone: + description: + - (Required for new resource) The zone of the dedicated host + required: True + type: str + placement_enabled: + description: + - Enables/disables placement on the dedicated host + required: False + type: bool + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('flavor', 'str'), + ('host_pool_id', 'str'), + ('zone', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'flavor', + 'host_pool_id', + 'zone', + 'placement_enabled', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('host_id', 'str'), + ('host_pool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'host_id', + 'host_pool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + flavor=dict( + required=False, + type='str'), + host_pool_id=dict( + required=False, + type='str'), + zone=dict( + required=False, + type='str'), + placement_enabled=dict( + required=False, + type='bool'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_container_dedicated_host_flavor_info.py b/plugins/modules/ibm_container_dedicated_host_flavor_info.py new file mode 100644 index 000000000..ee5883fac --- /dev/null +++ b/plugins/modules/ibm_container_dedicated_host_flavor_info.py @@ -0,0 +1,107 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_container_dedicated_host_flavor_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_dedicated_host_flavor + +short_description: Retrieve IBM Cloud 'ibm_container_dedicated_host_flavor' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_container_dedicated_host_flavor' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + zone: + description: + - The zone of the dedicated host flavor + required: True + type: str + host_flavor_id: + description: + - The id of the dedicated host flavor + required: True + type: str + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('zone', 'str'), + ('host_flavor_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'zone', + 'host_flavor_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + zone=dict( + required=True, + type='str'), + host_flavor_id=dict( + required=True, + type='str'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host_flavor', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_container_dedicated_host_flavors_info.py b/plugins/modules/ibm_container_dedicated_host_flavors_info.py new file mode 100644 index 000000000..21fbf1765 --- /dev/null +++ b/plugins/modules/ibm_container_dedicated_host_flavors_info.py @@ -0,0 +1,97 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_container_dedicated_host_flavors_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_dedicated_host_flavors + +short_description: Retrieve IBM Cloud 'ibm_container_dedicated_host_flavors' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_container_dedicated_host_flavors' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + zone: + description: + - The zone of the dedicated host flavors + required: True + type: str + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('zone', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'zone', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + zone=dict( + required=True, + type='str'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host_flavors', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_container_dedicated_host_info.py b/plugins/modules/ibm_container_dedicated_host_info.py new file mode 100644 index 000000000..19e53753f --- /dev/null +++ b/plugins/modules/ibm_container_dedicated_host_info.py @@ -0,0 +1,107 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_container_dedicated_host_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_dedicated_host + +short_description: Retrieve IBM Cloud 'ibm_container_dedicated_host' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_container_dedicated_host' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + host_id: + description: + - The id of the dedicated host + required: True + type: str + host_pool_id: + description: + - The id of the dedicated host pool the dedicated host is associated with + required: True + type: str + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('host_id', 'str'), + ('host_pool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'host_id', + 'host_pool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + host_id=dict( + required=True, + type='str'), + host_pool_id=dict( + required=True, + type='str'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_container_dedicated_host_pool.py b/plugins/modules/ibm_container_dedicated_host_pool.py new file mode 100644 index 000000000..6518642f2 --- /dev/null +++ b/plugins/modules/ibm_container_dedicated_host_pool.py @@ -0,0 +1,189 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_container_dedicated_host_pool +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/container_dedicated_host_pool + +short_description: Configure IBM Cloud 'ibm_container_dedicated_host_pool' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_container_dedicated_host_pool' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + name: + description: + - (Required for new resource) The name of the dedicated host pool + required: True + type: str + metro: + description: + - (Required for new resource) The metro to create the dedicated host pool in + required: True + type: str + flavor_class: + description: + - (Required for new resource) The flavor class of the dedicated host pool + required: True + type: str + resource_group_id: + description: + - ID of the resource group. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('name', 'str'), + ('metro', 'str'), + ('flavor_class', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'metro', + 'flavor_class', + 'resource_group_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('host_pool_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'host_pool_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + name=dict( + required=False, + type='str'), + metro=dict( + required=False, + type='str'), + flavor_class=dict( + required=False, + type='str'), + resource_group_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host_pool', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host_pool', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_container_dedicated_host_pool_info.py b/plugins/modules/ibm_container_dedicated_host_pool_info.py new file mode 100644 index 000000000..c64fc675f --- /dev/null +++ b/plugins/modules/ibm_container_dedicated_host_pool_info.py @@ -0,0 +1,97 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_container_dedicated_host_pool_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_dedicated_host_pool + +short_description: Retrieve IBM Cloud 'ibm_container_dedicated_host_pool' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_container_dedicated_host_pool' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + host_pool_id: + description: + - The id of the dedicated host pool + required: True + type: str + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('host_pool_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'host_pool_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + host_pool_id=dict( + required=True, + type='str'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_container_dedicated_host_pool', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_container_nlb_dns.py b/plugins/modules/ibm_container_nlb_dns.py index a439d1941..2ee985fbf 100644 --- a/plugins/modules/ibm_container_nlb_dns.py +++ b/plugins/modules/ibm_container_nlb_dns.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_container_nlb_dns' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_group_id: - description: - - The ID of the resource group that the cluster is in. To check the resource group ID of the cluster, use the GET /v1/clusters/idOrName API. To list available resource group IDs, run ibmcloud resource groups. - required: False - type: str cluster: description: - (Required for new resource) The name or ID of the cluster. To list the clusters that you have access to, use the `GET /v1/clusters` API or run `ibmcloud ks cluster ls`. @@ -43,6 +38,11 @@ required: True type: list elements: str + resource_group_id: + description: + - The ID of the resource group that the cluster is in. To check the resource group ID of the cluster, use the GET /v1/clusters/idOrName API. To list available resource group IDs, run ibmcloud resource groups. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -76,10 +76,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group_id', 'cluster', 'nlb_host', 'nlb_ips', + 'resource_group_id', ] # Params for Data source @@ -98,9 +98,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_group_id=dict( - required=False, - type='str'), cluster=dict( required=False, type='str'), @@ -111,6 +108,9 @@ required=False, elements='', type='list'), + resource_group_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -162,7 +162,7 @@ def run_module(): resource_type='ibm_container_nlb_dns', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -171,7 +171,7 @@ def run_module(): resource_type='ibm_container_nlb_dns', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_nlb_dns_info.py b/plugins/modules/ibm_container_nlb_dns_info.py index 91ec3d8b9..9d3d5ede0 100644 --- a/plugins/modules/ibm_container_nlb_dns_info.py +++ b/plugins/modules/ibm_container_nlb_dns_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_nlb_dns' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -78,7 +78,7 @@ def run_module(): resource_type='ibm_container_nlb_dns', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_storage_attachment.py b/plugins/modules/ibm_container_storage_attachment.py index 1aa4fb86f..bcb0d67b7 100644 --- a/plugins/modules/ibm_container_storage_attachment.py +++ b/plugins/modules/ibm_container_storage_attachment.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_container_storage_attachment' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -165,7 +165,7 @@ def run_module(): resource_type='ibm_container_storage_attachment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -174,7 +174,7 @@ def run_module(): resource_type='ibm_container_storage_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_storage_attachment_info.py b/plugins/modules/ibm_container_storage_attachment_info.py index 56c137d17..bc98e1d3a 100644 --- a/plugins/modules/ibm_container_storage_attachment_info.py +++ b/plugins/modules/ibm_container_storage_attachment_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_storage_attachment' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -107,7 +107,7 @@ def run_module(): resource_type='ibm_container_storage_attachment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_vpc_alb.py b/plugins/modules/ibm_container_vpc_alb.py index 377d5b78e..a008c33ac 100644 --- a/plugins/modules/ibm_container_vpc_alb.py +++ b/plugins/modules/ibm_container_vpc_alb.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_container_vpc_alb' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -161,7 +161,7 @@ def run_module(): resource_type='ibm_container_vpc_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -170,7 +170,7 @@ def run_module(): resource_type='ibm_container_vpc_alb', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_vpc_alb_create.py b/plugins/modules/ibm_container_vpc_alb_create.py index 34b7428b4..e6176129d 100644 --- a/plugins/modules/ibm_container_vpc_alb_create.py +++ b/plugins/modules/ibm_container_vpc_alb_create.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_container_vpc_alb_create' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cluster: + type: description: - - (Required for new resource) The ID of the cluster that the ALB belongs to. + - (Required for new resource) The type of ALB that you want to create. required: True type: str zone: @@ -42,9 +42,9 @@ - Enable the ALB instance in the cluster required: False type: bool - type: + cluster: description: - - (Required for new resource) The type of ALB that you want to create. + - (Required for new resource) The ID of the cluster that the ALB belongs to. required: True type: str id: @@ -73,18 +73,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cluster', 'str'), - ('zone', 'str'), ('type', 'str'), + ('zone', 'str'), + ('cluster', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cluster', + 'type', 'zone', 'resource_group_id', 'enable', - 'type', + 'cluster', ] # Params for Data source @@ -101,7 +101,7 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cluster=dict( + type=dict( required=False, type='str'), zone=dict( @@ -113,7 +113,7 @@ enable=dict( required=False, type='bool'), - type=dict( + cluster=dict( required=False, type='str'), id=dict( @@ -167,7 +167,7 @@ def run_module(): resource_type='ibm_container_vpc_alb_create', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_vpc_alb_info.py b/plugins/modules/ibm_container_vpc_alb_info.py index 682465d2e..e2539f275 100644 --- a/plugins/modules/ibm_container_vpc_alb_info.py +++ b/plugins/modules/ibm_container_vpc_alb_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_alb' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -87,7 +87,7 @@ def run_module(): resource_type='ibm_container_vpc_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_vpc_cluster.py b/plugins/modules/ibm_container_vpc_cluster.py index d5e174ec8..2804f9196 100644 --- a/plugins/modules/ibm_container_vpc_cluster.py +++ b/plugins/modules/ibm_container_vpc_cluster.py @@ -18,120 +18,119 @@ - Create, update or destroy an IBM Cloud 'ibm_container_vpc_cluster' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - service_subnet: + flavor: description: - - Custom subnet CIDR to provide private IP addresses for services - required: False + - (Required for new resource) Cluster nodes flavour + required: True type: str - force_delete_storage: + disable_public_service_endpoint: description: - - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered + - Boolean value true if Public service endpoint to be disabled required: False type: bool default: False - wait_for_worker_update: + cos_instance_crn: description: - - Wait for worker node to update during kube version update. + - A standard cloud object storage instance CRN to back up the internal registry in your OpenShift on VPC Gen 2 cluster required: False - type: bool - default: True - name: - description: - - (Required for new resource) The cluster name - required: True type: str - update_all_workers: + pod_subnet: description: - - Updates all the woker nodes if sets to true + - Custom subnet CIDR to provide private IP addresses for pods required: False - type: bool - default: False - retry_patch_version: + type: str + worker_labels: description: - - Argument which helps to retry the patch version updates on worker nodes. Increment the value to retry the patch updates if the previous apply fails + - Labels for default worker pool required: False - type: int - taints: + type: dict + elements: str + force_delete_storage: description: - - WorkerPool Taints + - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered required: False - type: list - elements: dict - flavor: - description: - - (Required for new resource) Cluster nodes flavour - required: True - type: str - wait_till: + type: bool + default: False + resource_group_id: description: - - wait_till can be configured for Master Ready, One worker Ready or Ingress Ready + - ID of the resource group. required: False type: str - default: IngressReady - cos_instance_crn: + image_security_enforcement: description: - - A standard cloud object storage instance CRN to back up the internal registry in your OpenShift on VPC Gen 2 cluster + - Set true to enable image security enforcement policies required: False - type: str - entitlement: + type: bool + default: False + update_all_workers: description: - - Entitlement option reduces additional OCP Licence cost in Openshift Clusters + - Updates all the woker nodes if sets to true required: False - type: str + type: bool + default: False worker_count: description: - Number of worker nodes in the cluster required: False type: int default: 1 - image_security_enforcement: - description: - - Set true to enable image security enforcement policies - required: False - type: bool - default: False host_pool_id: description: - The ID of the cluster's associated host pool required: False type: str - pod_subnet: + name: description: - - Custom subnet CIDR to provide private IP addresses for pods - required: False + - (Required for new resource) The cluster name + required: True type: str - zones: + retry_patch_version: description: - - (Required for new resource) Zone info - required: True - type: list - elements: dict - patch_version: + - Argument which helps to retry the patch version updates on worker nodes. Increment the value to retry the patch updates if the previous apply fails + required: False + type: int + wait_for_worker_update: description: - - Kubernetes patch version + - Wait for worker node to update during kube version update. + required: False + type: bool + default: True + service_subnet: + description: + - Custom subnet CIDR to provide private IP addresses for services required: False type: str - disable_public_service_endpoint: + crk: description: - - Boolean value true if Public service endpoint to be disabled + - Root Key ID for boot volume encryption required: False - type: bool - default: False + type: str + taints: + description: + - WorkerPool Taints + required: False + type: list + elements: dict tags: description: - List of tags for the resources required: False type: list elements: str - kms_instance_id: + entitlement: description: - - Instance ID for boot volume encryption + - Entitlement option reduces additional OCP Licence cost in Openshift Clusters required: False type: str + vpc_id: + description: + - (Required for new resource) The vpc id where the cluster is + required: True + type: str kms_config: description: - Enables KMS on a given cluster @@ -143,26 +142,27 @@ - Kubernetes version required: False type: str - worker_labels: + zones: description: - - Labels for default worker pool - required: False - type: dict - elements: str - crk: + - (Required for new resource) Zone info + required: True + type: list + elements: dict + patch_version: description: - - Root Key ID for boot volume encryption + - Kubernetes patch version required: False type: str - resource_group_id: + wait_till: description: - - ID of the resource group. + - wait_till can be configured for Master Ready, One worker Ready or Ingress Ready required: False type: str - vpc_id: + default: IngressReady + kms_instance_id: description: - - (Required for new resource) The vpc id where the cluster is - required: True + - Instance ID for boot volume encryption + required: False type: str id: description: @@ -190,40 +190,40 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('flavor', 'str'), - ('zones', 'list'), + ('name', 'str'), ('vpc_id', 'str'), + ('zones', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'service_subnet', + 'flavor', + 'disable_public_service_endpoint', + 'cos_instance_crn', + 'pod_subnet', + 'worker_labels', 'force_delete_storage', - 'wait_for_worker_update', - 'name', + 'resource_group_id', + 'image_security_enforcement', 'update_all_workers', + 'worker_count', + 'host_pool_id', + 'name', 'retry_patch_version', + 'wait_for_worker_update', + 'service_subnet', + 'crk', 'taints', - 'flavor', - 'wait_till', - 'cos_instance_crn', + 'tags', 'entitlement', - 'worker_count', - 'image_security_enforcement', - 'host_pool_id', - 'pod_subnet', + 'vpc_id', + 'kms_config', + 'kube_version', 'zones', 'patch_version', - 'disable_public_service_endpoint', - 'tags', + 'wait_till', 'kms_instance_id', - 'kms_config', - 'kube_version', - 'worker_labels', - 'crk', - 'resource_group_id', - 'vpc_id', ] # Params for Data source @@ -232,9 +232,9 @@ TL_ALL_PARAMETERS_DS = [ 'name', + 'resource_group_id', 'cluster_name_id', 'alb_type', - 'resource_group_id', ] TL_CONFLICTS_MAP = { @@ -244,67 +244,67 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - service_subnet=dict( + flavor=dict( required=False, type='str'), - force_delete_storage=dict( + disable_public_service_endpoint=dict( required=False, type='bool'), - wait_for_worker_update=dict( + cos_instance_crn=dict( required=False, - type='bool'), - name=dict( + type='str'), + pod_subnet=dict( required=False, type='str'), - update_all_workers=dict( + worker_labels=dict( + required=False, + elements='', + type='dict'), + force_delete_storage=dict( required=False, type='bool'), - retry_patch_version=dict( + resource_group_id=dict( required=False, - type='int'), - taints=dict( + type='str'), + image_security_enforcement=dict( required=False, - elements='', - type='list'), - flavor=dict( + type='bool'), + update_all_workers=dict( required=False, - type='str'), - wait_till=dict( + type='bool'), + worker_count=dict( required=False, - type='str'), - cos_instance_crn=dict( + type='int'), + host_pool_id=dict( required=False, type='str'), - entitlement=dict( + name=dict( required=False, type='str'), - worker_count=dict( + retry_patch_version=dict( required=False, type='int'), - image_security_enforcement=dict( + wait_for_worker_update=dict( required=False, type='bool'), - host_pool_id=dict( + service_subnet=dict( required=False, type='str'), - pod_subnet=dict( + crk=dict( required=False, type='str'), - zones=dict( + taints=dict( required=False, elements='', type='list'), - patch_version=dict( - required=False, - type='str'), - disable_public_service_endpoint=dict( - required=False, - type='bool'), tags=dict( required=False, elements='', type='list'), - kms_instance_id=dict( + entitlement=dict( + required=False, + type='str'), + vpc_id=dict( required=False, type='str'), kms_config=dict( @@ -314,17 +314,17 @@ kube_version=dict( required=False, type='str'), - worker_labels=dict( + zones=dict( required=False, elements='', - type='dict'), - crk=dict( + type='list'), + patch_version=dict( required=False, type='str'), - resource_group_id=dict( + wait_till=dict( required=False, type='str'), - vpc_id=dict( + kms_instance_id=dict( required=False, type='str'), id=dict( @@ -378,7 +378,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -387,7 +387,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_vpc_cluster_alb_info.py b/plugins/modules/ibm_container_vpc_cluster_alb_info.py index 492dd0987..cc62899b1 100644 --- a/plugins/modules/ibm_container_vpc_cluster_alb_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_alb_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster_alb' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -87,7 +87,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_vpc_cluster_info.py b/plugins/modules/ibm_container_vpc_cluster_info.py index 7a9c01c09..8d206f9e5 100644 --- a/plugins/modules/ibm_container_vpc_cluster_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,17 +26,17 @@ - Name or id of the cluster required: False type: str - alb_type: + resource_group_id: description: - - None + - ID of the resource group. required: False type: str - default: all - resource_group_id: + alb_type: description: - - ID of the resource group. + - None required: False type: str + default: all ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -55,8 +55,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'alb_type', 'resource_group_id', + 'alb_type', ] @@ -70,10 +70,10 @@ name=dict( required=False, type='str'), - alb_type=dict( + resource_group_id=dict( required=False, type='str'), - resource_group_id=dict( + alb_type=dict( required=False, type='str'), ibmcloud_api_key=dict( @@ -96,7 +96,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_vpc_cluster_worker_info.py b/plugins/modules/ibm_container_vpc_cluster_worker_info.py index 68bd4fced..b8113113d 100644 --- a/plugins/modules/ibm_container_vpc_cluster_worker_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_worker_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster_worker' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + resource_group_id: + description: + - ID of the resource group. + required: False + type: str worker_id: description: - ID of the worker @@ -31,11 +36,6 @@ - Name or ID of the cluster required: True type: str - resource_group_id: - description: - - ID of the resource group. - required: False - type: str ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -55,9 +55,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'resource_group_id', 'worker_id', 'cluster_name_id', - 'resource_group_id', ] @@ -68,15 +68,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + resource_group_id=dict( + required=False, + type='str'), worker_id=dict( required=True, type='str'), cluster_name_id=dict( required=True, type='str'), - resource_group_id=dict( - required=False, - type='str'), ibmcloud_api_key=dict( type='str', no_log=True, @@ -97,7 +97,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster_worker', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_vpc_cluster_worker_pool_info.py b/plugins/modules/ibm_container_vpc_cluster_worker_pool_info.py index a96825c86..af5bbd59b 100644 --- a/plugins/modules/ibm_container_vpc_cluster_worker_pool_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_worker_pool_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster_worker_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - worker_pool_name: + cluster: description: - - worker pool name + - Cluster name required: True type: str - cluster: + worker_pool_name: description: - - Cluster name + - worker pool name required: True type: str ibmcloud_api_key: @@ -44,14 +44,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('worker_pool_name', 'str'), ('cluster', 'str'), + ('worker_pool_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'worker_pool_name', 'cluster', + 'worker_pool_name', ] @@ -62,10 +62,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - worker_pool_name=dict( + cluster=dict( required=True, type='str'), - cluster=dict( + worker_pool_name=dict( required=True, type='str'), ibmcloud_api_key=dict( @@ -88,7 +88,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_vpc_worker_pool.py b/plugins/modules/ibm_container_vpc_worker_pool.py index 1ce509ac2..30e7bf46a 100644 --- a/plugins/modules/ibm_container_vpc_worker_pool.py +++ b/plugins/modules/ibm_container_vpc_worker_pool.py @@ -18,66 +18,51 @@ - Create, update or destroy an IBM Cloud 'ibm_container_vpc_worker_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - crk: - description: - - Root Key ID for boot volume encryption - required: False - type: str - resource_group_id: - description: - - ID of the resource group. - required: False - type: str - vpc_id: + cluster: description: - - (Required for new resource) The vpc id where the cluster is + - (Required for new resource) Cluster name required: True type: str - worker_count: - description: - - (Required for new resource) The number of workers - required: True - type: int - worker_pool_name: + zones: description: - - (Required for new resource) worker pool name + - (Required for new resource) Zones info required: True - type: str + type: list + elements: dict labels: description: - Labels required: False type: dict elements: str - kms_instance_id: + worker_count: description: - - Instance ID for boot volume encryption - required: False - type: str + - (Required for new resource) The number of workers + required: True + type: int taints: description: - WorkerPool Taints required: False type: list elements: dict - flavor: + resource_group_id: description: - - (Required for new resource) cluster node falvor - required: True + - ID of the resource group. + required: False type: str - zones: + vpc_id: description: - - (Required for new resource) Zones info + - (Required for new resource) The vpc id where the cluster is required: True - type: list - elements: dict - cluster: + type: str + flavor: description: - - (Required for new resource) Cluster name + - (Required for new resource) cluster node falvor required: True type: str entitlement: @@ -85,6 +70,21 @@ - Entitlement option reduces additional OCP Licence cost in Openshift Clusters required: False type: str + crk: + description: + - Root Key ID for boot volume encryption + required: False + type: str + kms_instance_id: + description: + - Instance ID for boot volume encryption + required: False + type: str + worker_pool_name: + description: + - (Required for new resource) worker pool name + required: True + type: str host_pool_id: description: - The ID of the dedicated host pool associated with the worker pool @@ -116,40 +116,40 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('vpc_id', 'str'), + ('cluster', 'str'), + ('zones', 'list'), ('worker_count', 'int'), - ('worker_pool_name', 'str'), + ('vpc_id', 'str'), ('flavor', 'str'), - ('zones', 'list'), - ('cluster', 'str'), + ('worker_pool_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'crk', - 'resource_group_id', - 'vpc_id', - 'worker_count', - 'worker_pool_name', + 'cluster', + 'zones', 'labels', - 'kms_instance_id', + 'worker_count', 'taints', + 'resource_group_id', + 'vpc_id', 'flavor', - 'zones', - 'cluster', 'entitlement', + 'crk', + 'kms_instance_id', + 'worker_pool_name', 'host_pool_id', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('cluster', 'str'), ('worker_pool_name', 'str'), + ('cluster', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'cluster', 'worker_pool_name', + 'cluster', ] TL_CONFLICTS_MAP = { @@ -159,45 +159,45 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - crk=dict( - required=False, - type='str'), - resource_group_id=dict( - required=False, - type='str'), - vpc_id=dict( + cluster=dict( required=False, type='str'), - worker_count=dict( - required=False, - type='int'), - worker_pool_name=dict( + zones=dict( required=False, - type='str'), + elements='', + type='list'), labels=dict( required=False, elements='', type='dict'), - kms_instance_id=dict( + worker_count=dict( required=False, - type='str'), + type='int'), taints=dict( required=False, elements='', type='list'), - flavor=dict( + resource_group_id=dict( required=False, type='str'), - zones=dict( + vpc_id=dict( required=False, - elements='', - type='list'), - cluster=dict( + type='str'), + flavor=dict( required=False, type='str'), entitlement=dict( required=False, type='str'), + crk=dict( + required=False, + type='str'), + kms_instance_id=dict( + required=False, + type='str'), + worker_pool_name=dict( + required=False, + type='str'), host_pool_id=dict( required=False, type='str'), @@ -252,7 +252,7 @@ def run_module(): resource_type='ibm_container_vpc_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -261,7 +261,7 @@ def run_module(): resource_type='ibm_container_vpc_worker_pool', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_vpc_worker_pool_info.py b/plugins/modules/ibm_container_vpc_worker_pool_info.py index f9fadc535..ff5898c3c 100644 --- a/plugins/modules/ibm_container_vpc_worker_pool_info.py +++ b/plugins/modules/ibm_container_vpc_worker_pool_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_worker_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cluster: + worker_pool_name: description: - - Cluster name + - worker pool name required: True type: str - worker_pool_name: + cluster: description: - - worker pool name + - Cluster name required: True type: str ibmcloud_api_key: @@ -44,14 +44,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cluster', 'str'), ('worker_pool_name', 'str'), + ('cluster', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cluster', 'worker_pool_name', + 'cluster', ] @@ -62,10 +62,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cluster=dict( + worker_pool_name=dict( required=True, type='str'), - worker_pool_name=dict( + cluster=dict( required=True, type='str'), ibmcloud_api_key=dict( @@ -88,7 +88,7 @@ def run_module(): resource_type='ibm_container_vpc_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_worker_pool.py b/plugins/modules/ibm_container_worker_pool.py index 9eca5cd8e..12c9c14e6 100644 --- a/plugins/modules/ibm_container_worker_pool.py +++ b/plugins/modules/ibm_container_worker_pool.py @@ -18,25 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_container_worker_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cluster: + disk_encryption: description: - - (Required for new resource) Cluster name - required: True - type: str - worker_pool_name: + - worker node disk encrypted if set to true + required: False + type: bool + default: True + machine_type: description: - - (Required for new resource) worker pool name + - (Required for new resource) worker nodes machine type required: True type: str - size_per_zone: - description: - - (Required for new resource) Number of nodes per zone - required: True - type: int entitlement: description: - Entitlement option reduces additional OCP Licence cost in Openshift Clusters @@ -48,34 +44,38 @@ required: False type: str default: shared - machine_type: - description: - - (Required for new resource) worker nodes machine type - required: True - type: str - disk_encryption: + resource_group_id: description: - - worker node disk encrypted if set to true + - ID of the resource group. required: False - type: bool - default: True - labels: + type: str + worker_pool_name: description: - - list of labels to worker pool - required: False - type: dict - elements: str + - (Required for new resource) worker pool name + required: True + type: str taints: description: - WorkerPool Taints required: False type: list elements: dict - resource_group_id: + cluster: description: - - ID of the resource group. - required: False + - (Required for new resource) Cluster name + required: True type: str + size_per_zone: + description: + - (Required for new resource) Number of nodes per zone + required: True + type: int + labels: + description: + - list of labels to worker pool + required: False + type: dict + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -102,24 +102,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cluster', 'str'), + ('machine_type', 'str'), ('worker_pool_name', 'str'), + ('cluster', 'str'), ('size_per_zone', 'int'), - ('machine_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cluster', - 'worker_pool_name', - 'size_per_zone', + 'disk_encryption', + 'machine_type', 'entitlement', 'hardware', - 'machine_type', - 'disk_encryption', - 'labels', - 'taints', 'resource_group_id', + 'worker_pool_name', + 'taints', + 'cluster', + 'size_per_zone', + 'labels', ] # Params for Data source @@ -140,38 +140,38 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cluster=dict( + disk_encryption=dict( required=False, - type='str'), - worker_pool_name=dict( + type='bool'), + machine_type=dict( required=False, type='str'), - size_per_zone=dict( - required=False, - type='int'), entitlement=dict( required=False, type='str'), hardware=dict( required=False, type='str'), - machine_type=dict( + resource_group_id=dict( required=False, type='str'), - disk_encryption=dict( - required=False, - type='bool'), - labels=dict( + worker_pool_name=dict( required=False, - elements='', - type='dict'), + type='str'), taints=dict( required=False, elements='', type='list'), - resource_group_id=dict( + cluster=dict( required=False, type='str'), + size_per_zone=dict( + required=False, + type='int'), + labels=dict( + required=False, + elements='', + type='dict'), id=dict( required=False, type='str'), @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_container_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -232,7 +232,7 @@ def run_module(): resource_type='ibm_container_worker_pool', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_container_worker_pool_info.py b/plugins/modules/ibm_container_worker_pool_info.py index 5a8b5116c..addb5c116 100644 --- a/plugins/modules/ibm_container_worker_pool_info.py +++ b/plugins/modules/ibm_container_worker_pool_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_worker_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -88,7 +88,7 @@ def run_module(): resource_type='ibm_container_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_worker_pool_zone_attachment.py b/plugins/modules/ibm_container_worker_pool_zone_attachment.py index 4716acc29..8be829987 100644 --- a/plugins/modules/ibm_container_worker_pool_zone_attachment.py +++ b/plugins/modules/ibm_container_worker_pool_zone_attachment.py @@ -18,45 +18,45 @@ - Create, update or destroy an IBM Cloud 'ibm_container_worker_pool_zone_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - zone: - description: - - (Required for new resource) Zone name - required: True - type: str worker_pool: description: - (Required for new resource) Workerpool name required: True type: str + private_vlan_id: + description: + - None + required: False + type: str public_vlan_id: description: - None required: False type: str - wait_till_albs: + resource_group_id: description: - - wait_till_albs can be configured to wait for albs during the worker pool zone attachment. + - ID of the resource group. required: False - type: bool - default: True + type: str cluster: description: - (Required for new resource) cluster name or ID required: True type: str - private_vlan_id: + wait_till_albs: description: - - None + - wait_till_albs can be configured to wait for albs during the worker pool zone attachment. required: False - type: str - resource_group_id: + type: bool + default: True + zone: description: - - ID of the resource group. - required: False + - (Required for new resource) Zone name + required: True type: str id: description: @@ -84,20 +84,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('zone', 'str'), ('worker_pool', 'str'), ('cluster', 'str'), + ('zone', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'zone', 'worker_pool', - 'public_vlan_id', - 'wait_till_albs', - 'cluster', 'private_vlan_id', + 'public_vlan_id', 'resource_group_id', + 'cluster', + 'wait_till_albs', + 'zone', ] # Params for Data source @@ -114,25 +114,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - zone=dict( + worker_pool=dict( required=False, type='str'), - worker_pool=dict( + private_vlan_id=dict( required=False, type='str'), public_vlan_id=dict( required=False, type='str'), - wait_till_albs=dict( + resource_group_id=dict( required=False, - type='bool'), + type='str'), cluster=dict( required=False, type='str'), - private_vlan_id=dict( + wait_till_albs=dict( required=False, - type='str'), - resource_group_id=dict( + type='bool'), + zone=dict( required=False, type='str'), id=dict( @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_container_worker_pool_zone_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cos_bucket.py b/plugins/modules/ibm_cos_bucket.py index e5381be97..529e611f2 100644 --- a/plugins/modules/ibm_cos_bucket.py +++ b/plugins/modules/ibm_cos_bucket.py @@ -18,66 +18,33 @@ - Create, update or destroy an IBM Cloud 'ibm_cos_bucket' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - abort_incomplete_multipart_upload_days: + archive_rule: description: - - Enable abort incomplete multipart upload to COS Bucket after a defined period of time + - Enable configuration archive_rule (glacier/accelerated) to COS Bucket after a defined period of time required: False type: list elements: dict - expire_rule: + hard_quota: description: - - Enable configuration expire_rule to COS Bucket after a defined period of time + - sets a maximum amount of storage (in bytes) available for a bucket required: False - type: list - elements: dict + type: int force_delete: description: - COS buckets need to be empty before they can be deleted. force_delete option empty the bucket and delete it. required: False type: bool default: True - bucket_name: - description: - - (Required for new resource) COS Bucket name - required: True - type: str - key_protect: - description: - - CRN of the key you want to use data at rest encryption - required: False - type: str - object_versioning: - description: - - Protect objects from accidental deletion or overwrites. Versioning allows you to keep multiple versions of an object protecting from unintentional data loss. - required: False - type: list - elements: dict - cross_region_location: - description: - - Cros region location info - required: False - type: str allowed_ip: description: - List of IPv4 or IPv6 addresses required: False type: list elements: str - storage_class: - description: - - (Required for new resource) Storage class info - required: True - type: str - endpoint_type: - description: - - public or private - required: False - type: str - default: public activity_tracking: description: - Enables sending log data to Activity Tracker and LogDNA to provide visibility into object read and write events @@ -90,14 +57,30 @@ required: False type: list elements: dict + resource_instance_id: + description: + - (Required for new resource) resource instance ID + required: True + type: str region_location: description: - Region Location info. required: False type: str - archive_rule: + storage_class: description: - - Enable configuration archive_rule (glacier/accelerated) to COS Bucket after a defined period of time + - Storage class info + required: False + type: str + endpoint_type: + description: + - public or private + required: False + type: str + default: public + expire_rule: + description: + - Enable configuration expire_rule to COS Bucket after a defined period of time required: False type: list elements: dict @@ -113,21 +96,43 @@ required: False type: list elements: dict - hard_quota: + single_site_location: description: - - sets a maximum amount of storage (in bytes) available for a bucket + - single site location info required: False - type: int - resource_instance_id: + type: str + abort_incomplete_multipart_upload_days: description: - - (Required for new resource) resource instance ID + - Enable abort incomplete multipart upload to COS Bucket after a defined period of time + required: False + type: list + elements: dict + bucket_name: + description: + - (Required for new resource) COS Bucket name required: True type: str - single_site_location: + key_protect: description: - - single site location info + - CRN of the key you want to use data at rest encryption + required: False + type: str + satellite_location_id: + description: + - Provide satellite location info. + required: False + type: str + cross_region_location: + description: + - Cros region location info required: False type: str + object_versioning: + description: + - Protect objects from accidental deletion or overwrites. Versioning allows you to keep multiple versions of an object protecting from unintentional data loss. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -174,127 +179,133 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('bucket_name', 'str'), - ('storage_class', 'str'), ('resource_instance_id', 'str'), + ('bucket_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'abort_incomplete_multipart_upload_days', - 'expire_rule', + 'archive_rule', + 'hard_quota', 'force_delete', - 'bucket_name', - 'key_protect', - 'object_versioning', - 'cross_region_location', 'allowed_ip', - 'storage_class', - 'endpoint_type', 'activity_tracking', 'metrics_monitoring', + 'resource_instance_id', 'region_location', - 'archive_rule', + 'storage_class', + 'endpoint_type', + 'expire_rule', 'retention_rule', 'noncurrent_version_expiration', - 'hard_quota', - 'resource_instance_id', 'single_site_location', + 'abort_incomplete_multipart_upload_days', + 'bucket_name', + 'key_protect', + 'satellite_location_id', + 'cross_region_location', + 'object_versioning', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ ('resource_instance_id', 'str'), ('bucket_name', 'str'), - ('bucket_type', 'str'), - ('bucket_region', 'str'), ] TL_ALL_PARAMETERS_DS = [ 'resource_instance_id', + 'endpoint_type', 'bucket_name', 'bucket_type', 'bucket_region', - 'endpoint_type', + 'satellite_location_id', ] TL_CONFLICTS_MAP = { + 'allowed_ip': ['satellite_location_id'], + 'region_location': ['cross_region_location', 'single_site_location', 'satellite_location_id'], + 'storage_class': ['satellite_location_id'], + 'endpoint_type': ['satellite_location_id'], + 'single_site_location': ['region_location', 'cross_region_location', 'satellite_location_id'], + 'satellite_location_id': ['cross_region_location', 'single_site_location', 'region_location'], + 'cross_region_location': ['region_location', 'single_site_location', 'satellite_location_id'], 'object_versioning': ['retention_rule'], - 'cross_region_location': ['region_location', 'single_site_location'], - 'region_location': ['cross_region_location', 'single_site_location'], - 'single_site_location': ['region_location', 'cross_region_location'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - abort_incomplete_multipart_upload_days=dict( + archive_rule=dict( required=False, elements='', type='list'), - expire_rule=dict( + hard_quota=dict( required=False, - elements='', - type='list'), + type='int'), force_delete=dict( required=False, type='bool'), - bucket_name=dict( + allowed_ip=dict( required=False, - type='str'), - key_protect=dict( + elements='', + type='list'), + activity_tracking=dict( required=False, - type='str'), - object_versioning=dict( + elements='', + type='list'), + metrics_monitoring=dict( required=False, elements='', type='list'), - cross_region_location=dict( + resource_instance_id=dict( required=False, type='str'), - allowed_ip=dict( + region_location=dict( required=False, - elements='', - type='list'), + type='str'), storage_class=dict( required=False, type='str'), endpoint_type=dict( required=False, type='str'), - activity_tracking=dict( + expire_rule=dict( required=False, elements='', type='list'), - metrics_monitoring=dict( + retention_rule=dict( required=False, elements='', type='list'), - region_location=dict( - required=False, - type='str'), - archive_rule=dict( + noncurrent_version_expiration=dict( required=False, elements='', type='list'), - retention_rule=dict( + single_site_location=dict( required=False, - elements='', - type='list'), - noncurrent_version_expiration=dict( + type='str'), + abort_incomplete_multipart_upload_days=dict( required=False, elements='', type='list'), - hard_quota=dict( + bucket_name=dict( required=False, - type='int'), - resource_instance_id=dict( + type='str'), + key_protect=dict( required=False, type='str'), - single_site_location=dict( + satellite_location_id=dict( required=False, type='str'), + cross_region_location=dict( + required=False, + type='str'), + object_versioning=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -360,7 +371,7 @@ def run_module(): resource_type='ibm_cos_bucket', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -369,7 +380,7 @@ def run_module(): resource_type='ibm_cos_bucket', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cos_bucket_info.py b/plugins/modules/ibm_cos_bucket_info.py index 2fee4e570..7be59c093 100644 --- a/plugins/modules/ibm_cos_bucket_info.py +++ b/plugins/modules/ibm_cos_bucket_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cos_bucket' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,6 +26,12 @@ - None required: True type: str + endpoint_type: + description: + - public or private + required: False + type: str + default: public bucket_name: description: - None @@ -34,19 +40,18 @@ bucket_type: description: - None - required: True + required: False type: str bucket_region: description: - None - required: True + required: False type: str - endpoint_type: + satellite_location_id: description: - - public or private + - None required: False type: str - default: public iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -82,21 +87,24 @@ TL_REQUIRED_PARAMETERS = [ ('resource_instance_id', 'str'), ('bucket_name', 'str'), - ('bucket_type', 'str'), - ('bucket_region', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'resource_instance_id', + 'endpoint_type', 'bucket_name', 'bucket_type', 'bucket_region', - 'endpoint_type', + 'satellite_location_id', ] TL_CONFLICTS_MAP = { + 'endpoint_type': ['satellite_location_id'], + 'bucket_type': ['satellite_location_id'], + 'bucket_region': ['satellite_location_id'], + 'satellite_location_id': ['bucket_type', 'bucket_region'], } # define available arguments/parameters a user can pass to the module @@ -106,16 +114,19 @@ resource_instance_id=dict( required=True, type='str'), + endpoint_type=dict( + required=False, + type='str'), bucket_name=dict( required=True, type='str'), bucket_type=dict( - required=True, + required=False, type='str'), bucket_region=dict( - required=True, + required=False, type='str'), - endpoint_type=dict( + satellite_location_id=dict( required=False, type='str'), iaas_classic_username=dict( @@ -152,7 +163,7 @@ def run_module(): resource_type='ibm_cos_bucket', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cos_bucket_object.py b/plugins/modules/ibm_cos_bucket_object.py index 039253d35..80013617d 100644 --- a/plugins/modules/ibm_cos_bucket_object.py +++ b/plugins/modules/ibm_cos_bucket_object.py @@ -18,37 +18,36 @@ - Create, update or destroy an IBM Cloud 'ibm_cos_bucket_object' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - bucket_location: - description: - - (Required for new resource) COS bucket location - required: True - type: str endpoint_type: description: - COS endpoint type: public, private, direct required: False type: str default: public - etag: + content_file: description: - - COS object MD5 hexdigest + - COS object content file path required: False type: str - key: + bucket_location: description: - - (Required for new resource) COS object key + - (Required for new resource) COS bucket location required: True type: str - force_delete: + content: description: - - COS buckets need to be empty before they can be deleted. force_delete option empty the bucket and delete it. + - COS object content required: False - type: bool - default: True + type: str + etag: + description: + - COS object MD5 hexdigest + required: False + type: str bucket_crn: description: - (Required for new resource) COS bucket CRN @@ -59,16 +58,17 @@ - COS object content in base64 encoding required: False type: str - content: + key: description: - - COS object content - required: False + - (Required for new resource) COS object key + required: True type: str - content_file: + force_delete: description: - - COS object content file path + - COS buckets need to be empty before they can be deleted. force_delete option empty the bucket and delete it. required: False - type: str + type: bool + default: True id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -116,74 +116,74 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('bucket_location', 'str'), - ('key', 'str'), ('bucket_crn', 'str'), + ('key', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bucket_location', 'endpoint_type', + 'content_file', + 'bucket_location', + 'content', 'etag', - 'key', - 'force_delete', 'bucket_crn', 'content_base64', - 'content', - 'content_file', + 'key', + 'force_delete', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('bucket_crn', 'str'), ('key', 'str'), + ('bucket_crn', 'str'), ('bucket_location', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'key', 'bucket_crn', 'endpoint_type', - 'key', 'bucket_location', ] TL_CONFLICTS_MAP = { - 'content_base64': ['content', 'content_file'], - 'content': ['content_base64', 'content_file'], 'content_file': ['content', 'content_base64'], + 'content': ['content_base64', 'content_file'], + 'content_base64': ['content', 'content_file'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - bucket_location=dict( + endpoint_type=dict( required=False, type='str'), - endpoint_type=dict( + content_file=dict( required=False, type='str'), - etag=dict( + bucket_location=dict( required=False, type='str'), - key=dict( + content=dict( required=False, type='str'), - force_delete=dict( + etag=dict( required=False, - type='bool'), + type='str'), bucket_crn=dict( required=False, type='str'), content_base64=dict( required=False, type='str'), - content=dict( + key=dict( required=False, type='str'), - content_file=dict( + force_delete=dict( required=False, - type='str'), + type='bool'), id=dict( required=False, type='str'), @@ -249,7 +249,7 @@ def run_module(): resource_type='ibm_cos_bucket_object', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -258,7 +258,7 @@ def run_module(): resource_type='ibm_cos_bucket_object', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_cos_bucket_object_info.py b/plugins/modules/ibm_cos_bucket_object_info.py index 3d6fbada8..f087ae591 100644 --- a/plugins/modules/ibm_cos_bucket_object_info.py +++ b/plugins/modules/ibm_cos_bucket_object_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_cos_bucket_object' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + key: + description: + - COS object key + required: True + type: str bucket_crn: description: - COS bucket CRN @@ -32,11 +37,6 @@ required: False type: str default: public - key: - description: - - COS object key - required: True - type: str bucket_location: description: - COS bucket location @@ -75,16 +75,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('bucket_crn', 'str'), ('key', 'str'), + ('bucket_crn', 'str'), ('bucket_location', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'key', 'bucket_crn', 'endpoint_type', - 'key', 'bucket_location', ] @@ -96,15 +96,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + key=dict( + required=True, + type='str'), bucket_crn=dict( required=True, type='str'), endpoint_type=dict( required=False, type='str'), - key=dict( - required=True, - type='str'), bucket_location=dict( required=True, type='str'), @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_cos_bucket_object', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cr_namespace.py b/plugins/modules/ibm_cr_namespace.py index 698fc27d0..4aa669753 100644 --- a/plugins/modules/ibm_cr_namespace.py +++ b/plugins/modules/ibm_cr_namespace.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cr_namespace' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,17 +27,17 @@ - (Required for new resource) The name of the namespace. required: True type: str - resource_group_id: - description: - - The ID of the resource group that the namespace will be created within. - required: False - type: str tags: description: - List of tags required: False type: list elements: str + resource_group_id: + description: + - The ID of the resource group that the namespace will be created within. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,8 +90,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'resource_group_id', 'tags', + 'resource_group_id', ] # Params for Data source @@ -111,13 +111,13 @@ name=dict( required=False, type='str'), - resource_group_id=dict( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), + resource_group_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_cr_namespace', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cr_namespaces_info.py b/plugins/modules/ibm_cr_namespaces_info.py index 94a219207..681979dcb 100644 --- a/plugins/modules/ibm_cr_namespaces_info.py +++ b/plugins/modules/ibm_cr_namespaces_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cr_namespaces' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_cr_namespaces', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cr_retention_policy.py b/plugins/modules/ibm_cr_retention_policy.py index 319b21f6d..2f5fffd83 100644 --- a/plugins/modules/ibm_cr_retention_policy.py +++ b/plugins/modules/ibm_cr_retention_policy.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cr_retention_policy' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_cr_retention_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_database.py b/plugins/modules/ibm_database.py index 461bb80cd..210b42bac 100644 --- a/plugins/modules/ibm_database.py +++ b/plugins/modules/ibm_database.py @@ -18,26 +18,25 @@ - Create, update or destroy an IBM Cloud 'ibm_database' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - plan: + backup_encryption_key_crn: description: - - (Required for new resource) The plan type of the Database instance - required: True + - The Backup Encryption Key CRN + required: False type: str - remote_leader_id: + point_in_time_recovery_deployment_id: description: - - The CRN of leader database + - The CRN of source instance required: False type: str - tags: + adminpassword: description: - - None + - The admin user password for the instance required: False - type: list - elements: str + type: str whitelist: description: - None @@ -50,16 +49,16 @@ required: False type: list elements: dict + resource_group_id: + description: + - The id of the resource group in which the Database instance is present + required: False + type: str location: description: - (Required for new resource) The location or the region in which Database instance exists required: True type: str - version: - description: - - The database version to provision if specified - required: False - type: str key_protect_key: description: - The CRN of Key protect key @@ -70,43 +69,22 @@ - The point in time recovery time stamp of the deployed instance required: False type: str - name: - description: - - (Required for new resource) Resource instance name for example, my Database instance - required: True - type: str - service: - description: - - (Required for new resource) The name of the Cloud Internet database service - required: True - type: str - configuration: - description: - - The configuration in JSON format - required: False - type: str - service_endpoints: - description: - - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. - required: False - type: str - default: public - backup_id: + remote_leader_id: description: - - The CRN of backup source database + - The CRN of leader database required: False type: str - point_in_time_recovery_deployment_id: + plan: description: - - The CRN of source instance - required: False + - (Required for new resource) The plan type of the Database instance + required: True type: str - auto_scaling: + tags: description: - - ICD Auto Scaling + - None required: False type: list - elements: dict + elements: str plan_validation: description: - For elasticsearch and postgres perform database parameter validation during the plan phase. Otherwise, database parameter validation happens in apply phase. @@ -118,27 +96,49 @@ - The CRN of Key protect instance required: False type: str - backup_encryption_key_crn: + backup_id: description: - - The Backup Encryption Key CRN + - The CRN of backup source database required: False type: str - resource_group_id: + name: description: - - The id of the resource group in which the Database instance is present + - (Required for new resource) Resource instance name for example, my Database instance + required: True + type: str + service: + description: + - (Required for new resource) The name of the Cloud Internet database service + required: True + type: str + configuration: + description: + - The configuration in JSON format required: False type: str - adminpassword: + version: description: - - The admin user password for the instance + - The database version to provision if specified + required: False + type: str + service_endpoints: + description: + - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. required: False type: str + default: public users: description: - None required: False type: list elements: dict + auto_scaling: + description: + - ICD Auto Scaling + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -185,36 +185,36 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('plan', 'str'), ('location', 'str'), + ('plan', 'str'), ('name', 'str'), ('service', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'plan', - 'remote_leader_id', - 'tags', + 'backup_encryption_key_crn', + 'point_in_time_recovery_deployment_id', + 'adminpassword', 'whitelist', 'group', + 'resource_group_id', 'location', - 'version', 'key_protect_key', 'point_in_time_recovery_time', + 'remote_leader_id', + 'plan', + 'tags', + 'plan_validation', + 'key_protect_instance', + 'backup_id', 'name', 'service', 'configuration', + 'version', 'service_endpoints', - 'backup_id', - 'point_in_time_recovery_deployment_id', - 'auto_scaling', - 'plan_validation', - 'key_protect_instance', - 'backup_encryption_key_crn', - 'resource_group_id', - 'adminpassword', 'users', + 'auto_scaling', ] # Params for Data source @@ -223,11 +223,11 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', + 'service', 'location', - 'resource_group_id', 'tags', - 'service', + 'name', + 'resource_group_id', ] TL_CONFLICTS_MAP = { @@ -238,16 +238,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - plan=dict( + backup_encryption_key_crn=dict( required=False, type='str'), - remote_leader_id=dict( + point_in_time_recovery_deployment_id=dict( required=False, type='str'), - tags=dict( + adminpassword=dict( required=False, - elements='', - type='list'), + type='str'), whitelist=dict( required=False, elements='', @@ -256,10 +255,10 @@ required=False, elements='', type='list'), - location=dict( + resource_group_id=dict( required=False, type='str'), - version=dict( + location=dict( required=False, type='str'), key_protect_key=dict( @@ -268,47 +267,48 @@ point_in_time_recovery_time=dict( required=False, type='str'), - name=dict( + remote_leader_id=dict( required=False, type='str'), - service=dict( + plan=dict( required=False, type='str'), - configuration=dict( + tags=dict( required=False, - type='str'), - service_endpoints=dict( + elements='', + type='list'), + plan_validation=dict( + required=False, + type='bool'), + key_protect_instance=dict( required=False, type='str'), backup_id=dict( required=False, type='str'), - point_in_time_recovery_deployment_id=dict( + name=dict( required=False, type='str'), - auto_scaling=dict( - required=False, - elements='', - type='list'), - plan_validation=dict( - required=False, - type='bool'), - key_protect_instance=dict( + service=dict( required=False, type='str'), - backup_encryption_key_crn=dict( + configuration=dict( required=False, type='str'), - resource_group_id=dict( + version=dict( required=False, type='str'), - adminpassword=dict( + service_endpoints=dict( required=False, type='str'), users=dict( required=False, elements='', type='list'), + auto_scaling=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -374,7 +374,7 @@ def run_module(): resource_type='ibm_database', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -383,7 +383,7 @@ def run_module(): resource_type='ibm_database', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_database_backup_info.py b/plugins/modules/ibm_database_backup_info.py index 6e70e1b95..b20be49d9 100644 --- a/plugins/modules/ibm_database_backup_info.py +++ b/plugins/modules/ibm_database_backup_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_database_backup' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_database_backup', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_database_backups_info.py b/plugins/modules/ibm_database_backups_info.py index de084a6d3..7bbccf1db 100644 --- a/plugins/modules/ibm_database_backups_info.py +++ b/plugins/modules/ibm_database_backups_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_database_backups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_database_backups', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_database_connection_info.py b/plugins/modules/ibm_database_connection_info.py index 8caebfdc6..b5766da42 100644 --- a/plugins/modules/ibm_database_connection_info.py +++ b/plugins/modules/ibm_database_connection_info.py @@ -17,13 +17,13 @@ description: - Retrieve an IBM Cloud 'ibm_database_connection' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - user_type: + endpoint_type: description: - - User type. + - Endpoint Type. The endpoint must be enabled on the deployment before its connection information can be fetched. required: True type: str deployment_id: @@ -31,9 +31,9 @@ - Deployment ID. required: True type: str - endpoint_type: + user_type: description: - - Endpoint Type. The endpoint must be enabled on the deployment before its connection information can be fetched. + - User type. required: True type: str user_id: @@ -74,17 +74,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('user_type', 'str'), - ('deployment_id', 'str'), ('endpoint_type', 'str'), + ('deployment_id', 'str'), + ('user_type', 'str'), ('user_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'user_type', - 'deployment_id', 'endpoint_type', + 'deployment_id', + 'user_type', 'user_id', ] @@ -96,13 +96,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - user_type=dict( + endpoint_type=dict( required=True, type='str'), deployment_id=dict( required=True, type='str'), - endpoint_type=dict( + user_type=dict( required=True, type='str'), user_id=dict( @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_database_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_database_info.py b/plugins/modules/ibm_database_info.py index 180748b9e..310cb2ff5 100644 --- a/plugins/modules/ibm_database_info.py +++ b/plugins/modules/ibm_database_info.py @@ -17,34 +17,34 @@ description: - Retrieve an IBM Cloud 'ibm_database' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + service: description: - - Resource instance name for example, my Database instance - required: True + - The name of the Cloud Database service + required: False type: str location: description: - The location or the region in which the Database instance exists required: False type: str - resource_group_id: - description: - - The id of the resource group in which the Database instance is present - required: False - type: str tags: description: - None required: False type: list elements: str - service: + name: description: - - The name of the Cloud Database service + - Resource instance name for example, my Database instance + required: True + type: str + resource_group_id: + description: + - The id of the resource group in which the Database instance is present required: False type: str iaas_classic_username: @@ -85,11 +85,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', + 'service', 'location', - 'resource_group_id', 'tags', - 'service', + 'name', + 'resource_group_id', ] @@ -100,20 +100,20 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=True, - type='str'), - location=dict( + service=dict( required=False, type='str'), - resource_group_id=dict( + location=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - service=dict( + name=dict( + required=True, + type='str'), + resource_group_id=dict( required=False, type='str'), iaas_classic_username=dict( @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_database', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_database_point_in_time_recovery_info.py b/plugins/modules/ibm_database_point_in_time_recovery_info.py index 53f394c99..1e7bf7dbd 100644 --- a/plugins/modules/ibm_database_point_in_time_recovery_info.py +++ b/plugins/modules/ibm_database_point_in_time_recovery_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_database_point_in_time_recovery' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_database_point_in_time_recovery', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_database_remotes_info.py b/plugins/modules/ibm_database_remotes_info.py index 464d61d19..9e2dff827 100644 --- a/plugins/modules/ibm_database_remotes_info.py +++ b/plugins/modules/ibm_database_remotes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_database_remotes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_database_remotes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_gateway.py b/plugins/modules/ibm_dl_gateway.py index 2c5cfc75f..67856b497 100644 --- a/plugins/modules/ibm_dl_gateway.py +++ b/plugins/modules/ibm_dl_gateway.py @@ -18,115 +18,89 @@ - Create, update or destroy an IBM Cloud 'ibm_dl_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - metered: - description: - - (Required for new resource) Metered billing option - required: True - type: bool - bgp_cer_cidr: - description: - - BGP customer edge router CIDR - required: False - type: str - global_: - description: - - (Required for new resource) Gateways with global routing (true) can connect to networks outside their associated region - required: True - type: bool - bgp_base_cidr: + tags: description: - - BGP base CIDR + - Tags for the direct link gateway required: False - type: str + type: list + elements: str bgp_ibm_cidr: description: - BGP IBM CIDR required: False type: str + bfd_interval: + description: + - BFD Interval + required: False + type: int bfd_multiplier: description: - BFD Multiplier required: False type: int - cross_connect_router: + location_name: description: - - Cross connect router + - Gateway location required: False type: str - customer_name: + authentication_key: description: - - Customer name + - BGP MD5 authentication key required: False type: str - macsec_config: - description: - - MACsec configuration information - required: False - type: list - elements: dict - tags: + carrier_name: description: - - Tags for the direct link gateway + - Carrier name required: False - type: list - elements: str + type: str bgp_asn: description: - (Required for new resource) BGP ASN required: True type: int - name: - description: - - (Required for new resource) The unique user-defined name for this gateway - required: True - type: str - loa_reject_reason: + port: description: - - Loa reject reason + - Gateway port required: False type: str - bfd_interval: + speed_mbps: description: - - BFD Interval - required: False + - (Required for new resource) Gateway speed in megabits per second + required: True type: int - bfd_status_updated_at: - description: - - Date and time BFD status was updated - required: False - type: str - location_name: + bfd_status: description: - - Gateway location + - Gateway BFD status required: False type: str - speed_mbps: + name: description: - - (Required for new resource) Gateway speed in megabits per second + - (Required for new resource) The unique user-defined name for this gateway required: True - type: int + type: str type: description: - (Required for new resource) Gateway type required: True type: str - resource_group: + bgp_cer_cidr: description: - - Gateway resource group + - BGP customer edge router CIDR required: False type: str - bfd_status: + loa_reject_reason: description: - - Gateway BFD status + - Loa reject reason required: False type: str - port: + bgp_base_cidr: description: - - Gateway port + - BGP base CIDR required: False type: str connection_mode: @@ -134,16 +108,42 @@ - Type of services this Gateway is attached to. Mode transit means this Gateway will be attached to Transit Gateway Service and direct means this Gateway will be attached to vpc or classic connection required: False type: str - carrier_name: + cross_connect_router: description: - - Carrier name + - Cross connect router required: False type: str - authentication_key: + global_: description: - - BGP MD5 authentication key + - (Required for new resource) Gateways with global routing (true) can connect to networks outside their associated region + required: True + type: bool + resource_group: + description: + - Gateway resource group + required: False + type: str + bfd_status_updated_at: + description: + - Date and time BFD status was updated + required: False + type: str + macsec_config: + description: + - MACsec configuration information + required: False + type: list + elements: dict + customer_name: + description: + - Customer name required: False type: str + metered: + description: + - (Required for new resource) Metered billing option + required: True + type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -190,40 +190,40 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('metered', 'bool'), - ('global_', 'bool'), ('bgp_asn', 'int'), - ('name', 'str'), ('speed_mbps', 'int'), + ('name', 'str'), ('type', 'str'), + ('global_', 'bool'), + ('metered', 'bool'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'metered', - 'bgp_cer_cidr', - 'global_', - 'bgp_base_cidr', - 'bgp_ibm_cidr', - 'bfd_multiplier', - 'cross_connect_router', - 'customer_name', - 'macsec_config', 'tags', - 'bgp_asn', - 'name', - 'loa_reject_reason', + 'bgp_ibm_cidr', 'bfd_interval', - 'bfd_status_updated_at', + 'bfd_multiplier', 'location_name', + 'authentication_key', + 'carrier_name', + 'bgp_asn', + 'port', 'speed_mbps', - 'type', - 'resource_group', 'bfd_status', - 'port', + 'name', + 'type', + 'bgp_cer_cidr', + 'loa_reject_reason', + 'bgp_base_cidr', 'connection_mode', - 'carrier_name', - 'authentication_key', + 'cross_connect_router', + 'global_', + 'resource_group', + 'bfd_status_updated_at', + 'macsec_config', + 'customer_name', + 'metered', ] # Params for Data source @@ -243,80 +243,80 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - metered=dict( - required=False, - type='bool'), - bgp_cer_cidr=dict( - required=False, - type='str'), - global_=dict( - required=False, - type='bool'), - bgp_base_cidr=dict( + tags=dict( required=False, - type='str'), + elements='', + type='list'), bgp_ibm_cidr=dict( required=False, type='str'), + bfd_interval=dict( + required=False, + type='int'), bfd_multiplier=dict( required=False, type='int'), - cross_connect_router=dict( + location_name=dict( required=False, type='str'), - customer_name=dict( + authentication_key=dict( required=False, type='str'), - macsec_config=dict( - required=False, - elements='', - type='list'), - tags=dict( + carrier_name=dict( required=False, - elements='', - type='list'), + type='str'), bgp_asn=dict( required=False, type='int'), - name=dict( - required=False, - type='str'), - loa_reject_reason=dict( + port=dict( required=False, type='str'), - bfd_interval=dict( + speed_mbps=dict( required=False, type='int'), - bfd_status_updated_at=dict( + bfd_status=dict( required=False, type='str'), - location_name=dict( + name=dict( required=False, type='str'), - speed_mbps=dict( - required=False, - type='int'), type=dict( required=False, type='str'), - resource_group=dict( + bgp_cer_cidr=dict( required=False, type='str'), - bfd_status=dict( + loa_reject_reason=dict( required=False, type='str'), - port=dict( + bgp_base_cidr=dict( required=False, type='str'), connection_mode=dict( required=False, type='str'), - carrier_name=dict( + cross_connect_router=dict( required=False, type='str'), - authentication_key=dict( + global_=dict( + required=False, + type='bool'), + resource_group=dict( + required=False, + type='str'), + bfd_status_updated_at=dict( + required=False, + type='str'), + macsec_config=dict( + required=False, + elements='', + type='list'), + customer_name=dict( required=False, type='str'), + metered=dict( + required=False, + type='bool'), id=dict( required=False, type='str'), @@ -382,7 +382,7 @@ def run_module(): resource_type='ibm_dl_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -391,7 +391,7 @@ def run_module(): resource_type='ibm_dl_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_dl_gateway_info.py b/plugins/modules/ibm_dl_gateway_info.py index 30bd7b0cf..d3759b8ec 100644 --- a/plugins/modules/ibm_dl_gateway_info.py +++ b/plugins/modules/ibm_dl_gateway_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_gateway' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dl_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_gateways_info.py b/plugins/modules/ibm_dl_gateways_info.py index 302d5a1f8..4c49c6530 100644 --- a/plugins/modules/ibm_dl_gateways_info.py +++ b/plugins/modules/ibm_dl_gateways_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_gateways' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_dl_gateways', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_locations_info.py b/plugins/modules/ibm_dl_locations_info.py index c782fdd7c..325d8eb01 100644 --- a/plugins/modules/ibm_dl_locations_info.py +++ b/plugins/modules/ibm_dl_locations_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_locations' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dl_locations', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_offering_speeds_info.py b/plugins/modules/ibm_dl_offering_speeds_info.py index f76a487ee..6f9d1a8e2 100644 --- a/plugins/modules/ibm_dl_offering_speeds_info.py +++ b/plugins/modules/ibm_dl_offering_speeds_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_offering_speeds' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dl_offering_speeds', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_port_info.py b/plugins/modules/ibm_dl_port_info.py index b215ceb0e..cf8649102 100644 --- a/plugins/modules/ibm_dl_port_info.py +++ b/plugins/modules/ibm_dl_port_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_port' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dl_port', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_ports_info.py b/plugins/modules/ibm_dl_ports_info.py index 11b8ba7b2..2ffe4a51e 100644 --- a/plugins/modules/ibm_dl_ports_info.py +++ b/plugins/modules/ibm_dl_ports_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_ports' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_dl_ports', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_provider_gateway.py b/plugins/modules/ibm_dl_provider_gateway.py index 006dfa29f..2dec125ff 100644 --- a/plugins/modules/ibm_dl_provider_gateway.py +++ b/plugins/modules/ibm_dl_provider_gateway.py @@ -18,49 +18,44 @@ - Create, update or destroy an IBM Cloud 'ibm_dl_provider_gateway' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - bgp_cer_cidr: - description: - - BGP customer edge router CIDR - required: False - type: str - vlan: - description: - - VLAN allocated for this gateway - required: False - type: int - bgp_asn: + name: description: - - (Required for new resource) BGP ASN + - (Required for new resource) The unique user-defined name for this gateway required: True - type: int - bgp_ibm_cidr: - description: - - BGP IBM CIDR - required: False type: str speed_mbps: description: - (Required for new resource) Gateway speed in megabits per second required: True type: int + port: + description: + - (Required for new resource) Gateway port + required: True + type: str customer_account_id: description: - (Required for new resource) Customer IBM Cloud account ID for the new gateway. A gateway object containing the pending create request will become available in the specified account. required: True type: str - port: + vlan: description: - - (Required for new resource) Gateway port - required: True + - VLAN allocated for this gateway + required: False + type: int + bgp_ibm_cidr: + description: + - BGP IBM CIDR + required: False type: str - name: + bgp_cer_cidr: description: - - (Required for new resource) The unique user-defined name for this gateway - required: True + - BGP customer edge router CIDR + required: False type: str tags: description: @@ -68,6 +63,11 @@ required: False type: list elements: str + bgp_asn: + description: + - (Required for new resource) BGP ASN + required: True + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -114,24 +114,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('bgp_asn', 'int'), + ('name', 'str'), ('speed_mbps', 'int'), - ('customer_account_id', 'str'), ('port', 'str'), - ('name', 'str'), + ('customer_account_id', 'str'), + ('bgp_asn', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bgp_cer_cidr', - 'vlan', - 'bgp_asn', - 'bgp_ibm_cidr', + 'name', 'speed_mbps', - 'customer_account_id', 'port', - 'name', + 'customer_account_id', + 'vlan', + 'bgp_ibm_cidr', + 'bgp_cer_cidr', 'tags', + 'bgp_asn', ] # Params for Data source @@ -148,34 +148,34 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - bgp_cer_cidr=dict( + name=dict( required=False, type='str'), - vlan=dict( - required=False, - type='int'), - bgp_asn=dict( + speed_mbps=dict( required=False, type='int'), - bgp_ibm_cidr=dict( + port=dict( required=False, type='str'), - speed_mbps=dict( - required=False, - type='int'), customer_account_id=dict( required=False, type='str'), - port=dict( + vlan=dict( + required=False, + type='int'), + bgp_ibm_cidr=dict( required=False, type='str'), - name=dict( + bgp_cer_cidr=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), + bgp_asn=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -241,7 +241,7 @@ def run_module(): resource_type='ibm_dl_provider_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_provider_gateways_info.py b/plugins/modules/ibm_dl_provider_gateways_info.py index d4893fe65..5d2ff4cd2 100644 --- a/plugins/modules/ibm_dl_provider_gateways_info.py +++ b/plugins/modules/ibm_dl_provider_gateways_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_provider_gateways' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_dl_provider_gateways', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_provider_ports_info.py b/plugins/modules/ibm_dl_provider_ports_info.py index 506fef633..df33fc6be 100644 --- a/plugins/modules/ibm_dl_provider_ports_info.py +++ b/plugins/modules/ibm_dl_provider_ports_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_provider_ports' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_dl_provider_ports', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_routers_info.py b/plugins/modules/ibm_dl_routers_info.py index 1e68ac200..92d4ddc1f 100644 --- a/plugins/modules/ibm_dl_routers_info.py +++ b/plugins/modules/ibm_dl_routers_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dl_routers' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_dl_routers', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dl_virtual_connection.py b/plugins/modules/ibm_dl_virtual_connection.py index a3cf1a6d6..f90ed6c6a 100644 --- a/plugins/modules/ibm_dl_virtual_connection.py +++ b/plugins/modules/ibm_dl_virtual_connection.py @@ -18,18 +18,23 @@ - Create, update or destroy an IBM Cloud 'ibm_dl_virtual_connection' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - gateway: + name: description: - - (Required for new resource) The Direct Link gateway identifier + - (Required for new resource) The user-defined name for this virtual connection. Virtualconnection names are unique within a gateway. This is the name of thevirtual connection itself, the network being connected may have its ownname attribute required: True type: str - name: + network_id: description: - - (Required for new resource) The user-defined name for this virtual connection. Virtualconnection names are unique within a gateway. This is the name of thevirtual connection itself, the network being connected may have its ownname attribute + - Unique identifier of the target network. For type=vpc virtual connections this is the CRN of the target VPC. This field does not apply to type=classic connections. + required: False + type: str + gateway: + description: + - (Required for new resource) The Direct Link gateway identifier required: True type: str type: @@ -37,11 +42,6 @@ - (Required for new resource) The type of virtual connection.Allowable values (classic,vpc) required: True type: str - network_id: - description: - - Unique identifier of the target network. For type=vpc virtual connections this is the CRN of the target VPC. This field does not apply to type=classic connections. - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -88,17 +88,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('gateway', 'str'), ('name', 'str'), + ('gateway', 'str'), ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'gateway', 'name', - 'type', 'network_id', + 'gateway', + 'type', ] # Params for Data source @@ -115,16 +115,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - gateway=dict( + name=dict( required=False, type='str'), - name=dict( + network_id=dict( required=False, type='str'), - type=dict( + gateway=dict( required=False, type='str'), - network_id=dict( + type=dict( required=False, type='str'), id=dict( @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_dl_virtual_connection', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_custom_resolver.py b/plugins/modules/ibm_dns_custom_resolver.py index 19c9e1cc5..cf0aad83a 100644 --- a/plugins/modules/ibm_dns_custom_resolver.py +++ b/plugins/modules/ibm_dns_custom_resolver.py @@ -18,43 +18,43 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_custom_resolver' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - enabled: - description: - - Whether the custom resolver is enabled - required: False - type: bool - default: True locations: description: - Locations on which the custom resolver will be running required: False type: list elements: dict - instance_id: - description: - - (Required for new resource) Instance ID - required: True - type: str name: description: - (Required for new resource) Name of the custom resolver required: True type: str - description: + enabled: description: - - Descriptive text of the custom resolver. + - Whether the custom resolver is enabled required: False - type: str + type: bool + default: True high_availability: description: - Whether High Availability is enabled in custom resolver required: False type: bool default: True + instance_id: + description: + - (Required for new resource) Instance ID + required: True + type: str + description: + description: + - Descriptive text of the custom resolver. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -101,18 +101,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), ('name', 'str'), + ('instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'enabled', 'locations', - 'instance_id', 'name', - 'description', + 'enabled', 'high_availability', + 'instance_id', + 'description', ] # Params for Data source @@ -129,25 +129,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - enabled=dict( - required=False, - type='bool'), locations=dict( required=False, elements='', type='list'), - instance_id=dict( - required=False, - type='str'), name=dict( required=False, type='str'), - description=dict( + enabled=dict( required=False, - type='str'), + type='bool'), high_availability=dict( required=False, type='bool'), + instance_id=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -213,7 +213,7 @@ def run_module(): resource_type='ibm_dns_custom_resolver', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_custom_resolver_forwarding_rule.py b/plugins/modules/ibm_dns_custom_resolver_forwarding_rule.py index c7c04243d..f13343c68 100644 --- a/plugins/modules/ibm_dns_custom_resolver_forwarding_rule.py +++ b/plugins/modules/ibm_dns_custom_resolver_forwarding_rule.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_custom_resolver_forwarding_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -211,7 +211,7 @@ def run_module(): resource_type='ibm_dns_custom_resolver_forwarding_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_custom_resolver_forwarding_rules_info.py b/plugins/modules/ibm_dns_custom_resolver_forwarding_rules_info.py index 0d4a4d53c..5892faf1a 100644 --- a/plugins/modules/ibm_dns_custom_resolver_forwarding_rules_info.py +++ b/plugins/modules/ibm_dns_custom_resolver_forwarding_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_custom_resolver_forwarding_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_dns_custom_resolver_forwarding_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_custom_resolver_location.py b/plugins/modules/ibm_dns_custom_resolver_location.py index fc1fca4e2..1bd409f85 100644 --- a/plugins/modules/ibm_dns_custom_resolver_location.py +++ b/plugins/modules/ibm_dns_custom_resolver_location.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_custom_resolver_location' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + subnet_crn: + description: + - (Required for new resource) CRLocation Subnet CRN + required: True + type: str + enabled: + description: + - CRLocation Enabled + required: False + type: bool + default: False cr_enabled: description: - None @@ -38,17 +49,6 @@ - (Required for new resource) Custom Resolver ID required: True type: str - subnet_crn: - description: - - (Required for new resource) CRLocation Subnet CRN - required: True - type: str - enabled: - description: - - CRLocation Enabled - required: False - type: bool - default: False id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,18 +95,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('subnet_crn', 'str'), ('instance_id', 'str'), ('resolver_id', 'str'), - ('subnet_crn', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'subnet_crn', + 'enabled', 'cr_enabled', 'instance_id', 'resolver_id', - 'subnet_crn', - 'enabled', ] # Params for Data source @@ -123,6 +123,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + subnet_crn=dict( + required=False, + type='str'), + enabled=dict( + required=False, + type='bool'), cr_enabled=dict( required=False, type='bool'), @@ -132,12 +138,6 @@ resolver_id=dict( required=False, type='str'), - subnet_crn=dict( - required=False, - type='str'), - enabled=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -203,7 +203,7 @@ def run_module(): resource_type='ibm_dns_custom_resolver_location', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_custom_resolvers_info.py b/plugins/modules/ibm_dns_custom_resolvers_info.py index 16e2d5124..6f813f0ab 100644 --- a/plugins/modules/ibm_dns_custom_resolvers_info.py +++ b/plugins/modules/ibm_dns_custom_resolvers_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_custom_resolvers' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dns_custom_resolvers', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_domain.py b/plugins/modules/ibm_dns_domain.py index 5c843bd2f..c5b7a8158 100644 --- a/plugins/modules/ibm_dns_domain.py +++ b/plugins/modules/ibm_dns_domain.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_domain' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_dns_domain', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -194,7 +194,7 @@ def run_module(): resource_type='ibm_dns_domain', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_dns_domain_info.py b/plugins/modules/ibm_dns_domain_info.py index 03f344ce4..dc88ed8c8 100644 --- a/plugins/modules/ibm_dns_domain_info.py +++ b/plugins/modules/ibm_dns_domain_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_domain' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dns_domain', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_domain_registration_info.py b/plugins/modules/ibm_dns_domain_registration_info.py index a6ac7d277..7dd1ce2f9 100644 --- a/plugins/modules/ibm_dns_domain_registration_info.py +++ b/plugins/modules/ibm_dns_domain_registration_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_domain_registration' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dns_domain_registration', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_domain_registration_nameservers.py b/plugins/modules/ibm_dns_domain_registration_nameservers.py index 52ca8d5fd..96556541d 100644 --- a/plugins/modules/ibm_dns_domain_registration_nameservers.py +++ b/plugins/modules/ibm_dns_domain_registration_nameservers.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_domain_registration_nameservers' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -175,7 +175,7 @@ def run_module(): resource_type='ibm_dns_domain_registration_nameservers', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_glb.py b/plugins/modules/ibm_dns_glb.py index 4a29ff31f..f7a4962b4 100644 --- a/plugins/modules/ibm_dns_glb.py +++ b/plugins/modules/ibm_dns_glb.py @@ -18,37 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_glb' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_id: + fallback_pool: description: - - (Required for new resource) The GUID of the private DNS. + - (Required for new resource) The pool ID to use when all other pools are detected as unhealthy required: True type: str - description: - description: - - Descriptive text of the load balancer - required: False - type: str - enabled: - description: - - Whether the load balancer is enabled - required: False - type: bool default_pools: description: - (Required for new resource) A list of pool IDs ordered by their failover priority required: True type: list elements: str - az_pools: + instance_id: description: - - Map availability zones to pool ID's. - required: False - type: list - elements: dict + - (Required for new resource) The GUID of the private DNS. + required: True + type: str zone_id: description: - (Required for new resource) Zone Id @@ -59,16 +48,27 @@ - (Required for new resource) Name of the load balancer required: True type: str + enabled: + description: + - Whether the load balancer is enabled + required: False + type: bool ttl: description: - Time to live in second required: False type: int default: 60 - fallback_pool: + az_pools: description: - - (Required for new resource) The pool ID to use when all other pools are detected as unhealthy - required: True + - Map availability zones to pool ID's. + required: False + type: list + elements: dict + description: + description: + - Descriptive text of the load balancer + required: False type: str id: description: @@ -116,24 +116,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), + ('fallback_pool', 'str'), ('default_pools', 'list'), + ('instance_id', 'str'), ('zone_id', 'str'), ('name', 'str'), - ('fallback_pool', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_id', - 'description', - 'enabled', + 'fallback_pool', 'default_pools', - 'az_pools', + 'instance_id', 'zone_id', 'name', + 'enabled', 'ttl', - 'fallback_pool', + 'az_pools', + 'description', ] # Params for Data source @@ -150,33 +150,33 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_id=dict( - required=False, - type='str'), - description=dict( + fallback_pool=dict( required=False, type='str'), - enabled=dict( - required=False, - type='bool'), default_pools=dict( required=False, elements='', type='list'), - az_pools=dict( + instance_id=dict( required=False, - elements='', - type='list'), + type='str'), zone_id=dict( required=False, type='str'), name=dict( required=False, type='str'), + enabled=dict( + required=False, + type='bool'), ttl=dict( required=False, type='int'), - fallback_pool=dict( + az_pools=dict( + required=False, + elements='', + type='list'), + description=dict( required=False, type='str'), id=dict( @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_dns_glb', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_glb_monitor.py b/plugins/modules/ibm_dns_glb_monitor.py index 83c77586f..f44b56556 100644 --- a/plugins/modules/ibm_dns_glb_monitor.py +++ b/plugins/modules/ibm_dns_glb_monitor.py @@ -18,85 +18,85 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_glb_monitor' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - retries: - description: - - The number of retries to attempt in case of a timeout before marking the origin as unhealthy - required: False - type: int - default: 1 name: description: - (Required for new resource) The unique identifier of a service instance. required: True type: str - type: - description: - - The protocol to use for the health check - required: False - type: str - default: HTTP interval: description: - The interval between each health check required: False type: int default: 60 - description: + path: description: - - Descriptive text of the load balancer monitor + - The endpoint path to health check against required: False type: str - timeout: + allow_insecure: description: - - The timeout (in seconds) before marking the health check as failed + - Do not validate the certificate when monitor use HTTPS. This parameter is currently only valid for HTTPS monitors. required: False - type: int - default: 5 + type: bool expected_codes: description: - The expected HTTP response code or code range of the health check. This parameter is only valid for HTTP and HTTPS required: False type: str - expected_body: + type: description: - - A case-insensitive sub-string to look for in the response body + - The protocol to use for the health check required: False type: str - method: + default: HTTP + port: description: - - The method to use for the health check + - Port number to connect to for the health check required: False - type: str - path: + type: int + retries: description: - - The endpoint path to health check against + - The number of retries to attempt in case of a timeout before marking the origin as unhealthy required: False - type: str + type: int + default: 1 + timeout: + description: + - The timeout (in seconds) before marking the health check as failed + required: False + type: int + default: 5 headers: description: - The HTTP request headers to send in the health check required: False type: list elements: dict + expected_body: + description: + - A case-insensitive sub-string to look for in the response body + required: False + type: str instance_id: description: - (Required for new resource) Instance Id required: True type: str - port: + description: description: - - Port number to connect to for the health check + - Descriptive text of the load balancer monitor required: False - type: int - allow_insecure: + type: str + method: description: - - Do not validate the certificate when monitor use HTTPS. This parameter is currently only valid for HTTPS monitors. + - The method to use for the health check required: False - type: bool + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -149,20 +149,20 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'retries', 'name', - 'type', 'interval', - 'description', - 'timeout', - 'expected_codes', - 'expected_body', - 'method', 'path', + 'allow_insecure', + 'expected_codes', + 'type', + 'port', + 'retries', + 'timeout', 'headers', + 'expected_body', 'instance_id', - 'port', - 'allow_insecure', + 'description', + 'method', ] # Params for Data source @@ -179,49 +179,49 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - retries=dict( - required=False, - type='int'), name=dict( required=False, type='str'), - type=dict( - required=False, - type='str'), interval=dict( required=False, type='int'), - description=dict( + path=dict( required=False, type='str'), - timeout=dict( + allow_insecure=dict( required=False, - type='int'), + type='bool'), expected_codes=dict( required=False, type='str'), - expected_body=dict( + type=dict( required=False, type='str'), - method=dict( + port=dict( required=False, - type='str'), - path=dict( + type='int'), + retries=dict( required=False, - type='str'), + type='int'), + timeout=dict( + required=False, + type='int'), headers=dict( required=False, elements='', type='list'), + expected_body=dict( + required=False, + type='str'), instance_id=dict( required=False, type='str'), - port=dict( + description=dict( required=False, - type='int'), - allow_insecure=dict( + type='str'), + method=dict( required=False, - type='bool'), + type='str'), id=dict( required=False, type='str'), @@ -287,7 +287,7 @@ def run_module(): resource_type='ibm_dns_glb_monitor', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_glb_monitors_info.py b/plugins/modules/ibm_dns_glb_monitors_info.py index 29474eebc..76f76f71b 100644 --- a/plugins/modules/ibm_dns_glb_monitors_info.py +++ b/plugins/modules/ibm_dns_glb_monitors_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_glb_monitors' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dns_glb_monitors', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_glb_pool.py b/plugins/modules/ibm_dns_glb_pool.py index 7098fb326..9d8e3d47d 100644 --- a/plugins/modules/ibm_dns_glb_pool.py +++ b/plugins/modules/ibm_dns_glb_pool.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_glb_pool' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_id: + name: description: - - (Required for new resource) Instance Id + - (Required for new resource) The unique identifier of a service instance. required: True type: str description: @@ -42,38 +42,38 @@ - The minimum number of origins that must be healthy for this pool to serve traffic required: False type: int - name: + monitor: description: - - (Required for new resource) The unique identifier of a service instance. - required: True + - The ID of the load balancer monitor to be associated to this pool + required: False type: str - healthcheck_region: + healthcheck_subnets: description: - - Health check region of VSIs + - Health check subnet crn of VSIs required: False - type: str + type: list + elements: str origins: description: - (Required for new resource) Origins info required: True type: list elements: dict - monitor: + instance_id: description: - - The ID of the load balancer monitor to be associated to this pool - required: False + - (Required for new resource) Instance Id + required: True type: str notification_channel: description: - The notification channel,It is a webhook url required: False type: str - healthcheck_subnets: + healthcheck_region: description: - - Health check subnet crn of VSIs + - Health check region of VSIs required: False - type: list - elements: str + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -120,23 +120,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), ('name', 'str'), ('origins', 'list'), + ('instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_id', + 'name', 'description', 'enabled', 'healthy_origins_threshold', - 'name', - 'healthcheck_region', - 'origins', 'monitor', - 'notification_channel', 'healthcheck_subnets', + 'origins', + 'instance_id', + 'notification_channel', + 'healthcheck_region', ] # Params for Data source @@ -153,7 +153,7 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_id=dict( + name=dict( required=False, type='str'), description=dict( @@ -165,26 +165,26 @@ healthy_origins_threshold=dict( required=False, type='int'), - name=dict( + monitor=dict( required=False, type='str'), - healthcheck_region=dict( + healthcheck_subnets=dict( required=False, - type='str'), + elements='', + type='list'), origins=dict( required=False, elements='', type='list'), - monitor=dict( + instance_id=dict( required=False, type='str'), notification_channel=dict( required=False, type='str'), - healthcheck_subnets=dict( + healthcheck_region=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -250,7 +250,7 @@ def run_module(): resource_type='ibm_dns_glb_pool', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_glb_pools_info.py b/plugins/modules/ibm_dns_glb_pools_info.py index 8bc53a1ab..693b063ac 100644 --- a/plugins/modules/ibm_dns_glb_pools_info.py +++ b/plugins/modules/ibm_dns_glb_pools_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_glb_pools' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dns_glb_pools', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_glbs_info.py b/plugins/modules/ibm_dns_glbs_info.py index 8964a3e19..26c0cfda9 100644 --- a/plugins/modules/ibm_dns_glbs_info.py +++ b/plugins/modules/ibm_dns_glbs_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_glbs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_dns_glbs', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_permitted_network.py b/plugins/modules/ibm_dns_permitted_network.py index 6cfe5f003..4733fc787 100644 --- a/plugins/modules/ibm_dns_permitted_network.py +++ b/plugins/modules/ibm_dns_permitted_network.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_permitted_network' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_dns_permitted_network', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_permitted_networks_info.py b/plugins/modules/ibm_dns_permitted_networks_info.py index 52f96b73c..505cff700 100644 --- a/plugins/modules/ibm_dns_permitted_networks_info.py +++ b/plugins/modules/ibm_dns_permitted_networks_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_permitted_networks' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_dns_permitted_networks', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_record.py b/plugins/modules/ibm_dns_record.py index f5b608534..eb446e368 100644 --- a/plugins/modules/ibm_dns_record.py +++ b/plugins/modules/ibm_dns_record.py @@ -18,15 +18,47 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_record' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - responsible_person: + data: description: - - Responsible person for DNS record + - (Required for new resource) DNS record data + required: True + type: str + expire: + description: + - DNS record expiry info + required: False + type: int + type: + description: + - (Required for new resource) DNS record type + required: True + type: str + service: + description: + - service info + required: False + type: str + protocol: + description: + - protocol info required: False type: str + priority: + description: + - priority info + required: False + type: int + default: 0 + tags: + description: + - tags set for the resource + required: False + type: list + elements: str minimum_ttl: description: - Minimun TTL configuration @@ -37,80 +69,48 @@ - (Required for new resource) TTL configuration required: True type: int - type: - description: - - (Required for new resource) DNS record type - required: True - type: str domain_id: description: - (Required for new resource) Domain ID of dns record instance required: True type: int + host: + description: + - (Required for new resource) Hostname + required: True + type: str mx_priority: description: - Maximum priority required: False type: int default: 0 - refresh: - description: - - refresh rate - required: False - type: int - weight: - description: - - weight info - required: False - type: int - default: 0 - expire: + responsible_person: description: - - DNS record expiry info + - Responsible person for DNS record required: False - type: int + type: str retry: description: - Retry count required: False type: int - protocol: - description: - - protocol info - required: False - type: str port: description: - port number required: False type: int - priority: + refresh: description: - - priority info + - refresh rate required: False type: int - default: 0 - data: - description: - - (Required for new resource) DNS record data - required: True - type: str - host: - description: - - (Required for new resource) Hostname - required: True - type: str - service: - description: - - service info - required: False - type: str - tags: + weight: description: - - tags set for the resource + - weight info required: False - type: list - elements: str + type: int + default: 0 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -157,32 +157,32 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('ttl', 'int'), + ('data', 'str'), ('type', 'str'), + ('ttl', 'int'), ('domain_id', 'int'), - ('data', 'str'), ('host', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'responsible_person', + 'data', + 'expire', + 'type', + 'service', + 'protocol', + 'priority', + 'tags', 'minimum_ttl', 'ttl', - 'type', 'domain_id', + 'host', 'mx_priority', - 'refresh', - 'weight', - 'expire', + 'responsible_person', 'retry', - 'protocol', 'port', - 'priority', - 'data', - 'host', - 'service', - 'tags', + 'refresh', + 'weight', ] # Params for Data source @@ -199,58 +199,58 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - responsible_person=dict( + data=dict( required=False, type='str'), - minimum_ttl=dict( - required=False, - type='int'), - ttl=dict( + expire=dict( required=False, type='int'), type=dict( required=False, type='str'), - domain_id=dict( + service=dict( required=False, - type='int'), - mx_priority=dict( + type='str'), + protocol=dict( required=False, - type='int'), - refresh=dict( + type='str'), + priority=dict( required=False, type='int'), - weight=dict( + tags=dict( + required=False, + elements='', + type='list'), + minimum_ttl=dict( required=False, type='int'), - expire=dict( + ttl=dict( required=False, type='int'), - retry=dict( + domain_id=dict( required=False, type='int'), - protocol=dict( + host=dict( required=False, type='str'), - port=dict( - required=False, - type='int'), - priority=dict( + mx_priority=dict( required=False, type='int'), - data=dict( + responsible_person=dict( required=False, type='str'), - host=dict( + retry=dict( required=False, - type='str'), - service=dict( + type='int'), + port=dict( required=False, - type='str'), - tags=dict( + type='int'), + refresh=dict( required=False, - elements='', - type='list'), + type='int'), + weight=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -316,7 +316,7 @@ def run_module(): resource_type='ibm_dns_record', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_resource_record.py b/plugins/modules/ibm_dns_resource_record.py index be21c9a87..c5beeb6c8 100644 --- a/plugins/modules/ibm_dns_resource_record.py +++ b/plugins/modules/ibm_dns_resource_record.py @@ -18,26 +18,36 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_resource_record' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - ttl: + rdata: description: - - DNS record TTL + - (Required for new resource) DNS record Data + required: True + type: str + service: + description: + - Service info required: False - type: int - default: 900 + type: str zone_id: description: - (Required for new resource) Zone ID required: True type: str - rdata: + type: description: - - (Required for new resource) DNS record Data + - (Required for new resource) DNS record Type required: True type: str + ttl: + description: + - DNS record TTL + required: False + type: int + default: 900 port: description: - DNS server Port @@ -49,6 +59,17 @@ required: False type: int default: 0 + weight: + description: + - DNS server weight + required: False + type: int + default: 0 + protocol: + description: + - Protocol + required: False + type: str instance_id: description: - (Required for new resource) Instance ID @@ -59,33 +80,12 @@ - (Required for new resource) DNS record name required: True type: str - type: - description: - - (Required for new resource) DNS record Type - required: True - type: str preference: description: - DNS maximum preference required: False type: int default: 0 - protocol: - description: - - Protocol - required: False - type: str - weight: - description: - - DNS server weight - required: False - type: int - default: 0 - service: - description: - - Service info - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -132,27 +132,27 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('zone_id', 'str'), ('rdata', 'str'), + ('zone_id', 'str'), + ('type', 'str'), ('instance_id', 'str'), ('name', 'str'), - ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'ttl', - 'zone_id', 'rdata', + 'service', + 'zone_id', + 'type', + 'ttl', 'port', 'priority', + 'weight', + 'protocol', 'instance_id', 'name', - 'type', 'preference', - 'protocol', - 'weight', - 'service', ] # Params for Data source @@ -169,42 +169,42 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - ttl=dict( + rdata=dict( required=False, - type='int'), + type='str'), + service=dict( + required=False, + type='str'), zone_id=dict( required=False, type='str'), - rdata=dict( + type=dict( required=False, type='str'), + ttl=dict( + required=False, + type='int'), port=dict( required=False, type='int'), priority=dict( required=False, type='int'), - instance_id=dict( + weight=dict( required=False, - type='str'), - name=dict( + type='int'), + protocol=dict( required=False, type='str'), - type=dict( + instance_id=dict( required=False, type='str'), - preference=dict( - required=False, - type='int'), - protocol=dict( + name=dict( required=False, type='str'), - weight=dict( + preference=dict( required=False, type='int'), - service=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -270,7 +270,7 @@ def run_module(): resource_type='ibm_dns_resource_record', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_resource_records_info.py b/plugins/modules/ibm_dns_resource_records_info.py index 6dcc38e97..7b6b32d07 100644 --- a/plugins/modules/ibm_dns_resource_records_info.py +++ b/plugins/modules/ibm_dns_resource_records_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_resource_records' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_dns_resource_records', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_reverse_record.py b/plugins/modules/ibm_dns_reverse_record.py index a5e2d5e55..62760c50b 100644 --- a/plugins/modules/ibm_dns_reverse_record.py +++ b/plugins/modules/ibm_dns_reverse_record.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_reverse_record' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -182,7 +182,7 @@ def run_module(): resource_type='ibm_dns_reverse_record', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_secondary.py b/plugins/modules/ibm_dns_secondary.py index f7ecb0d37..238839546 100644 --- a/plugins/modules/ibm_dns_secondary.py +++ b/plugins/modules/ibm_dns_secondary.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_secondary' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_dns_secondary', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_dns_secondary', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_dns_secondary_info.py b/plugins/modules/ibm_dns_secondary_info.py index 67c1a52c6..5b26c36a7 100644 --- a/plugins/modules/ibm_dns_secondary_info.py +++ b/plugins/modules/ibm_dns_secondary_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_secondary' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dns_secondary', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_zone.py b/plugins/modules/ibm_dns_zone.py index f28fe6b02..87dbcdcb6 100644 --- a/plugins/modules/ibm_dns_zone.py +++ b/plugins/modules/ibm_dns_zone.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_zone' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_dns_zone', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_dns_zones_info.py b/plugins/modules/ibm_dns_zones_info.py index 4761d5541..35ccf119f 100644 --- a/plugins/modules/ibm_dns_zones_info.py +++ b/plugins/modules/ibm_dns_zones_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_dns_zones' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_dns_zones', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destination.py b/plugins/modules/ibm_en_destination.py index e1ec806b0..db5540cf8 100644 --- a/plugins/modules/ibm_en_destination.py +++ b/plugins/modules/ibm_en_destination.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - config: - description: - - Payload describing a destination configuration. - required: False - type: list - elements: dict - name: - description: - - (Required for new resource) The Destintion name. - required: True - type: str type: description: - (Required for new resource) The type of Destination Webhook. @@ -48,6 +37,17 @@ - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str + name: + description: + - (Required for new resource) The Destintion name. + required: True + type: str + config: + description: + - Payload describing a destination configuration. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,29 +94,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('type', 'str'), ('instance_guid', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'config', - 'name', 'type', 'description', 'instance_guid', + 'name', + 'config', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('instance_guid', 'str'), ('destination_id', 'str'), + ('instance_guid', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance_guid', 'destination_id', + 'instance_guid', ] TL_CONFLICTS_MAP = { @@ -126,13 +126,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - config=dict( - required=False, - elements='', - type='list'), - name=dict( - required=False, - type='str'), type=dict( required=False, type='str'), @@ -142,6 +135,13 @@ instance_guid=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), + config=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_en_destination', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -216,7 +216,7 @@ def run_module(): resource_type='ibm_en_destination', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_destination_android.py b/plugins/modules/ibm_en_destination_android.py index cb4c29218..ffde98df2 100644 --- a/plugins/modules/ibm_en_destination_android.py +++ b/plugins/modules/ibm_en_destination_android.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_android' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + name: + description: + - (Required for new resource) The Destintion name. + required: True + type: str config: description: - Payload describing a destination configuration. @@ -33,11 +38,6 @@ - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - name: - description: - - (Required for new resource) The Destintion name. - required: True - type: str type: description: - (Required for new resource) The type of Destination push_android. @@ -94,29 +94,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), ('name', 'str'), + ('instance_guid', 'str'), ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', 'config', 'instance_guid', - 'name', 'type', 'description', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('instance_guid', 'str'), ('destination_id', 'str'), + ('instance_guid', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance_guid', 'destination_id', + 'instance_guid', ] TL_CONFLICTS_MAP = { @@ -126,6 +126,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + name=dict( + required=False, + type='str'), config=dict( required=False, elements='', @@ -133,9 +136,6 @@ instance_guid=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), type=dict( required=False, type='str'), @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_en_destination_android', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -216,7 +216,7 @@ def run_module(): resource_type='ibm_en_destination_android', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_destination_android_info.py b/plugins/modules/ibm_en_destination_android_info.py index 15fac0dc2..dab2c9b36 100644 --- a/plugins/modules/ibm_en_destination_android_info.py +++ b/plugins/modules/ibm_en_destination_android_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination_android' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_guid: + destination_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for Destination. required: True type: str - destination_id: + instance_guid: description: - - Unique identifier for Destination. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), ('destination_id', 'str'), + ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_guid', 'destination_id', + 'instance_guid', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_guid=dict( + destination_id=dict( required=True, type='str'), - destination_id=dict( + instance_guid=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination_android', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destination_chrome.py b/plugins/modules/ibm_en_destination_chrome.py index 6cf258ede..fa9361023 100644 --- a/plugins/modules/ibm_en_destination_chrome.py +++ b/plugins/modules/ibm_en_destination_chrome.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_chrome' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + config: + description: + - Payload describing a destination configuration. + required: False + type: list + elements: dict + instance_guid: + description: + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str type: description: - (Required for new resource) The type of Destination type push_chrome. @@ -32,22 +43,11 @@ - The Destination description. required: False type: str - instance_guid: - description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. - required: True - type: str name: description: - (Required for new resource) The Destintion name. required: True type: str - config: - description: - - Payload describing a destination configuration. - required: False - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,18 +94,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('type', 'str'), ('instance_guid', 'str'), + ('type', 'str'), ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'config', + 'instance_guid', 'type', 'description', - 'instance_guid', 'name', - 'config', ] # Params for Data source @@ -126,22 +126,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - type=dict( + config=dict( + required=False, + elements='', + type='list'), + instance_guid=dict( required=False, type='str'), - description=dict( + type=dict( required=False, type='str'), - instance_guid=dict( + description=dict( required=False, type='str'), name=dict( required=False, type='str'), - config=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_en_destination_chrome', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -216,7 +216,7 @@ def run_module(): resource_type='ibm_en_destination_chrome', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_destination_chrome_info.py b/plugins/modules/ibm_en_destination_chrome_info.py index ef3af6e37..ecbadef14 100644 --- a/plugins/modules/ibm_en_destination_chrome_info.py +++ b/plugins/modules/ibm_en_destination_chrome_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination_chrome' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination_chrome', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destination_firefox.py b/plugins/modules/ibm_en_destination_firefox.py index 2c21ce101..ee47ba053 100644 --- a/plugins/modules/ibm_en_destination_firefox.py +++ b/plugins/modules/ibm_en_destination_firefox.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_firefox' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_en_destination_firefox', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -216,7 +216,7 @@ def run_module(): resource_type='ibm_en_destination_firefox', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_destination_firefox_info.py b/plugins/modules/ibm_en_destination_firefox_info.py index 03e6ed280..c6cfbe6c8 100644 --- a/plugins/modules/ibm_en_destination_firefox_info.py +++ b/plugins/modules/ibm_en_destination_firefox_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination_firefox' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination_firefox', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destination_info.py b/plugins/modules/ibm_en_destination_info.py index f6af46eef..326d2db85 100644 --- a/plugins/modules/ibm_en_destination_info.py +++ b/plugins/modules/ibm_en_destination_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_guid: + destination_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for Destination. required: True type: str - destination_id: + instance_guid: description: - - Unique identifier for Destination. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), ('destination_id', 'str'), + ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_guid', 'destination_id', + 'instance_guid', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_guid=dict( + destination_id=dict( required=True, type='str'), - destination_id=dict( + instance_guid=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destination_ios.py b/plugins/modules/ibm_en_destination_ios.py index 0e6665ac7..17c762908 100644 --- a/plugins/modules/ibm_en_destination_ios.py +++ b/plugins/modules/ibm_en_destination_ios.py @@ -18,23 +18,29 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_ios' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + type: description: - - (Required for new resource) The Destintion name. + - (Required for new resource) The type of Destination type push_ios. required: True type: str - instance_guid: + certificate: description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + - (Required for new resource) The Certificate File. required: True type: str - type: + config: description: - - (Required for new resource) The type of Destination type push_ios. + - Payload describing a destination configuration. + required: False + type: list + elements: dict + name: + description: + - (Required for new resource) The Destintion name. required: True type: str description: @@ -47,17 +53,11 @@ - (Required for new resource) The Certificate Content Type to be set p8/p12. required: True type: str - certificate: + instance_guid: description: - - (Required for new resource) The Certificate File. + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - config: - description: - - Payload describing a destination configuration. - required: False - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,22 +104,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), - ('instance_guid', 'str'), ('type', 'str'), - ('certificate_content_type', 'str'), ('certificate', 'str'), + ('name', 'str'), + ('certificate_content_type', 'str'), + ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'instance_guid', 'type', - 'description', - 'certificate_content_type', 'certificate', 'config', + 'name', + 'description', + 'certificate_content_type', + 'instance_guid', ] # Params for Data source @@ -140,13 +140,17 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + type=dict( required=False, type='str'), - instance_guid=dict( + certificate=dict( required=False, type='str'), - type=dict( + config=dict( + required=False, + elements='', + type='list'), + name=dict( required=False, type='str'), description=dict( @@ -155,13 +159,9 @@ certificate_content_type=dict( required=False, type='str'), - certificate=dict( + instance_guid=dict( required=False, type='str'), - config=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_en_destination_ios', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -236,7 +236,7 @@ def run_module(): resource_type='ibm_en_destination_ios', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_destination_ios_info.py b/plugins/modules/ibm_en_destination_ios_info.py index 245b6cb52..4cab3b9cc 100644 --- a/plugins/modules/ibm_en_destination_ios_info.py +++ b/plugins/modules/ibm_en_destination_ios_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination_ios' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination_ios', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destination_safari.py b/plugins/modules/ibm_en_destination_safari.py new file mode 100644 index 000000000..70ffed3a6 --- /dev/null +++ b/plugins/modules/ibm_en_destination_safari.py @@ -0,0 +1,354 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_destination_safari +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_destination_safari + +short_description: Configure IBM Cloud 'ibm_en_destination_safari' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_en_destination_safari' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + description: + description: + - The Destination description. + required: False + type: str + icon_16x16_2x: + description: + - The Certificate File. + required: False + type: str + icon_16x16_content_type: + description: + - The Certificate File. + required: False + type: str + config: + description: + - Payload describing a destination configuration. + required: False + type: list + elements: dict + type: + description: + - (Required for new resource) The type of Destination type push_ios. + required: True + type: str + icon_16x16: + description: + - The Certificate File. + required: False + type: str + icon_128x128_2x: + description: + - The Certificate File. + required: False + type: str + icon_16x16_2x_content_type: + description: + - The Certificate File. + required: False + type: str + icon_32x32_content_type: + description: + - The Certificate File. + required: False + type: str + icon_128x128_content_type: + description: + - The Certificate File. + required: False + type: str + icon_128x128_2x_content_type: + description: + - The Certificate File. + required: False + type: str + name: + description: + - (Required for new resource) The Destintion name. + required: True + type: str + certificate: + description: + - (Required for new resource) The Certificate File. + required: True + type: str + icon_32x32: + description: + - The Certificate File. + required: False + type: str + icon_32x32_2x: + description: + - The Certificate File. + required: False + type: str + icon_128x128: + description: + - The Certificate File. + required: False + type: str + icon_32x32_2x_content_type: + description: + - The Certificate File. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('type', 'str'), + ('name', 'str'), + ('certificate', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'description', + 'icon_16x16_2x', + 'icon_16x16_content_type', + 'config', + 'type', + 'icon_16x16', + 'icon_128x128_2x', + 'icon_16x16_2x_content_type', + 'icon_32x32_content_type', + 'icon_128x128_content_type', + 'icon_128x128_2x_content_type', + 'name', + 'certificate', + 'icon_32x32', + 'icon_32x32_2x', + 'icon_128x128', + 'icon_32x32_2x_content_type', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('instance_guid', 'str'), + ('destination_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'instance_guid', + 'destination_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + icon_16x16_2x=dict( + required=False, + type='str'), + icon_16x16_content_type=dict( + required=False, + type='str'), + config=dict( + required=False, + elements='', + type='list'), + type=dict( + required=False, + type='str'), + icon_16x16=dict( + required=False, + type='str'), + icon_128x128_2x=dict( + required=False, + type='str'), + icon_16x16_2x_content_type=dict( + required=False, + type='str'), + icon_32x32_content_type=dict( + required=False, + type='str'), + icon_128x128_content_type=dict( + required=False, + type='str'), + icon_128x128_2x_content_type=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + certificate=dict( + required=False, + type='str'), + icon_32x32=dict( + required=False, + type='str'), + icon_32x32_2x=dict( + required=False, + type='str'), + icon_128x128=dict( + required=False, + type='str'), + icon_32x32_2x_content_type=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_en_destination_safari', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_en_destination_safari', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_destination_safari_info.py b/plugins/modules/ibm_en_destination_safari_info.py new file mode 100644 index 000000000..519cebe70 --- /dev/null +++ b/plugins/modules/ibm_en_destination_safari_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_destination_safari_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_destination_safari + +short_description: Retrieve IBM Cloud 'ibm_en_destination_safari' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_destination_safari' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + destination_id: + description: + - Unique identifier for Destination. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('destination_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'destination_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=True, + type='str'), + destination_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_en_destination_safari', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_destination_slack.py b/plugins/modules/ibm_en_destination_slack.py new file mode 100644 index 000000000..b7a105a9f --- /dev/null +++ b/plugins/modules/ibm_en_destination_slack.py @@ -0,0 +1,236 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_destination_slack +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_destination_slack + +short_description: Configure IBM Cloud 'ibm_en_destination_slack' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_en_destination_slack' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + name: + description: + - (Required for new resource) The Destintion name. + required: True + type: str + instance_guid: + description: + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + type: + description: + - (Required for new resource) The type of Destination Webhook. + required: True + type: str + description: + description: + - The Destination description. + required: False + type: str + config: + description: + - Payload describing a destination configuration. + required: False + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('name', 'str'), + ('instance_guid', 'str'), + ('type', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'instance_guid', + 'type', + 'description', + 'config', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('instance_guid', 'str'), + ('destination_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'instance_guid', + 'destination_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + name=dict( + required=False, + type='str'), + instance_guid=dict( + required=False, + type='str'), + type=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + config=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_en_destination_slack', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_en_destination_slack', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_destination_slack_info.py b/plugins/modules/ibm_en_destination_slack_info.py new file mode 100644 index 000000000..9a38b38c3 --- /dev/null +++ b/plugins/modules/ibm_en_destination_slack_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_destination_slack_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_destination_slack + +short_description: Retrieve IBM Cloud 'ibm_en_destination_slack' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_destination_slack' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + destination_id: + description: + - Unique identifier for Destination. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('destination_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'destination_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=True, + type='str'), + destination_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_en_destination_slack', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_destination_webhook.py b/plugins/modules/ibm_en_destination_webhook.py index 23bf46d26..32766d5b4 100644 --- a/plugins/modules/ibm_en_destination_webhook.py +++ b/plugins/modules/ibm_en_destination_webhook.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_webhook' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + instance_guid: description: - - (Required for new resource) The Destintion name. + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str type: @@ -32,15 +32,9 @@ - (Required for new resource) The type of Destination Webhook. required: True type: str - config: - description: - - Payload describing a destination configuration. - required: False - type: list - elements: dict - instance_guid: + name: description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + - (Required for new resource) The Destintion name. required: True type: str description: @@ -48,6 +42,12 @@ - The Destination description. required: False type: str + config: + description: + - Payload describing a destination configuration. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,29 +94,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), - ('type', 'str'), ('instance_guid', 'str'), + ('type', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'type', - 'config', 'instance_guid', + 'type', + 'name', 'description', + 'config', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('instance_guid', 'str'), ('destination_id', 'str'), + ('instance_guid', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance_guid', 'destination_id', + 'instance_guid', ] TL_CONFLICTS_MAP = { @@ -126,22 +126,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + instance_guid=dict( required=False, type='str'), type=dict( required=False, type='str'), - config=dict( - required=False, - elements='', - type='list'), - instance_guid=dict( + name=dict( required=False, type='str'), description=dict( required=False, type='str'), + config=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_en_destination_webhook', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -216,7 +216,7 @@ def run_module(): resource_type='ibm_en_destination_webhook', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_destination_webhook_info.py b/plugins/modules/ibm_en_destination_webhook_info.py index 388fdd34d..aea1c65a3 100644 --- a/plugins/modules/ibm_en_destination_webhook_info.py +++ b/plugins/modules/ibm_en_destination_webhook_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination_webhook' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_guid: + destination_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for Destination. required: True type: str - destination_id: + instance_guid: description: - - Unique identifier for Destination. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), ('destination_id', 'str'), + ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_guid', 'destination_id', + 'instance_guid', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_guid=dict( + destination_id=dict( required=True, type='str'), - destination_id=dict( + instance_guid=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination_webhook', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destinations_info.py b/plugins/modules/ibm_en_destinations_info.py index a67e15d06..357f0376d 100644 --- a/plugins/modules/ibm_en_destinations_info.py +++ b/plugins/modules/ibm_en_destinations_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_destinations' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_en_destinations', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_source.py b/plugins/modules/ibm_en_source.py new file mode 100644 index 000000000..35bb654fa --- /dev/null +++ b/plugins/modules/ibm_en_source.py @@ -0,0 +1,225 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_source +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_source + +short_description: Configure IBM Cloud 'ibm_en_source' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_en_source' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + name: + description: + - (Required for new resource) The Source name. + required: True + type: str + description: + description: + - The Source description. + required: False + type: str + enabled: + description: + - (Required for new resource) The enabled flag for source + required: True + type: bool + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('name', 'str'), + ('enabled', 'bool'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'name', + 'description', + 'enabled', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('instance_guid', 'str'), + ('source_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'instance_guid', + 'source_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + enabled=dict( + required=False, + type='bool'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_en_source', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_en_source', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_source_info.py b/plugins/modules/ibm_en_source_info.py new file mode 100644 index 000000000..83a74d351 --- /dev/null +++ b/plugins/modules/ibm_en_source_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_source_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_source + +short_description: Retrieve IBM Cloud 'ibm_en_source' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_source' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + source_id: + description: + - Unique identifier for Source. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('source_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'source_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=True, + type='str'), + source_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_en_source', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_subscription.py b/plugins/modules/ibm_en_subscription.py index bd349e392..a63662807 100644 --- a/plugins/modules/ibm_en_subscription.py +++ b/plugins/modules/ibm_en_subscription.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + destination_id: + description: + - (Required for new resource) Destination ID. + required: True + type: str topic_id: description: - (Required for new resource) Topic ID. @@ -33,6 +38,11 @@ required: False type: list elements: dict + instance_guid: + description: + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str name: description: - (Required for new resource) Subscription name. @@ -43,16 +53,6 @@ - Subscription description. required: False type: str - instance_guid: - description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. - required: True - type: str - destination_id: - description: - - (Required for new resource) Destination ID. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -99,20 +99,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('destination_id', 'str'), ('topic_id', 'str'), - ('name', 'str'), ('instance_guid', 'str'), - ('destination_id', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'destination_id', 'topic_id', 'attributes', + 'instance_guid', 'name', 'description', - 'instance_guid', - 'destination_id', ] # Params for Data source @@ -133,6 +133,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + destination_id=dict( + required=False, + type='str'), topic_id=dict( required=False, type='str'), @@ -140,16 +143,13 @@ required=False, elements='', type='list'), - name=dict( - required=False, - type='str'), - description=dict( + instance_guid=dict( required=False, type='str'), - instance_guid=dict( + name=dict( required=False, type='str'), - destination_id=dict( + description=dict( required=False, type='str'), id=dict( @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_en_subscription', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_en_subscription', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_android.py b/plugins/modules/ibm_en_subscription_android.py index 0138f5fe2..ee9ce14bf 100644 --- a/plugins/modules/ibm_en_subscription_android.py +++ b/plugins/modules/ibm_en_subscription_android.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_android' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -32,14 +32,14 @@ - Subscription description. required: False type: str - name: + destination_id: description: - - (Required for new resource) Subscription name. + - (Required for new resource) Destination ID. required: True type: str - destination_id: + name: description: - - (Required for new resource) Destination ID. + - (Required for new resource) Subscription name. required: True type: str topic_id: @@ -94,8 +94,8 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('instance_guid', 'str'), - ('name', 'str'), ('destination_id', 'str'), + ('name', 'str'), ('topic_id', 'str'), ] @@ -103,8 +103,8 @@ TL_ALL_PARAMETERS = [ 'instance_guid', 'description', - 'name', 'destination_id', + 'name', 'topic_id', ] @@ -132,10 +132,10 @@ description=dict( required=False, type='str'), - name=dict( + destination_id=dict( required=False, type='str'), - destination_id=dict( + name=dict( required=False, type='str'), topic_id=dict( @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_en_subscription_android', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_en_subscription_android', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_android_info.py b/plugins/modules/ibm_en_subscription_android_info.py index 12eaa83dc..95e13240f 100644 --- a/plugins/modules/ibm_en_subscription_android_info.py +++ b/plugins/modules/ibm_en_subscription_android_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription_android' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription_android', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_chrome.py b/plugins/modules/ibm_en_subscription_chrome.py index 176be8d25..a638566fb 100644 --- a/plugins/modules/ibm_en_subscription_chrome.py +++ b/plugins/modules/ibm_en_subscription_chrome.py @@ -18,13 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_chrome' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - destination_id: + instance_guid: description: - - (Required for new resource) Destination ID. + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + name: + description: + - (Required for new resource) Subscription name. required: True type: str description: @@ -32,9 +37,9 @@ - Subscription description. required: False type: str - name: + destination_id: description: - - (Required for new resource) Subscription name. + - (Required for new resource) Destination ID. required: True type: str topic_id: @@ -42,11 +47,6 @@ - (Required for new resource) Topic ID. required: True type: str - instance_guid: - description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -93,30 +93,30 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('destination_id', 'str'), + ('instance_guid', 'str'), ('name', 'str'), + ('destination_id', 'str'), ('topic_id', 'str'), - ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'destination_id', - 'description', + 'instance_guid', 'name', + 'description', + 'destination_id', 'topic_id', - 'instance_guid', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('subscription_id', 'str'), ('instance_guid', 'str'), + ('subscription_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'subscription_id', 'instance_guid', + 'subscription_id', ] TL_CONFLICTS_MAP = { @@ -126,19 +126,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - destination_id=dict( + instance_guid=dict( required=False, type='str'), - description=dict( + name=dict( required=False, type='str'), - name=dict( + description=dict( required=False, type='str'), - topic_id=dict( + destination_id=dict( required=False, type='str'), - instance_guid=dict( + topic_id=dict( required=False, type='str'), id=dict( @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_en_subscription_chrome', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_en_subscription_chrome', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_chrome_info.py b/plugins/modules/ibm_en_subscription_chrome_info.py index 66cf671ea..1966f56fa 100644 --- a/plugins/modules/ibm_en_subscription_chrome_info.py +++ b/plugins/modules/ibm_en_subscription_chrome_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription_chrome' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - subscription_id: + instance_guid: description: - - Unique identifier for result. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - instance_guid: + subscription_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for result. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('subscription_id', 'str'), ('instance_guid', 'str'), + ('subscription_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'subscription_id', 'instance_guid', + 'subscription_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - subscription_id=dict( + instance_guid=dict( required=True, type='str'), - instance_guid=dict( + subscription_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription_chrome', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_email.py b/plugins/modules/ibm_en_subscription_email.py index 933ad2efe..5e086fdd7 100644 --- a/plugins/modules/ibm_en_subscription_email.py +++ b/plugins/modules/ibm_en_subscription_email.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_email' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) Subscription name. - required: True - type: str - attributes: - description: - - None - required: False - type: list - elements: dict instance_guid: description: - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. @@ -48,6 +37,17 @@ - (Required for new resource) Destination ID. required: True type: str + attributes: + description: + - None + required: False + type: list + elements: dict + name: + description: + - (Required for new resource) Subscription name. + required: True + type: str topic_id: description: - (Required for new resource) Topic ID. @@ -99,31 +99,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('instance_guid', 'str'), ('destination_id', 'str'), + ('name', 'str'), ('topic_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'attributes', 'instance_guid', 'description', 'destination_id', + 'attributes', + 'name', 'topic_id', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('subscription_id', 'str'), ('instance_guid', 'str'), + ('subscription_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'subscription_id', 'instance_guid', + 'subscription_id', ] TL_CONFLICTS_MAP = { @@ -133,13 +133,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=False, - type='str'), - attributes=dict( - required=False, - elements='', - type='list'), instance_guid=dict( required=False, type='str'), @@ -149,6 +142,13 @@ destination_id=dict( required=False, type='str'), + attributes=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), topic_id=dict( required=False, type='str'), @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_en_subscription_email', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_en_subscription_email', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_email_info.py b/plugins/modules/ibm_en_subscription_email_info.py index e1d0e3b79..9586ed07d 100644 --- a/plugins/modules/ibm_en_subscription_email_info.py +++ b/plugins/modules/ibm_en_subscription_email_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription_email' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - subscription_id: + instance_guid: description: - - Unique identifier for result. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - instance_guid: + subscription_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for result. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('subscription_id', 'str'), ('instance_guid', 'str'), + ('subscription_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'subscription_id', 'instance_guid', + 'subscription_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - subscription_id=dict( + instance_guid=dict( required=True, type='str'), - instance_guid=dict( + subscription_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription_email', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_firefox.py b/plugins/modules/ibm_en_subscription_firefox.py index 72ad08383..5b4146e7d 100644 --- a/plugins/modules/ibm_en_subscription_firefox.py +++ b/plugins/modules/ibm_en_subscription_firefox.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_firefox' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + name: + description: + - (Required for new resource) Subscription name. + required: True + type: str description: description: - Subscription description. @@ -37,11 +42,6 @@ - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - name: - description: - - (Required for new resource) Subscription name. - required: True - type: str topic_id: description: - (Required for new resource) Topic ID. @@ -93,18 +93,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('name', 'str'), ('destination_id', 'str'), ('instance_guid', 'str'), - ('name', 'str'), ('topic_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', 'description', 'destination_id', 'instance_guid', - 'name', 'topic_id', ] @@ -126,6 +126,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + name=dict( + required=False, + type='str'), description=dict( required=False, type='str'), @@ -135,9 +138,6 @@ instance_guid=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), topic_id=dict( required=False, type='str'), @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_en_subscription_firefox', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_en_subscription_firefox', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_firefox_info.py b/plugins/modules/ibm_en_subscription_firefox_info.py index 543e56b2c..e68334b66 100644 --- a/plugins/modules/ibm_en_subscription_firefox_info.py +++ b/plugins/modules/ibm_en_subscription_firefox_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription_firefox' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription_firefox', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_info.py b/plugins/modules/ibm_en_subscription_info.py index 1c20d34cc..759932531 100644 --- a/plugins/modules/ibm_en_subscription_info.py +++ b/plugins/modules/ibm_en_subscription_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_ios.py b/plugins/modules/ibm_en_subscription_ios.py index 427a57462..f9cbacdb8 100644 --- a/plugins/modules/ibm_en_subscription_ios.py +++ b/plugins/modules/ibm_en_subscription_ios.py @@ -18,33 +18,33 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_ios' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_guid: + destination_id: description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + - (Required for new resource) Destination ID. required: True type: str - description: + topic_id: description: - - Subscription description. - required: False + - (Required for new resource) Topic ID. + required: True type: str name: description: - (Required for new resource) Subscription name. required: True type: str - destination_id: + description: description: - - (Required for new resource) Destination ID. - required: True + - Subscription description. + required: False type: str - topic_id: + instance_guid: description: - - (Required for new resource) Topic ID. + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str id: @@ -93,19 +93,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), - ('name', 'str'), ('destination_id', 'str'), ('topic_id', 'str'), + ('name', 'str'), + ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_guid', - 'description', - 'name', 'destination_id', 'topic_id', + 'name', + 'description', + 'instance_guid', ] # Params for Data source @@ -126,19 +126,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_guid=dict( + destination_id=dict( required=False, type='str'), - description=dict( + topic_id=dict( required=False, type='str'), name=dict( required=False, type='str'), - destination_id=dict( + description=dict( required=False, type='str'), - topic_id=dict( + instance_guid=dict( required=False, type='str'), id=dict( @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_en_subscription_ios', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_en_subscription_ios', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_ios_info.py b/plugins/modules/ibm_en_subscription_ios_info.py index 94194b243..647fcdbbd 100644 --- a/plugins/modules/ibm_en_subscription_ios_info.py +++ b/plugins/modules/ibm_en_subscription_ios_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription_ios' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription_ios', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_safari.py b/plugins/modules/ibm_en_subscription_safari.py new file mode 100644 index 000000000..5152792eb --- /dev/null +++ b/plugins/modules/ibm_en_subscription_safari.py @@ -0,0 +1,235 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_subscription_safari +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_subscription_safari + +short_description: Configure IBM Cloud 'ibm_en_subscription_safari' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_en_subscription_safari' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + name: + description: + - (Required for new resource) Subscription name. + required: True + type: str + description: + description: + - Subscription description. + required: False + type: str + destination_id: + description: + - (Required for new resource) Destination ID. + required: True + type: str + topic_id: + description: + - (Required for new resource) Topic ID. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('name', 'str'), + ('destination_id', 'str'), + ('topic_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'name', + 'description', + 'destination_id', + 'topic_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('instance_guid', 'str'), + ('subscription_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'instance_guid', + 'subscription_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + destination_id=dict( + required=False, + type='str'), + topic_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_en_subscription_safari', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_en_subscription_safari', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_subscription_safari_info.py b/plugins/modules/ibm_en_subscription_safari_info.py new file mode 100644 index 000000000..fb65af49c --- /dev/null +++ b/plugins/modules/ibm_en_subscription_safari_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_subscription_safari_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_subscription_safari + +short_description: Retrieve IBM Cloud 'ibm_en_subscription_safari' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_subscription_safari' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + subscription_id: + description: + - Unique identifier for result. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('subscription_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'subscription_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=True, + type='str'), + subscription_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_en_subscription_safari', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_subscription_slack.py b/plugins/modules/ibm_en_subscription_slack.py new file mode 100644 index 000000000..98122b774 --- /dev/null +++ b/plugins/modules/ibm_en_subscription_slack.py @@ -0,0 +1,246 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_subscription_slack +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_subscription_slack + +short_description: Configure IBM Cloud 'ibm_en_subscription_slack' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_en_subscription_slack' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + attributes: + description: + - None + required: False + type: list + elements: dict + name: + description: + - (Required for new resource) Subscription name. + required: True + type: str + description: + description: + - Subscription description. + required: False + type: str + destination_id: + description: + - (Required for new resource) Destination ID. + required: True + type: str + topic_id: + description: + - (Required for new resource) Topic ID. + required: True + type: str + instance_guid: + description: + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('name', 'str'), + ('destination_id', 'str'), + ('topic_id', 'str'), + ('instance_guid', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'attributes', + 'name', + 'description', + 'destination_id', + 'topic_id', + 'instance_guid', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('instance_guid', 'str'), + ('subscription_id', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'instance_guid', + 'subscription_id', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + attributes=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + destination_id=dict( + required=False, + type='str'), + topic_id=dict( + required=False, + type='str'), + instance_guid=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_en_subscription_slack', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_en_subscription_slack', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_subscription_slack_info.py b/plugins/modules/ibm_en_subscription_slack_info.py new file mode 100644 index 000000000..1cfbb6808 --- /dev/null +++ b/plugins/modules/ibm_en_subscription_slack_info.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_en_subscription_slack_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_subscription_slack + +short_description: Retrieve IBM Cloud 'ibm_en_subscription_slack' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_subscription_slack' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str + subscription_id: + description: + - Unique identifier for result. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_guid', 'str'), + ('subscription_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_guid', + 'subscription_id', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_guid=dict( + required=True, + type='str'), + subscription_id=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_en_subscription_slack', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_en_subscription_sms.py b/plugins/modules/ibm_en_subscription_sms.py index 0fc94f24e..06002286c 100644 --- a/plugins/modules/ibm_en_subscription_sms.py +++ b/plugins/modules/ibm_en_subscription_sms.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_sms' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - description: - description: - - Subscription description. - required: False - type: str - attributes: - description: - - None - required: False - type: list - elements: dict instance_guid: description: - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. @@ -43,6 +32,11 @@ - (Required for new resource) Subscription name. required: True type: str + description: + description: + - Subscription description. + required: False + type: str destination_id: description: - (Required for new resource) Destination ID. @@ -53,6 +47,12 @@ - (Required for new resource) Topic ID. required: True type: str + attributes: + description: + - None + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,23 +107,23 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'attributes', 'instance_guid', 'name', + 'description', 'destination_id', 'topic_id', + 'attributes', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('instance_guid', 'str'), ('subscription_id', 'str'), + ('instance_guid', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance_guid', 'subscription_id', + 'instance_guid', ] TL_CONFLICTS_MAP = { @@ -133,25 +133,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - description=dict( - required=False, - type='str'), - attributes=dict( - required=False, - elements='', - type='list'), instance_guid=dict( required=False, type='str'), name=dict( required=False, type='str'), + description=dict( + required=False, + type='str'), destination_id=dict( required=False, type='str'), topic_id=dict( required=False, type='str'), + attributes=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_en_subscription_sms', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_en_subscription_sms', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_sms_info.py b/plugins/modules/ibm_en_subscription_sms_info.py index 39cc72975..1badcb050 100644 --- a/plugins/modules/ibm_en_subscription_sms_info.py +++ b/plugins/modules/ibm_en_subscription_sms_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription_sms' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_guid: + subscription_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for result. required: True type: str - subscription_id: + instance_guid: description: - - Unique identifier for result. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), ('subscription_id', 'str'), + ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_guid', 'subscription_id', + 'instance_guid', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_guid=dict( + subscription_id=dict( required=True, type='str'), - subscription_id=dict( + instance_guid=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription_sms', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_webhook.py b/plugins/modules/ibm_en_subscription_webhook.py index 04d9d5213..326eda16c 100644 --- a/plugins/modules/ibm_en_subscription_webhook.py +++ b/plugins/modules/ibm_en_subscription_webhook.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_webhook' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,32 +27,32 @@ - (Required for new resource) Destination ID. required: True type: str - topic_id: + attributes: description: - - (Required for new resource) Topic ID. - required: True - type: str + - None + required: False + type: list + elements: dict instance_guid: description: - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - name: - description: - - (Required for new resource) Subscription name. - required: True - type: str description: description: - Subscription description. required: False type: str - attributes: + topic_id: description: - - None - required: False - type: list - elements: dict + - (Required for new resource) Topic ID. + required: True + type: str + name: + description: + - (Required for new resource) Subscription name. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -100,19 +100,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('destination_id', 'str'), - ('topic_id', 'str'), ('instance_guid', 'str'), + ('topic_id', 'str'), ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'destination_id', - 'topic_id', + 'attributes', 'instance_guid', - 'name', 'description', - 'attributes', + 'topic_id', + 'name', ] # Params for Data source @@ -136,22 +136,22 @@ destination_id=dict( required=False, type='str'), - topic_id=dict( + attributes=dict( required=False, - type='str'), + elements='', + type='list'), instance_guid=dict( required=False, type='str'), - name=dict( + description=dict( required=False, type='str'), - description=dict( + topic_id=dict( required=False, type='str'), - attributes=dict( + name=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_en_subscription_webhook', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_en_subscription_webhook', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_subscription_webhook_info.py b/plugins/modules/ibm_en_subscription_webhook_info.py index b6cf74cba..fe51cb9b5 100644 --- a/plugins/modules/ibm_en_subscription_webhook_info.py +++ b/plugins/modules/ibm_en_subscription_webhook_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription_webhook' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_subscription_webhook', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscriptions_info.py b/plugins/modules/ibm_en_subscriptions_info.py index e197328f7..e49ea70eb 100644 --- a/plugins/modules/ibm_en_subscriptions_info.py +++ b/plugins/modules/ibm_en_subscriptions_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscriptions' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_en_subscriptions', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_topic.py b/plugins/modules/ibm_en_topic.py index 30267d5bb..2f98c7701 100644 --- a/plugins/modules/ibm_en_topic.py +++ b/plugins/modules/ibm_en_topic.py @@ -18,31 +18,31 @@ - Create, update or destroy an IBM Cloud 'ibm_en_topic' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - sources: - description: - - List of sources. - required: False - type: list - elements: dict - description: + name: description: - - Description of the topic. - required: False + - (Required for new resource) Name of the topic. + required: True type: str instance_guid: description: - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - name: + description: description: - - (Required for new resource) Name of the topic. - required: True + - Description of the topic. + required: False type: str + sources: + description: + - List of sources. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,16 +89,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), ('name', 'str'), + ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'sources', - 'description', - 'instance_guid', 'name', + 'instance_guid', + 'description', + 'sources', ] # Params for Data source @@ -119,19 +119,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - sources=dict( - required=False, - elements='', - type='list'), - description=dict( + name=dict( required=False, type='str'), instance_guid=dict( required=False, type='str'), - name=dict( + description=dict( required=False, type='str'), + sources=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -197,7 +197,7 @@ def run_module(): resource_type='ibm_en_topic', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_en_topic', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_en_topic_info.py b/plugins/modules/ibm_en_topic_info.py index 78af75c42..12f9d790a 100644 --- a/plugins/modules/ibm_en_topic_info.py +++ b/plugins/modules/ibm_en_topic_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_topic' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_topic', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_topics_info.py b/plugins/modules/ibm_en_topics_info.py index 6b335c20c..445f4a153 100644 --- a/plugins/modules/ibm_en_topics_info.py +++ b/plugins/modules/ibm_en_topics_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_topics' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_en_topics', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_enterprise.py b/plugins/modules/ibm_enterprise.py index 742dda2d8..31dfd82d9 100644 --- a/plugins/modules/ibm_enterprise.py +++ b/plugins/modules/ibm_enterprise.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_enterprise' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + domain: + description: + - A domain or subdomain for the enterprise, such as `example.com` or `my.example.com`. + required: False + type: str source_account_id: description: - (Required for new resource) The ID of the account that is used to create the enterprise. @@ -37,11 +42,6 @@ - (Required for new resource) The IAM ID of the enterprise primary contact, such as `IBMid-0123ABC`. The IAM ID must already exist. required: True type: str - domain: - description: - - A domain or subdomain for the enterprise, such as `example.com` or `my.example.com`. - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,10 +95,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'domain', 'source_account_id', 'name', 'primary_contact_iam_id', - 'domain', ] # Params for Data source @@ -115,6 +115,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + domain=dict( + required=False, + type='str'), source_account_id=dict( required=False, type='str'), @@ -124,9 +127,6 @@ primary_contact_iam_id=dict( required=False, type='str'), - domain=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_enterprise', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_enterprise_account.py b/plugins/modules/ibm_enterprise_account.py index 177a85429..091e44458 100644 --- a/plugins/modules/ibm_enterprise_account.py +++ b/plugins/modules/ibm_enterprise_account.py @@ -18,38 +18,38 @@ - Create, update or destroy an IBM Cloud 'ibm_enterprise_account' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - parent: + owner_iam_id: description: - - (Required for new resource) The CRN of the parent under which the account will be created. The parent can be an existing account group or the enterprise itself. - required: True + - The IAM ID of the account owner, such as `IBMid-0123ABC`. The IAM ID must already exist. + required: False type: str - name: + enterprise_account_id: description: - - The name of the account. This field must have 3 - 60 characters. + - The enterprise account ID. required: False type: str - owner_iam_id: + account_id: description: - - The IAM ID of the account owner, such as `IBMid-0123ABC`. The IAM ID must already exist. + - The source account id of account to be imported required: False type: str - enterprise_id: + parent: description: - - The enterprise ID that the account is a part of. - required: False + - (Required for new resource) The CRN of the parent under which the account will be created. The parent can be an existing account group or the enterprise itself. + required: True type: str - enterprise_account_id: + name: description: - - The enterprise account ID. + - The name of the account. This field must have 3 - 60 characters. required: False type: str - account_id: + enterprise_id: description: - - The source account id of account to be imported + - The enterprise ID that the account is a part of. required: False type: str id: @@ -103,12 +103,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'parent', - 'name', 'owner_iam_id', - 'enterprise_id', 'enterprise_account_id', 'account_id', + 'parent', + 'name', + 'enterprise_id', ] # Params for Data source @@ -125,22 +125,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - parent=dict( + owner_iam_id=dict( required=False, type='str'), - name=dict( + enterprise_account_id=dict( required=False, type='str'), - owner_iam_id=dict( + account_id=dict( required=False, type='str'), - enterprise_id=dict( + parent=dict( required=False, type='str'), - enterprise_account_id=dict( + name=dict( required=False, type='str'), - account_id=dict( + enterprise_id=dict( required=False, type='str'), id=dict( @@ -208,7 +208,7 @@ def run_module(): resource_type='ibm_enterprise_account', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_enterprise_account_group.py b/plugins/modules/ibm_enterprise_account_group.py index eaabd1093..628878d89 100644 --- a/plugins/modules/ibm_enterprise_account_group.py +++ b/plugins/modules/ibm_enterprise_account_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_enterprise_account_group' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_enterprise_account_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_enterprise_account_groups_info.py b/plugins/modules/ibm_enterprise_account_groups_info.py index c873e7a95..a912f6f22 100644 --- a/plugins/modules/ibm_enterprise_account_groups_info.py +++ b/plugins/modules/ibm_enterprise_account_groups_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_enterprise_account_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_enterprise_account_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_enterprise_accounts_info.py b/plugins/modules/ibm_enterprise_accounts_info.py index f20d99c79..17532687d 100644 --- a/plugins/modules/ibm_enterprise_accounts_info.py +++ b/plugins/modules/ibm_enterprise_accounts_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_enterprise_accounts' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_enterprise_accounts', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_enterprises_info.py b/plugins/modules/ibm_enterprises_info.py index 560ee28f5..1e6871f9a 100644 --- a/plugins/modules/ibm_enterprises_info.py +++ b/plugins/modules/ibm_enterprises_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_enterprises' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_enterprises', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_event_streams_schema.py b/plugins/modules/ibm_event_streams_schema.py index 969068ed0..b25d4c11c 100644 --- a/plugins/modules/ibm_event_streams_schema.py +++ b/plugins/modules/ibm_event_streams_schema.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_event_streams_schema' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -96,13 +96,13 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('schema_id', 'str'), ('resource_instance_id', 'str'), + ('schema_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'schema_id', 'resource_instance_id', + 'schema_id', ] TL_CONFLICTS_MAP = { @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_event_streams_schema', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_event_streams_schema', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_event_streams_schema_info.py b/plugins/modules/ibm_event_streams_schema_info.py index e156bf53b..204471e81 100644 --- a/plugins/modules/ibm_event_streams_schema_info.py +++ b/plugins/modules/ibm_event_streams_schema_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_event_streams_schema' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - schema_id: + resource_instance_id: description: - - The unique ID to be assigned to the schema. + - The ID or CRN of the Event Streams service instance required: True type: str - resource_instance_id: + schema_id: description: - - The ID or CRN of the Event Streams service instance + - The unique ID to be assigned to the schema. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('schema_id', 'str'), ('resource_instance_id', 'str'), + ('schema_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'schema_id', 'resource_instance_id', + 'schema_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - schema_id=dict( + resource_instance_id=dict( required=True, type='str'), - resource_instance_id=dict( + schema_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_event_streams_schema', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_event_streams_topic.py b/plugins/modules/ibm_event_streams_topic.py index 1de24da9f..595840f98 100644 --- a/plugins/modules/ibm_event_streams_topic.py +++ b/plugins/modules/ibm_event_streams_topic.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_event_streams_topic' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - config: - description: - - The configuration parameters of a topic - required: False - type: dict resource_instance_id: description: - (Required for new resource) The CRN of the Event Streams instance @@ -43,6 +38,11 @@ required: False type: int default: 1 + config: + description: + - The configuration parameters of a topic + required: False + type: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,21 +95,21 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'config', 'resource_instance_id', 'name', 'partitions', + 'config', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('resource_instance_id', 'str'), ('name', 'str'), + ('resource_instance_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'resource_instance_id', 'name', + 'resource_instance_id', ] TL_CONFLICTS_MAP = { @@ -119,9 +119,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - config=dict( - required=False, - type='dict'), resource_instance_id=dict( required=False, type='str'), @@ -131,6 +128,9 @@ partitions=dict( required=False, type='int'), + config=dict( + required=False, + type='dict'), id=dict( required=False, type='str'), @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_event_streams_topic', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_event_streams_topic', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_event_streams_topic_info.py b/plugins/modules/ibm_event_streams_topic_info.py index 45d33d707..a15dec4f0 100644 --- a/plugins/modules/ibm_event_streams_topic_info.py +++ b/plugins/modules/ibm_event_streams_topic_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_event_streams_topic' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_instance_id: + name: description: - - The CRN of the Event Streams instance + - The name of the topic required: True type: str - name: + resource_instance_id: description: - - The name of the topic + - The CRN of the Event Streams instance required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('resource_instance_id', 'str'), ('name', 'str'), + ('resource_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_instance_id', 'name', + 'resource_instance_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_instance_id=dict( + name=dict( required=True, type='str'), - name=dict( + resource_instance_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_event_streams_topic', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_firewall.py b/plugins/modules/ibm_firewall.py index 17b8c67d0..09594312d 100644 --- a/plugins/modules/ibm_firewall.py +++ b/plugins/modules/ibm_firewall.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_firewall' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + firewall_type: + description: + - Firewall type + required: False + type: str + default: HARDWARE_FIREWALL_DEDICATED ha_enabled: description: - set to true if High availability is enabled @@ -39,12 +45,6 @@ required: False type: list elements: str - firewall_type: - description: - - Firewall type - required: False - type: str - default: HARDWARE_FIREWALL_DEDICATED id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -96,10 +96,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'firewall_type', 'ha_enabled', 'public_vlan_id', 'tags', - 'firewall_type', ] # Params for Data source @@ -116,6 +116,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + firewall_type=dict( + required=False, + type='str'), ha_enabled=dict( required=False, type='bool'), @@ -126,9 +129,6 @@ required=False, elements='', type='list'), - firewall_type=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -194,7 +194,7 @@ def run_module(): resource_type='ibm_firewall', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_firewall_policy.py b/plugins/modules/ibm_firewall_policy.py index e44a541bf..4010df9ad 100644 --- a/plugins/modules/ibm_firewall_policy.py +++ b/plugins/modules/ibm_firewall_policy.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_firewall_policy' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_firewall_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_function_action.py b/plugins/modules/ibm_function_action.py index 4ffb91ead..b099662e8 100644 --- a/plugins/modules/ibm_function_action.py +++ b/plugins/modules/ibm_function_action.py @@ -18,44 +18,44 @@ - Create, update or destroy an IBM Cloud 'ibm_function_action' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - exec: - description: - - (Required for new resource) Execution info - required: True - type: list - elements: dict - publish: + user_defined_annotations: description: - - Action visibilty. + - Annotation values in KEY VALUE format. required: False - type: bool - limits: + type: str + default: [] + user_defined_parameters: description: - - None + - Parameters values in KEY VALUE format. Parameter bindings included in the context passed to the action. required: False - type: list - elements: dict + type: str + default: [] namespace: description: - (Required for new resource) IBM Cloud function namespace. required: True type: str - user_defined_annotations: + limits: description: - - Annotation values in KEY VALUE format. + - None required: False - type: str - default: [] - user_defined_parameters: + type: list + elements: dict + exec: description: - - Parameters values in KEY VALUE format. Parameter bindings included in the context passed to the action. + - (Required for new resource) Execution info + required: True + type: list + elements: dict + publish: + description: + - Action visibilty. required: False - type: str - default: [] + type: bool name: description: - (Required for new resource) Name of action. @@ -93,31 +93,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('exec', 'list'), ('namespace', 'str'), + ('exec', 'list'), ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'exec', - 'publish', - 'limits', - 'namespace', 'user_defined_annotations', 'user_defined_parameters', + 'namespace', + 'limits', + 'exec', + 'publish', 'name', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('name', 'str'), ('namespace', 'str'), + ('name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'name', 'namespace', + 'name', ] TL_CONFLICTS_MAP = { @@ -127,26 +127,26 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - exec=dict( + user_defined_annotations=dict( required=False, - elements='', - type='list'), - publish=dict( + type='str'), + user_defined_parameters=dict( required=False, - type='bool'), + type='str'), + namespace=dict( + required=False, + type='str'), limits=dict( required=False, elements='', type='list'), - namespace=dict( - required=False, - type='str'), - user_defined_annotations=dict( + exec=dict( required=False, - type='str'), - user_defined_parameters=dict( + elements='', + type='list'), + publish=dict( required=False, - type='str'), + type='bool'), name=dict( required=False, type='str'), @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_function_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -214,7 +214,7 @@ def run_module(): resource_type='ibm_function_action', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_function_action_info.py b/plugins/modules/ibm_function_action_info.py index 75bb2ab14..a5916596c 100644 --- a/plugins/modules/ibm_function_action_info.py +++ b/plugins/modules/ibm_function_action_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_function_action' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + namespace: description: - - Name of action. + - Name of the namespace. required: True type: str - namespace: + name: description: - - Name of the namespace. + - Name of action. required: True type: str function_namespace: @@ -50,14 +50,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('namespace', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'namespace', + 'name', ] @@ -68,10 +68,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + namespace=dict( required=True, type='str'), - namespace=dict( + name=dict( required=True, type='str'), function_namespace=dict( @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_function_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_function_namespace.py b/plugins/modules/ibm_function_namespace.py index fb9c53de1..e3e96f74e 100644 --- a/plugins/modules/ibm_function_namespace.py +++ b/plugins/modules/ibm_function_namespace.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_function_namespace' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_group_id: - description: - - (Required for new resource) Resource Group ID. - required: True - type: str name: description: - (Required for new resource) Name of namespace. @@ -37,6 +32,11 @@ - Namespace Description. required: False type: str + resource_group_id: + description: + - (Required for new resource) Resource Group ID. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -69,15 +69,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('resource_group_id', 'str'), ('name', 'str'), + ('resource_group_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group_id', 'name', 'description', + 'resource_group_id', ] # Params for Data source @@ -96,15 +96,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_group_id=dict( - required=False, - type='str'), name=dict( required=False, type='str'), description=dict( required=False, type='str'), + resource_group_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -160,7 +160,7 @@ def run_module(): resource_type='ibm_function_namespace', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -169,7 +169,7 @@ def run_module(): resource_type='ibm_function_namespace', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_function_namespace_info.py b/plugins/modules/ibm_function_namespace_info.py index 80e01a7fa..0904a1bfd 100644 --- a/plugins/modules/ibm_function_namespace_info.py +++ b/plugins/modules/ibm_function_namespace_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_function_namespace' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -88,7 +88,7 @@ def run_module(): resource_type='ibm_function_namespace', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_function_package.py b/plugins/modules/ibm_function_package.py index 83a9f3b48..3b78c166b 100644 --- a/plugins/modules/ibm_function_package.py +++ b/plugins/modules/ibm_function_package.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_function_package' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,16 +27,22 @@ - (Required for new resource) IBM Cloud function namespace. required: True type: str - name: + user_defined_parameters: description: - - (Required for new resource) Name of package. - required: True + - Parameters values in KEY VALUE format. Parameter bindings included in the context passed to the package. + required: False type: str + default: [] bind_package_name: description: - Name of package to be binded. required: False type: str + name: + description: + - (Required for new resource) Name of package. + required: True + type: str publish: description: - Package visibilty. @@ -49,12 +55,6 @@ required: False type: str default: [] - user_defined_parameters: - description: - - Parameters values in KEY VALUE format. Parameter bindings included in the context passed to the package. - required: False - type: str - default: [] id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,11 +94,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'namespace', - 'name', + 'user_defined_parameters', 'bind_package_name', + 'name', 'publish', 'user_defined_annotations', - 'user_defined_parameters', ] # Params for Data source @@ -122,21 +122,21 @@ namespace=dict( required=False, type='str'), - name=dict( + user_defined_parameters=dict( required=False, type='str'), bind_package_name=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), publish=dict( required=False, type='bool'), user_defined_annotations=dict( required=False, type='str'), - user_defined_parameters=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_function_package', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -201,7 +201,7 @@ def run_module(): resource_type='ibm_function_package', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_function_package_info.py b/plugins/modules/ibm_function_package_info.py index 57f5ade17..519641f5f 100644 --- a/plugins/modules/ibm_function_package_info.py +++ b/plugins/modules/ibm_function_package_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_function_package' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_function_package', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_function_rule.py b/plugins/modules/ibm_function_rule.py index 3d897c8f4..dc719d638 100644 --- a/plugins/modules/ibm_function_rule.py +++ b/plugins/modules/ibm_function_rule.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_function_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - action_name: - description: - - (Required for new resource) Name of action. - required: True - type: str namespace: description: - (Required for new resource) IBM Cloud function namespace. @@ -42,6 +37,11 @@ - (Required for new resource) Name of trigger. required: True type: str + action_name: + description: + - (Required for new resource) Name of action. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -74,18 +74,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('action_name', 'str'), ('namespace', 'str'), ('name', 'str'), ('trigger_name', 'str'), + ('action_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'action_name', 'namespace', 'name', 'trigger_name', + 'action_name', ] # Params for Data source @@ -106,9 +106,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - action_name=dict( - required=False, - type='str'), namespace=dict( required=False, type='str'), @@ -118,6 +115,9 @@ trigger_name=dict( required=False, type='str'), + action_name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -173,7 +173,7 @@ def run_module(): resource_type='ibm_function_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -182,7 +182,7 @@ def run_module(): resource_type='ibm_function_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_function_rule_info.py b/plugins/modules/ibm_function_rule_info.py index e57576e5f..a4f1d39dd 100644 --- a/plugins/modules/ibm_function_rule_info.py +++ b/plugins/modules/ibm_function_rule_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_function_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_function_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_function_trigger.py b/plugins/modules/ibm_function_trigger.py index 55188b688..84024451f 100644 --- a/plugins/modules/ibm_function_trigger.py +++ b/plugins/modules/ibm_function_trigger.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_function_trigger' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -28,6 +28,12 @@ required: False type: str default: [] + user_defined_parameters: + description: + - Parameters values in KEY VALUE format. Parameter bindings included in the context passed to the trigger. + required: False + type: str + default: [] namespace: description: - (Required for new resource) IBM Cloud function namespace. @@ -44,12 +50,6 @@ required: False type: list elements: dict - user_defined_parameters: - description: - - Parameters values in KEY VALUE format. Parameter bindings included in the context passed to the trigger. - required: False - type: str - default: [] id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,10 +89,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'user_defined_annotations', + 'user_defined_parameters', 'namespace', 'name', 'feed', - 'user_defined_parameters', ] # Params for Data source @@ -116,6 +116,9 @@ user_defined_annotations=dict( required=False, type='str'), + user_defined_parameters=dict( + required=False, + type='str'), namespace=dict( required=False, type='str'), @@ -126,9 +129,6 @@ required=False, elements='', type='list'), - user_defined_parameters=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_function_trigger', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_function_trigger', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_function_trigger_info.py b/plugins/modules/ibm_function_trigger_info.py index 96d683ec0..bf94cd54b 100644 --- a/plugins/modules/ibm_function_trigger_info.py +++ b/plugins/modules/ibm_function_trigger_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_function_trigger' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_function_trigger', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_hardware_firewall_shared.py b/plugins/modules/ibm_hardware_firewall_shared.py index 3b8323fe4..0d839e552 100644 --- a/plugins/modules/ibm_hardware_firewall_shared.py +++ b/plugins/modules/ibm_hardware_firewall_shared.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_hardware_firewall_shared' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_hardware_firewall_shared', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_hpcs.py b/plugins/modules/ibm_hpcs.py index d20c4ca22..cdce8343c 100644 --- a/plugins/modules/ibm_hpcs.py +++ b/plugins/modules/ibm_hpcs.py @@ -18,20 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_hpcs' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - signature_threshold: + plan: description: - - (Required for new resource) Signature Threshold Value + - (Required for new resource) The plan type of the HPCS Instance required: True - type: int - units: + type: str + service: description: - - (Required for new resource) The number of operational crypto units for your service instance - required: True - type: int + - The name of the service offering `hs-crypto` + required: False + type: str + default: hs-crypto revocation_threshold: description: - (Required for new resource) Revocation Threshold Value @@ -42,9 +43,20 @@ - (Required for new resource) A name for the HPCS instance required: True type: str - signature_server_url: + location: description: - - URL of signing service + - (Required for new resource) The location where the HPCS instance available + required: True + type: str + admins: + description: + - (Required for new resource) Crypto Unit Administrators + required: True + type: list + elements: dict + resource_group_id: + description: + - The resource group id required: False type: str tags: @@ -53,43 +65,31 @@ required: False type: list elements: str - plan: + units: description: - - (Required for new resource) The plan type of the HPCS Instance + - (Required for new resource) The number of operational crypto units for your service instance required: True - type: str - service: - description: - - The name of the service offering `hs-crypto` - required: False - type: str - default: hs-crypto - resource_group_id: - description: - - The resource group id - required: False - type: str + type: int failover_units: description: - The number of failover crypto units for your service instance required: False type: int - location: + signature_threshold: description: - - (Required for new resource) The location where the HPCS instance available + - (Required for new resource) Signature Threshold Value required: True - type: str + type: int service_endpoints: description: - Types of the service endpoints. Possible values are `public-and-private`, `private-only`. required: False type: str - admins: + signature_server_url: description: - - (Required for new resource) Crypto Unit Administrators - required: True - type: list - elements: dict + - URL of signing service + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -136,30 +136,30 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('signature_threshold', 'int'), - ('units', 'int'), + ('plan', 'str'), ('revocation_threshold', 'int'), ('name', 'str'), - ('plan', 'str'), ('location', 'str'), ('admins', 'list'), + ('units', 'int'), + ('signature_threshold', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'signature_threshold', - 'units', - 'revocation_threshold', - 'name', - 'signature_server_url', - 'tags', 'plan', 'service', + 'revocation_threshold', + 'name', + 'location', + 'admins', 'resource_group_id', + 'tags', + 'units', 'failover_units', - 'location', + 'signature_threshold', 'service_endpoints', - 'admins', + 'signature_server_url', ] # Params for Data source @@ -168,10 +168,10 @@ ] TL_ALL_PARAMETERS_DS = [ + 'name', 'resource_group_id', 'location', 'service', - 'name', ] TL_CONFLICTS_MAP = { @@ -181,47 +181,47 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - signature_threshold=dict( + plan=dict( required=False, - type='int'), - units=dict( + type='str'), + service=dict( required=False, - type='int'), + type='str'), revocation_threshold=dict( required=False, type='int'), name=dict( required=False, type='str'), - signature_server_url=dict( + location=dict( required=False, type='str'), - tags=dict( + admins=dict( required=False, elements='', type='list'), - plan=dict( + resource_group_id=dict( required=False, type='str'), - service=dict( + tags=dict( required=False, - type='str'), - resource_group_id=dict( + elements='', + type='list'), + units=dict( required=False, - type='str'), + type='int'), failover_units=dict( required=False, type='int'), - location=dict( + signature_threshold=dict( required=False, - type='str'), + type='int'), service_endpoints=dict( required=False, type='str'), - admins=dict( + signature_server_url=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -287,7 +287,7 @@ def run_module(): resource_type='ibm_hpcs', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -296,7 +296,7 @@ def run_module(): resource_type='ibm_hpcs', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_hpcs_info.py b/plugins/modules/ibm_hpcs_info.py index 277be07a7..68f8a1ea3 100644 --- a/plugins/modules/ibm_hpcs_info.py +++ b/plugins/modules/ibm_hpcs_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_hpcs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + name: + description: + - Resource instance name for example, myobjectstorage + required: True + type: str resource_group_id: description: - The id of the resource group in which the instance is present @@ -37,11 +42,6 @@ required: False type: str default: hs-crypto - name: - description: - - Resource instance name for example, myobjectstorage - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -80,10 +80,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', 'resource_group_id', 'location', 'service', - 'name', ] @@ -94,6 +94,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + name=dict( + required=True, + type='str'), resource_group_id=dict( required=False, type='str'), @@ -103,9 +106,6 @@ service=dict( required=False, type='str'), - name=dict( - required=True, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -140,7 +140,7 @@ def run_module(): resource_type='ibm_hpcs', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_hpcs_key_template.py b/plugins/modules/ibm_hpcs_key_template.py new file mode 100644 index 000000000..07ee0f0b3 --- /dev/null +++ b/plugins/modules/ibm_hpcs_key_template.py @@ -0,0 +1,275 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_key_template +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/hpcs_key_template + +short_description: Configure IBM Cloud 'ibm_hpcs_key_template' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_hpcs_key_template' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_id: + description: + - (Required for new resource) The ID of the UKO instance this resource exists in. + required: True + type: str + vault: + description: + - (Required for new resource) ID of the Vault where the entity is to be created in. + required: True + type: list + elements: dict + key: + description: + - (Required for new resource) Properties describing the properties of the managed key. + required: True + type: list + elements: dict + region: + description: + - (Required for new resource) The region of the UKO instance this resource exists in. + required: True + type: str + description: + description: + - Description of the key template. + required: False + type: str + uko_vault: + description: + - (Required for new resource) The UUID of the Vault in which the update is to take place. + required: True + type: str + name: + description: + - (Required for new resource) Name of the template, it will be referenced when creating managed keys. + required: True + type: str + keystores: + description: + - (Required for new resource) An array describing the type and group of target keystores the managed key is to be installed in. + required: True + type: list + elements: dict + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_id', 'str'), + ('vault', 'list'), + ('key', 'list'), + ('region', 'str'), + ('uko_vault', 'str'), + ('name', 'str'), + ('keystores', 'list'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_id', + 'vault', + 'key', + 'region', + 'description', + 'uko_vault', + 'name', + 'keystores', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('region', 'str'), + ('instance_id', 'str'), + ('template_id', 'str'), + ('uko_vault', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'region', + 'instance_id', + 'template_id', + 'uko_vault', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_id=dict( + required=False, + type='str'), + vault=dict( + required=False, + elements='', + type='list'), + key=dict( + required=False, + elements='', + type='list'), + region=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + uko_vault=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + keystores=dict( + required=False, + elements='', + type='list'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_hpcs_key_template', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_hpcs_key_template', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_hpcs_key_template_info.py b/plugins/modules/ibm_hpcs_key_template_info.py new file mode 100644 index 000000000..4fb96929b --- /dev/null +++ b/plugins/modules/ibm_hpcs_key_template_info.py @@ -0,0 +1,161 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_key_template_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/hpcs_key_template + +short_description: Retrieve IBM Cloud 'ibm_hpcs_key_template' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_hpcs_key_template' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + region: + description: + - The region of the UKO instance this resource exists in. + required: True + type: str + instance_id: + description: + - The ID of the UKO instance this resource exists in. + required: True + type: str + template_id: + description: + - UUID of the template. + required: True + type: str + uko_vault: + description: + - The UUID of the Vault in which the update is to take place. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('region', 'str'), + ('instance_id', 'str'), + ('template_id', 'str'), + ('uko_vault', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'region', + 'instance_id', + 'template_id', + 'uko_vault', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + region=dict( + required=True, + type='str'), + instance_id=dict( + required=True, + type='str'), + template_id=dict( + required=True, + type='str'), + uko_vault=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_hpcs_key_template', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_hpcs_keystore.py b/plugins/modules/ibm_hpcs_keystore.py new file mode 100644 index 000000000..c0afd840c --- /dev/null +++ b/plugins/modules/ibm_hpcs_keystore.py @@ -0,0 +1,424 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_keystore +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/hpcs_keystore + +short_description: Configure IBM Cloud 'ibm_hpcs_keystore' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_hpcs_keystore' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + region: + description: + - (Required for new resource) The region of the UKO instance this resource exists in. + required: True + type: str + ibm_variant: + description: + - Possible IBM Cloud KMS variants. + required: False + type: str + groups: + description: + - List of groups that this keystore belongs to. + required: False + type: list + elements: str + name: + description: + - Name of the target keystore. It can be changed in the future. + required: False + type: str + description: + description: + - Description of the keystore. + required: False + type: str + instance_id: + description: + - (Required for new resource) The ID of the UKO instance this resource exists in. + required: True + type: str + uko_vault: + description: + - (Required for new resource) The UUID of the Vault in which the update is to take place. + required: True + type: str + aws_region: + description: + - AWS Region. + required: False + type: str + aws_access_key_id: + description: + - The access key id used for connecting to this instance of AWS KMS. + required: False + type: str + azure_service_name: + description: + - Service name of the key vault instance from the Azure portal. + required: False + type: str + azure_resource_group: + description: + - Resource group in Azure. + required: False + type: str + azure_service_principal_password: + description: + - Azure service principal password. + required: False + type: str + azure_subscription_id: + description: + - Subscription ID in Azure. + required: False + type: str + aws_secret_access_key: + description: + - The secret access key used for connecting to this instance of AWS KMS. + required: False + type: str + azure_tenant: + description: + - Azure tenant that the Key Vault is associated with,. + required: False + type: str + azure_environment: + description: + - Azure environment, usually 'Azure'. + required: False + type: str + ibm_iam_endpoint: + description: + - Endpoint of the IAM service for this IBM Cloud keystore. + required: False + type: str + ibm_instance_id: + description: + - The instance ID of the IBM Cloud keystore. + required: False + type: str + ibm_api_endpoint: + description: + - API endpoint of the IBM Cloud keystore. + required: False + type: str + ibm_api_key: + description: + - The IBM Cloud API key to be used for connecting to this IBM Cloud keystore. + required: False + type: str + ibm_key_ring: + description: + - The key ring of an IBM Cloud KMS Keystore. + required: False + type: str + vault: + description: + - (Required for new resource) Reference to a vault. + required: True + type: list + elements: dict + type: + description: + - (Required for new resource) Type of keystore. + required: True + type: str + azure_location: + description: + - Location of the Azure Key Vault. + required: False + type: str + azure_service_principal_client_id: + description: + - Azure service principal client ID. + required: False + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('region', 'str'), + ('instance_id', 'str'), + ('uko_vault', 'str'), + ('vault', 'list'), + ('type', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'region', + 'ibm_variant', + 'groups', + 'name', + 'description', + 'instance_id', + 'uko_vault', + 'aws_region', + 'aws_access_key_id', + 'azure_service_name', + 'azure_resource_group', + 'azure_service_principal_password', + 'azure_subscription_id', + 'aws_secret_access_key', + 'azure_tenant', + 'azure_environment', + 'ibm_iam_endpoint', + 'ibm_instance_id', + 'ibm_api_endpoint', + 'ibm_api_key', + 'ibm_key_ring', + 'vault', + 'type', + 'azure_location', + 'azure_service_principal_client_id', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('instance_id', 'str'), + ('uko_vault', 'str'), + ('keystore_id', 'str'), + ('region', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'instance_id', + 'uko_vault', + 'keystore_id', + 'region', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + region=dict( + required=False, + type='str'), + ibm_variant=dict( + required=False, + type='str'), + groups=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + instance_id=dict( + required=False, + type='str'), + uko_vault=dict( + required=False, + type='str'), + aws_region=dict( + required=False, + type='str'), + aws_access_key_id=dict( + required=False, + type='str'), + azure_service_name=dict( + required=False, + type='str'), + azure_resource_group=dict( + required=False, + type='str'), + azure_service_principal_password=dict( + required=False, + type='str'), + azure_subscription_id=dict( + required=False, + type='str'), + aws_secret_access_key=dict( + required=False, + type='str'), + azure_tenant=dict( + required=False, + type='str'), + azure_environment=dict( + required=False, + type='str'), + ibm_iam_endpoint=dict( + required=False, + type='str'), + ibm_instance_id=dict( + required=False, + type='str'), + ibm_api_endpoint=dict( + required=False, + type='str'), + ibm_api_key=dict( + required=False, + type='str'), + ibm_key_ring=dict( + required=False, + type='str'), + vault=dict( + required=False, + elements='', + type='list'), + type=dict( + required=False, + type='str'), + azure_location=dict( + required=False, + type='str'), + azure_service_principal_client_id=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_hpcs_keystore', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_hpcs_keystore', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_hpcs_keystore_info.py b/plugins/modules/ibm_hpcs_keystore_info.py new file mode 100644 index 000000000..7d4fe0806 --- /dev/null +++ b/plugins/modules/ibm_hpcs_keystore_info.py @@ -0,0 +1,161 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_keystore_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/hpcs_keystore + +short_description: Retrieve IBM Cloud 'ibm_hpcs_keystore' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_hpcs_keystore' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_id: + description: + - The ID of the UKO instance this resource exists in. + required: True + type: str + uko_vault: + description: + - The UUID of the Vault in which the update is to take place. + required: True + type: str + keystore_id: + description: + - UUID of the keystore. + required: True + type: str + region: + description: + - The region of the UKO instance this resource exists in. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_id', 'str'), + ('uko_vault', 'str'), + ('keystore_id', 'str'), + ('region', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_id', + 'uko_vault', + 'keystore_id', + 'region', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_id=dict( + required=True, + type='str'), + uko_vault=dict( + required=True, + type='str'), + keystore_id=dict( + required=True, + type='str'), + region=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_hpcs_keystore', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_hpcs_managed_key.py b/plugins/modules/ibm_hpcs_managed_key.py new file mode 100644 index 000000000..315c6ba8e --- /dev/null +++ b/plugins/modules/ibm_hpcs_managed_key.py @@ -0,0 +1,280 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_managed_key +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/hpcs_managed_key + +short_description: Configure IBM Cloud 'ibm_hpcs_managed_key' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_hpcs_managed_key' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + template_name: + description: + - Name of the key template to use when creating a key. + required: False + type: str + label: + description: + - (Required for new resource) The label of the key. + required: True + type: str + tags: + description: + - Key-value pairs associated with the key. + required: False + type: list + elements: dict + description: + description: + - Description of the managed key. + required: False + type: str + instance_id: + description: + - (Required for new resource) The ID of the UKO instance this resource exists in. + required: True + type: str + state_: + description: + - The state of the key. + required: False + type: str + uko_vault: + description: + - (Required for new resource) The UUID of the Vault in which the update is to take place. + required: True + type: str + vault: + description: + - (Required for new resource) ID of the Vault where the entity is to be created in. + required: True + type: list + elements: dict + region: + description: + - (Required for new resource) The region of the UKO instance this resource exists in. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('label', 'str'), + ('instance_id', 'str'), + ('uko_vault', 'str'), + ('vault', 'list'), + ('region', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'template_name', + 'label', + 'tags', + 'description', + 'instance_id', + 'state_', + 'uko_vault', + 'vault', + 'region', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('region', 'str'), + ('key_id', 'str'), + ('instance_id', 'str'), + ('uko_vault', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'region', + 'key_id', + 'instance_id', + 'uko_vault', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + template_name=dict( + required=False, + type='str'), + label=dict( + required=False, + type='str'), + tags=dict( + required=False, + elements='', + type='list'), + description=dict( + required=False, + type='str'), + instance_id=dict( + required=False, + type='str'), + state_=dict( + required=False, + type='str'), + uko_vault=dict( + required=False, + type='str'), + vault=dict( + required=False, + elements='', + type='list'), + region=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_hpcs_managed_key', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_hpcs_managed_key', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_hpcs_managed_key_info.py b/plugins/modules/ibm_hpcs_managed_key_info.py new file mode 100644 index 000000000..3ca78d9d7 --- /dev/null +++ b/plugins/modules/ibm_hpcs_managed_key_info.py @@ -0,0 +1,161 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_managed_key_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/hpcs_managed_key + +short_description: Retrieve IBM Cloud 'ibm_hpcs_managed_key' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_hpcs_managed_key' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + region: + description: + - The region of the UKO instance this resource exists in. + required: True + type: str + key_id: + description: + - UUID of the key. + required: True + type: str + instance_id: + description: + - The ID of the UKO instance this resource exists in. + required: True + type: str + uko_vault: + description: + - The UUID of the Vault in which the update is to take place. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('region', 'str'), + ('key_id', 'str'), + ('instance_id', 'str'), + ('uko_vault', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'region', + 'key_id', + 'instance_id', + 'uko_vault', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + region=dict( + required=True, + type='str'), + key_id=dict( + required=True, + type='str'), + instance_id=dict( + required=True, + type='str'), + uko_vault=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_hpcs_managed_key', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_hpcs_vault.py b/plugins/modules/ibm_hpcs_vault.py new file mode 100644 index 000000000..166bfc970 --- /dev/null +++ b/plugins/modules/ibm_hpcs_vault.py @@ -0,0 +1,227 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_vault +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/hpcs_vault + +short_description: Configure IBM Cloud 'ibm_hpcs_vault' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_hpcs_vault' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_id: + description: + - (Required for new resource) The ID of the UKO instance this resource exists in. + required: True + type: str + name: + description: + - (Required for new resource) A human-readable name to assign to your vault. To protect your privacy, do not use personal data, such as your name or location. + required: True + type: str + description: + description: + - Description of the vault. + required: False + type: str + region: + description: + - (Required for new resource) The region of the UKO instance this resource exists in. + required: True + type: str + id: + description: + - (Required when updating or destroying existing resource) IBM Cloud Resource ID. + required: False + type: str + state: + description: + - State of resource + choices: + - available + - absent + default: available + required: False + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_id', 'str'), + ('name', 'str'), + ('region', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_id', + 'name', + 'description', + 'region', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('instance_id', 'str'), + ('vault_id', 'str'), + ('region', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'instance_id', + 'vault_id', + 'region', +] + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_id=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + region=dict( + required=False, + type='str'), + id=dict( + required=False, + type='str'), + state=dict( + type='str', + required=False, + default='available', + choices=(['available', 'absent'])), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + # New resource required arguments checks + missing_args = [] + if module.params['id'] is None: + for arg, _ in TL_REQUIRED_PARAMETERS: + if module.params[arg] is None: + missing_args.append(arg) + if missing_args: + module.fail_json(msg=( + "missing required arguments: " + ", ".join(missing_args))) + + conflicts = {} + if len(TL_CONFLICTS_MAP) != 0: + for arg in TL_CONFLICTS_MAP: + if module.params[arg]: + for conflict in TL_CONFLICTS_MAP[arg]: + try: + if module.params[conflict]: + conflicts[arg] = conflict + except KeyError: + pass + if len(conflicts): + module.fail_json(msg=("conflicts exist: {}".format(conflicts))) + + result_ds = ibmcloud_terraform( + resource_type='ibm_hpcs_vault', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS_DS, + tl_all_params=TL_ALL_PARAMETERS_DS) + + if result_ds['rc'] != 0 or (result_ds['rc'] == 0 and (module.params['id'] is not None or module.params['state'] == 'absent')): + result = ibmcloud_terraform( + resource_type='ibm_hpcs_vault', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + else: + module.exit_json(**result_ds) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_hpcs_vault_info.py b/plugins/modules/ibm_hpcs_vault_info.py new file mode 100644 index 000000000..c5d7c1da8 --- /dev/null +++ b/plugins/modules/ibm_hpcs_vault_info.py @@ -0,0 +1,151 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_hpcs_vault_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/hpcs_vault + +short_description: Retrieve IBM Cloud 'ibm_hpcs_vault' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_hpcs_vault' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.43.0 + - Terraform v0.12.20 + +options: + instance_id: + description: + - The ID of the UKO instance this resource exists in. + required: True + type: str + vault_id: + description: + - UUID of the vault. + required: True + type: str + region: + description: + - The region of the UKO instance this resource exists in. + required: True + type: str + iaas_classic_username: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure (SoftLayer) user name. This can also be provided + via the environment variable 'IAAS_CLASSIC_USERNAME'. + required: False + iaas_classic_api_key: + description: + - (Required when generation = 1) The IBM Cloud Classic + Infrastructure API key. This can also be provided via the + environment variable 'IAAS_CLASSIC_API_KEY'. + required: False + region: + description: + - The IBM Cloud region where you want to create your + resources. If this value is not specified, us-south is + used by default. This can also be provided via the + environment variable 'IC_REGION'. + default: us-south + required: False + ibmcloud_api_key: + description: + - The IBM Cloud API key to authenticate with the IBM Cloud + platform. This can also be provided via the environment + variable 'IC_API_KEY'. + required: True + +author: + - Jay Carman (@jaywcarman) +''' + +# Top level parameter keys required by Terraform module +TL_REQUIRED_PARAMETERS = [ + ('instance_id', 'str'), + ('vault_id', 'str'), + ('region', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_id', + 'vault_id', + 'region', +] + + +TL_CONFLICTS_MAP = { +} + +# define available arguments/parameters a user can pass to the module +from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform +from ansible.module_utils.basic import env_fallback +module_args = dict( + instance_id=dict( + required=True, + type='str'), + vault_id=dict( + required=True, + type='str'), + region=dict( + required=True, + type='str'), + iaas_classic_username=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_USERNAME']), + required=False), + iaas_classic_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IAAS_CLASSIC_API_KEY']), + required=False), + region=dict( + type='str', + fallback=(env_fallback, ['IC_REGION']), + default='us-south'), + ibmcloud_api_key=dict( + type='str', + no_log=True, + fallback=(env_fallback, ['IC_API_KEY']), + required=True) +) + + +def run_module(): + from ansible.module_utils.basic import AnsibleModule + + module = AnsibleModule( + argument_spec=module_args, + supports_check_mode=False + ) + + result = ibmcloud_terraform( + resource_type='ibm_hpcs_vault', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.43.0', + tl_required_params=TL_REQUIRED_PARAMETERS, + tl_all_params=TL_ALL_PARAMETERS) + + if result['rc'] > 0: + module.fail_json( + msg=Terraform.parse_stderr(result['stderr']), **result) + + module.exit_json(**result) + + +def main(): + run_module() + + +if __name__ == '__main__': + main() diff --git a/plugins/modules/ibm_iam_access_group.py b/plugins/modules/ibm_iam_access_group.py index 8ba33d22b..4a6cb9e50 100644 --- a/plugins/modules/ibm_iam_access_group.py +++ b/plugins/modules/ibm_iam_access_group.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_access_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) Name of the access group - required: True - type: str description: description: - Description of the access group @@ -38,6 +33,11 @@ required: False type: list elements: str + name: + description: + - (Required for new resource) Name of the access group + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,9 +89,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'description', 'tags', + 'name', ] # Params for Data source @@ -109,9 +109,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=False, - type='str'), description=dict( required=False, type='str'), @@ -119,6 +116,9 @@ required=False, elements='', type='list'), + name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_iam_access_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_iam_access_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_access_group_dynamic_rule.py b/plugins/modules/ibm_iam_access_group_dynamic_rule.py index 39f47b167..3140a600a 100644 --- a/plugins/modules/ibm_iam_access_group_dynamic_rule.py +++ b/plugins/modules/ibm_iam_access_group_dynamic_rule.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_access_group_dynamic_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - access_group_id: - description: - - (Required for new resource) Unique identifier of the access group - required: True - type: str name: description: - (Required for new resource) The name of the Rule @@ -48,6 +43,11 @@ required: True type: list elements: dict + access_group_id: + description: + - (Required for new resource) Unique identifier of the access group + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,20 +94,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('access_group_id', 'str'), ('name', 'str'), ('expiration', 'int'), ('identity_provider', 'str'), ('conditions', 'list'), + ('access_group_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'access_group_id', 'name', 'expiration', 'identity_provider', 'conditions', + 'access_group_id', ] # Params for Data source @@ -124,9 +124,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - access_group_id=dict( - required=False, - type='str'), name=dict( required=False, type='str'), @@ -140,6 +137,9 @@ required=False, elements='', type='list'), + access_group_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_iam_access_group_dynamic_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_access_group_info.py b/plugins/modules/ibm_iam_access_group_info.py index 4aaef6145..57405570b 100644 --- a/plugins/modules/ibm_iam_access_group_info.py +++ b/plugins/modules/ibm_iam_access_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_access_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_iam_access_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_access_group_members.py b/plugins/modules/ibm_iam_access_group_members.py index e4ee62bbf..cc609eab3 100644 --- a/plugins/modules/ibm_iam_access_group_members.py +++ b/plugins/modules/ibm_iam_access_group_members.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_access_group_members' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_iam_access_group_members', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_access_group_policy.py b/plugins/modules/ibm_iam_access_group_policy.py index 8783f88d6..d17c9ea1d 100644 --- a/plugins/modules/ibm_iam_access_group_policy.py +++ b/plugins/modules/ibm_iam_access_group_policy.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_access_group_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + description: + description: + - Description of the Policy + required: False + type: str + transaction_id: + description: + - Set transactionID for debug + required: False + type: str access_group_id: description: - (Required for new resource) ID of access group @@ -39,16 +49,12 @@ required: False type: bool default: False - transaction_id: - description: - - Set transactionID for debug - required: False - type: str - description: + tags: description: - - Description of the Policy + - None required: False - type: str + type: list + elements: str resources: description: - None @@ -61,12 +67,6 @@ required: False type: list elements: dict - tags: - description: - - None - required: False - type: list - elements: str resource_tags: description: - Set access management tags. @@ -125,14 +125,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'description', + 'transaction_id', 'access_group_id', 'roles', 'account_management', - 'transaction_id', - 'description', + 'tags', 'resources', 'resource_attributes', - 'tags', 'resource_tags', ] @@ -157,6 +157,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + description=dict( + required=False, + type='str'), + transaction_id=dict( + required=False, + type='str'), access_group_id=dict( required=False, type='str'), @@ -167,21 +173,15 @@ account_management=dict( required=False, type='bool'), - transaction_id=dict( - required=False, - type='str'), - description=dict( - required=False, - type='str'), - resources=dict( + tags=dict( required=False, elements='', type='list'), - resource_attributes=dict( + resources=dict( required=False, elements='', type='list'), - tags=dict( + resource_attributes=dict( required=False, elements='', type='list'), @@ -254,7 +254,7 @@ def run_module(): resource_type='ibm_iam_access_group_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -263,7 +263,7 @@ def run_module(): resource_type='ibm_iam_access_group_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_access_group_policy_info.py b/plugins/modules/ibm_iam_access_group_policy_info.py index a73bb53c3..dcdefe152 100644 --- a/plugins/modules/ibm_iam_access_group_policy_info.py +++ b/plugins/modules/ibm_iam_access_group_policy_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_access_group_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -130,7 +130,7 @@ def run_module(): resource_type='ibm_iam_access_group_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_account_settings.py b/plugins/modules/ibm_iam_account_settings.py index f0246fd1f..8007bcade 100644 --- a/plugins/modules/ibm_iam_account_settings.py +++ b/plugins/modules/ibm_iam_account_settings.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_account_settings' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -28,17 +28,21 @@ required: False type: bool default: False + restrict_create_service_id: + description: + - Defines whether or not creating a Service Id is access controlled. Valid values: * RESTRICTED - to apply access control * NOT_RESTRICTED - to remove access control * NOT_SET - to 'unset' a previous set value. + required: False + type: str allowed_ip_addresses: description: - Defines the IP addresses and subnets from which IAM tokens can be created for the account. required: False type: str - if_match: + mfa: description: - - Version of the account settings to be updated. Specify the version that you retrieved as entity_tag (ETag header) when reading the account. This value helps identifying parallel usage of this API. Pass * to indicate to update any version available. This might result in stale updates. + - Defines the MFA trait for the account. Valid values: * NONE - No MFA trait set * TOTP - For all non-federated IBMId users * TOTP4ALL - For all users * LEVEL1 - Email-based MFA for all users * LEVEL2 - TOTP-based MFA for all users * LEVEL3 - U2F MFA for all users. required: False type: str - default: * session_expiration_in_seconds: description: - Defines the session expiration in seconds for the account. Valid values: * Any whole number between between '900' and '86400' * NOT_SET - To unset account setting and use service default. @@ -49,16 +53,6 @@ - Defines the period of time in seconds in which a session will be invalidated due to inactivity. Valid values: * Any whole number between '900' and '7200' * NOT_SET - To unset account setting and use service default. required: False type: str - max_sessions_per_identity: - description: - - Defines the max allowed sessions per identity required by the account. Value values: * Any whole number greater than '0' * NOT_SET - To unset account setting and use service default. - required: False - type: str - restrict_create_service_id: - description: - - Defines whether or not creating a Service Id is access controlled. Valid values: * RESTRICTED - to apply access control * NOT_RESTRICTED - to remove access control * NOT_SET - to 'unset' a previous set value. - required: False - type: str restrict_create_platform_apikey: description: - Defines whether or not creating platform API keys is access controlled. Valid values: * RESTRICTED - to apply access control * NOT_RESTRICTED - to remove access control * NOT_SET - to 'unset' a previous set value. @@ -69,9 +63,15 @@ - Version of the account settings. required: False type: str - mfa: + if_match: description: - - Defines the MFA trait for the account. Valid values: * NONE - No MFA trait set * TOTP - For all non-federated IBMId users * TOTP4ALL - For all users * LEVEL1 - Email-based MFA for all users * LEVEL2 - TOTP-based MFA for all users * LEVEL3 - U2F MFA for all users. + - Version of the account settings to be updated. Specify the version that you retrieved as entity_tag (ETag header) when reading the account. This value helps identifying parallel usage of this API. Pass * to indicate to update any version available. This might result in stale updates. + required: False + type: str + default: * + max_sessions_per_identity: + description: + - Defines the max allowed sessions per identity required by the account. Value values: * Any whole number greater than '0' * NOT_SET - To unset account setting and use service default. required: False type: str id: @@ -125,15 +125,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'include_history', + 'restrict_create_service_id', 'allowed_ip_addresses', - 'if_match', + 'mfa', 'session_expiration_in_seconds', 'session_invalidation_in_seconds', - 'max_sessions_per_identity', - 'restrict_create_service_id', 'restrict_create_platform_apikey', 'entity_tag', - 'mfa', + 'if_match', + 'max_sessions_per_identity', ] # Params for Data source @@ -154,10 +154,13 @@ include_history=dict( required=False, type='bool'), + restrict_create_service_id=dict( + required=False, + type='str'), allowed_ip_addresses=dict( required=False, type='str'), - if_match=dict( + mfa=dict( required=False, type='str'), session_expiration_in_seconds=dict( @@ -166,19 +169,16 @@ session_invalidation_in_seconds=dict( required=False, type='str'), - max_sessions_per_identity=dict( - required=False, - type='str'), - restrict_create_service_id=dict( - required=False, - type='str'), restrict_create_platform_apikey=dict( required=False, type='str'), entity_tag=dict( required=False, type='str'), - mfa=dict( + if_match=dict( + required=False, + type='str'), + max_sessions_per_identity=dict( required=False, type='str'), id=dict( @@ -246,7 +246,7 @@ def run_module(): resource_type='ibm_iam_account_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -255,7 +255,7 @@ def run_module(): resource_type='ibm_iam_account_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_account_settings_info.py b/plugins/modules/ibm_iam_account_settings_info.py index 090e42c21..e0c46e490 100644 --- a/plugins/modules/ibm_iam_account_settings_info.py +++ b/plugins/modules/ibm_iam_account_settings_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_account_settings' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_account_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_api_key.py b/plugins/modules/ibm_iam_api_key.py index 06ba62271..ac07ea563 100644 --- a/plugins/modules/ibm_iam_api_key.py +++ b/plugins/modules/ibm_iam_api_key.py @@ -18,41 +18,41 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_api_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + apikey: + description: + - You can optionally passthrough the API key value for this API key. If passed, NO validation of that apiKey value is done, i.e. the value can be non-URL safe. If omitted, the API key management will create an URL safe opaque API key value. The value of the API key is checked for uniqueness. Please ensure enough variations when passing in this value. + required: False + type: str entity_lock: description: - Indicates if the API key is locked for further write operations. False by default. required: False type: str default: false - name: + store_value: description: - - (Required for new resource) Name of the API key. The name is not checked for uniqueness. Therefore multiple names with the same value can exist. Access is done via the UUID of the API key. - required: True - type: str + - Send true or false to set whether the API key value is retrievable in the future by using the Get details of an API key request. If you create an API key for a user, you must specify `false` or omit the value. We don't allow storing of API keys for users. + required: False + type: bool file: description: - File where api key is to be stored required: False type: str - description: + name: description: - - The optional description of the API key. The 'description' property is only available if a description was provided during a create of an API key. - required: False + - (Required for new resource) Name of the API key. The name is not checked for uniqueness. Therefore multiple names with the same value can exist. Access is done via the UUID of the API key. + required: True type: str - apikey: + description: description: - - You can optionally passthrough the API key value for this API key. If passed, NO validation of that apiKey value is done, i.e. the value can be non-URL safe. If omitted, the API key management will create an URL safe opaque API key value. The value of the API key is checked for uniqueness. Please ensure enough variations when passing in this value. + - The optional description of the API key. The 'description' property is only available if a description was provided during a create of an API key. required: False type: str - store_value: - description: - - Send true or false to set whether the API key value is retrievable in the future by using the Get details of an API key request. If you create an API key for a user, you must specify `false` or omit the value. We don't allow storing of API keys for users. - required: False - type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,12 +104,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'apikey', 'entity_lock', - 'name', + 'store_value', 'file', + 'name', 'description', - 'apikey', - 'store_value', ] # Params for Data source @@ -128,24 +128,24 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - entity_lock=dict( + apikey=dict( required=False, type='str'), - name=dict( + entity_lock=dict( required=False, type='str'), + store_value=dict( + required=False, + type='bool'), file=dict( required=False, type='str'), - description=dict( + name=dict( required=False, type='str'), - apikey=dict( + description=dict( required=False, type='str'), - store_value=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -211,7 +211,7 @@ def run_module(): resource_type='ibm_iam_api_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -220,7 +220,7 @@ def run_module(): resource_type='ibm_iam_api_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_api_key_info.py b/plugins/modules/ibm_iam_api_key_info.py index cfb4392d6..62673319b 100644 --- a/plugins/modules/ibm_iam_api_key_info.py +++ b/plugins/modules/ibm_iam_api_key_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_api_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_api_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_auth_token_info.py b/plugins/modules/ibm_iam_auth_token_info.py index f797baca8..ec56b628e 100644 --- a/plugins/modules/ibm_iam_auth_token_info.py +++ b/plugins/modules/ibm_iam_auth_token_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_auth_token' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_iam_auth_token', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_authorization_policies_info.py b/plugins/modules/ibm_iam_authorization_policies_info.py index 92d21d0ef..e0f96a0ad 100644 --- a/plugins/modules/ibm_iam_authorization_policies_info.py +++ b/plugins/modules/ibm_iam_authorization_policies_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_iam_authorization_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - account_id: - description: - - The unique ID of an account - required: False - type: str sort: description: - Sort query for policies @@ -36,6 +31,11 @@ - Set transactionID for debug required: False type: str + account_id: + description: + - The unique ID of an account + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -73,9 +73,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'account_id', 'sort', 'transaction_id', + 'account_id', ] @@ -86,15 +86,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - account_id=dict( - required=False, - type='str'), sort=dict( required=False, type='str'), transaction_id=dict( required=False, type='str'), + account_id=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -129,7 +129,7 @@ def run_module(): resource_type='ibm_iam_authorization_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_authorization_policy.py b/plugins/modules/ibm_iam_authorization_policy.py index 947bf2e99..48020f52e 100644 --- a/plugins/modules/ibm_iam_authorization_policy.py +++ b/plugins/modules/ibm_iam_authorization_policy.py @@ -18,51 +18,43 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_authorization_policy' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - subject_attributes: + source_resource_group_id: description: - - Set subject attributes. + - The source resource group Id required: False - type: list - elements: dict - source_resource_type: + type: str + target_resource_type: description: - - Resource type of source service + - Resource type of target service required: False type: str - target_resource_instance_id: + target_service_name: description: - - The target resource instance Id + - The target service name required: False type: str - source_resource_group_id: + target_resource_instance_id: description: - - The source resource group Id + - The target resource instance Id required: False type: str - resource_attributes: + description: description: - - Set resource attributes. + - Description of the Policy required: False - type: list - elements: dict - target_service_name: + type: str + transaction_id: description: - - The target service name + - Set transactionID for debug required: False type: str - roles: - description: - - (Required for new resource) Role names of the policy definition - required: True - type: list - elements: str - source_resource_instance_id: + source_service_name: description: - - The source resource instance Id + - The source service name required: False type: str target_resource_group_id: @@ -70,29 +62,37 @@ - The target resource group Id required: False type: str - target_resource_type: + source_resource_type: description: - - Resource type of target service + - Resource type of source service required: False type: str - source_service_account: + subject_attributes: description: - - Account GUID of source service + - Set subject attributes. required: False - type: str - source_service_name: + type: list + elements: dict + resource_attributes: description: - - The source service name + - Set resource attributes. required: False - type: str - description: + type: list + elements: dict + roles: description: - - Description of the Policy + - (Required for new resource) Role names of the policy definition + required: True + type: list + elements: str + source_resource_instance_id: + description: + - The source resource instance Id required: False type: str - transaction_id: + source_service_account: description: - - Set transactionID for debug + - Account GUID of source service required: False type: str id: @@ -146,20 +146,20 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'subject_attributes', - 'source_resource_type', - 'target_resource_instance_id', 'source_resource_group_id', - 'resource_attributes', + 'target_resource_type', 'target_service_name', + 'target_resource_instance_id', + 'description', + 'transaction_id', + 'source_service_name', + 'target_resource_group_id', + 'source_resource_type', + 'subject_attributes', + 'resource_attributes', 'roles', 'source_resource_instance_id', - 'target_resource_group_id', - 'target_resource_type', 'source_service_account', - 'source_service_name', - 'description', - 'transaction_id', ] # Params for Data source @@ -170,14 +170,14 @@ ] TL_CONFLICTS_MAP = { - 'subject_attributes': ['source_resource_instance_id', 'source_resource_group_id', 'source_resource_type', 'source_service_account'], - 'source_resource_type': ['subject_attributes'], - 'target_resource_instance_id': ['resource_attributes'], 'source_resource_group_id': ['subject_attributes'], + 'target_resource_type': ['resource_attributes'], + 'target_resource_instance_id': ['resource_attributes'], + 'target_resource_group_id': ['resource_attributes'], + 'source_resource_type': ['subject_attributes'], + 'subject_attributes': ['source_resource_instance_id', 'source_resource_group_id', 'source_resource_type', 'source_service_account'], 'resource_attributes': ['target_resource_instance_id', 'target_resource_group_id', 'target_resource_type'], 'source_resource_instance_id': ['subject_attributes'], - 'target_resource_group_id': ['resource_attributes'], - 'target_resource_type': ['resource_attributes'], 'source_service_account': ['subject_attributes'], } @@ -185,49 +185,49 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - subject_attributes=dict( - required=False, - elements='', - type='list'), - source_resource_type=dict( + source_resource_group_id=dict( required=False, type='str'), - target_resource_instance_id=dict( + target_resource_type=dict( required=False, type='str'), - source_resource_group_id=dict( + target_service_name=dict( required=False, type='str'), - resource_attributes=dict( + target_resource_instance_id=dict( required=False, - elements='', - type='list'), - target_service_name=dict( + type='str'), + description=dict( required=False, type='str'), - roles=dict( + transaction_id=dict( required=False, - elements='', - type='list'), - source_resource_instance_id=dict( + type='str'), + source_service_name=dict( required=False, type='str'), target_resource_group_id=dict( required=False, type='str'), - target_resource_type=dict( + source_resource_type=dict( required=False, type='str'), - source_service_account=dict( + subject_attributes=dict( required=False, - type='str'), - source_service_name=dict( + elements='', + type='list'), + resource_attributes=dict( required=False, - type='str'), - description=dict( + elements='', + type='list'), + roles=dict( + required=False, + elements='', + type='list'), + source_resource_instance_id=dict( required=False, type='str'), - transaction_id=dict( + source_service_account=dict( required=False, type='str'), id=dict( @@ -295,7 +295,7 @@ def run_module(): resource_type='ibm_iam_authorization_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_authorization_policy_detach.py b/plugins/modules/ibm_iam_authorization_policy_detach.py index c3835faf0..c3b70b80f 100644 --- a/plugins/modules/ibm_iam_authorization_policy_detach.py +++ b/plugins/modules/ibm_iam_authorization_policy_detach.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_authorization_policy_detach' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -163,7 +163,7 @@ def run_module(): resource_type='ibm_iam_authorization_policy_detach', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_custom_role.py b/plugins/modules/ibm_iam_custom_role.py index ee71163c8..55be60086 100644 --- a/plugins/modules/ibm_iam_custom_role.py +++ b/plugins/modules/ibm_iam_custom_role.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_custom_role' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) The name of the custom Role - required: True - type: str description: description: - The description of the role @@ -37,17 +32,22 @@ - (Required for new resource) The Service Name required: True type: str + display_name: + description: + - (Required for new resource) Display Name of the Custom Role + required: True + type: str + name: + description: + - (Required for new resource) The name of the custom Role + required: True + type: str actions: description: - (Required for new resource) The actions of the role required: True type: list elements: str - display_name: - description: - - (Required for new resource) Display Name of the Custom Role - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,19 +94,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('service', 'str'), - ('actions', 'list'), ('display_name', 'str'), + ('name', 'str'), + ('actions', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'description', 'service', - 'actions', 'display_name', + 'name', + 'actions', ] # Params for Data source @@ -123,22 +123,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=False, - type='str'), description=dict( required=False, type='str'), service=dict( required=False, type='str'), + display_name=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), actions=dict( required=False, elements='', type='list'), - display_name=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_iam_custom_role', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_role_actions_info.py b/plugins/modules/ibm_iam_role_actions_info.py index b6c04e4e7..f0d845018 100644 --- a/plugins/modules/ibm_iam_role_actions_info.py +++ b/plugins/modules/ibm_iam_role_actions_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_role_actions' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_role_actions', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_roles_info.py b/plugins/modules/ibm_iam_roles_info.py index 512125401..8125c893a 100644 --- a/plugins/modules/ibm_iam_roles_info.py +++ b/plugins/modules/ibm_iam_roles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_roles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_iam_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_service_api_key.py b/plugins/modules/ibm_iam_service_api_key.py index 61052c456..54a74ba2c 100644 --- a/plugins/modules/ibm_iam_service_api_key.py +++ b/plugins/modules/ibm_iam_service_api_key.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_service_api_key' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + apikey: + description: + - API key value for this API key + required: False + type: str file: description: - File where api key is to be stored @@ -37,11 +42,6 @@ - description of the API key required: False type: str - apikey: - description: - - API key value for this API key - required: False - type: str iam_service_id: description: - (Required for new resource) The service iam_id that this API key authenticates @@ -109,10 +109,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'apikey', 'file', 'name', 'description', - 'apikey', 'iam_service_id', 'locked', 'store_value', @@ -132,6 +132,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + apikey=dict( + required=False, + type='str'), file=dict( required=False, type='str'), @@ -141,9 +144,6 @@ description=dict( required=False, type='str'), - apikey=dict( - required=False, - type='str'), iam_service_id=dict( required=False, type='str'), @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_iam_service_api_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_service_id.py b/plugins/modules/ibm_iam_service_id.py index a0145f980..13d668646 100644 --- a/plugins/modules/ibm_iam_service_id.py +++ b/plugins/modules/ibm_iam_service_id.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_service_id' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_iam_service_id', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -194,7 +194,7 @@ def run_module(): resource_type='ibm_iam_service_id', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_service_id_info.py b/plugins/modules/ibm_iam_service_id_info.py index 7d88d5846..9a6370f5f 100644 --- a/plugins/modules/ibm_iam_service_id_info.py +++ b/plugins/modules/ibm_iam_service_id_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_service_id' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_service_id', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_service_policy.py b/plugins/modules/ibm_iam_service_policy.py index 19da516d3..b557fee8f 100644 --- a/plugins/modules/ibm_iam_service_policy.py +++ b/plugins/modules/ibm_iam_service_policy.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_service_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + resources: + description: + - None + required: False + type: list + elements: dict account_management: description: - Give access to all account management services @@ -34,11 +40,6 @@ required: False type: list elements: str - description: - description: - - Description of the Policy - required: False - type: str transaction_id: description: - Set transactionID for debug @@ -49,23 +50,17 @@ - UUID of ServiceID required: False type: str + iam_id: + description: + - IAM ID of ServiceID + required: False + type: str roles: description: - (Required for new resource) Role names of the policy definition required: True type: list elements: str - resources: - description: - - None - required: False - type: list - elements: dict - iam_id: - description: - - IAM ID of ServiceID - required: False - type: str resource_attributes: description: - Set resource attributes. @@ -78,6 +73,11 @@ required: False type: list elements: dict + description: + description: + - Description of the Policy + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -129,16 +129,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'resources', 'account_management', 'tags', - 'description', 'transaction_id', 'iam_service_id', - 'roles', - 'resources', 'iam_id', + 'roles', 'resource_attributes', 'resource_tags', + 'description', ] # Params for Data source @@ -146,15 +146,15 @@ ] TL_ALL_PARAMETERS_DS = [ - 'iam_service_id', - 'iam_id', 'sort', 'transaction_id', + 'iam_service_id', + 'iam_id', ] TL_CONFLICTS_MAP = { - 'account_management': ['resources', 'resource_attributes'], 'resources': ['account_management', 'resource_attributes'], + 'account_management': ['resources', 'resource_attributes'], 'resource_attributes': ['resources', 'account_management'], } @@ -162,6 +162,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + resources=dict( + required=False, + elements='', + type='list'), account_management=dict( required=False, type='bool'), @@ -169,26 +173,19 @@ required=False, elements='', type='list'), - description=dict( - required=False, - type='str'), transaction_id=dict( required=False, type='str'), iam_service_id=dict( required=False, type='str'), - roles=dict( + iam_id=dict( required=False, - elements='', - type='list'), - resources=dict( + type='str'), + roles=dict( required=False, elements='', type='list'), - iam_id=dict( - required=False, - type='str'), resource_attributes=dict( required=False, elements='', @@ -197,6 +194,9 @@ required=False, elements='', type='list'), + description=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -262,7 +262,7 @@ def run_module(): resource_type='ibm_iam_service_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -271,7 +271,7 @@ def run_module(): resource_type='ibm_iam_service_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_service_policy_info.py b/plugins/modules/ibm_iam_service_policy_info.py index 76a7e97b2..185ad2fac 100644 --- a/plugins/modules/ibm_iam_service_policy_info.py +++ b/plugins/modules/ibm_iam_service_policy_info.py @@ -17,28 +17,28 @@ description: - Retrieve an IBM Cloud 'ibm_iam_service_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - iam_service_id: + sort: description: - - UUID of ServiceID + - Sort query for policies required: False type: str - iam_id: + transaction_id: description: - - IAM ID of ServiceID + - Set transactionID for debug required: False type: str - sort: + iam_service_id: description: - - Sort query for policies + - UUID of ServiceID required: False type: str - transaction_id: + iam_id: description: - - Set transactionID for debug + - IAM ID of ServiceID required: False type: str iaas_classic_username: @@ -78,10 +78,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'iam_service_id', - 'iam_id', 'sort', 'transaction_id', + 'iam_service_id', + 'iam_id', ] @@ -92,16 +92,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - iam_service_id=dict( + sort=dict( required=False, type='str'), - iam_id=dict( + transaction_id=dict( required=False, type='str'), - sort=dict( + iam_service_id=dict( required=False, type='str'), - transaction_id=dict( + iam_id=dict( required=False, type='str'), iaas_classic_username=dict( @@ -138,7 +138,7 @@ def run_module(): resource_type='ibm_iam_service_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_trusted_profile.py b/plugins/modules/ibm_iam_trusted_profile.py index 88da2a079..075e9ecd3 100644 --- a/plugins/modules/ibm_iam_trusted_profile.py +++ b/plugins/modules/ibm_iam_trusted_profile.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_trusted_profile' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -174,7 +174,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_trusted_profile_claim_rule.py b/plugins/modules/ibm_iam_trusted_profile_claim_rule.py index 4509a6cae..20d1cf434 100644 --- a/plugins/modules/ibm_iam_trusted_profile_claim_rule.py +++ b/plugins/modules/ibm_iam_trusted_profile_claim_rule.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_trusted_profile_claim_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -28,16 +28,11 @@ required: True type: list elements: dict - name: + realm_name: description: - - Name of the claim rule to be created or updated. + - The realm name of the Idp this claim rule applies to. This field is required only if the type is specified as 'Profile-SAML'. required: False type: str - expiration: - description: - - Session expiration in seconds, only required if type is 'Profile-SAML'. - required: False - type: int profile_id: description: - (Required for new resource) ID of the trusted profile to create a claim rule. @@ -48,9 +43,9 @@ - (Required for new resource) Type of the calim rule, either 'Profile-SAML' or 'Profile-CR'. required: True type: str - realm_name: + name: description: - - The realm name of the Idp this claim rule applies to. This field is required only if the type is specified as 'Profile-SAML'. + - Name of the claim rule to be created or updated. required: False type: str cr_type: @@ -58,6 +53,11 @@ - The compute resource type the rule applies to, required only if type is specified as 'Profile-CR'. Valid values are VSI, IKS_SA, ROKS_SA. required: False type: str + expiration: + description: + - Session expiration in seconds, only required if type is 'Profile-SAML'. + required: False + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -112,12 +112,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'conditions', - 'name', - 'expiration', + 'realm_name', 'profile_id', 'type', - 'realm_name', + 'name', 'cr_type', + 'expiration', ] # Params for Data source @@ -142,24 +142,24 @@ required=False, elements='', type='list'), - name=dict( + realm_name=dict( required=False, type='str'), - expiration=dict( - required=False, - type='int'), profile_id=dict( required=False, type='str'), type=dict( required=False, type='str'), - realm_name=dict( + name=dict( required=False, type='str'), cr_type=dict( required=False, type='str'), + expiration=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -225,7 +225,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_claim_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -234,7 +234,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_claim_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_trusted_profile_claim_rule_info.py b/plugins/modules/ibm_iam_trusted_profile_claim_rule_info.py index abf0190d7..b6d1489c6 100644 --- a/plugins/modules/ibm_iam_trusted_profile_claim_rule_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_claim_rule_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile_claim_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_claim_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_trusted_profile_claim_rules_info.py b/plugins/modules/ibm_iam_trusted_profile_claim_rules_info.py index fc2c23ccd..6e66652fe 100644 --- a/plugins/modules/ibm_iam_trusted_profile_claim_rules_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_claim_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile_claim_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_claim_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_trusted_profile_info.py b/plugins/modules/ibm_iam_trusted_profile_info.py index 49f57203e..187cf52ff 100644 --- a/plugins/modules/ibm_iam_trusted_profile_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_trusted_profile_link.py b/plugins/modules/ibm_iam_trusted_profile_link.py index 228aa3433..f5219a366 100644 --- a/plugins/modules/ibm_iam_trusted_profile_link.py +++ b/plugins/modules/ibm_iam_trusted_profile_link.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_trusted_profile_link' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -104,13 +104,13 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('profile_id', 'str'), ('link_id', 'str'), + ('profile_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'profile_id', 'link_id', + 'profile_id', ] TL_CONFLICTS_MAP = { @@ -198,7 +198,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_link', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_link', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_trusted_profile_link_info.py b/plugins/modules/ibm_iam_trusted_profile_link_info.py index c6707a319..472359bbb 100644 --- a/plugins/modules/ibm_iam_trusted_profile_link_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_link_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile_link' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - profile_id: + link_id: description: - - ID of the trusted profile. + - ID of the link. required: True type: str - link_id: + profile_id: description: - - ID of the link. + - ID of the trusted profile. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('profile_id', 'str'), ('link_id', 'str'), + ('profile_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'profile_id', 'link_id', + 'profile_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - profile_id=dict( + link_id=dict( required=True, type='str'), - link_id=dict( + profile_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_link', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_trusted_profile_links_info.py b/plugins/modules/ibm_iam_trusted_profile_links_info.py index 2028586cf..e55e4d4a6 100644 --- a/plugins/modules/ibm_iam_trusted_profile_links_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_links_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile_links' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_links', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_trusted_profile_policy.py b/plugins/modules/ibm_iam_trusted_profile_policy.py index 4b15a1e73..7ad575b18 100644 --- a/plugins/modules/ibm_iam_trusted_profile_policy.py +++ b/plugins/modules/ibm_iam_trusted_profile_policy.py @@ -18,18 +18,36 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_trusted_profile_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - transaction_id: + resources: description: - - Set transactionID for debug + - None + required: False + type: list + elements: dict + account_management: + description: + - Give access to all account management services + required: False + type: bool + default: False + resource_tags: + description: + - Set access management tags. + required: False + type: list + elements: dict + description: + description: + - Description of the Policy required: False type: str - iam_id: + profile_id: description: - - IAM ID of Trusted Profile + - UUID of Trusted Profile required: False type: str roles: @@ -50,34 +68,16 @@ required: False type: list elements: str - resource_tags: - description: - - Set access management tags. - required: False - type: list - elements: dict - description: + transaction_id: description: - - Description of the Policy + - Set transactionID for debug required: False type: str - profile_id: + iam_id: description: - - UUID of Trusted Profile + - IAM ID of Trusted Profile required: False type: str - resources: - description: - - None - required: False - type: list - elements: dict - account_management: - description: - - Give access to all account management services - required: False - type: bool - default: False id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -129,16 +129,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'transaction_id', - 'iam_id', - 'roles', - 'resource_attributes', - 'tags', + 'resources', + 'account_management', 'resource_tags', 'description', 'profile_id', - 'resources', - 'account_management', + 'roles', + 'resource_attributes', + 'tags', + 'transaction_id', + 'iam_id', ] # Params for Data source @@ -146,26 +146,37 @@ ] TL_ALL_PARAMETERS_DS = [ - 'profile_id', - 'iam_id', 'sort', 'transaction_id', + 'profile_id', + 'iam_id', ] TL_CONFLICTS_MAP = { - 'resource_attributes': ['resources', 'account_management'], 'resources': ['account_management', 'resource_attributes'], 'account_management': ['resources', 'resource_attributes'], + 'resource_attributes': ['resources', 'account_management'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - transaction_id=dict( + resources=dict( + required=False, + elements='', + type='list'), + account_management=dict( + required=False, + type='bool'), + resource_tags=dict( + required=False, + elements='', + type='list'), + description=dict( required=False, type='str'), - iam_id=dict( + profile_id=dict( required=False, type='str'), roles=dict( @@ -180,23 +191,12 @@ required=False, elements='', type='list'), - resource_tags=dict( - required=False, - elements='', - type='list'), - description=dict( + transaction_id=dict( required=False, type='str'), - profile_id=dict( + iam_id=dict( required=False, type='str'), - resources=dict( - required=False, - elements='', - type='list'), - account_management=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -262,7 +262,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -271,7 +271,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_trusted_profile_policy_info.py b/plugins/modules/ibm_iam_trusted_profile_policy_info.py index d30546d02..c7314033d 100644 --- a/plugins/modules/ibm_iam_trusted_profile_policy_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_policy_info.py @@ -17,28 +17,28 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - profile_id: + sort: description: - - UUID of trusted profile + - Sort query for policies required: False type: str - iam_id: + transaction_id: description: - - IAM ID of trusted profile + - Set transactionID for debug required: False type: str - sort: + profile_id: description: - - Sort query for policies + - UUID of trusted profile required: False type: str - transaction_id: + iam_id: description: - - Set transactionID for debug + - IAM ID of trusted profile required: False type: str iaas_classic_username: @@ -78,10 +78,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'profile_id', - 'iam_id', 'sort', 'transaction_id', + 'profile_id', + 'iam_id', ] @@ -92,16 +92,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - profile_id=dict( + sort=dict( required=False, type='str'), - iam_id=dict( + transaction_id=dict( required=False, type='str'), - sort=dict( + profile_id=dict( required=False, type='str'), - transaction_id=dict( + iam_id=dict( required=False, type='str'), iaas_classic_username=dict( @@ -138,7 +138,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_trusted_profiles_info.py b/plugins/modules/ibm_iam_trusted_profiles_info.py index 16c5f1555..3a2ef5aa4 100644 --- a/plugins/modules/ibm_iam_trusted_profiles_info.py +++ b/plugins/modules/ibm_iam_trusted_profiles_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - account_id: - description: - - Account ID to query for trusted profiles. - required: False - type: str name: description: - Name of the profile @@ -36,6 +31,11 @@ - Defines if the entity history is included in the response. Default is false required: False type: bool + account_id: + description: + - Account ID to query for trusted profiles. + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -73,9 +73,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'account_id', 'name', 'include_history', + 'account_id', ] @@ -86,15 +86,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - account_id=dict( - required=False, - type='str'), name=dict( required=False, type='str'), include_history=dict( required=False, type='bool'), + account_id=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -129,7 +129,7 @@ def run_module(): resource_type='ibm_iam_trusted_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_user_invite.py b/plugins/modules/ibm_iam_user_invite.py index e0f921953..250696eee 100644 --- a/plugins/modules/ibm_iam_user_invite.py +++ b/plugins/modules/ibm_iam_user_invite.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_user_invite' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -209,7 +209,7 @@ def run_module(): resource_type='ibm_iam_user_invite', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_user_policy.py b/plugins/modules/ibm_iam_user_policy.py index 99bd9493c..a03a8f5de 100644 --- a/plugins/modules/ibm_iam_user_policy.py +++ b/plugins/modules/ibm_iam_user_policy.py @@ -18,26 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_user_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - None - required: False - type: list - elements: str - description: - description: - - Description of the Policy - required: False - type: str - transaction_id: - description: - - Set transactionID for debug - required: False - type: str roles: description: - (Required for new resource) Role names of the policy definition @@ -50,12 +34,17 @@ required: False type: list elements: dict - account_management: + tags: description: - - Give access to all account management services + - None required: False - type: bool - default: False + type: list + elements: str + description: + description: + - Description of the Policy + required: False + type: str ibm_id: description: - (Required for new resource) The ibm id or email of user @@ -67,12 +56,23 @@ required: False type: list elements: dict + account_management: + description: + - Give access to all account management services + required: False + type: bool + default: False resource_tags: description: - Set access management tags. required: False type: list elements: dict + transaction_id: + description: + - Set transactionID for debug + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -125,15 +125,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', - 'description', - 'transaction_id', 'roles', 'resources', - 'account_management', + 'tags', + 'description', 'ibm_id', 'resource_attributes', + 'account_management', 'resource_tags', + 'transaction_id', ] # Params for Data source @@ -142,42 +142,36 @@ ] TL_ALL_PARAMETERS_DS = [ + 'ibm_id', 'sort', 'transaction_id', - 'ibm_id', ] TL_CONFLICTS_MAP = { 'resources': ['account_management', 'resource_attributes'], - 'account_management': ['resources', 'resource_attributes'], 'resource_attributes': ['resources', 'account_management'], + 'account_management': ['resources', 'resource_attributes'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( + roles=dict( required=False, elements='', type='list'), - description=dict( - required=False, - type='str'), - transaction_id=dict( - required=False, - type='str'), - roles=dict( + resources=dict( required=False, elements='', type='list'), - resources=dict( + tags=dict( required=False, elements='', type='list'), - account_management=dict( + description=dict( required=False, - type='bool'), + type='str'), ibm_id=dict( required=False, type='str'), @@ -185,10 +179,16 @@ required=False, elements='', type='list'), + account_management=dict( + required=False, + type='bool'), resource_tags=dict( required=False, elements='', type='list'), + transaction_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -254,7 +254,7 @@ def run_module(): resource_type='ibm_iam_user_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -263,7 +263,7 @@ def run_module(): resource_type='ibm_iam_user_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_iam_user_policy_info.py b/plugins/modules/ibm_iam_user_policy_info.py index 664962df0..baa841e9f 100644 --- a/plugins/modules/ibm_iam_user_policy_info.py +++ b/plugins/modules/ibm_iam_user_policy_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_iam_user_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + ibm_id: + description: + - The ibm id or email of user + required: True + type: str sort: description: - Sort query for policies @@ -31,11 +36,6 @@ - Set transactionID for debug required: False type: str - ibm_id: - description: - - The ibm id or email of user - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -74,9 +74,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'ibm_id', 'sort', 'transaction_id', - 'ibm_id', ] @@ -87,15 +87,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + ibm_id=dict( + required=True, + type='str'), sort=dict( required=False, type='str'), transaction_id=dict( required=False, type='str'), - ibm_id=dict( - required=True, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -130,7 +130,7 @@ def run_module(): resource_type='ibm_iam_user_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_user_profile_info.py b/plugins/modules/ibm_iam_user_profile_info.py index 20eed3179..5660881c8 100644 --- a/plugins/modules/ibm_iam_user_profile_info.py +++ b/plugins/modules/ibm_iam_user_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_user_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_iam_user_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_user_settings.py b/plugins/modules/ibm_iam_user_settings.py index 815c5aeda..2ce4b4e8f 100644 --- a/plugins/modules/ibm_iam_user_settings.py +++ b/plugins/modules/ibm_iam_user_settings.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_user_settings' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -174,7 +174,7 @@ def run_module(): resource_type='ibm_iam_user_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_users_info.py b/plugins/modules/ibm_iam_users_info.py index d689c1cbc..536efe6a8 100644 --- a/plugins/modules/ibm_iam_users_info.py +++ b/plugins/modules/ibm_iam_users_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_users' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_iam_users', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_ipsec_vpn.py b/plugins/modules/ibm_ipsec_vpn.py index 85e01e368..7167765e3 100644 --- a/plugins/modules/ibm_ipsec_vpn.py +++ b/plugins/modules/ibm_ipsec_vpn.py @@ -18,27 +18,31 @@ - Create, update or destroy an IBM Cloud 'ibm_ipsec_vpn' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + customer_peer_ip: + description: + - Customer Peer IP Address + required: False + type: str internal_subnet_id: description: - Internal subnet ID value required: False type: int - phase_one: + remote_subnet: description: - None required: False type: list elements: dict - phase_two: + datacenter: description: - - None - required: False - type: list - elements: dict + - (Required for new resource) Datacenter name + required: True + type: str address_translation: description: - None @@ -50,32 +54,28 @@ - Preshared Key data required: False type: str - customer_peer_ip: - description: - - Customer Peer IP Address - required: False - type: str - remote_subnet_id: + phase_one: description: - - Remote subnet ID value + - None required: False - type: int - remote_subnet: + type: list + elements: dict + phase_two: description: - None required: False type: list elements: dict + remote_subnet_id: + description: + - Remote subnet ID value + required: False + type: int service_subnet_id: description: - Service subnet ID value required: False type: int - datacenter: - description: - - (Required for new resource) Datacenter name - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -127,16 +127,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'customer_peer_ip', 'internal_subnet_id', - 'phase_one', - 'phase_two', + 'remote_subnet', + 'datacenter', 'address_translation', 'preshared_key', - 'customer_peer_ip', + 'phase_one', + 'phase_two', 'remote_subnet_id', - 'remote_subnet', 'service_subnet_id', - 'datacenter', ] # Params for Data source @@ -147,25 +147,27 @@ ] TL_CONFLICTS_MAP = { - 'remote_subnet_id': ['remote_subnet'], 'remote_subnet': ['remote_subnet_id'], + 'remote_subnet_id': ['remote_subnet'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + customer_peer_ip=dict( + required=False, + type='str'), internal_subnet_id=dict( required=False, type='int'), - phase_one=dict( + remote_subnet=dict( required=False, elements='', type='list'), - phase_two=dict( + datacenter=dict( required=False, - elements='', - type='list'), + type='str'), address_translation=dict( required=False, elements='', @@ -173,22 +175,20 @@ preshared_key=dict( required=False, type='str'), - customer_peer_ip=dict( - required=False, - type='str'), - remote_subnet_id=dict( + phase_one=dict( required=False, - type='int'), - remote_subnet=dict( + elements='', + type='list'), + phase_two=dict( required=False, elements='', type='list'), - service_subnet_id=dict( + remote_subnet_id=dict( required=False, type='int'), - datacenter=dict( + service_subnet_id=dict( required=False, - type='str'), + type='int'), id=dict( required=False, type='str'), @@ -254,7 +254,7 @@ def run_module(): resource_type='ibm_ipsec_vpn', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server.py b/plugins/modules/ibm_is_bare_metal_server.py index 4254603ca..f045478c5 100644 --- a/plugins/modules/ibm_is_bare_metal_server.py +++ b/plugins/modules/ibm_is_bare_metal_server.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_is_bare_metal_server' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + network_interfaces: + description: + - None + required: False + type: list + elements: dict keys: description: - (Required for new resource) SSH key Ids for the bare metal server @@ -33,37 +39,30 @@ - (Required for new resource) image id required: True type: str - user_data: - description: - - User data given for the bare metal server - required: False - type: str zone: description: - (Required for new resource) Zone name required: True type: str - delete_type: + resource_group: description: - - Enables stopping type of the bare metal server before deleting + - Resource group name required: False type: str - default: hard - network_interfaces: + name: description: - - None + - Bare metal server name required: False - type: list - elements: dict - tags: + type: str + primary_network_interface: description: - - Tags for the Bare metal server - required: False + - (Required for new resource) Primary Network interface info + required: True type: list - elements: str - name: + elements: dict + user_data: description: - - Bare metal server name + - User data given for the bare metal server required: False type: str vpc: @@ -71,17 +70,18 @@ - The VPC the bare metal server is to be a part of required: False type: str - primary_network_interface: + tags: description: - - (Required for new resource) Primary Network interface info - required: True + - Tags for the Bare metal server + required: False type: list - elements: dict - resource_group: + elements: str + delete_type: description: - - Resource group name + - Enables stopping type of the bare metal server before deleting required: False type: str + default: hard action: description: - This restart/start/stops a bare metal server. @@ -147,17 +147,17 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'network_interfaces', 'keys', 'image', - 'user_data', 'zone', - 'delete_type', - 'network_interfaces', - 'tags', + 'resource_group', 'name', - 'vpc', 'primary_network_interface', - 'resource_group', + 'user_data', + 'vpc', + 'tags', + 'delete_type', 'action', 'profile', ] @@ -167,8 +167,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'identifier', 'name', + 'identifier', ] TL_CONFLICTS_MAP = { @@ -178,6 +178,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + network_interfaces=dict( + required=False, + elements='', + type='list'), keys=dict( required=False, elements='', @@ -185,34 +189,30 @@ image=dict( required=False, type='str'), - user_data=dict( - required=False, - type='str'), zone=dict( required=False, type='str'), - delete_type=dict( + resource_group=dict( required=False, type='str'), - network_interfaces=dict( + name=dict( required=False, - elements='', - type='list'), - tags=dict( + type='str'), + primary_network_interface=dict( required=False, elements='', type='list'), - name=dict( + user_data=dict( required=False, type='str'), vpc=dict( required=False, type='str'), - primary_network_interface=dict( + tags=dict( required=False, elements='', type='list'), - resource_group=dict( + delete_type=dict( required=False, type='str'), action=dict( @@ -298,7 +298,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -307,7 +307,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_bare_metal_server_action.py b/plugins/modules/ibm_is_bare_metal_server_action.py index 0acfc8e3a..ba93938c8 100644 --- a/plugins/modules/ibm_is_bare_metal_server_action.py +++ b/plugins/modules/ibm_is_bare_metal_server_action.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_bare_metal_server_action' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - bare_metal_server: - description: - - (Required for new resource) Bare metal server identifier - required: True - type: str stop_type: description: - The type of stop operation @@ -38,6 +33,11 @@ - (Required for new resource) This restart/start/stops a bare metal server. required: True type: str + bare_metal_server: + description: + - (Required for new resource) Bare metal server identifier + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,15 +84,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('bare_metal_server', 'str'), ('action', 'str'), + ('bare_metal_server', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bare_metal_server', 'stop_type', 'action', + 'bare_metal_server', ] # Params for Data source @@ -109,15 +109,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - bare_metal_server=dict( - required=False, - type='str'), stop_type=dict( required=False, type='str'), action=dict( required=False, type='str'), + bare_metal_server=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_action', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_disk.py b/plugins/modules/ibm_is_bare_metal_server_disk.py index 410f50b92..287075774 100644 --- a/plugins/modules/ibm_is_bare_metal_server_disk.py +++ b/plugins/modules/ibm_is_bare_metal_server_disk.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_bare_metal_server_disk' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - Bare metal server disk name - required: False - type: str bare_metal_server: description: - (Required for new resource) Bare metal server identifier @@ -37,6 +32,11 @@ - (Required for new resource) Bare metal server disk identifier required: True type: str + name: + description: + - Bare metal server disk name + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,9 +89,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'bare_metal_server', 'disk', + 'name', ] # Params for Data source @@ -112,15 +112,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=False, - type='str'), bare_metal_server=dict( required=False, type='str'), disk=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -198,7 +198,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_disk', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_disk', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_bare_metal_server_disk_info.py b/plugins/modules/ibm_is_bare_metal_server_disk_info.py index 7275c5557..c8b5283a7 100644 --- a/plugins/modules/ibm_is_bare_metal_server_disk_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_disk_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_disk' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_disk', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_disks_info.py b/plugins/modules/ibm_is_bare_metal_server_disks_info.py index 1b591ffcb..19d51bee6 100644 --- a/plugins/modules/ibm_is_bare_metal_server_disks_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_disks_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_disks' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_disks', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_info.py b/plugins/modules/ibm_is_bare_metal_server_info.py index 60ad417d5..a3359ca1b 100644 --- a/plugins/modules/ibm_is_bare_metal_server_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - identifier: + name: description: - - None + - Bare metal server name required: False type: str - name: + identifier: description: - - Bare metal server name + - None required: False type: str generation: @@ -68,24 +68,24 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'identifier', 'name', + 'identifier', ] TL_CONFLICTS_MAP = { - 'identifier': ['name'], 'name': ['identifier'], + 'identifier': ['name'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - identifier=dict( + name=dict( required=False, type='str'), - name=dict( + identifier=dict( required=False, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_initialization_info.py b/plugins/modules/ibm_is_bare_metal_server_initialization_info.py index 65493967a..7724e241d 100644 --- a/plugins/modules/ibm_is_bare_metal_server_initialization_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_initialization_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_initialization' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_initialization', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_network_interface.py b/plugins/modules/ibm_is_bare_metal_server_network_interface.py index 37e2b3ce4..2695eb058 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interface.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interface.py @@ -18,30 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_is_bare_metal_server_network_interface' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - primary_ip: + security_groups: description: - - title: IPv4, The IP address. + - Collection of security groups ids required: False type: list - elements: dict - allow_ip_spoofing: - description: - - Indicates whether source IP spoofing is allowed on this interface. If false, source IP spoofing is prevented on this interface. If true, source IP spoofing is allowed on this interface. - required: False - type: bool - enable_infrastructure_nat: + elements: str + name: description: - - If true, the VPC infrastructure performs any needed NAT operations. If false, the packet is passed unmodified to/from the network interface, allowing the workload to perform any needed NAT operations. + - The user-defined name for this network interface required: False - type: bool - bare_metal_server: - description: - - (Required for new resource) Bare metal server identifier - required: True type: str allowed_vlans: description: @@ -49,23 +39,16 @@ required: False type: list elements: int - hard_stop: - description: - - Only used for PCI network interfaces, whether to hard/immediately stop server - required: False - type: bool - default: True - name: + bare_metal_server: description: - - The user-defined name for this network interface - required: False + - (Required for new resource) Bare metal server identifier + required: True type: str - security_groups: + allow_ip_spoofing: description: - - Collection of security groups ids + - Indicates whether source IP spoofing is allowed on this interface. If false, source IP spoofing is prevented on this interface. If true, source IP spoofing is allowed on this interface. required: False - type: list - elements: str + type: bool subnet: description: - (Required for new resource) The id of the associated subnet @@ -81,6 +64,23 @@ - Indicates the 802.1Q VLAN ID tag that must be used for all traffic on this interface required: False type: int + hard_stop: + description: + - Only used for PCI network interfaces, whether to hard/immediately stop server + required: False + type: bool + default: True + enable_infrastructure_nat: + description: + - If true, the VPC infrastructure performs any needed NAT operations. If false, the packet is passed unmodified to/from the network interface, allowing the workload to perform any needed NAT operations. + required: False + type: bool + primary_ip: + description: + - title: IPv4, The IP address. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -133,28 +133,28 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'primary_ip', - 'allow_ip_spoofing', - 'enable_infrastructure_nat', - 'bare_metal_server', - 'allowed_vlans', - 'hard_stop', - 'name', 'security_groups', + 'name', + 'allowed_vlans', + 'bare_metal_server', + 'allow_ip_spoofing', 'subnet', 'allow_interface_to_float', 'vlan', + 'hard_stop', + 'enable_infrastructure_nat', + 'primary_ip', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('bare_metal_server', 'str'), ('network_interface', 'str'), + ('bare_metal_server', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'bare_metal_server', 'network_interface', + 'bare_metal_server', ] TL_CONFLICTS_MAP = { @@ -167,33 +167,23 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - primary_ip=dict( + security_groups=dict( required=False, elements='', type='list'), - allow_ip_spoofing=dict( - required=False, - type='bool'), - enable_infrastructure_nat=dict( - required=False, - type='bool'), - bare_metal_server=dict( + name=dict( required=False, type='str'), allowed_vlans=dict( required=False, elements='', type='list'), - hard_stop=dict( - required=False, - type='bool'), - name=dict( + bare_metal_server=dict( required=False, type='str'), - security_groups=dict( + allow_ip_spoofing=dict( required=False, - elements='', - type='list'), + type='bool'), subnet=dict( required=False, type='str'), @@ -203,6 +193,16 @@ vlan=dict( required=False, type='int'), + hard_stop=dict( + required=False, + type='bool'), + enable_infrastructure_nat=dict( + required=False, + type='bool'), + primary_ip=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -280,7 +280,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -289,7 +289,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_bare_metal_server_network_interface_allow_float.py b/plugins/modules/ibm_is_bare_metal_server_network_interface_allow_float.py index eab0c4e3e..6fb78fdca 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interface_allow_float.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interface_allow_float.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_bare_metal_server_network_interface_allow_float' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - primary_ip: - description: - - title: IPv4, The IP address. - required: False - type: list - elements: dict - vlan: - description: - - (Required for new resource) Indicates the 802.1Q VLAN ID tag that must be used for all traffic on this interface - required: True - type: int enable_infrastructure_nat: description: - If true, the VPC infrastructure performs any needed NAT operations. If false, the packet is passed unmodified to/from the network interface, allowing the workload to perform any needed NAT operations. @@ -44,26 +33,37 @@ required: False type: list elements: str - subnet: + allow_ip_spoofing: description: - - (Required for new resource) The id of the associated subnet + - Indicates whether source IP spoofing is allowed on this interface. If false, source IP spoofing is prevented on this interface. If true, source IP spoofing is allowed on this interface. + required: False + type: bool + primary_ip: + description: + - title: IPv4, The IP address. + required: False + type: list + elements: dict + vlan: + description: + - (Required for new resource) Indicates the 802.1Q VLAN ID tag that must be used for all traffic on this interface required: True - type: str + type: int bare_metal_server: description: - (Required for new resource) Bare metal server identifier required: True type: str - allow_ip_spoofing: - description: - - Indicates whether source IP spoofing is allowed on this interface. If false, source IP spoofing is prevented on this interface. If true, source IP spoofing is allowed on this interface. - required: False - type: bool name: description: - The user-defined name for this network interface required: False type: str + subnet: + description: + - (Required for new resource) The id of the associated subnet + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -111,20 +111,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('vlan', 'int'), - ('subnet', 'str'), ('bare_metal_server', 'str'), + ('subnet', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'primary_ip', - 'vlan', 'enable_infrastructure_nat', 'security_groups', - 'subnet', - 'bare_metal_server', 'allow_ip_spoofing', + 'primary_ip', + 'vlan', + 'bare_metal_server', 'name', + 'subnet', ] # Params for Data source @@ -141,32 +141,32 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - primary_ip=dict( + enable_infrastructure_nat=dict( + required=False, + type='bool'), + security_groups=dict( required=False, elements='', type='list'), - vlan=dict( - required=False, - type='int'), - enable_infrastructure_nat=dict( + allow_ip_spoofing=dict( required=False, type='bool'), - security_groups=dict( + primary_ip=dict( required=False, elements='', type='list'), - subnet=dict( + vlan=dict( required=False, - type='str'), + type='int'), bare_metal_server=dict( required=False, type='str'), - allow_ip_spoofing=dict( - required=False, - type='bool'), name=dict( required=False, type='str'), + subnet=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface_allow_float', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip.py b/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip.py index 487a836db..2e1dfb524 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_bare_metal_server_network_interface_floating_ip' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -97,15 +97,15 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('network_interface', 'str'), - ('floating_ip', 'str'), ('bare_metal_server', 'str'), + ('floating_ip', 'str'), + ('network_interface', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'network_interface', - 'floating_ip', 'bare_metal_server', + 'floating_ip', + 'network_interface', ] TL_CONFLICTS_MAP = { @@ -201,7 +201,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface_floating_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -210,7 +210,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface_floating_ip', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip_info.py b/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip_info.py index 566488544..9db949670 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ip_info.py @@ -17,13 +17,13 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_network_interface_floating_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - network_interface: + bare_metal_server: description: - - The network interface identifier of bare metal server + - The bare metal server identifier required: True type: str floating_ip: @@ -31,9 +31,9 @@ - The floating ip identifier of the network interface associated with the bare metal server required: True type: str - bare_metal_server: + network_interface: description: - - The bare metal server identifier + - The network interface identifier of bare metal server required: True type: str generation: @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('network_interface', 'str'), - ('floating_ip', 'str'), ('bare_metal_server', 'str'), + ('floating_ip', 'str'), + ('network_interface', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'network_interface', - 'floating_ip', 'bare_metal_server', + 'floating_ip', + 'network_interface', ] @@ -89,13 +89,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - network_interface=dict( + bare_metal_server=dict( required=True, type='str'), floating_ip=dict( required=True, type='str'), - bare_metal_server=dict( + network_interface=dict( required=True, type='str'), generation=dict( @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface_floating_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ips_info.py b/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ips_info.py index 6fdaa4ba5..49bdab0c9 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ips_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interface_floating_ips_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_network_interface_floating_ips' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface_floating_ips', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_network_interface_info.py b/plugins/modules/ibm_is_bare_metal_server_network_interface_info.py index bf1553d18..5e1ac9750 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interface_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interface_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_network_interface' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - bare_metal_server: + network_interface: description: - - The bare metal server identifier + - The bare metal server network interface identifier required: True type: str - network_interface: + bare_metal_server: description: - - The bare metal server network interface identifier + - The bare metal server identifier required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('bare_metal_server', 'str'), ('network_interface', 'str'), + ('bare_metal_server', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bare_metal_server', 'network_interface', + 'bare_metal_server', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - bare_metal_server=dict( + network_interface=dict( required=True, type='str'), - network_interface=dict( + bare_metal_server=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interface', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_network_interfaces_info.py b/plugins/modules/ibm_is_bare_metal_server_network_interfaces_info.py index 1d4692e67..1bb6feada 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interfaces_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interfaces_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_network_interfaces' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_network_interfaces', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_profile_info.py b/plugins/modules/ibm_is_bare_metal_server_profile_info.py index fbd30b907..e6063efe3 100644 --- a/plugins/modules/ibm_is_bare_metal_server_profile_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_server_profiles_info.py b/plugins/modules/ibm_is_bare_metal_server_profiles_info.py index b613873eb..654f2dcb8 100644 --- a/plugins/modules/ibm_is_bare_metal_server_profiles_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_bare_metal_servers_info.py b/plugins/modules/ibm_is_bare_metal_servers_info.py index 1dc6530dc..7ae9b52c7 100644 --- a/plugins/modules/ibm_is_bare_metal_servers_info.py +++ b/plugins/modules/ibm_is_bare_metal_servers_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_servers' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_bare_metal_servers', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host.py b/plugins/modules/ibm_is_dedicated_host.py index 6fc1a41ad..04237b2ef 100644 --- a/plugins/modules/ibm_is_dedicated_host.py +++ b/plugins/modules/ibm_is_dedicated_host.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_dedicated_host' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_group: - description: - - The unique identifier for the resource group to use. If unspecified, the account's [default resourcegroup](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used. - required: False - type: str instance_placement_enabled: description: - If set to true, instances can be placed on this dedicated host. @@ -38,16 +33,21 @@ - (Required for new resource) The Globally unique name of the dedicated host profile to use for this dedicated host. required: True type: str - host_group: - description: - - (Required for new resource) The unique identifier of the dedicated host group for this dedicated host. - required: True - type: str name: description: - The unique user-defined name for this dedicated host. If unspecified, the name will be a hyphenated list of randomly-selected words. required: False type: str + resource_group: + description: + - The unique identifier for the resource group to use. If unspecified, the account's [default resourcegroup](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used. + required: False + type: str + host_group: + description: + - (Required for new resource) The unique identifier of the dedicated host group for this dedicated host. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -100,11 +100,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group', 'instance_placement_enabled', 'profile', - 'host_group', 'name', + 'resource_group', + 'host_group', ] # Params for Data source @@ -115,8 +115,8 @@ TL_ALL_PARAMETERS_DS = [ 'name', - 'resource_group', 'host_group', + 'resource_group', ] TL_CONFLICTS_MAP = { @@ -126,19 +126,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_group=dict( - required=False, - type='str'), instance_placement_enabled=dict( required=False, type='bool'), profile=dict( required=False, type='str'), - host_group=dict( + name=dict( required=False, type='str'), - name=dict( + resource_group=dict( + required=False, + type='str'), + host_group=dict( required=False, type='str'), id=dict( @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_dedicated_host', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_is_dedicated_host', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_dedicated_host_disk_info.py b/plugins/modules/ibm_is_dedicated_host_disk_info.py index baebc7254..be72e4415 100644 --- a/plugins/modules/ibm_is_dedicated_host_disk_info.py +++ b/plugins/modules/ibm_is_dedicated_host_disk_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_host_disk' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - disk: + dedicated_host: description: - - The dedicated host disk identifier. + - The dedicated host identifier. required: True type: str - dedicated_host: + disk: description: - - The dedicated host identifier. + - The dedicated host disk identifier. required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('disk', 'str'), ('dedicated_host', 'str'), + ('disk', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'disk', 'dedicated_host', + 'disk', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - disk=dict( + dedicated_host=dict( required=True, type='str'), - dedicated_host=dict( + disk=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_disk', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host_disk_management.py b/plugins/modules/ibm_is_dedicated_host_disk_management.py index 960bfef25..1ef1505c2 100644 --- a/plugins/modules/ibm_is_dedicated_host_disk_management.py +++ b/plugins/modules/ibm_is_dedicated_host_disk_management.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_dedicated_host_disk_management' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -187,7 +187,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_disk_management', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host_disks_info.py b/plugins/modules/ibm_is_dedicated_host_disks_info.py index 4d69676e3..01d137a16 100644 --- a/plugins/modules/ibm_is_dedicated_host_disks_info.py +++ b/plugins/modules/ibm_is_dedicated_host_disks_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_host_disks' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_disks', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host_group.py b/plugins/modules/ibm_is_dedicated_host_group.py index 8d42d6fae..3dcc8be82 100644 --- a/plugins/modules/ibm_is_dedicated_host_group.py +++ b/plugins/modules/ibm_is_dedicated_host_group.py @@ -18,34 +18,34 @@ - Create, update or destroy an IBM Cloud 'ibm_is_dedicated_host_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + family: + description: + - (Required for new resource) The dedicated host profile family for hosts in this group. + required: True + type: str name: description: - The unique user-defined name for this dedicated host group. If unspecified, the name will be a hyphenated list of randomly-selected words. required: False type: str - resource_group: + zone: description: - - The unique identifier of the resource group to use. If unspecified, the account's [default resourcegroup](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used. - required: False + - (Required for new resource) The globally unique name of the zone this dedicated host group will reside in. + required: True type: str class_: description: - (Required for new resource) The dedicated host profile class for hosts in this group. required: True type: str - family: - description: - - (Required for new resource) The dedicated host profile family for hosts in this group. - required: True - type: str - zone: + resource_group: description: - - (Required for new resource) The globally unique name of the zone this dedicated host group will reside in. - required: True + - The unique identifier of the resource group to use. If unspecified, the account's [default resourcegroup](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used. + required: False type: str id: description: @@ -93,18 +93,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('class_', 'str'), ('family', 'str'), ('zone', 'str'), + ('class_', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'resource_group', - 'class_', 'family', + 'name', 'zone', + 'class_', + 'resource_group', ] # Params for Data source @@ -123,19 +123,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + family=dict( required=False, type='str'), - resource_group=dict( + name=dict( required=False, type='str'), - class_=dict( + zone=dict( required=False, type='str'), - family=dict( + class_=dict( required=False, type='str'), - zone=dict( + resource_group=dict( required=False, type='str'), id=dict( @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_dedicated_host_group_info.py b/plugins/modules/ibm_is_dedicated_host_group_info.py index 1d7cc2e99..c8e9e8374 100644 --- a/plugins/modules/ibm_is_dedicated_host_group_info.py +++ b/plugins/modules/ibm_is_dedicated_host_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_host_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host_groups_info.py b/plugins/modules/ibm_is_dedicated_host_groups_info.py index 7027f1670..4bdcc061a 100644 --- a/plugins/modules/ibm_is_dedicated_host_groups_info.py +++ b/plugins/modules/ibm_is_dedicated_host_groups_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_host_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host_info.py b/plugins/modules/ibm_is_dedicated_host_info.py index b1cd1179f..12bff637b 100644 --- a/plugins/modules/ibm_is_dedicated_host_info.py +++ b/plugins/modules/ibm_is_dedicated_host_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_host' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,16 +26,16 @@ - The unique name of this dedicated host required: True type: str - resource_group: - description: - - The unique identifier of the resource group this dedicated host belongs to - required: False - type: str host_group: description: - The unique identifier of the dedicated host group this dedicated host belongs to required: True type: str + resource_group: + description: + - The unique identifier of the resource group this dedicated host belongs to + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -76,8 +76,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'resource_group', 'host_group', + 'resource_group', ] @@ -91,12 +91,12 @@ name=dict( required=True, type='str'), - resource_group=dict( - required=False, - type='str'), host_group=dict( required=True, type='str'), + resource_group=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -143,7 +143,7 @@ def run_module(): resource_type='ibm_is_dedicated_host', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host_profile_info.py b/plugins/modules/ibm_is_dedicated_host_profile_info.py index 081d45b4f..5e3157c89 100644 --- a/plugins/modules/ibm_is_dedicated_host_profile_info.py +++ b/plugins/modules/ibm_is_dedicated_host_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_host_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -123,7 +123,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_host_profiles_info.py b/plugins/modules/ibm_is_dedicated_host_profiles_info.py index c2454d559..81bafbbc8 100644 --- a/plugins/modules/ibm_is_dedicated_host_profiles_info.py +++ b/plugins/modules/ibm_is_dedicated_host_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_host_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_dedicated_host_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_dedicated_hosts_info.py b/plugins/modules/ibm_is_dedicated_hosts_info.py index 8f7ea0642..0eb40a0ec 100644 --- a/plugins/modules/ibm_is_dedicated_hosts_info.py +++ b/plugins/modules/ibm_is_dedicated_hosts_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_dedicated_hosts' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -123,7 +123,7 @@ def run_module(): resource_type='ibm_is_dedicated_hosts', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_endpoint_gateway_targets_info.py b/plugins/modules/ibm_is_endpoint_gateway_targets_info.py index 96369f3e5..d7b524a37 100644 --- a/plugins/modules/ibm_is_endpoint_gateway_targets_info.py +++ b/plugins/modules/ibm_is_endpoint_gateway_targets_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_endpoint_gateway_targets' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_endpoint_gateway_targets', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_floating_ip.py b/plugins/modules/ibm_is_floating_ip.py index 797f66589..ac0321e47 100644 --- a/plugins/modules/ibm_is_floating_ip.py +++ b/plugins/modules/ibm_is_floating_ip.py @@ -18,26 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_is_floating_ip' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) Name of the floating IP - required: True - type: str resource_group: description: - Resource group info required: False type: str - tags: - description: - - Floating IP tags - required: False - type: list - elements: str zone: description: - Zone name @@ -48,6 +37,17 @@ - Target info required: False type: str + tags: + description: + - Floating IP tags + required: False + type: list + elements: str + name: + description: + - (Required for new resource) Name of the floating IP + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -99,11 +99,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'resource_group', - 'tags', 'zone', 'target', + 'tags', + 'name', ] # Params for Data source @@ -124,20 +124,20 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + resource_group=dict( required=False, type='str'), - resource_group=dict( + zone=dict( + required=False, + type='str'), + target=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - zone=dict( - required=False, - type='str'), - target=dict( + name=dict( required=False, type='str'), id=dict( @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_is_floating_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_is_floating_ip', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_floating_ip_info.py b/plugins/modules/ibm_is_floating_ip_info.py index c2998d6c7..acd101f1b 100644 --- a/plugins/modules/ibm_is_floating_ip_info.py +++ b/plugins/modules/ibm_is_floating_ip_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_floating_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_floating_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_floating_ips_info.py b/plugins/modules/ibm_is_floating_ips_info.py index 0da1e9243..edfbe98db 100644 --- a/plugins/modules/ibm_is_floating_ips_info.py +++ b/plugins/modules/ibm_is_floating_ips_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_floating_ips' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -123,7 +123,7 @@ def run_module(): resource_type='ibm_is_floating_ips', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_flow_log.py b/plugins/modules/ibm_is_flow_log.py index 52715166e..d8fe588b7 100644 --- a/plugins/modules/ibm_is_flow_log.py +++ b/plugins/modules/ibm_is_flow_log.py @@ -18,20 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_flow_log' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) Flow Log Collector name - required: True - type: str - resource_group: - description: - - The resource group of flow log - required: False - type: str tags: description: - Tags for the VPC Flow logs @@ -43,12 +33,22 @@ - (Required for new resource) The Cloud Object Storage bucket name where the collected flows will be logged required: True type: str + resource_group: + description: + - The resource group of flow log + required: False + type: str active: description: - Indicates whether this collector is active required: False type: bool default: True + name: + description: + - (Required for new resource) Flow Log Collector name + required: True + type: str target: description: - (Required for new resource) The target id that the flow log collector is to collect flow logs @@ -100,18 +100,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('storage_bucket', 'str'), + ('name', 'str'), ('target', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'resource_group', 'tags', 'storage_bucket', + 'resource_group', 'active', + 'name', 'target', ] @@ -131,12 +131,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=False, - type='str'), - resource_group=dict( - required=False, - type='str'), tags=dict( required=False, elements='', @@ -144,9 +138,15 @@ storage_bucket=dict( required=False, type='str'), + resource_group=dict( + required=False, + type='str'), active=dict( required=False, type='bool'), + name=dict( + required=False, + type='str'), target=dict( required=False, type='str'), @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_is_flow_log', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -236,7 +236,7 @@ def run_module(): resource_type='ibm_is_flow_log', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_flow_log_info.py b/plugins/modules/ibm_is_flow_log_info.py index b59447ab5..f167f1080 100644 --- a/plugins/modules/ibm_is_flow_log_info.py +++ b/plugins/modules/ibm_is_flow_log_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_flow_log' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_flow_log', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_flow_logs_info.py b/plugins/modules/ibm_is_flow_logs_info.py index 31a76ce8b..8a10f0a44 100644 --- a/plugins/modules/ibm_is_flow_logs_info.py +++ b/plugins/modules/ibm_is_flow_logs_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_flow_logs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_flow_logs', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_ike_policies_info.py b/plugins/modules/ibm_is_ike_policies_info.py index dbb9d5105..28188d37d 100644 --- a/plugins/modules/ibm_is_ike_policies_info.py +++ b/plugins/modules/ibm_is_ike_policies_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_ike_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_ike_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_ike_policy.py b/plugins/modules/ibm_is_ike_policy.py index 3e2aeba31..259b9855d 100644 --- a/plugins/modules/ibm_is_ike_policy.py +++ b/plugins/modules/ibm_is_ike_policy.py @@ -18,20 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_is_ike_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + resource_group: description: - - (Required for new resource) IKE name - required: True + - IKE resource group ID + required: False type: str - authentication_algorithm: + key_lifetime: description: - - (Required for new resource) Authentication algorithm type - required: True - type: str + - IKE Key lifetime + required: False + type: int + default: 28800 ike_version: description: - IKE version @@ -47,17 +48,16 @@ - (Required for new resource) IKE DH group required: True type: int - resource_group: + name: description: - - IKE resource group ID - required: False + - (Required for new resource) IKE name + required: True type: str - key_lifetime: + authentication_algorithm: description: - - IKE Key lifetime - required: False - type: int - default: 28800 + - (Required for new resource) Authentication algorithm type + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,21 +104,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), - ('authentication_algorithm', 'str'), ('encryption_algorithm', 'str'), ('dh_group', 'int'), + ('name', 'str'), + ('authentication_algorithm', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'authentication_algorithm', + 'resource_group', + 'key_lifetime', 'ike_version', 'encryption_algorithm', 'dh_group', - 'resource_group', - 'key_lifetime', + 'name', + 'authentication_algorithm', ] # Params for Data source @@ -137,12 +137,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + resource_group=dict( required=False, type='str'), - authentication_algorithm=dict( + key_lifetime=dict( required=False, - type='str'), + type='int'), ike_version=dict( required=False, type='int'), @@ -152,12 +152,12 @@ dh_group=dict( required=False, type='int'), - resource_group=dict( + name=dict( required=False, type='str'), - key_lifetime=dict( + authentication_algorithm=dict( required=False, - type='int'), + type='str'), id=dict( required=False, type='str'), @@ -235,7 +235,7 @@ def run_module(): resource_type='ibm_is_ike_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_is_ike_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_ike_policy_info.py b/plugins/modules/ibm_is_ike_policy_info.py index 326f7cc9d..5cc2ca923 100644 --- a/plugins/modules/ibm_is_ike_policy_info.py +++ b/plugins/modules/ibm_is_ike_policy_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_ike_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_ike_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_image.py b/plugins/modules/ibm_is_image.py index 44c8ca9b2..8879f2174 100644 --- a/plugins/modules/ibm_is_image.py +++ b/plugins/modules/ibm_is_image.py @@ -18,30 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_image' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - source_volume: - description: - - Image volume id - required: False - type: str - encrypted_data_key: - description: - - A base64-encoded, encrypted representation of the key that was used to encrypt the data for this image - required: False - type: str - resource_group: - description: - - The resource group for this image - required: False - type: str - operating_system: - description: - - Image Operating system - required: False - type: str encryption_key: description: - The CRN of the Key Protect Root Key or Hyper Protect Crypto Service Root Key for this resource @@ -53,6 +33,11 @@ required: False type: list elements: str + source_volume: + description: + - Image volume id + required: False + type: str href: description: - Image Href value @@ -63,6 +48,21 @@ - (Required for new resource) Image name required: True type: str + encrypted_data_key: + description: + - A base64-encoded, encrypted representation of the key that was used to encrypt the data for this image + required: False + type: str + operating_system: + description: + - Image Operating system + required: False + type: str + resource_group: + description: + - The resource group for this image + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -114,14 +114,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'source_volume', - 'encrypted_data_key', - 'resource_group', - 'operating_system', 'encryption_key', 'tags', + 'source_volume', 'href', 'name', + 'encrypted_data_key', + 'operating_system', + 'resource_group', ] # Params for Data source @@ -129,9 +129,9 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', 'identifier', 'visibility', + 'name', ] TL_CONFLICTS_MAP = { @@ -141,29 +141,29 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - source_volume=dict( + encryption_key=dict( required=False, type='str'), - encrypted_data_key=dict( + tags=dict( required=False, - type='str'), - resource_group=dict( + elements='', + type='list'), + source_volume=dict( required=False, type='str'), - operating_system=dict( + href=dict( required=False, type='str'), - encryption_key=dict( + name=dict( required=False, type='str'), - tags=dict( + encrypted_data_key=dict( required=False, - elements='', - type='list'), - href=dict( + type='str'), + operating_system=dict( required=False, type='str'), - name=dict( + resource_group=dict( required=False, type='str'), id=dict( @@ -243,7 +243,7 @@ def run_module(): resource_type='ibm_is_image', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -252,7 +252,7 @@ def run_module(): resource_type='ibm_is_image', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_image_info.py b/plugins/modules/ibm_is_image_info.py index 83d0e4ce0..6409e4666 100644 --- a/plugins/modules/ibm_is_image_info.py +++ b/plugins/modules/ibm_is_image_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_is_image' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - Image name - required: False - type: str identifier: description: - Image id @@ -36,6 +31,11 @@ - Whether the image is publicly visible or private to the account required: False type: str + name: + description: + - Image name + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -73,9 +73,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'identifier', 'visibility', + 'name', ] @@ -86,15 +86,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=False, - type='str'), identifier=dict( required=False, type='str'), visibility=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_is_image', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_images_info.py b/plugins/modules/ibm_is_images_info.py index d67be2f3d..20c6aaf61 100644 --- a/plugins/modules/ibm_is_images_info.py +++ b/plugins/modules/ibm_is_images_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_images' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_group: + name: description: - - The id of the resource group + - The name of the image required: False type: str - name: + status: description: - - The name of the image + - The status of the image required: False type: str visibility: @@ -36,6 +36,11 @@ - Whether the image is publicly visible or private to the account required: False type: str + resource_group: + description: + - The id of the resource group + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -73,9 +78,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group', 'name', + 'status', 'visibility', + 'resource_group', ] @@ -86,15 +92,18 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_group=dict( + name=dict( required=False, type='str'), - name=dict( + status=dict( required=False, type='str'), visibility=dict( required=False, type='str'), + resource_group=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -141,7 +150,7 @@ def run_module(): resource_type='ibm_is_images', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance.py b/plugins/modules/ibm_is_instance.py index b0df861d4..75bb8c88a 100644 --- a/plugins/modules/ibm_is_instance.py +++ b/plugins/modules/ibm_is_instance.py @@ -18,68 +18,58 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - default_trusted_profile_target: - description: - - The unique identifier or CRN of the default IAM trusted profile to use for this virtual server instance. - required: False - type: str - dedicated_host_group: + volumes: description: - - Unique Identifier of the Dedicated Host Group where the instance will be placed + - List of volumes required: False - type: str - name: - description: - - (Required for new resource) Instance name - required: True - type: str - resource_group: + type: list + elements: str + auto_delete_volume: description: - - Instance resource group + - Auto delete volume along with instance required: False - type: str - metadata_service_enabled: + type: bool + default_trusted_profile_auto_link: description: - - Indicates whether the metadata service endpoint is available to the virtual server instance + - If set to `true`, the system will create a link to the specified `target` trusted profile during instance creation. Regardless of whether a link is created by the system or manually using the IAM Identity service, it will be automatically deleted when the instance is deleted. required: False type: bool - profile: + action: description: - - Profile info + - Enables stopping of instance before deleting and waits till deletion is complete required: False type: str - tags: + network_interfaces: description: - - list of tags for the instance + - None required: False type: list - elements: str - wait_before_delete: + elements: dict + image: description: - - Enables stopping of instance before deleting and waits till deletion is complete + - image id required: False - type: bool - default: True - action: + type: str + profile: description: - - Enables stopping of instance before deleting and waits till deletion is complete + - Profile info required: False type: str - boot_volume: + force_action: description: - - None + - If set to true, the action will be forced immediately, and all queued actions deleted. Ignored for the start action. required: False - type: list - elements: dict - force_recovery_time: + type: bool + default: False + resource_group: description: - - Define timeout to force the instances to start/stop in minutes. + - Instance resource group required: False - type: int + type: str availability_policy_host_failure: description: - The availability policy to use for this virtual server instance @@ -90,79 +80,89 @@ - Id of the instance template required: False type: str + metadata_service_enabled: + description: + - Indicates whether the metadata service endpoint is available to the virtual server instance + required: False + type: bool primary_network_interface: description: - Primary Network interface info required: False type: list elements: dict - image: + default_trusted_profile_target: description: - - image id + - The unique identifier or CRN of the default IAM trusted profile to use for this virtual server instance. required: False type: str - network_interfaces: + dedicated_host: description: - - None + - Unique Identifier of the Dedicated Host where the instance will be placed required: False - type: list - elements: dict - user_data: + type: str + dedicated_host_group: description: - - User data given for the instance + - Unique Identifier of the Dedicated Host Group where the instance will be placed required: False type: str + keys: + description: + - SSH key Ids for the instance + required: False + type: list + elements: str zone: description: - Zone name required: False type: str - default_trusted_profile_auto_link: - description: - - If set to `true`, the system will create a link to the specified `target` trusted profile during instance creation. Regardless of whether a link is created by the system or manually using the IAM Identity service, it will be automatically deleted when the instance is deleted. - required: False - type: bool total_volume_bandwidth: description: - The amount of bandwidth (in megabits per second) allocated exclusively to instance storage volumes required: False type: int - keys: + tags: description: - - SSH key Ids for the instance + - list of tags for the instance required: False type: list elements: str - force_action: + boot_volume: description: - - If set to true, the action will be forced immediately, and all queued actions deleted. Ignored for the start action. + - None required: False - type: bool - default: False - placement_group: + type: list + elements: dict + force_recovery_time: description: - - Unique Identifier of the Placement Group for restricting the placement of the instance + - Define timeout to force the instances to start/stop in minutes. required: False + type: int + name: + description: + - (Required for new resource) Instance name + required: True type: str - volumes: + vpc: description: - - List of volumes + - VPC id required: False - type: list - elements: str - auto_delete_volume: + type: str + placement_group: description: - - Auto delete volume along with instance + - Unique Identifier of the Placement Group for restricting the placement of the instance required: False - type: bool - vpc: + type: str + wait_before_delete: description: - - VPC id + - Enables stopping of instance before deleting and waits till deletion is complete required: False - type: str - dedicated_host: + type: bool + default: True + user_data: description: - - Unique Identifier of the Dedicated Host where the instance will be placed + - User data given for the instance required: False type: str id: @@ -216,33 +216,33 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'default_trusted_profile_target', - 'dedicated_host_group', - 'name', - 'resource_group', - 'metadata_service_enabled', - 'profile', - 'tags', - 'wait_before_delete', + 'volumes', + 'auto_delete_volume', + 'default_trusted_profile_auto_link', 'action', - 'boot_volume', - 'force_recovery_time', + 'network_interfaces', + 'image', + 'profile', + 'force_action', + 'resource_group', 'availability_policy_host_failure', 'instance_template', + 'metadata_service_enabled', 'primary_network_interface', - 'image', - 'network_interfaces', - 'user_data', + 'default_trusted_profile_target', + 'dedicated_host', + 'dedicated_host_group', + 'keys', 'zone', - 'default_trusted_profile_auto_link', 'total_volume_bandwidth', - 'keys', - 'force_action', - 'placement_group', - 'volumes', - 'auto_delete_volume', + 'tags', + 'boot_volume', + 'force_recovery_time', + 'name', 'vpc', - 'dedicated_host', + 'placement_group', + 'wait_before_delete', + 'user_data', ] # Params for Data source @@ -251,108 +251,108 @@ ] TL_ALL_PARAMETERS_DS = [ - 'passphrase', 'name', + 'passphrase', 'private_key', ] TL_CONFLICTS_MAP = { - 'dedicated_host_group': ['dedicated_host', 'placement_group'], - 'instance_template': ['boot_volume.0.snapshot'], 'image': ['boot_volume.0.snapshot'], - 'placement_group': ['dedicated_host', 'dedicated_host_group'], + 'instance_template': ['boot_volume.0.snapshot'], 'dedicated_host': ['dedicated_host_group', 'placement_group'], + 'dedicated_host_group': ['dedicated_host', 'placement_group'], + 'placement_group': ['dedicated_host', 'dedicated_host_group'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - default_trusted_profile_target=dict( - required=False, - type='str'), - dedicated_host_group=dict( - required=False, - type='str'), - name=dict( + volumes=dict( required=False, - type='str'), - resource_group=dict( + elements='', + type='list'), + auto_delete_volume=dict( required=False, - type='str'), - metadata_service_enabled=dict( + type='bool'), + default_trusted_profile_auto_link=dict( required=False, type='bool'), - profile=dict( + action=dict( required=False, type='str'), - tags=dict( + network_interfaces=dict( required=False, elements='', type='list'), - wait_before_delete=dict( + image=dict( required=False, - type='bool'), - action=dict( + type='str'), + profile=dict( required=False, type='str'), - boot_volume=dict( + force_action=dict( required=False, - elements='', - type='list'), - force_recovery_time=dict( + type='bool'), + resource_group=dict( required=False, - type='int'), + type='str'), availability_policy_host_failure=dict( required=False, type='str'), instance_template=dict( required=False, type='str'), + metadata_service_enabled=dict( + required=False, + type='bool'), primary_network_interface=dict( required=False, elements='', type='list'), - image=dict( + default_trusted_profile_target=dict( required=False, type='str'), - network_interfaces=dict( + dedicated_host=dict( required=False, - elements='', - type='list'), - user_data=dict( + type='str'), + dedicated_host_group=dict( required=False, type='str'), + keys=dict( + required=False, + elements='', + type='list'), zone=dict( required=False, type='str'), - default_trusted_profile_auto_link=dict( - required=False, - type='bool'), total_volume_bandwidth=dict( required=False, type='int'), - keys=dict( + tags=dict( required=False, elements='', type='list'), - force_action=dict( - required=False, - type='bool'), - placement_group=dict( - required=False, - type='str'), - volumes=dict( + boot_volume=dict( required=False, elements='', type='list'), - auto_delete_volume=dict( + force_recovery_time=dict( required=False, - type='bool'), + type='int'), + name=dict( + required=False, + type='str'), vpc=dict( required=False, type='str'), - dedicated_host=dict( + placement_group=dict( + required=False, + type='str'), + wait_before_delete=dict( + required=False, + type='bool'), + user_data=dict( required=False, type='str'), id=dict( @@ -432,7 +432,7 @@ def run_module(): resource_type='ibm_is_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -441,7 +441,7 @@ def run_module(): resource_type='ibm_is_instance', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_action.py b/plugins/modules/ibm_is_instance_action.py index 3c55511d1..419e4ec18 100644 --- a/plugins/modules/ibm_is_instance_action.py +++ b/plugins/modules/ibm_is_instance_action.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_action' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance: - description: - - (Required for new resource) Instance identifier - required: True - type: str action: description: - (Required for new resource) This restart/start/stops an instance. @@ -38,6 +33,11 @@ required: False type: bool default: False + instance: + description: + - (Required for new resource) Instance identifier + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,15 +84,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance', 'str'), ('action', 'str'), + ('instance', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance', 'action', 'force_action', + 'instance', ] # Params for Data source @@ -109,15 +109,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance=dict( - required=False, - type='str'), action=dict( required=False, type='str'), force_action=dict( required=False, type='bool'), + instance=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_is_instance_action', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_disk_info.py b/plugins/modules/ibm_is_instance_disk_info.py index b91226689..7315aab33 100644 --- a/plugins/modules/ibm_is_instance_disk_info.py +++ b/plugins/modules/ibm_is_instance_disk_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_disk' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_disk', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_disk_management.py b/plugins/modules/ibm_is_instance_disk_management.py index 70db7cc91..67679f0ff 100644 --- a/plugins/modules/ibm_is_instance_disk_management.py +++ b/plugins/modules/ibm_is_instance_disk_management.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_disk_management' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -187,7 +187,7 @@ def run_module(): resource_type='ibm_is_instance_disk_management', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_disks_info.py b/plugins/modules/ibm_is_instance_disks_info.py index f98919e32..2c9cd6d82 100644 --- a/plugins/modules/ibm_is_instance_disks_info.py +++ b/plugins/modules/ibm_is_instance_disks_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_disks' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_instance_disks', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group.py b/plugins/modules/ibm_is_instance_group.py index fd88f2047..1cc427c60 100644 --- a/plugins/modules/ibm_is_instance_group.py +++ b/plugins/modules/ibm_is_instance_group.py @@ -18,16 +18,25 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_count: + name: description: - - The number of instances in the instance group + - (Required for new resource) The user-defined name for this instance group + required: True + type: str + load_balancer_pool: + description: + - load balancer pool ID required: False - type: int - default: 0 + type: str + instance_template: + description: + - (Required for new resource) instance template ID + required: True + type: str resource_group: description: - Resource group ID @@ -38,16 +47,18 @@ - Used by the instance group when scaling up instances to supply the port for the load balancer pool member. required: False type: int - name: + tags: description: - - (Required for new resource) The user-defined name for this instance group - required: True - type: str - instance_template: + - List of tags for instance group + required: False + type: list + elements: str + instance_count: description: - - (Required for new resource) instance template ID - required: True - type: str + - The number of instances in the instance group + required: False + type: int + default: 0 subnets: description: - (Required for new resource) list of subnet IDs @@ -59,17 +70,6 @@ - load balancer ID required: False type: str - load_balancer_pool: - description: - - load balancer pool ID - required: False - type: str - tags: - description: - - List of tags for instance group - required: False - type: list - elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -123,15 +123,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_count', - 'resource_group', - 'application_port', 'name', + 'load_balancer_pool', 'instance_template', + 'resource_group', + 'application_port', + 'tags', + 'instance_count', 'subnets', 'load_balancer', - 'load_balancer_pool', - 'tags', ] # Params for Data source @@ -150,21 +150,28 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_count=dict( + name=dict( required=False, - type='int'), + type='str'), + load_balancer_pool=dict( + required=False, + type='str'), + instance_template=dict( + required=False, + type='str'), resource_group=dict( required=False, type='str'), application_port=dict( required=False, type='int'), - name=dict( + tags=dict( required=False, - type='str'), - instance_template=dict( + elements='', + type='list'), + instance_count=dict( required=False, - type='str'), + type='int'), subnets=dict( required=False, elements='', @@ -172,13 +179,6 @@ load_balancer=dict( required=False, type='str'), - load_balancer_pool=dict( - required=False, - type='str'), - tags=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -256,7 +256,7 @@ def run_module(): resource_type='ibm_is_instance_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -265,7 +265,7 @@ def run_module(): resource_type='ibm_is_instance_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_group_info.py b/plugins/modules/ibm_is_instance_group_info.py index 009702e7c..77463159c 100644 --- a/plugins/modules/ibm_is_instance_group_info.py +++ b/plugins/modules/ibm_is_instance_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_instance_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_manager.py b/plugins/modules/ibm_is_instance_group_manager.py index 49a14bcf4..7efba51f8 100644 --- a/plugins/modules/ibm_is_instance_group_manager.py +++ b/plugins/modules/ibm_is_instance_group_manager.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_group_manager' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -33,12 +33,23 @@ required: False type: str default: autoscale + aggregation_window: + description: + - The time window in seconds to aggregate metrics prior to evaluation + required: False + type: int + default: 90 cooldown: description: - The duration of time in seconds to pause further scale actions after scaling has taken place required: False type: int default: 300 + max_membership_count: + description: + - The maximum number of members in a managed instance group + required: False + type: int enable_manager: description: - enable instance group manager @@ -50,17 +61,6 @@ - (Required for new resource) instance group ID required: True type: str - aggregation_window: - description: - - The time window in seconds to aggregate metrics prior to evaluation - required: False - type: int - default: 90 - max_membership_count: - description: - - The maximum number of members in a managed instance group - required: False - type: int min_membership_count: description: - The minimum number of members in a managed instance group @@ -120,11 +120,11 @@ TL_ALL_PARAMETERS = [ 'name', 'manager_type', + 'aggregation_window', 'cooldown', + 'max_membership_count', 'enable_manager', 'instance_group', - 'aggregation_window', - 'max_membership_count', 'min_membership_count', ] @@ -152,21 +152,21 @@ manager_type=dict( required=False, type='str'), + aggregation_window=dict( + required=False, + type='int'), cooldown=dict( required=False, type='int'), + max_membership_count=dict( + required=False, + type='int'), enable_manager=dict( required=False, type='bool'), instance_group=dict( required=False, type='str'), - aggregation_window=dict( - required=False, - type='int'), - max_membership_count=dict( - required=False, - type='int'), min_membership_count=dict( required=False, type='int'), @@ -247,7 +247,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -256,7 +256,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_group_manager_action.py b/plugins/modules/ibm_is_instance_group_manager_action.py index 6a1fb8496..ba79e4b61 100644 --- a/plugins/modules/ibm_is_instance_group_manager_action.py +++ b/plugins/modules/ibm_is_instance_group_manager_action.py @@ -18,51 +18,51 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_group_manager_action' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_group: + name: description: - - (Required for new resource) instance group ID - required: True + - instance group manager action name + required: False type: str membership_count: description: - The number of members the instance group should have at the scheduled time. required: False type: int - target_manager: - description: - - The unique identifier for this instance group manager of type autoscale. - required: False - type: str - cron_spec: - description: - - The cron specification for a recurring scheduled action. Actions can be applied a maximum of one time within a 5 min period. - required: False - type: str min_membership_count: description: - The minimum number of members in a managed instance group required: False type: int default: 1 - run_at: + target_manager: description: - - The date and time the scheduled action will run. + - The unique identifier for this instance group manager of type autoscale. required: False type: str - name: + instance_group: description: - - instance group manager action name - required: False + - (Required for new resource) instance group ID + required: True type: str instance_group_manager: description: - (Required for new resource) Instance group manager ID of type scheduled required: True type: str + cron_spec: + description: + - The cron specification for a recurring scheduled action. Actions can be applied a maximum of one time within a 5 min period. + required: False + type: str + run_at: + description: + - The date and time the scheduled action will run. + required: False + type: str max_membership_count: description: - The maximum number of members in a managed instance group @@ -120,35 +120,35 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_group', + 'name', 'membership_count', + 'min_membership_count', 'target_manager', + 'instance_group', + 'instance_group_manager', 'cron_spec', - 'min_membership_count', 'run_at', - 'name', - 'instance_group_manager', 'max_membership_count', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('instance_group_manager', 'str'), - ('instance_group', 'str'), ('name', 'str'), + ('instance_group', 'str'), + ('instance_group_manager', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance_group_manager', - 'instance_group', 'name', + 'instance_group', + 'instance_group_manager', ] TL_CONFLICTS_MAP = { 'membership_count': ['target_manager', 'max_membership_count', 'min_membership_count'], + 'min_membership_count': ['membership_count'], 'target_manager': ['membership_count'], 'cron_spec': ['run_at'], - 'min_membership_count': ['membership_count'], 'run_at': ['cron_spec'], 'max_membership_count': ['membership_count'], } @@ -157,28 +157,28 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_group=dict( + name=dict( required=False, type='str'), membership_count=dict( required=False, type='int'), + min_membership_count=dict( + required=False, + type='int'), target_manager=dict( required=False, type='str'), - cron_spec=dict( + instance_group=dict( required=False, type='str'), - min_membership_count=dict( - required=False, - type='int'), - run_at=dict( + instance_group_manager=dict( required=False, type='str'), - name=dict( + cron_spec=dict( required=False, type='str'), - instance_group_manager=dict( + run_at=dict( required=False, type='str'), max_membership_count=dict( @@ -261,7 +261,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -270,7 +270,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_action', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_group_manager_action_info.py b/plugins/modules/ibm_is_instance_group_manager_action_info.py index f73c272e1..3d3573a4b 100644 --- a/plugins/modules/ibm_is_instance_group_manager_action_info.py +++ b/plugins/modules/ibm_is_instance_group_manager_action_info.py @@ -17,13 +17,13 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_manager_action' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_group_manager: + name: description: - - Instance group manager ID of type scheduled + - instance group manager action name required: True type: str instance_group: @@ -31,9 +31,9 @@ - instance group ID required: True type: str - name: + instance_group_manager: description: - - instance group manager action name + - Instance group manager ID of type scheduled required: True type: str generation: @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_group_manager', 'str'), - ('instance_group', 'str'), ('name', 'str'), + ('instance_group', 'str'), + ('instance_group_manager', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_group_manager', - 'instance_group', 'name', + 'instance_group', + 'instance_group_manager', ] @@ -89,13 +89,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_group_manager=dict( + name=dict( required=True, type='str'), instance_group=dict( required=True, type='str'), - name=dict( + instance_group_manager=dict( required=True, type='str'), generation=dict( @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_manager_actions_info.py b/plugins/modules/ibm_is_instance_group_manager_actions_info.py index 102748438..0dcf80a2b 100644 --- a/plugins/modules/ibm_is_instance_group_manager_actions_info.py +++ b/plugins/modules/ibm_is_instance_group_manager_actions_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_manager_actions' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_actions', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_manager_info.py b/plugins/modules/ibm_is_instance_group_manager_info.py index 73e9f2f63..aff60ca92 100644 --- a/plugins/modules/ibm_is_instance_group_manager_info.py +++ b/plugins/modules/ibm_is_instance_group_manager_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_manager' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_manager_policies_info.py b/plugins/modules/ibm_is_instance_group_manager_policies_info.py index f74f93c61..c8839d6aa 100644 --- a/plugins/modules/ibm_is_instance_group_manager_policies_info.py +++ b/plugins/modules/ibm_is_instance_group_manager_policies_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_manager_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_manager_policy.py b/plugins/modules/ibm_is_instance_group_manager_policy.py index 29b124e5c..a8eabe682 100644 --- a/plugins/modules/ibm_is_instance_group_manager_policy.py +++ b/plugins/modules/ibm_is_instance_group_manager_policy.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_group_manager_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + metric_value: + description: + - (Required for new resource) The metric value to be evaluated + required: True + type: int + policy_type: + description: + - (Required for new resource) The type of Policy for the Instance Group + required: True + type: str name: description: - instance group manager policy name @@ -42,16 +52,6 @@ - (Required for new resource) The type of metric to be evaluated required: True type: str - metric_value: - description: - - (Required for new resource) The metric value to be evaluated - required: True - type: int - policy_type: - description: - - (Required for new resource) The type of Policy for the Instance Group - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -98,34 +98,34 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('metric_value', 'int'), + ('policy_type', 'str'), ('instance_group', 'str'), ('instance_group_manager', 'str'), ('metric_type', 'str'), - ('metric_value', 'int'), - ('policy_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'metric_value', + 'policy_type', 'name', 'instance_group', 'instance_group_manager', 'metric_type', - 'metric_value', - 'policy_type', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ + ('instance_group', 'str'), ('instance_group_manager', 'str'), ('name', 'str'), - ('instance_group', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'instance_group', 'instance_group_manager', 'name', - 'instance_group', ] TL_CONFLICTS_MAP = { @@ -135,6 +135,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + metric_value=dict( + required=False, + type='int'), + policy_type=dict( + required=False, + type='str'), name=dict( required=False, type='str'), @@ -147,12 +153,6 @@ metric_type=dict( required=False, type='str'), - metric_value=dict( - required=False, - type='int'), - policy_type=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -230,7 +230,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -239,7 +239,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_group_manager_policy_info.py b/plugins/modules/ibm_is_instance_group_manager_policy_info.py index 2baae75ef..486eb4ec6 100644 --- a/plugins/modules/ibm_is_instance_group_manager_policy_info.py +++ b/plugins/modules/ibm_is_instance_group_manager_policy_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_manager_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + instance_group: + description: + - instance group ID + required: True + type: str instance_group_manager: description: - Instance group manager ID @@ -31,11 +36,6 @@ - The name of the instance group manager policy required: True type: str - instance_group: - description: - - instance group ID - required: True - type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('instance_group', 'str'), ('instance_group_manager', 'str'), ('name', 'str'), - ('instance_group', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'instance_group', 'instance_group_manager', 'name', - 'instance_group', ] @@ -89,13 +89,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_group_manager=dict( + instance_group=dict( required=True, type='str'), - name=dict( + instance_group_manager=dict( required=True, type='str'), - instance_group=dict( + name=dict( required=True, type='str'), generation=dict( @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_managers_info.py b/plugins/modules/ibm_is_instance_group_managers_info.py index 1a8876c23..1f9ab3788 100644 --- a/plugins/modules/ibm_is_instance_group_managers_info.py +++ b/plugins/modules/ibm_is_instance_group_managers_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_managers' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_instance_group_managers', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_membership.py b/plugins/modules/ibm_is_instance_group_membership.py index b1b0b5c32..af0f87d65 100644 --- a/plugins/modules/ibm_is_instance_group_membership.py +++ b/plugins/modules/ibm_is_instance_group_membership.py @@ -18,31 +18,31 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_group_membership' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_group_membership: - description: - - (Required for new resource) The unique identifier for this instance group membership. - required: True - type: str name: description: - The user-defined name for this instance group membership. Names must be unique within the instance group. required: False type: str - instance_group: - description: - - (Required for new resource) The instance group identifier. - required: True - type: str action_delete: description: - The delete flag for this instance group membership. Must be set to true to delete instance group membership. required: False type: bool default: False + instance_group: + description: + - (Required for new resource) The instance group identifier. + required: True + type: str + instance_group_membership: + description: + - (Required for new resource) The unique identifier for this instance group membership. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,16 +89,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_group_membership', 'str'), ('instance_group', 'str'), + ('instance_group_membership', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_group_membership', 'name', - 'instance_group', 'action_delete', + 'instance_group', + 'instance_group_membership', ] # Params for Data source @@ -119,18 +119,18 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_group_membership=dict( - required=False, - type='str'), name=dict( required=False, type='str'), + action_delete=dict( + required=False, + type='bool'), instance_group=dict( required=False, type='str'), - action_delete=dict( + instance_group_membership=dict( required=False, - type='bool'), + type='str'), id=dict( required=False, type='str'), @@ -208,7 +208,7 @@ def run_module(): resource_type='ibm_is_instance_group_membership', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_is_instance_group_membership', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_group_membership_info.py b/plugins/modules/ibm_is_instance_group_membership_info.py index 2d828142b..f512dbcd0 100644 --- a/plugins/modules/ibm_is_instance_group_membership_info.py +++ b/plugins/modules/ibm_is_instance_group_membership_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_membership' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_group_membership', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_group_memberships_info.py b/plugins/modules/ibm_is_instance_group_memberships_info.py index 6bcce27d1..0b2e7b845 100644 --- a/plugins/modules/ibm_is_instance_group_memberships_info.py +++ b/plugins/modules/ibm_is_instance_group_memberships_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_memberships' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_instance_group_memberships', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_info.py b/plugins/modules/ibm_is_instance_info.py index fbbb21f5a..18dd12f53 100644 --- a/plugins/modules/ibm_is_instance_info.py +++ b/plugins/modules/ibm_is_instance_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - passphrase: - description: - - Passphrase for Instance Private Key file - required: False - type: str name: description: - Instance name required: True type: str + passphrase: + description: + - Passphrase for Instance Private Key file + required: False + type: str private_key: description: - Instance Private Key file @@ -74,8 +74,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'passphrase', 'name', + 'passphrase', 'private_key', ] @@ -87,12 +87,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - passphrase=dict( - required=False, - type='str'), name=dict( required=True, type='str'), + passphrase=dict( + required=False, + type='str'), private_key=dict( required=False, type='str'), @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_is_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_network_interface.py b/plugins/modules/ibm_is_instance_network_interface.py index 86811e971..1af633b7c 100644 --- a/plugins/modules/ibm_is_instance_network_interface.py +++ b/plugins/modules/ibm_is_instance_network_interface.py @@ -18,27 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_network_interface' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - primary_ip: + allow_ip_spoofing: description: - - The primary IP address to bind to the network interface. This can be specified using an existing reserved IP, or a prototype object for a new reserved IP. + - Indicates whether source IP spoofing is allowed on this interface. If false, source IP spoofing is prevented on this interface. If true, source IP spoofing is allowed on this interface. required: False - type: list - elements: dict + type: bool + default: False security_groups: description: - None required: False type: list elements: str - name: + primary_ip: description: - - (Required for new resource) The user-defined name for this network interface. If unspecified, the name will be a hyphenated list of randomly-selected words. - required: True - type: str + - The primary IP address to bind to the network interface. This can be specified using an existing reserved IP, or a prototype object for a new reserved IP. + required: False + type: list + elements: dict floating_ip: description: - The ID of the floating IP to attach to this network interface @@ -49,17 +50,16 @@ - (Required for new resource) The unique identifier of the subnet. required: True type: str - allow_ip_spoofing: - description: - - Indicates whether source IP spoofing is allowed on this interface. If false, source IP spoofing is prevented on this interface. If true, source IP spoofing is allowed on this interface. - required: False - type: bool - default: False instance: description: - (Required for new resource) The unique identifier of the instance. required: True type: str + name: + description: + - (Required for new resource) The user-defined name for this network interface. If unspecified, the name will be a hyphenated list of randomly-selected words. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -106,20 +106,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('subnet', 'str'), ('instance', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'primary_ip', + 'allow_ip_spoofing', 'security_groups', - 'name', + 'primary_ip', 'floating_ip', 'subnet', - 'allow_ip_spoofing', 'instance', + 'name', ] # Params for Data source @@ -140,29 +140,29 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - primary_ip=dict( + allow_ip_spoofing=dict( required=False, - elements='', - type='list'), + type='bool'), security_groups=dict( required=False, elements='', type='list'), - name=dict( + primary_ip=dict( required=False, - type='str'), + elements='', + type='list'), floating_ip=dict( required=False, type='str'), subnet=dict( required=False, type='str'), - allow_ip_spoofing=dict( - required=False, - type='bool'), instance=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -240,7 +240,7 @@ def run_module(): resource_type='ibm_is_instance_network_interface', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -249,7 +249,7 @@ def run_module(): resource_type='ibm_is_instance_network_interface', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_network_interface_info.py b/plugins/modules/ibm_is_instance_network_interface_info.py index 0c3b24b94..521c4d0ef 100644 --- a/plugins/modules/ibm_is_instance_network_interface_info.py +++ b/plugins/modules/ibm_is_instance_network_interface_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_network_interface' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_network_interface', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_network_interface_reserved_ip_info.py b/plugins/modules/ibm_is_instance_network_interface_reserved_ip_info.py index bcfa67b5e..1dd3c2a8d 100644 --- a/plugins/modules/ibm_is_instance_network_interface_reserved_ip_info.py +++ b/plugins/modules/ibm_is_instance_network_interface_reserved_ip_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_network_interface_reserved_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_instance_network_interface_reserved_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_network_interface_reserved_ips_info.py b/plugins/modules/ibm_is_instance_network_interface_reserved_ips_info.py index c6cceb664..3d1cd82d6 100644 --- a/plugins/modules/ibm_is_instance_network_interface_reserved_ips_info.py +++ b/plugins/modules/ibm_is_instance_network_interface_reserved_ips_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_network_interface_reserved_ips' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_network_interface_reserved_ips', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_network_interfaces_info.py b/plugins/modules/ibm_is_instance_network_interfaces_info.py index 94e690dd7..19ba1a268 100644 --- a/plugins/modules/ibm_is_instance_network_interfaces_info.py +++ b/plugins/modules/ibm_is_instance_network_interfaces_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_network_interfaces' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_instance_network_interfaces', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_profile_info.py b/plugins/modules/ibm_is_instance_profile_info.py index ce398f00a..763c0a522 100644 --- a/plugins/modules/ibm_is_instance_profile_info.py +++ b/plugins/modules/ibm_is_instance_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_instance_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_profiles_info.py b/plugins/modules/ibm_is_instance_profiles_info.py index c168a96d3..1ad90b8cd 100644 --- a/plugins/modules/ibm_is_instance_profiles_info.py +++ b/plugins/modules/ibm_is_instance_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_instance_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_template.py b/plugins/modules/ibm_is_instance_template.py index 4de711337..0c3cfda7c 100644 --- a/plugins/modules/ibm_is_instance_template.py +++ b/plugins/modules/ibm_is_instance_template.py @@ -18,52 +18,51 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_template' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - vpc: + dedicated_host_group: description: - - (Required for new resource) VPC id + - Unique Identifier of the Dedicated Host Group where the instance will be placed + required: False + type: str + image: + description: + - (Required for new resource) image name required: True type: str - default_trusted_profile_auto_link: + availability_policy_host_failure: description: - - If set to `true`, the system will create a link to the specified `target` trusted profile during instance creation. Regardless of whether a link is created by the system or manually using the IAM Identity service, it will be automatically deleted when the instance is deleted. + - The availability policy to use for this virtual server instance required: False - type: bool - primary_network_interface: + type: str + vpc: description: - - (Required for new resource) Primary Network interface info + - (Required for new resource) VPC id required: True - type: list - elements: dict - metadata_service_enabled: + type: str + default_trusted_profile_target: description: - - Indicates whether the metadata service endpoint is available to the virtual server instance + - The unique identifier or CRN of the default IAM trusted profile to use for this virtual server instance. required: False - type: bool - default: False - profile: - description: - - (Required for new resource) Profile info - required: True type: str total_volume_bandwidth: description: - The amount of bandwidth (in megabits per second) allocated exclusively to instance storage volumes required: False type: int + keys: + description: + - (Required for new resource) SSH key Ids for the instance template + required: True + type: list + elements: str dedicated_host: description: - Unique Identifier of the Dedicated Host where the instance will be placed required: False type: str - placement_group: - description: - - Unique Identifier of the Placement Group for restricting the placement of the instance - required: False - type: str volume_attachments: description: - None @@ -76,56 +75,57 @@ required: False type: list elements: dict - image: + metadata_service_enabled: description: - - (Required for new resource) image name - required: True - type: str - name: + - Indicates whether the metadata service endpoint is available to the virtual server instance + required: False + type: bool + default: False + resource_group: description: - - Instance Template name + - Instance template resource group required: False type: str - boot_volume: + placement_group: description: - - None + - Unique Identifier of the Placement Group for restricting the placement of the instance required: False - type: list - elements: dict + type: str zone: description: - (Required for new resource) Zone name required: True type: str - default_trusted_profile_target: + profile: description: - - The unique identifier or CRN of the default IAM trusted profile to use for this virtual server instance. - required: False + - (Required for new resource) Profile info + required: True type: str - keys: + default_trusted_profile_auto_link: description: - - (Required for new resource) SSH key Ids for the instance template + - If set to `true`, the system will create a link to the specified `target` trusted profile during instance creation. Regardless of whether a link is created by the system or manually using the IAM Identity service, it will be automatically deleted when the instance is deleted. + required: False + type: bool + primary_network_interface: + description: + - (Required for new resource) Primary Network interface info required: True type: list - elements: str - dedicated_host_group: - description: - - Unique Identifier of the Dedicated Host Group where the instance will be placed - required: False - type: str - availability_policy_host_failure: + elements: dict + user_data: description: - - The availability policy to use for this virtual server instance + - User data given for the instance required: False type: str - resource_group: + boot_volume: description: - - Instance template resource group + - None required: False - type: str - user_data: + type: list + elements: dict + name: description: - - User data given for the instance + - Instance Template name required: False type: str id: @@ -174,36 +174,36 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('vpc', 'str'), - ('primary_network_interface', 'list'), - ('profile', 'str'), ('image', 'str'), - ('zone', 'str'), + ('vpc', 'str'), ('keys', 'list'), + ('zone', 'str'), + ('profile', 'str'), + ('primary_network_interface', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'dedicated_host_group', + 'image', + 'availability_policy_host_failure', 'vpc', - 'default_trusted_profile_auto_link', - 'primary_network_interface', - 'metadata_service_enabled', - 'profile', + 'default_trusted_profile_target', 'total_volume_bandwidth', + 'keys', 'dedicated_host', - 'placement_group', 'volume_attachments', 'network_interfaces', - 'image', - 'name', - 'boot_volume', - 'zone', - 'default_trusted_profile_target', - 'keys', - 'dedicated_host_group', - 'availability_policy_host_failure', + 'metadata_service_enabled', 'resource_group', + 'placement_group', + 'zone', + 'profile', + 'default_trusted_profile_auto_link', + 'primary_network_interface', 'user_data', + 'boot_volume', + 'name', ] # Params for Data source @@ -216,38 +216,38 @@ ] TL_CONFLICTS_MAP = { + 'dedicated_host_group': ['dedicated_host', 'placement_group'], 'dedicated_host': ['dedicated_host_group', 'placement_group'], 'placement_group': ['dedicated_host', 'dedicated_host_group'], - 'dedicated_host_group': ['dedicated_host', 'placement_group'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - vpc=dict( + dedicated_host_group=dict( required=False, type='str'), - default_trusted_profile_auto_link=dict( + image=dict( required=False, - type='bool'), - primary_network_interface=dict( + type='str'), + availability_policy_host_failure=dict( required=False, - elements='', - type='list'), - metadata_service_enabled=dict( + type='str'), + vpc=dict( required=False, - type='bool'), - profile=dict( + type='str'), + default_trusted_profile_target=dict( required=False, type='str'), total_volume_bandwidth=dict( required=False, type='int'), - dedicated_host=dict( + keys=dict( required=False, - type='str'), - placement_group=dict( + elements='', + type='list'), + dedicated_host=dict( required=False, type='str'), volume_attachments=dict( @@ -258,36 +258,36 @@ required=False, elements='', type='list'), - image=dict( + metadata_service_enabled=dict( required=False, - type='str'), - name=dict( + type='bool'), + resource_group=dict( required=False, type='str'), - boot_volume=dict( + placement_group=dict( required=False, - elements='', - type='list'), + type='str'), zone=dict( required=False, type='str'), - default_trusted_profile_target=dict( + profile=dict( required=False, type='str'), - keys=dict( + default_trusted_profile_auto_link=dict( + required=False, + type='bool'), + primary_network_interface=dict( required=False, elements='', type='list'), - dedicated_host_group=dict( - required=False, - type='str'), - availability_policy_host_failure=dict( + user_data=dict( required=False, type='str'), - resource_group=dict( + boot_volume=dict( required=False, - type='str'), - user_data=dict( + elements='', + type='list'), + name=dict( required=False, type='str'), id=dict( @@ -367,7 +367,7 @@ def run_module(): resource_type='ibm_is_instance_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -376,7 +376,7 @@ def run_module(): resource_type='ibm_is_instance_template', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_template_info.py b/plugins/modules/ibm_is_instance_template_info.py index 3fcbbc365..a033bf2aa 100644 --- a/plugins/modules/ibm_is_instance_template_info.py +++ b/plugins/modules/ibm_is_instance_template_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_template' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_instance_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_templates_info.py b/plugins/modules/ibm_is_instance_templates_info.py index 40a97c3a7..aa63af8b4 100644 --- a/plugins/modules/ibm_is_instance_templates_info.py +++ b/plugins/modules/ibm_is_instance_templates_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_templates' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_instance_templates', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_volume_attachment.py b/plugins/modules/ibm_is_instance_volume_attachment.py index 903dcc995..1f269348a 100644 --- a/plugins/modules/ibm_is_instance_volume_attachment.py +++ b/plugins/modules/ibm_is_instance_volume_attachment.py @@ -18,39 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_volume_attachment' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - delete_volume_on_instance_delete: - description: - - If set to true, when deleting the instance the volume will also be deleted. - required: False - type: bool - capacity: + snapshot: description: - - The capacity of the volume in gigabytes. The specified minimum and maximum capacity values for creating or updating volumes may expand in the future. + - The snapshot of the volume to be attached required: False - type: int + type: str instance: description: - (Required for new resource) Instance id required: True type: str - name: - description: - - The user-defined name for this volume attachment. - required: False - type: str - delete_volume_on_attachment_delete: + delete_volume_on_instance_delete: description: - - If set to true, when deleting the attachment, the volume will also be deleted. Default value for this true. + - If set to true, when deleting the instance the volume will also be deleted. required: False type: bool - default: True - snapshot: + volume: description: - - The snapshot of the volume to be attached + - Instance id required: False type: str iops: @@ -63,21 +52,32 @@ - The globally unique name for the volume profile to use for this volume. required: False type: str - encryption_key: + delete_volume_on_attachment_delete: description: - - The CRN of the [Key Protect Root Key](https://cloud.ibm.com/docs/key-protect?topic=key-protect-getting-started-tutorial) or [Hyper Protect Crypto Service Root Key](https://cloud.ibm.com/docs/hs-crypto?topic=hs-crypto-get-started) for this resource. + - If set to true, when deleting the attachment, the volume will also be deleted. Default value for this true. + required: False + type: bool + default: True + volume_name: + description: + - The unique user-defined name for this volume required: False type: str - volume: + name: description: - - Instance id + - The user-defined name for this volume attachment. required: False type: str - volume_name: + encryption_key: description: - - The unique user-defined name for this volume + - The CRN of the [Key Protect Root Key](https://cloud.ibm.com/docs/key-protect?topic=key-protect-getting-started-tutorial) or [Hyper Protect Crypto Service Root Key](https://cloud.ibm.com/docs/hs-crypto?topic=hs-crypto-get-started) for this resource. required: False type: str + capacity: + description: + - The capacity of the volume in gigabytes. The specified minimum and maximum capacity values for creating or updating volumes may expand in the future. + required: False + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -129,58 +129,52 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'delete_volume_on_instance_delete', - 'capacity', - 'instance', - 'name', - 'delete_volume_on_attachment_delete', 'snapshot', + 'instance', + 'delete_volume_on_instance_delete', + 'volume', 'iops', 'profile', - 'encryption_key', - 'volume', + 'delete_volume_on_attachment_delete', 'volume_name', + 'name', + 'encryption_key', + 'capacity', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('instance', 'str'), ('name', 'str'), + ('instance', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance', 'name', + 'instance', ] TL_CONFLICTS_MAP = { - 'capacity': ['volume'], 'snapshot': ['volume'], + 'volume': ['iops', 'volume_name', 'profile', 'capacity', 'snapshot'], 'iops': ['volume'], 'profile': ['volume'], - 'volume': ['iops', 'volume_name', 'profile', 'capacity', 'snapshot'], + 'capacity': ['volume'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - delete_volume_on_instance_delete=dict( - required=False, - type='bool'), - capacity=dict( - required=False, - type='int'), - instance=dict( + snapshot=dict( required=False, type='str'), - name=dict( + instance=dict( required=False, type='str'), - delete_volume_on_attachment_delete=dict( + delete_volume_on_instance_delete=dict( required=False, type='bool'), - snapshot=dict( + volume=dict( required=False, type='str'), iops=dict( @@ -189,15 +183,21 @@ profile=dict( required=False, type='str'), - encryption_key=dict( + delete_volume_on_attachment_delete=dict( + required=False, + type='bool'), + volume_name=dict( required=False, type='str'), - volume=dict( + name=dict( required=False, type='str'), - volume_name=dict( + encryption_key=dict( required=False, type='str'), + capacity=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -275,7 +275,7 @@ def run_module(): resource_type='ibm_is_instance_volume_attachment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -284,7 +284,7 @@ def run_module(): resource_type='ibm_is_instance_volume_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_instance_volume_attachment_info.py b/plugins/modules/ibm_is_instance_volume_attachment_info.py index 181736bbb..e08a1d197 100644 --- a/plugins/modules/ibm_is_instance_volume_attachment_info.py +++ b/plugins/modules/ibm_is_instance_volume_attachment_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_volume_attachment' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance: + name: description: - - Instance id + - The user-defined name for this volume attachment. required: True type: str - name: + instance: description: - - The user-defined name for this volume attachment. + - Instance id required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance', 'str'), ('name', 'str'), + ('instance', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance', 'name', + 'instance', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance=dict( + name=dict( required=True, type='str'), - name=dict( + instance=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_volume_attachment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instance_volume_attachments_info.py b/plugins/modules/ibm_is_instance_volume_attachments_info.py index bda2b4c29..c5f9765e5 100644 --- a/plugins/modules/ibm_is_instance_volume_attachments_info.py +++ b/plugins/modules/ibm_is_instance_volume_attachments_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_volume_attachments' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_instance_volume_attachments', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_instances_info.py b/plugins/modules/ibm_is_instances_info.py index a0037b607..da858836b 100644 --- a/plugins/modules/ibm_is_instances_info.py +++ b/plugins/modules/ibm_is_instances_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_instances' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_group: + instance_group_name: description: - - Instance group ID to filter the instances attached to it + - Instance group name to filter the instances attached to it required: False type: str - vpc_crn: + vpc_name: description: - - VPC CRN to filter the instances attached to it + - Name of the vpc to filter the instances attached to it required: False type: str resource_group: @@ -36,34 +36,29 @@ - Instance resource group required: False type: str - dedicated_host: - description: - - ID of the dedicated host to filter the instances attached to it - required: False - type: str placement_group: description: - ID of the placement group to filter the instances attached to it required: False type: str - instance_group_name: + instance_group: description: - - Instance group name to filter the instances attached to it + - Instance group ID to filter the instances attached to it required: False type: str - vpc_name: + vpc_crn: description: - - Name of the vpc to filter the instances attached to it + - VPC CRN to filter the instances attached to it required: False type: str - vpc: + dedicated_host_name: description: - - VPC ID to filter the instances attached to it + - Name of the dedicated host to filter the instances attached to it required: False type: str - dedicated_host_name: + dedicated_host: description: - - Name of the dedicated host to filter the instances attached to it + - ID of the dedicated host to filter the instances attached to it required: False type: str placement_group_name: @@ -71,6 +66,11 @@ - Name of the placement group to filter the instances attached to it required: False type: str + vpc: + description: + - VPC ID to filter the instances attached to it + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -108,65 +108,65 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_group', - 'vpc_crn', - 'resource_group', - 'dedicated_host', - 'placement_group', 'instance_group_name', 'vpc_name', - 'vpc', + 'resource_group', + 'placement_group', + 'instance_group', + 'vpc_crn', 'dedicated_host_name', + 'dedicated_host', 'placement_group_name', + 'vpc', ] TL_CONFLICTS_MAP = { - 'instance_group': ['vpc', 'vpc_crn', 'vpc_name', 'instance_group_name'], - 'vpc_crn': ['vpc_name', 'vpc', 'instance_group'], - 'dedicated_host': ['dedicated_host_name'], - 'placement_group': ['placement_group_name'], 'instance_group_name': ['vpc', 'vpc_crn', 'vpc_name', 'instance_group'], 'vpc_name': ['vpc', 'vpc_crn', 'instance_group'], - 'vpc': ['vpc_name', 'vpc_crn', 'instance_group'], + 'placement_group': ['placement_group_name'], + 'instance_group': ['vpc', 'vpc_crn', 'vpc_name', 'instance_group_name'], + 'vpc_crn': ['vpc_name', 'vpc', 'instance_group'], 'dedicated_host_name': ['dedicated_host'], + 'dedicated_host': ['dedicated_host_name'], 'placement_group_name': ['placement_group'], + 'vpc': ['vpc_name', 'vpc_crn', 'instance_group'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_group=dict( + instance_group_name=dict( required=False, type='str'), - vpc_crn=dict( + vpc_name=dict( required=False, type='str'), resource_group=dict( required=False, type='str'), - dedicated_host=dict( - required=False, - type='str'), placement_group=dict( required=False, type='str'), - instance_group_name=dict( + instance_group=dict( required=False, type='str'), - vpc_name=dict( + vpc_crn=dict( required=False, type='str'), - vpc=dict( + dedicated_host_name=dict( required=False, type='str'), - dedicated_host_name=dict( + dedicated_host=dict( required=False, type='str'), placement_group_name=dict( required=False, type='str'), + vpc=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -213,7 +213,7 @@ def run_module(): resource_type='ibm_is_instances', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_ipsec_policies_info.py b/plugins/modules/ibm_is_ipsec_policies_info.py index f2c68c069..1d6f4209a 100644 --- a/plugins/modules/ibm_is_ipsec_policies_info.py +++ b/plugins/modules/ibm_is_ipsec_policies_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_ipsec_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_ipsec_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_ipsec_policy.py b/plugins/modules/ibm_is_ipsec_policy.py index c8c1a5d55..eb1e6ce4d 100644 --- a/plugins/modules/ibm_is_ipsec_policy.py +++ b/plugins/modules/ibm_is_ipsec_policy.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_ipsec_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -32,11 +32,6 @@ - (Required for new resource) Encryption algorithm required: True type: str - resource_group: - description: - - Resource group info - required: False - type: str authentication_algorithm: description: - (Required for new resource) Authentication alorothm @@ -47,6 +42,11 @@ - (Required for new resource) PFS info required: True type: str + resource_group: + description: + - Resource group info + required: False + type: str key_lifetime: description: - IPSEC key lifetime @@ -109,9 +109,9 @@ TL_ALL_PARAMETERS = [ 'name', 'encryption_algorithm', - 'resource_group', 'authentication_algorithm', 'pfs', + 'resource_group', 'key_lifetime', ] @@ -137,15 +137,15 @@ encryption_algorithm=dict( required=False, type='str'), - resource_group=dict( - required=False, - type='str'), authentication_algorithm=dict( required=False, type='str'), pfs=dict( required=False, type='str'), + resource_group=dict( + required=False, + type='str'), key_lifetime=dict( required=False, type='int'), @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_is_ipsec_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -235,7 +235,7 @@ def run_module(): resource_type='ibm_is_ipsec_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_ipsec_policy_info.py b/plugins/modules/ibm_is_ipsec_policy_info.py index f055b3b46..d96f261dd 100644 --- a/plugins/modules/ibm_is_ipsec_policy_info.py +++ b/plugins/modules/ibm_is_ipsec_policy_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_ipsec_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_ipsec_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb.py b/plugins/modules/ibm_is_lb.py index dbf0fbb85..d077ff085 100644 --- a/plugins/modules/ibm_is_lb.py +++ b/plugins/modules/ibm_is_lb.py @@ -18,22 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - None - required: False - type: list - elements: str - route_mode: - description: - - Indicates whether route mode is enabled for this load balancer - required: False - type: bool - default: False logging: description: - Logging of Load Balancer @@ -51,28 +39,40 @@ required: True type: list elements: str - security_groups: - description: - - Load Balancer securitygroups list - required: False - type: list - elements: str resource_group: description: - None required: False type: str - profile: + route_mode: description: - - The profile to use for this load balancer. + - Indicates whether route mode is enabled for this load balancer required: False - type: str + type: bool + default: False type: description: - Load Balancer type required: False type: str default: public + profile: + description: + - The profile to use for this load balancer. + required: False + type: str + tags: + description: + - None + required: False + type: list + elements: str + security_groups: + description: + - Load Balancer securitygroups list + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -125,15 +125,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', - 'route_mode', 'logging', 'name', 'subnets', - 'security_groups', 'resource_group', - 'profile', + 'route_mode', 'type', + 'profile', + 'tags', + 'security_groups', ] # Params for Data source @@ -147,21 +147,14 @@ TL_CONFLICTS_MAP = { 'logging': ['profile'], - 'security_groups': ['profile'], 'profile': ['logging'], + 'security_groups': ['profile'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - elements='', - type='list'), - route_mode=dict( - required=False, - type='bool'), logging=dict( required=False, type='bool'), @@ -172,19 +165,26 @@ required=False, elements='', type='list'), - security_groups=dict( - required=False, - elements='', - type='list'), resource_group=dict( required=False, type='str'), - profile=dict( + route_mode=dict( required=False, - type='str'), + type='bool'), type=dict( required=False, type='str'), + profile=dict( + required=False, + type='str'), + tags=dict( + required=False, + elements='', + type='list'), + security_groups=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -262,7 +262,7 @@ def run_module(): resource_type='ibm_is_lb', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -271,7 +271,7 @@ def run_module(): resource_type='ibm_is_lb', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_lb_info.py b/plugins/modules/ibm_is_lb_info.py index 2609520a8..e3742d68d 100644 --- a/plugins/modules/ibm_is_lb_info.py +++ b/plugins/modules/ibm_is_lb_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_lb', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_listener.py b/plugins/modules/ibm_is_lb_listener.py index 748538edf..99ef8cf0d 100644 --- a/plugins/modules/ibm_is_lb_listener.py +++ b/plugins/modules/ibm_is_lb_listener.py @@ -18,70 +18,70 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_listener' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - port_min: - description: - - The inclusive lower bound of the range of ports used by this listener. Only load balancers in the `network` family support more than one port per listener. - required: False - type: int - port_max: + port: description: - - The inclusive upper bound of the range of ports used by this listener. Only load balancers in the `network` family support more than one port per listener + - Loadbalancer listener port required: False type: int - https_redirect_status_code: + connection_limit: description: - - The HTTP status code to be returned in the redirect response + - Connection limit for Loadbalancer required: False type: int - https_redirect_listener: + default_pool: description: - - ID of the listener that will be set as http redirect target + - Loadbalancer default pool info required: False type: str - protocol: + lb: description: - - (Required for new resource) Loadbalancer protocol + - (Required for new resource) Loadbalancer listener ID required: True type: str - certificate_instance: + accept_proxy_protocol: description: - - certificate instance for the Loadbalancer + - Listener will forward proxy protocol + required: False + type: bool + https_redirect_listener: + description: + - ID of the listener that will be set as http redirect target required: False type: str - connection_limit: + port_min: description: - - Connection limit for Loadbalancer + - The inclusive lower bound of the range of ports used by this listener. Only load balancers in the `network` family support more than one port per listener. required: False type: int - default_pool: + https_redirect_status_code: description: - - Loadbalancer default pool info + - The HTTP status code to be returned in the redirect response required: False - type: str - lb: + type: int + protocol: description: - - (Required for new resource) Loadbalancer listener ID + - (Required for new resource) Loadbalancer protocol required: True type: str - port: - description: - - Loadbalancer listener port - required: False - type: int - accept_proxy_protocol: + certificate_instance: description: - - Listener will forward proxy protocol + - certificate instance for the Loadbalancer required: False - type: bool + type: str https_redirect_uri: description: - Target URI where traffic will be redirected required: False type: str + port_max: + description: + - The inclusive upper bound of the range of ports used by this listener. Only load balancers in the `network` family support more than one port per listener + required: False + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -128,24 +128,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('protocol', 'str'), ('lb', 'str'), + ('protocol', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'port_min', - 'port_max', - 'https_redirect_status_code', - 'https_redirect_listener', - 'protocol', - 'certificate_instance', + 'port', 'connection_limit', 'default_pool', 'lb', - 'port', 'accept_proxy_protocol', + 'https_redirect_listener', + 'port_min', + 'https_redirect_status_code', + 'protocol', + 'certificate_instance', 'https_redirect_uri', + 'port_max', ] # Params for Data source @@ -166,42 +166,42 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - port_min=dict( - required=False, - type='int'), - port_max=dict( + port=dict( required=False, type='int'), - https_redirect_status_code=dict( + connection_limit=dict( required=False, type='int'), - https_redirect_listener=dict( + default_pool=dict( required=False, type='str'), - protocol=dict( + lb=dict( required=False, type='str'), - certificate_instance=dict( + accept_proxy_protocol=dict( + required=False, + type='bool'), + https_redirect_listener=dict( required=False, type='str'), - connection_limit=dict( + port_min=dict( required=False, type='int'), - default_pool=dict( + https_redirect_status_code=dict( required=False, - type='str'), - lb=dict( + type='int'), + protocol=dict( required=False, type='str'), - port=dict( - required=False, - type='int'), - accept_proxy_protocol=dict( + certificate_instance=dict( required=False, - type='bool'), + type='str'), https_redirect_uri=dict( required=False, type='str'), + port_max=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -279,7 +279,7 @@ def run_module(): resource_type='ibm_is_lb_listener', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -288,7 +288,7 @@ def run_module(): resource_type='ibm_is_lb_listener', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_lb_listener_info.py b/plugins/modules/ibm_is_lb_listener_info.py index 8505b1c9b..1269ec453 100644 --- a/plugins/modules/ibm_is_lb_listener_info.py +++ b/plugins/modules/ibm_is_lb_listener_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_lb_listener', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_listener_policies_info.py b/plugins/modules/ibm_is_lb_listener_policies_info.py index d491f9545..b3ac7d6c5 100644 --- a/plugins/modules/ibm_is_lb_listener_policies_info.py +++ b/plugins/modules/ibm_is_lb_listener_policies_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - lb: + listener: description: - - The load balancer identifier. + - The listener identifier. required: True type: str - listener: + lb: description: - - The listener identifier. + - The load balancer identifier. required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('lb', 'str'), ('listener', 'str'), + ('lb', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'lb', 'listener', + 'lb', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - lb=dict( + listener=dict( required=True, type='str'), - listener=dict( + lb=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_listener_policy.py b/plugins/modules/ibm_is_lb_listener_policy.py index 357b8702b..efa2f5065 100644 --- a/plugins/modules/ibm_is_lb_listener_policy.py +++ b/plugins/modules/ibm_is_lb_listener_policy.py @@ -18,23 +18,29 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_listener_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - listener: + rules: description: - - (Required for new resource) Listener ID - required: True + - Policy Rules + required: False + type: list + elements: dict + target_id: + description: + - Listener Policy Target ID + required: False type: str target_https_redirect_status_code: description: - The HTTP status code to be returned in the redirect response required: False type: int - target_https_redirect_listener: + name: description: - - ID of the listener that will be set as http redirect target + - Policy name required: False type: str target_url: @@ -42,29 +48,24 @@ - Policy Target URL required: False type: str - action: + lb: description: - - (Required for new resource) Policy Action + - (Required for new resource) Load Balancer Listener Policy required: True type: str - priority: + action: description: - - (Required for new resource) Listener Policy Priority + - (Required for new resource) Policy Action required: True - type: int - name: - description: - - Policy name - required: False type: str target_http_status_code: description: - Listener Policy target HTTPS Status code. required: False type: int - lb: + listener: description: - - (Required for new resource) Load Balancer Listener Policy + - (Required for new resource) Listener ID required: True type: str target_https_redirect_uri: @@ -72,17 +73,16 @@ - Target URI where traffic will be redirected required: False type: str - rules: - description: - - Policy Rules - required: False - type: list - elements: dict - target_id: + target_https_redirect_listener: description: - - Listener Policy Target ID + - ID of the listener that will be set as http redirect target required: False type: str + priority: + description: + - (Required for new resource) Listener Policy Priority + required: True + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -129,26 +129,26 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('listener', 'str'), + ('lb', 'str'), ('action', 'str'), + ('listener', 'str'), ('priority', 'int'), - ('lb', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'listener', + 'rules', + 'target_id', 'target_https_redirect_status_code', - 'target_https_redirect_listener', + 'name', 'target_url', + 'lb', 'action', - 'priority', - 'name', 'target_http_status_code', - 'lb', + 'listener', 'target_https_redirect_uri', - 'rules', - 'target_id', + 'target_https_redirect_listener', + 'priority', ] # Params for Data source @@ -171,43 +171,43 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - listener=dict( + rules=dict( + required=False, + elements='', + type='list'), + target_id=dict( required=False, type='str'), target_https_redirect_status_code=dict( required=False, type='int'), - target_https_redirect_listener=dict( + name=dict( required=False, type='str'), target_url=dict( required=False, type='str'), - action=dict( + lb=dict( required=False, type='str'), - priority=dict( - required=False, - type='int'), - name=dict( + action=dict( required=False, type='str'), target_http_status_code=dict( required=False, type='int'), - lb=dict( + listener=dict( required=False, type='str'), target_https_redirect_uri=dict( required=False, type='str'), - rules=dict( - required=False, - elements='', - type='list'), - target_id=dict( + target_https_redirect_listener=dict( required=False, type='str'), + priority=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -285,7 +285,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -294,7 +294,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_lb_listener_policy_info.py b/plugins/modules/ibm_is_lb_listener_policy_info.py index 98b2e0afb..42f67b862 100644 --- a/plugins/modules/ibm_is_lb_listener_policy_info.py +++ b/plugins/modules/ibm_is_lb_listener_policy_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_listener_policy_rule.py b/plugins/modules/ibm_is_lb_listener_policy_rule.py index 20cb5718b..372915c03 100644 --- a/plugins/modules/ibm_is_lb_listener_policy_rule.py +++ b/plugins/modules/ibm_is_lb_listener_policy_rule.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_listener_policy_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,9 +27,9 @@ - (Required for new resource) Listener ID. required: True type: str - condition: + policy: description: - - (Required for new resource) Condition info of the rule. + - (Required for new resource) Listener Policy ID required: True type: str type: @@ -37,6 +37,11 @@ - (Required for new resource) Policy rule type. required: True type: str + value: + description: + - (Required for new resource) policy rule value info + required: True + type: str field: description: - None @@ -47,14 +52,9 @@ - (Required for new resource) Loadbalancer ID required: True type: str - policy: - description: - - (Required for new resource) Listener Policy ID - required: True - type: str - value: + condition: description: - - (Required for new resource) policy rule value info + - (Required for new resource) Condition info of the rule. required: True type: str id: @@ -104,37 +104,37 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('listener', 'str'), - ('condition', 'str'), - ('type', 'str'), - ('lb', 'str'), ('policy', 'str'), + ('type', 'str'), ('value', 'str'), + ('lb', 'str'), + ('condition', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'listener', - 'condition', + 'policy', 'type', + 'value', 'field', 'lb', - 'policy', - 'value', + 'condition', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ + ('rule', 'str'), ('lb', 'str'), ('listener', 'str'), ('policy', 'str'), - ('rule', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'rule', 'lb', 'listener', 'policy', - 'rule', ] TL_CONFLICTS_MAP = { @@ -147,22 +147,22 @@ listener=dict( required=False, type='str'), - condition=dict( + policy=dict( required=False, type='str'), type=dict( required=False, type='str'), - field=dict( + value=dict( required=False, type='str'), - lb=dict( + field=dict( required=False, type='str'), - policy=dict( + lb=dict( required=False, type='str'), - value=dict( + condition=dict( required=False, type='str'), id=dict( @@ -242,7 +242,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policy_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -251,7 +251,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policy_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_lb_listener_policy_rule_info.py b/plugins/modules/ibm_is_lb_listener_policy_rule_info.py index a9d6a0684..3a229c192 100644 --- a/plugins/modules/ibm_is_lb_listener_policy_rule_info.py +++ b/plugins/modules/ibm_is_lb_listener_policy_rule_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener_policy_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + rule: + description: + - The rule identifier. + required: True + type: str lb: description: - The load balancer identifier. @@ -36,11 +41,6 @@ - The policy identifier. required: True type: str - rule: - description: - - The rule identifier. - required: True - type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -74,18 +74,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('rule', 'str'), ('lb', 'str'), ('listener', 'str'), ('policy', 'str'), - ('rule', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'rule', 'lb', 'listener', 'policy', - 'rule', ] @@ -96,6 +96,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + rule=dict( + required=True, + type='str'), lb=dict( required=True, type='str'), @@ -105,9 +108,6 @@ policy=dict( required=True, type='str'), - rule=dict( - required=True, - type='str'), generation=dict( type='int', required=False, @@ -154,7 +154,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policy_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_listener_policy_rules_info.py b/plugins/modules/ibm_is_lb_listener_policy_rules_info.py index d8699c05b..e242cd676 100644 --- a/plugins/modules/ibm_is_lb_listener_policy_rules_info.py +++ b/plugins/modules/ibm_is_lb_listener_policy_rules_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener_policy_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - lb: - description: - - The load balancer identifier. - required: True - type: str listener: description: - The listener identifier. @@ -36,6 +31,11 @@ - The policy identifier. required: True type: str + lb: + description: + - The load balancer identifier. + required: True + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('lb', 'str'), ('listener', 'str'), ('policy', 'str'), + ('lb', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'lb', 'listener', 'policy', + 'lb', ] @@ -89,15 +89,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - lb=dict( - required=True, - type='str'), listener=dict( required=True, type='str'), policy=dict( required=True, type='str'), + lb=dict( + required=True, + type='str'), generation=dict( type='int', required=False, @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policy_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_listeners_info.py b/plugins/modules/ibm_is_lb_listeners_info.py index 845ebf353..712daff30 100644 --- a/plugins/modules/ibm_is_lb_listeners_info.py +++ b/plugins/modules/ibm_is_lb_listeners_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listeners' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_lb_listeners', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_pool.py b/plugins/modules/ibm_is_lb_pool.py index 376badf5a..d8937acd0 100644 --- a/plugins/modules/ibm_is_lb_pool.py +++ b/plugins/modules/ibm_is_lb_pool.py @@ -18,74 +18,74 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + session_persistence_type: description: - - (Required for new resource) Load Balancer Pool name + - Load Balancer Pool session persisence type. + required: False + type: str + health_monitor_url: + description: + - Health monitor URL of LB Pool + required: False + type: str + lb: + description: + - (Required for new resource) Load Balancer ID required: True type: str - protocol: + algorithm: description: - - (Required for new resource) Load Balancer Protocol + - (Required for new resource) Load Balancer Pool algorithm required: True type: str - health_monitor_port: + health_retries: description: - - Health monitor Port the LB Pool - required: False + - (Required for new resource) Load Balancer health retry count + required: True type: int - lb: + protocol: description: - - (Required for new resource) Load Balancer ID + - (Required for new resource) Load Balancer Protocol required: True type: str - health_type: + health_delay: description: - - (Required for new resource) Load Balancer health type + - (Required for new resource) Load Blancer health delay time period required: True - type: str + type: int + health_monitor_port: + description: + - Health monitor Port the LB Pool + required: False + type: int session_persistence_app_cookie_name: description: - Load Balancer Pool session persisence app cookie name. required: False type: str - algorithm: - description: - - (Required for new resource) Load Balancer Pool algorithm - required: True - type: str proxy_protocol: description: - PROXY protocol setting for this pool required: False type: str - health_delay: - description: - - (Required for new resource) Load Blancer health delay time period - required: True - type: int - health_retries: + name: description: - - (Required for new resource) Load Balancer health retry count + - (Required for new resource) Load Balancer Pool name required: True - type: int + type: str health_timeout: description: - (Required for new resource) Load Balancer health timeout interval required: True type: int - health_monitor_url: - description: - - Health monitor URL of LB Pool - required: False - type: str - session_persistence_type: + health_type: description: - - Load Balancer Pool session persisence type. - required: False + - (Required for new resource) Load Balancer health type + required: True type: str id: description: @@ -133,31 +133,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), - ('protocol', 'str'), ('lb', 'str'), - ('health_type', 'str'), ('algorithm', 'str'), - ('health_delay', 'int'), ('health_retries', 'int'), + ('protocol', 'str'), + ('health_delay', 'int'), + ('name', 'str'), ('health_timeout', 'int'), + ('health_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', + 'session_persistence_type', + 'health_monitor_url', + 'lb', + 'algorithm', + 'health_retries', 'protocol', + 'health_delay', 'health_monitor_port', - 'lb', - 'health_type', 'session_persistence_app_cookie_name', - 'algorithm', 'proxy_protocol', - 'health_delay', - 'health_retries', + 'name', 'health_timeout', - 'health_monitor_url', - 'session_persistence_type', + 'health_type', ] # Params for Data source @@ -166,9 +166,9 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', - 'lb', 'identifier', + 'lb', + 'name', ] TL_CONFLICTS_MAP = { @@ -178,43 +178,43 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + session_persistence_type=dict( required=False, type='str'), - protocol=dict( + health_monitor_url=dict( required=False, type='str'), - health_monitor_port=dict( - required=False, - type='int'), lb=dict( required=False, type='str'), - health_type=dict( - required=False, - type='str'), - session_persistence_app_cookie_name=dict( - required=False, - type='str'), algorithm=dict( required=False, type='str'), - proxy_protocol=dict( + health_retries=dict( + required=False, + type='int'), + protocol=dict( required=False, type='str'), health_delay=dict( required=False, type='int'), - health_retries=dict( + health_monitor_port=dict( required=False, type='int'), - health_timeout=dict( + session_persistence_app_cookie_name=dict( required=False, - type='int'), - health_monitor_url=dict( + type='str'), + proxy_protocol=dict( required=False, type='str'), - session_persistence_type=dict( + name=dict( + required=False, + type='str'), + health_timeout=dict( + required=False, + type='int'), + health_type=dict( required=False, type='str'), id=dict( @@ -294,7 +294,7 @@ def run_module(): resource_type='ibm_is_lb_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -303,7 +303,7 @@ def run_module(): resource_type='ibm_is_lb_pool', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_lb_pool_info.py b/plugins/modules/ibm_is_lb_pool_info.py index eef1da1b9..cb9b36a94 100644 --- a/plugins/modules/ibm_is_lb_pool_info.py +++ b/plugins/modules/ibm_is_lb_pool_info.py @@ -17,13 +17,13 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + identifier: description: - - The user-defined name for this load balancer pool. + - The pool identifier. required: False type: str lb: @@ -31,9 +31,9 @@ - The load balancer identifier. required: True type: str - identifier: + name: description: - - The pool identifier. + - The user-defined name for this load balancer pool. required: False type: str generation: @@ -74,9 +74,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'lb', 'identifier', + 'lb', + 'name', ] @@ -87,13 +87,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + identifier=dict( required=False, type='str'), lb=dict( required=True, type='str'), - identifier=dict( + name=dict( required=False, type='str'), generation=dict( @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_is_lb_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_pool_member.py b/plugins/modules/ibm_is_lb_pool_member.py index 530bb2aae..5e9f2364e 100644 --- a/plugins/modules/ibm_is_lb_pool_member.py +++ b/plugins/modules/ibm_is_lb_pool_member.py @@ -18,18 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_pool_member' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pool: + lb: description: - - (Required for new resource) Loadblancer Poold ID + - (Required for new resource) Load balancer ID required: True type: str - lb: + port: description: - - (Required for new resource) Load balancer ID + - (Required for new resource) Load Balancer Pool port + required: True + type: int + weight: + description: + - Load balcner pool member weight + required: False + type: int + pool: + description: + - (Required for new resource) Loadblancer Poold ID required: True type: str target_id: @@ -37,21 +47,11 @@ - Load balancer pool member target id required: False type: str - port: - description: - - (Required for new resource) Load Balancer Pool port - required: True - type: int target_address: description: - Load balancer pool member target address required: False type: str - weight: - description: - - Load balcner pool member weight - required: False - type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -98,32 +98,32 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pool', 'str'), ('lb', 'str'), ('port', 'int'), + ('pool', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pool', 'lb', - 'target_id', 'port', - 'target_address', 'weight', + 'pool', + 'target_id', + 'target_address', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('lb', 'str'), ('pool', 'str'), ('member', 'str'), + ('lb', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'lb', 'pool', 'member', + 'lb', ] TL_CONFLICTS_MAP = { @@ -133,24 +133,24 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pool=dict( + lb=dict( required=False, type='str'), - lb=dict( + port=dict( + required=False, + type='int'), + weight=dict( + required=False, + type='int'), + pool=dict( required=False, type='str'), target_id=dict( required=False, type='str'), - port=dict( - required=False, - type='int'), target_address=dict( required=False, type='str'), - weight=dict( - required=False, - type='int'), id=dict( required=False, type='str'), @@ -228,7 +228,7 @@ def run_module(): resource_type='ibm_is_lb_pool_member', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -237,7 +237,7 @@ def run_module(): resource_type='ibm_is_lb_pool_member', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_lb_pool_member_info.py b/plugins/modules/ibm_is_lb_pool_member_info.py index a1faab38d..6a53fe8e9 100644 --- a/plugins/modules/ibm_is_lb_pool_member_info.py +++ b/plugins/modules/ibm_is_lb_pool_member_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_pool_member' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - lb: - description: - - The load balancer identifier. - required: True - type: str pool: description: - The pool identifier. @@ -36,6 +31,11 @@ - The member identifier. required: True type: str + lb: + description: + - The load balancer identifier. + required: True + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('lb', 'str'), ('pool', 'str'), ('member', 'str'), + ('lb', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'lb', 'pool', 'member', + 'lb', ] @@ -89,15 +89,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - lb=dict( - required=True, - type='str'), pool=dict( required=True, type='str'), member=dict( required=True, type='str'), + lb=dict( + required=True, + type='str'), generation=dict( type='int', required=False, @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_lb_pool_member', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_pool_members_info.py b/plugins/modules/ibm_is_lb_pool_members_info.py index 9b1099230..d8010f85f 100644 --- a/plugins/modules/ibm_is_lb_pool_members_info.py +++ b/plugins/modules/ibm_is_lb_pool_members_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_pool_members' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_lb_pool_members', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_pools_info.py b/plugins/modules/ibm_is_lb_pools_info.py index 1455ade1b..62a85e5de 100644 --- a/plugins/modules/ibm_is_lb_pools_info.py +++ b/plugins/modules/ibm_is_lb_pools_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_pools' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_lb_pools', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lb_profiles_info.py b/plugins/modules/ibm_is_lb_profiles_info.py index 56f64ca49..548de28e2 100644 --- a/plugins/modules/ibm_is_lb_profiles_info.py +++ b/plugins/modules/ibm_is_lb_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_lb_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_lbs_info.py b/plugins/modules/ibm_is_lbs_info.py index a3c40254a..4c11db8bf 100644 --- a/plugins/modules/ibm_is_lbs_info.py +++ b/plugins/modules/ibm_is_lbs_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lbs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_lbs', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_network_acl.py b/plugins/modules/ibm_is_network_acl.py index 459e049dd..72918a311 100644 --- a/plugins/modules/ibm_is_network_acl.py +++ b/plugins/modules/ibm_is_network_acl.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_network_acl' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,6 +27,11 @@ - (Required for new resource) Network ACL name required: True type: str + vpc: + description: + - Network ACL VPC name + required: False + type: str resource_group: description: - Resource group ID for the network ACL @@ -44,11 +49,6 @@ required: False type: list elements: dict - vpc: - description: - - Network ACL VPC name - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -101,10 +101,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', + 'vpc', 'resource_group', 'tags', 'rules', - 'vpc', ] # Params for Data source @@ -112,9 +112,9 @@ ] TL_ALL_PARAMETERS_DS = [ - 'network_acl', 'name', 'vpc_name', + 'network_acl', ] TL_CONFLICTS_MAP = { @@ -127,6 +127,9 @@ name=dict( required=False, type='str'), + vpc=dict( + required=False, + type='str'), resource_group=dict( required=False, type='str'), @@ -138,9 +141,6 @@ required=False, elements='', type='list'), - vpc=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_network_acl', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_is_network_acl', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_network_acl_info.py b/plugins/modules/ibm_is_network_acl_info.py index 831b368ba..295deab94 100644 --- a/plugins/modules/ibm_is_network_acl_info.py +++ b/plugins/modules/ibm_is_network_acl_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_is_network_acl' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - network_acl: - description: - - The network acl id. - required: False - type: str name: description: - The network acl name. @@ -36,6 +31,11 @@ - The name of the vpc the network acl resides in. required: False type: str + network_acl: + description: + - The network acl id. + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -73,9 +73,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'network_acl', 'name', 'vpc_name', + 'network_acl', ] @@ -86,15 +86,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - network_acl=dict( - required=False, - type='str'), name=dict( required=False, type='str'), vpc_name=dict( required=False, type='str'), + network_acl=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_is_network_acl', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_network_acl_rule.py b/plugins/modules/ibm_is_network_acl_rule.py index e3e1aff2a..b4fc106e7 100644 --- a/plugins/modules/ibm_is_network_acl_rule.py +++ b/plugins/modules/ibm_is_network_acl_rule.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_network_acl_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,41 +27,40 @@ - The rule that this rule is immediately before. If absent, this is the last rule. required: False type: str - name: - description: - - The user-defined name for this rule. Names must be unique within the network ACL the rule resides in. If unspecified, the name will be a hyphenated list of randomly-selected words. - required: False - type: str action: description: - (Required for new resource) Whether to allow or deny matching traffic required: True type: str - source: + direction: description: - - (Required for new resource) The source CIDR block. The CIDR block 0.0.0.0/0 applies to all addresses. + - (Required for new resource) Direction of traffic to enforce, either inbound or outbound required: True type: str - tcp: + udp: description: - None required: False type: list elements: dict - udp: + name: description: - - None + - The user-defined name for this rule. Names must be unique within the network ACL the rule resides in. If unspecified, the name will be a hyphenated list of randomly-selected words. required: False - type: list - elements: dict + type: str + destination: + description: + - (Required for new resource) The destination CIDR block. The CIDR block 0.0.0.0/0 applies to all addresses. + required: True + type: str network_acl: description: - (Required for new resource) Network ACL id required: True type: str - destination: + source: description: - - (Required for new resource) The destination CIDR block. The CIDR block 0.0.0.0/0 applies to all addresses. + - (Required for new resource) The source CIDR block. The CIDR block 0.0.0.0/0 applies to all addresses. required: True type: str icmp: @@ -70,11 +69,12 @@ required: False type: list elements: dict - direction: + tcp: description: - - (Required for new resource) Direction of traffic to enforce, either inbound or outbound - required: True - type: str + - None + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -122,24 +122,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('action', 'str'), - ('source', 'str'), - ('network_acl', 'str'), - ('destination', 'str'), ('direction', 'str'), + ('destination', 'str'), + ('network_acl', 'str'), + ('source', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'before', - 'name', 'action', - 'source', - 'tcp', + 'direction', 'udp', - 'network_acl', + 'name', 'destination', + 'network_acl', + 'source', 'icmp', - 'direction', + 'tcp', ] # Params for Data source @@ -154,9 +154,9 @@ ] TL_CONFLICTS_MAP = { - 'tcp': ['icmp', 'udp'], 'udp': ['icmp', 'tcp'], 'icmp': ['tcp', 'udp'], + 'tcp': ['icmp', 'udp'], } # define available arguments/parameters a user can pass to the module @@ -166,36 +166,36 @@ before=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), action=dict( required=False, type='str'), - source=dict( + direction=dict( required=False, type='str'), - tcp=dict( - required=False, - elements='', - type='list'), udp=dict( required=False, elements='', type='list'), - network_acl=dict( + name=dict( required=False, type='str'), destination=dict( required=False, type='str'), + network_acl=dict( + required=False, + type='str'), + source=dict( + required=False, + type='str'), icmp=dict( required=False, elements='', type='list'), - direction=dict( + tcp=dict( required=False, - type='str'), + elements='', + type='list'), id=dict( required=False, type='str'), @@ -273,7 +273,7 @@ def run_module(): resource_type='ibm_is_network_acl_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -282,7 +282,7 @@ def run_module(): resource_type='ibm_is_network_acl_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_network_acl_rule_info.py b/plugins/modules/ibm_is_network_acl_rule_info.py index 7437bad47..373a103da 100644 --- a/plugins/modules/ibm_is_network_acl_rule_info.py +++ b/plugins/modules/ibm_is_network_acl_rule_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_network_acl_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_network_acl_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_network_acl_rules_info.py b/plugins/modules/ibm_is_network_acl_rules_info.py index 06c27ca3f..a41e44548 100644 --- a/plugins/modules/ibm_is_network_acl_rules_info.py +++ b/plugins/modules/ibm_is_network_acl_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_network_acl_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_network_acl_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_network_acls_info.py b/plugins/modules/ibm_is_network_acls_info.py index 00907055e..cf1a28a1b 100644 --- a/plugins/modules/ibm_is_network_acls_info.py +++ b/plugins/modules/ibm_is_network_acls_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_network_acls' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -123,7 +123,7 @@ def run_module(): resource_type='ibm_is_network_acls', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_operating_system_info.py b/plugins/modules/ibm_is_operating_system_info.py index c6bbc2167..42889eb8a 100644 --- a/plugins/modules/ibm_is_operating_system_info.py +++ b/plugins/modules/ibm_is_operating_system_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_operating_system' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_operating_system', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_operating_systems_info.py b/plugins/modules/ibm_is_operating_systems_info.py index 807e0f59d..d91786305 100644 --- a/plugins/modules/ibm_is_operating_systems_info.py +++ b/plugins/modules/ibm_is_operating_systems_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_operating_systems' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_operating_systems', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_placement_group.py b/plugins/modules/ibm_is_placement_group.py index 919a20410..63d43c496 100644 --- a/plugins/modules/ibm_is_placement_group.py +++ b/plugins/modules/ibm_is_placement_group.py @@ -18,13 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_is_placement_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - strategy: + access_tags: description: - - (Required for new resource) The strategy for this placement group- `host_spread`: place on different compute hosts- `power_spread`: place on compute hosts that use different power sourcesThe enumerated values for this property may expand in the future. When processing this property, check for and log unknown values. Optionally halt processing and surface the error, or bypass the placement group on which the unexpected strategy was encountered. + - List of access management tags + required: False + type: list + elements: str + name: + description: + - (Required for new resource) The unique user-defined name for this placement group. If unspecified, the name will be a hyphenated list of randomly-selected words. required: True type: str resource_group: @@ -38,17 +44,11 @@ required: False type: list elements: str - name: + strategy: description: - - (Required for new resource) The unique user-defined name for this placement group. If unspecified, the name will be a hyphenated list of randomly-selected words. + - (Required for new resource) The strategy for this placement group- `host_spread`: place on different compute hosts- `power_spread`: place on compute hosts that use different power sourcesThe enumerated values for this property may expand in the future. When processing this property, check for and log unknown values. Optionally halt processing and surface the error, or bypass the placement group on which the unexpected strategy was encountered. required: True type: str - access_tags: - description: - - List of access management tags - required: False - type: list - elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,17 +95,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('strategy', 'str'), ('name', 'str'), + ('strategy', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'strategy', + 'access_tags', + 'name', 'resource_group', 'tags', - 'name', - 'access_tags', + 'strategy', ] # Params for Data source @@ -124,7 +124,11 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - strategy=dict( + access_tags=dict( + required=False, + elements='', + type='list'), + name=dict( required=False, type='str'), resource_group=dict( @@ -134,13 +138,9 @@ required=False, elements='', type='list'), - name=dict( + strategy=dict( required=False, type='str'), - access_tags=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_is_placement_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_placement_group_info.py b/plugins/modules/ibm_is_placement_group_info.py index 2d5cc4dbc..78cc0edaf 100644 --- a/plugins/modules/ibm_is_placement_group_info.py +++ b/plugins/modules/ibm_is_placement_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_placement_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_placement_groups_info.py b/plugins/modules/ibm_is_placement_groups_info.py index 82cee8eeb..c4883a04d 100644 --- a/plugins/modules/ibm_is_placement_groups_info.py +++ b/plugins/modules/ibm_is_placement_groups_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_placement_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_placement_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_public_gateway.py b/plugins/modules/ibm_is_public_gateway.py index 029fadc08..bd59f3276 100644 --- a/plugins/modules/ibm_is_public_gateway.py +++ b/plugins/modules/ibm_is_public_gateway.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_public_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - Service tags for the public gateway instance - required: False - type: list - elements: str name: description: - (Required for new resource) Name of the Public gateway instance @@ -38,21 +32,27 @@ - None required: False type: dict - zone: - description: - - (Required for new resource) Public gateway zone info - required: True - type: str resource_group: description: - Public gateway resource group info required: False type: str + zone: + description: + - (Required for new resource) Public gateway zone info + required: True + type: str vpc: description: - (Required for new resource) Public gateway VPC info required: True type: str + tags: + description: + - Service tags for the public gateway instance + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -106,12 +106,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'name', 'floating_ip', - 'zone', 'resource_group', + 'zone', 'vpc', + 'tags', ] # Params for Data source @@ -131,25 +131,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - elements='', - type='list'), name=dict( required=False, type='str'), floating_ip=dict( required=False, type='dict'), - zone=dict( + resource_group=dict( required=False, type='str'), - resource_group=dict( + zone=dict( required=False, type='str'), vpc=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_is_public_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -236,7 +236,7 @@ def run_module(): resource_type='ibm_is_public_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_public_gateway_info.py b/plugins/modules/ibm_is_public_gateway_info.py index 7435fa395..bc04d5370 100644 --- a/plugins/modules/ibm_is_public_gateway_info.py +++ b/plugins/modules/ibm_is_public_gateway_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_public_gateway' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_public_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_public_gateways_info.py b/plugins/modules/ibm_is_public_gateways_info.py index 531e3b0b6..801bae1ce 100644 --- a/plugins/modules/ibm_is_public_gateways_info.py +++ b/plugins/modules/ibm_is_public_gateways_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_public_gateways' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_public_gateways', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_region_info.py b/plugins/modules/ibm_is_region_info.py index 477c860a3..b7dd5ab08 100644 --- a/plugins/modules/ibm_is_region_info.py +++ b/plugins/modules/ibm_is_region_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_region' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -123,7 +123,7 @@ def run_module(): resource_type='ibm_is_region', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_regions_info.py b/plugins/modules/ibm_is_regions_info.py index 78264c4c2..e0cabaf39 100644 --- a/plugins/modules/ibm_is_regions_info.py +++ b/plugins/modules/ibm_is_regions_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_regions' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_regions', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_security_group.py b/plugins/modules/ibm_is_security_group.py index 7fdef75a0..7fdfd2642 100644 --- a/plugins/modules/ibm_is_security_group.py +++ b/plugins/modules/ibm_is_security_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_security_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,12 +27,6 @@ - Security group name required: False type: str - tags: - description: - - List of tags - required: False - type: list - elements: str vpc: description: - (Required for new resource) Security group's resource group id @@ -43,6 +37,12 @@ - Resource Group ID required: False type: str + tags: + description: + - List of tags + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,9 +95,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'tags', 'vpc', 'resource_group', + 'tags', ] # Params for Data source @@ -119,16 +119,16 @@ name=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), vpc=dict( required=False, type='str'), resource_group=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_is_security_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_is_security_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_security_group_info.py b/plugins/modules/ibm_is_security_group_info.py index 55d16c75d..101563fcb 100644 --- a/plugins/modules/ibm_is_security_group_info.py +++ b/plugins/modules/ibm_is_security_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_security_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_security_group_network_interface_attachment.py b/plugins/modules/ibm_is_security_group_network_interface_attachment.py index 292a0d209..7710fd6a9 100644 --- a/plugins/modules/ibm_is_security_group_network_interface_attachment.py +++ b/plugins/modules/ibm_is_security_group_network_interface_attachment.py @@ -18,18 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_is_security_group_network_interface_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - security_group: + network_interface: description: - - (Required for new resource) security group network interface attachment group ID + - (Required for new resource) security group network interface attachment NIC ID required: True type: str - network_interface: + security_group: description: - - (Required for new resource) security group network interface attachment NIC ID + - (Required for new resource) security group network interface attachment group ID required: True type: str id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('security_group', 'str'), ('network_interface', 'str'), + ('security_group', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'security_group', 'network_interface', + 'security_group', ] # Params for Data source @@ -102,10 +102,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - security_group=dict( + network_interface=dict( required=False, type='str'), - network_interface=dict( + security_group=dict( required=False, type='str'), id=dict( @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_is_security_group_network_interface_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_security_group_rule.py b/plugins/modules/ibm_is_security_group_rule.py index 6ba1b61f4..0613b5983 100644 --- a/plugins/modules/ibm_is_security_group_rule.py +++ b/plugins/modules/ibm_is_security_group_rule.py @@ -18,31 +18,32 @@ - Create, update or destroy an IBM Cloud 'ibm_is_security_group_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - direction: - description: - - (Required for new resource) Direction of traffic to enforce, either inbound or outbound - required: True - type: str ip_version: description: - IP version: ipv4 required: False type: str default: ipv4 - remote: + udp: description: - - Security group id: an IP address, a CIDR block, or a single security group identifier + - protocol=udp required: False - type: str + type: list + elements: dict group: description: - (Required for new resource) Security group id required: True type: str + remote: + description: + - Security group id: an IP address, a CIDR block, or a single security group identifier + required: False + type: str icmp: description: - protocol=icmp @@ -55,12 +56,11 @@ required: False type: list elements: dict - udp: + direction: description: - - protocol=udp - required: False - type: list - elements: dict + - (Required for new resource) Direction of traffic to enforce, either inbound or outbound + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,54 +107,55 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('direction', 'str'), ('group', 'str'), + ('direction', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'direction', 'ip_version', - 'remote', + 'udp', 'group', + 'remote', 'icmp', 'tcp', - 'udp', + 'direction', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('security_group_rule', 'str'), ('security_group', 'str'), + ('security_group_rule', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'security_group_rule', 'security_group', + 'security_group_rule', ] TL_CONFLICTS_MAP = { + 'udp': ['tcp', 'icmp'], 'icmp': ['tcp', 'udp'], 'tcp': ['udp', 'icmp'], - 'udp': ['tcp', 'icmp'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - direction=dict( - required=False, - type='str'), ip_version=dict( required=False, type='str'), - remote=dict( + udp=dict( required=False, - type='str'), + elements='', + type='list'), group=dict( required=False, type='str'), + remote=dict( + required=False, + type='str'), icmp=dict( required=False, elements='', @@ -163,10 +164,9 @@ required=False, elements='', type='list'), - udp=dict( + direction=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_is_security_group_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -253,7 +253,7 @@ def run_module(): resource_type='ibm_is_security_group_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_security_group_rule_info.py b/plugins/modules/ibm_is_security_group_rule_info.py index fad116092..63050dab7 100644 --- a/plugins/modules/ibm_is_security_group_rule_info.py +++ b/plugins/modules/ibm_is_security_group_rule_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_group_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - security_group_rule: + security_group: description: - - The rule identifier. + - The security group identifier. required: True type: str - security_group: + security_group_rule: description: - - The security group identifier. + - The rule identifier. required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('security_group_rule', 'str'), ('security_group', 'str'), + ('security_group_rule', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'security_group_rule', 'security_group', + 'security_group_rule', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - security_group_rule=dict( + security_group=dict( required=True, type='str'), - security_group=dict( + security_group_rule=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_security_group_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_security_group_rules_info.py b/plugins/modules/ibm_is_security_group_rules_info.py index a2fb5ded6..5ab79ba01 100644 --- a/plugins/modules/ibm_is_security_group_rules_info.py +++ b/plugins/modules/ibm_is_security_group_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_group_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_security_group_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_security_group_target.py b/plugins/modules/ibm_is_security_group_target.py index 43f21471d..1bda13b6e 100644 --- a/plugins/modules/ibm_is_security_group_target.py +++ b/plugins/modules/ibm_is_security_group_target.py @@ -18,18 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_is_security_group_target' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - target: + security_group: description: - - (Required for new resource) security group target identifier + - (Required for new resource) Security group id required: True type: str - security_group: + target: description: - - (Required for new resource) Security group id + - (Required for new resource) security group target identifier required: True type: str id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('target', 'str'), ('security_group', 'str'), + ('target', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'target', 'security_group', + 'target', ] # Params for Data source @@ -106,10 +106,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - target=dict( + security_group=dict( required=False, type='str'), - security_group=dict( + target=dict( required=False, type='str'), id=dict( @@ -189,7 +189,7 @@ def run_module(): resource_type='ibm_is_security_group_target', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -198,7 +198,7 @@ def run_module(): resource_type='ibm_is_security_group_target', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_security_group_target_info.py b/plugins/modules/ibm_is_security_group_target_info.py index 8730742b4..f28513c3a 100644 --- a/plugins/modules/ibm_is_security_group_target_info.py +++ b/plugins/modules/ibm_is_security_group_target_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_group_target' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_security_group_target', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_security_group_targets_info.py b/plugins/modules/ibm_is_security_group_targets_info.py index 9138f72f0..861889503 100644 --- a/plugins/modules/ibm_is_security_group_targets_info.py +++ b/plugins/modules/ibm_is_security_group_targets_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_group_targets' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_security_group_targets', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_security_groups_info.py b/plugins/modules/ibm_is_security_groups_info.py index 03a2d51f0..65daed909 100644 --- a/plugins/modules/ibm_is_security_groups_info.py +++ b/plugins/modules/ibm_is_security_groups_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + vpc_name: + description: + - vpc name. + required: False + type: str resource_group: description: - resource group identifier. @@ -36,11 +41,6 @@ - vpc crn required: False type: str - vpc_name: - description: - - vpc name. - required: False - type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -78,10 +78,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'vpc_name', 'resource_group', 'vpc_id', 'vpc_crn', - 'vpc_name', ] @@ -92,6 +92,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + vpc_name=dict( + required=False, + type='str'), resource_group=dict( required=False, type='str'), @@ -101,9 +104,6 @@ vpc_crn=dict( required=False, type='str'), - vpc_name=dict( - required=False, - type='str'), generation=dict( type='int', required=False, @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_is_security_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_snapshot.py b/plugins/modules/ibm_is_snapshot.py index da76ee0c5..a6e41c569 100644 --- a/plugins/modules/ibm_is_snapshot.py +++ b/plugins/modules/ibm_is_snapshot.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_snapshot' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -98,8 +98,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'identifier', 'name', + 'identifier', ] TL_CONFLICTS_MAP = { @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_is_snapshot', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_is_snapshot', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_snapshot_info.py b/plugins/modules/ibm_is_snapshot_info.py index e9fc79887..8638d5f51 100644 --- a/plugins/modules/ibm_is_snapshot_info.py +++ b/plugins/modules/ibm_is_snapshot_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_snapshot' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - identifier: + name: description: - - Snapshot identifier + - Snapshot name required: False type: str - name: + identifier: description: - - Snapshot name + - Snapshot identifier required: False type: str generation: @@ -68,8 +68,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'identifier', 'name', + 'identifier', ] @@ -80,10 +80,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - identifier=dict( + name=dict( required=False, type='str'), - name=dict( + identifier=dict( required=False, type='str'), generation=dict( @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_snapshot', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_snapshots_info.py b/plugins/modules/ibm_is_snapshots_info.py index 7c3055104..dcba1b433 100644 --- a/plugins/modules/ibm_is_snapshots_info.py +++ b/plugins/modules/ibm_is_snapshots_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_snapshots' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_is_snapshots', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_ssh_key.py b/plugins/modules/ibm_is_ssh_key.py index 4b357eb13..e8c00b9d2 100644 --- a/plugins/modules/ibm_is_ssh_key.py +++ b/plugins/modules/ibm_is_ssh_key.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_ssh_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -32,17 +32,17 @@ - (Required for new resource) SSH Public key data required: True type: str - resource_group: - description: - - Resource group ID - required: False - type: str tags: description: - List of tags for SSH key required: False type: list elements: str + resource_group: + description: + - Resource group ID + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -97,8 +97,8 @@ TL_ALL_PARAMETERS = [ 'name', 'public_key', - 'resource_group', 'tags', + 'resource_group', ] # Params for Data source @@ -124,13 +124,13 @@ public_key=dict( required=False, type='str'), - resource_group=dict( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), + resource_group=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -208,7 +208,7 @@ def run_module(): resource_type='ibm_is_ssh_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_is_ssh_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_ssh_key_info.py b/plugins/modules/ibm_is_ssh_key_info.py index 273149357..2c9bf8a6b 100644 --- a/plugins/modules/ibm_is_ssh_key_info.py +++ b/plugins/modules/ibm_is_ssh_key_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_ssh_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_ssh_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_ssh_keys_info.py b/plugins/modules/ibm_is_ssh_keys_info.py index e9ed49f11..e76fd512e 100644 --- a/plugins/modules/ibm_is_ssh_keys_info.py +++ b/plugins/modules/ibm_is_ssh_keys_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_ssh_keys' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_ssh_keys', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_subnet.py b/plugins/modules/ibm_is_subnet.py index aab4179e9..493c2dca8 100644 --- a/plugins/modules/ibm_is_subnet.py +++ b/plugins/modules/ibm_is_subnet.py @@ -18,73 +18,73 @@ - Create, update or destroy an IBM Cloud 'ibm_is_subnet' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - total_ipv4_address_count: - description: - - The total number of IPv4 addresses in this subnet. - required: False - type: int - name: - description: - - (Required for new resource) Subnet name - required: True - type: str tags: description: - List of tags required: False type: list elements: str - ipv4_cidr_block: - description: - - IPV4 subnet - CIDR block - required: False - type: str vpc: description: - (Required for new resource) VPC instance ID required: True type: str - zone: + resource_group: description: - - (Required for new resource) Subnet zone info - required: True + - The resource group for this subnet + required: False type: str routing_table: description: - routing table id that is associated with the subnet required: False type: str - ip_version: - description: - - The IP version(s) to support for this subnet. - required: False - type: str - default: ipv4 access_tags: description: - List of access management tags required: False type: list elements: str + public_gateway: + description: + - Public Gateway of the subnet + required: False + type: str + zone: + description: + - (Required for new resource) Subnet zone info + required: True + type: str network_acl: description: - The network ACL for this subnet required: False type: str - public_gateway: + total_ipv4_address_count: description: - - Public Gateway of the subnet + - The total number of IPv4 addresses in this subnet. required: False + type: int + name: + description: + - (Required for new resource) Subnet name + required: True type: str - resource_group: + ipv4_cidr_block: description: - - The resource group for this subnet + - IPV4 subnet - CIDR block + required: False + type: str + ip_version: + description: + - The IP version(s) to support for this subnet. required: False type: str + default: ipv4 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -131,25 +131,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('vpc', 'str'), ('zone', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'total_ipv4_address_count', - 'name', 'tags', - 'ipv4_cidr_block', 'vpc', - 'zone', + 'resource_group', 'routing_table', - 'ip_version', 'access_tags', - 'network_acl', 'public_gateway', - 'resource_group', + 'zone', + 'network_acl', + 'total_ipv4_address_count', + 'name', + 'ipv4_cidr_block', + 'ip_version', ] # Params for Data source @@ -170,42 +170,42 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - total_ipv4_address_count=dict( - required=False, - type='int'), - name=dict( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), - ipv4_cidr_block=dict( - required=False, - type='str'), vpc=dict( required=False, type='str'), - zone=dict( + resource_group=dict( required=False, type='str'), routing_table=dict( required=False, type='str'), - ip_version=dict( - required=False, - type='str'), access_tags=dict( required=False, elements='', type='list'), + public_gateway=dict( + required=False, + type='str'), + zone=dict( + required=False, + type='str'), network_acl=dict( required=False, type='str'), - public_gateway=dict( + total_ipv4_address_count=dict( + required=False, + type='int'), + name=dict( required=False, type='str'), - resource_group=dict( + ipv4_cidr_block=dict( + required=False, + type='str'), + ip_version=dict( required=False, type='str'), id=dict( @@ -285,7 +285,7 @@ def run_module(): resource_type='ibm_is_subnet', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -294,7 +294,7 @@ def run_module(): resource_type='ibm_is_subnet', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_subnet_info.py b/plugins/modules/ibm_is_subnet_info.py index fddb8f316..65264faae 100644 --- a/plugins/modules/ibm_is_subnet_info.py +++ b/plugins/modules/ibm_is_subnet_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_subnet' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_subnet', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_subnet_network_acl_attachment.py b/plugins/modules/ibm_is_subnet_network_acl_attachment.py index 7293c9bf6..e98e59403 100644 --- a/plugins/modules/ibm_is_subnet_network_acl_attachment.py +++ b/plugins/modules/ibm_is_subnet_network_acl_attachment.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_subnet_network_acl_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_is_subnet_network_acl_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_subnet_public_gateway_attachment.py b/plugins/modules/ibm_is_subnet_public_gateway_attachment.py index 9a802129b..d933f46d8 100644 --- a/plugins/modules/ibm_is_subnet_public_gateway_attachment.py +++ b/plugins/modules/ibm_is_subnet_public_gateway_attachment.py @@ -18,18 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_is_subnet_public_gateway_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - public_gateway: + subnet: description: - - (Required for new resource) The unique identifier of public gateway + - (Required for new resource) The subnet identifier required: True type: str - subnet: + public_gateway: description: - - (Required for new resource) The subnet identifier + - (Required for new resource) The unique identifier of public gateway required: True type: str id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('public_gateway', 'str'), ('subnet', 'str'), + ('public_gateway', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'public_gateway', 'subnet', + 'public_gateway', ] # Params for Data source @@ -102,10 +102,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - public_gateway=dict( + subnet=dict( required=False, type='str'), - subnet=dict( + public_gateway=dict( required=False, type='str'), id=dict( @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_is_subnet_public_gateway_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_subnet_reserved_ip.py b/plugins/modules/ibm_is_subnet_reserved_ip.py index dcaef118c..70fb45e20 100644 --- a/plugins/modules/ibm_is_subnet_reserved_ip.py +++ b/plugins/modules/ibm_is_subnet_reserved_ip.py @@ -18,25 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_is_subnet_reserved_ip' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - address: - description: - - The address for this reserved IP. - required: False - type: str name: description: - The user-defined or system-provided name for this reserved IP. required: False type: str - target: - description: - - The unique identifier for target. - required: False - type: str subnet: description: - (Required for new resource) The subnet identifier. @@ -47,6 +37,16 @@ - If set to true, this reserved IP will be automatically deleted required: False type: bool + target: + description: + - The unique identifier for target. + required: False + type: str + address: + description: + - The address for this reserved IP. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -98,11 +98,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'address', 'name', - 'target', 'subnet', 'auto_delete', + 'target', + 'address', ] # Params for Data source @@ -123,21 +123,21 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - address=dict( - required=False, - type='str'), name=dict( required=False, type='str'), - target=dict( - required=False, - type='str'), subnet=dict( required=False, type='str'), auto_delete=dict( required=False, type='bool'), + target=dict( + required=False, + type='str'), + address=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_is_subnet_reserved_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_is_subnet_reserved_ip', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_subnet_reserved_ip_info.py b/plugins/modules/ibm_is_subnet_reserved_ip_info.py index e2ff8de28..40930e275 100644 --- a/plugins/modules/ibm_is_subnet_reserved_ip_info.py +++ b/plugins/modules/ibm_is_subnet_reserved_ip_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_subnet_reserved_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_subnet_reserved_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_subnet_reserved_ips_info.py b/plugins/modules/ibm_is_subnet_reserved_ips_info.py index 8d77286d7..5193e35ca 100644 --- a/plugins/modules/ibm_is_subnet_reserved_ips_info.py +++ b/plugins/modules/ibm_is_subnet_reserved_ips_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_subnet_reserved_ips' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_subnet_reserved_ips', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_subnet_routing_table_attachment.py b/plugins/modules/ibm_is_subnet_routing_table_attachment.py index ee6ed296e..be02c9a8b 100644 --- a/plugins/modules/ibm_is_subnet_routing_table_attachment.py +++ b/plugins/modules/ibm_is_subnet_routing_table_attachment.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_subnet_routing_table_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_is_subnet_routing_table_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_subnets_info.py b/plugins/modules/ibm_is_subnets_info.py index be17ade44..6ea82e851 100644 --- a/plugins/modules/ibm_is_subnets_info.py +++ b/plugins/modules/ibm_is_subnets_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_subnets' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_is_subnets', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_virtual_endpoint_gateway.py b/plugins/modules/ibm_is_virtual_endpoint_gateway.py index 0204a1beb..ae225d0ec 100644 --- a/plugins/modules/ibm_is_virtual_endpoint_gateway.py +++ b/plugins/modules/ibm_is_virtual_endpoint_gateway.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_virtual_endpoint_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - List of tags for VPE - required: False - type: list - elements: str name: description: - (Required for new resource) Endpoint gateway name @@ -44,11 +38,6 @@ required: False type: list elements: str - vpc: - description: - - (Required for new resource) The VPC id - required: True - type: str ips: description: - Endpoint gateway IPs @@ -61,6 +50,17 @@ required: True type: list elements: dict + vpc: + description: + - (Required for new resource) The VPC id + required: True + type: str + tags: + description: + - List of tags for VPE + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -108,19 +108,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('name', 'str'), - ('vpc', 'str'), ('target', 'list'), + ('vpc', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'name', 'resource_group', 'security_groups', - 'vpc', 'ips', 'target', + 'vpc', + 'tags', ] # Params for Data source @@ -139,10 +139,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - elements='', - type='list'), name=dict( required=False, type='str'), @@ -153,9 +149,6 @@ required=False, elements='', type='list'), - vpc=dict( - required=False, - type='str'), ips=dict( required=False, elements='', @@ -164,6 +157,13 @@ required=False, elements='', type='list'), + vpc=dict( + required=False, + type='str'), + tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -241,7 +241,7 @@ def run_module(): resource_type='ibm_is_virtual_endpoint_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -250,7 +250,7 @@ def run_module(): resource_type='ibm_is_virtual_endpoint_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_virtual_endpoint_gateway_info.py b/plugins/modules/ibm_is_virtual_endpoint_gateway_info.py index ab88f10a9..9ada1ae89 100644 --- a/plugins/modules/ibm_is_virtual_endpoint_gateway_info.py +++ b/plugins/modules/ibm_is_virtual_endpoint_gateway_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_virtual_endpoint_gateway' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_virtual_endpoint_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_virtual_endpoint_gateway_ip.py b/plugins/modules/ibm_is_virtual_endpoint_gateway_ip.py index 1878e1a7b..934822dca 100644 --- a/plugins/modules/ibm_is_virtual_endpoint_gateway_ip.py +++ b/plugins/modules/ibm_is_virtual_endpoint_gateway_ip.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_virtual_endpoint_gateway_ip' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_is_virtual_endpoint_gateway_ip', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_virtual_endpoint_gateway_ips_info.py b/plugins/modules/ibm_is_virtual_endpoint_gateway_ips_info.py index a206e348d..1c9f6e0b6 100644 --- a/plugins/modules/ibm_is_virtual_endpoint_gateway_ips_info.py +++ b/plugins/modules/ibm_is_virtual_endpoint_gateway_ips_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_virtual_endpoint_gateway_ips' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_virtual_endpoint_gateway_ips', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_virtual_endpoint_gateways_info.py b/plugins/modules/ibm_is_virtual_endpoint_gateways_info.py index 1eeeb0dc3..53e4c6206 100644 --- a/plugins/modules/ibm_is_virtual_endpoint_gateways_info.py +++ b/plugins/modules/ibm_is_virtual_endpoint_gateways_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_virtual_endpoint_gateways' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_virtual_endpoint_gateways', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_volume.py b/plugins/modules/ibm_is_volume.py index 2d383f5e9..dfcf11328 100644 --- a/plugins/modules/ibm_is_volume.py +++ b/plugins/modules/ibm_is_volume.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_volume' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - profile: - description: - - (Required for new resource) Volume profile name - required: True - type: str encryption_key: description: - Volume encryption key info @@ -43,21 +38,16 @@ required: False type: int default: 100 - resource_group: + iops: description: - - Resource group name + - IOPS value for the Volume required: False - type: str + type: int zone: description: - (Required for new resource) Zone name required: True type: str - iops: - description: - - IOPS value for the Volume - required: False - type: int delete_all_snapshots: description: - Deletes all snapshots created from this volume @@ -69,6 +59,16 @@ required: False type: list elements: str + profile: + description: + - (Required for new resource) Volume profile name + required: True + type: str + resource_group: + description: + - Resource group name + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -115,22 +115,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('profile', 'str'), ('name', 'str'), ('zone', 'str'), + ('profile', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'profile', 'encryption_key', 'name', 'capacity', - 'resource_group', - 'zone', 'iops', + 'zone', 'delete_all_snapshots', 'tags', + 'profile', + 'resource_group', ] # Params for Data source @@ -150,9 +150,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - profile=dict( - required=False, - type='str'), encryption_key=dict( required=False, type='str'), @@ -162,15 +159,12 @@ capacity=dict( required=False, type='int'), - resource_group=dict( + iops=dict( required=False, - type='str'), + type='int'), zone=dict( required=False, type='str'), - iops=dict( - required=False, - type='int'), delete_all_snapshots=dict( required=False, type='bool'), @@ -178,6 +172,12 @@ required=False, elements='', type='list'), + profile=dict( + required=False, + type='str'), + resource_group=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -255,7 +255,7 @@ def run_module(): resource_type='ibm_is_volume', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -264,7 +264,7 @@ def run_module(): resource_type='ibm_is_volume', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_volume_info.py b/plugins/modules/ibm_is_volume_info.py index bb0f4e0ef..445a4e0c1 100644 --- a/plugins/modules/ibm_is_volume_info.py +++ b/plugins/modules/ibm_is_volume_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_volume' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_volume', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_volume_profile_info.py b/plugins/modules/ibm_is_volume_profile_info.py index 701c5b90e..e8d81c5c1 100644 --- a/plugins/modules/ibm_is_volume_profile_info.py +++ b/plugins/modules/ibm_is_volume_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_volume_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_volume_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_volume_profiles_info.py b/plugins/modules/ibm_is_volume_profiles_info.py index 8b1ea4e8c..1aef3011d 100644 --- a/plugins/modules/ibm_is_volume_profiles_info.py +++ b/plugins/modules/ibm_is_volume_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_volume_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_volume_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_volumes_info.py b/plugins/modules/ibm_is_volumes_info.py index ce7816d19..3d7377900 100644 --- a/plugins/modules/ibm_is_volumes_info.py +++ b/plugins/modules/ibm_is_volumes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_volumes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_volumes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc.py b/plugins/modules/ibm_is_vpc.py index 5499cf3ea..dc765734f 100644 --- a/plugins/modules/ibm_is_vpc.py +++ b/plugins/modules/ibm_is_vpc.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - address_prefix_management: - description: - - Address Prefix management value - required: False - type: str - default: auto default_security_group_name: description: - Default security group name @@ -38,33 +32,39 @@ - Default routing table name required: False type: str - resource_group: - description: - - Resource group info - required: False - type: str classic_access: description: - Set to true if classic access needs to enabled to VPC required: False type: bool default: False - default_network_acl_name: - description: - - Default Network ACL name - required: False - type: str tags: description: - List of tags required: False type: list elements: str + address_prefix_management: + description: + - Address Prefix management value + required: False + type: str + default: auto name: description: - (Required for new resource) VPC name required: True type: str + resource_group: + description: + - Resource group info + required: False + type: str + default_network_acl_name: + description: + - Default Network ACL name + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -116,14 +116,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'address_prefix_management', 'default_security_group_name', 'default_routing_table_name', - 'resource_group', 'classic_access', - 'default_network_acl_name', 'tags', + 'address_prefix_management', 'name', + 'resource_group', + 'default_network_acl_name', ] # Params for Data source @@ -142,31 +142,31 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - address_prefix_management=dict( - required=False, - type='str'), default_security_group_name=dict( required=False, type='str'), default_routing_table_name=dict( required=False, type='str'), - resource_group=dict( - required=False, - type='str'), classic_access=dict( required=False, type='bool'), - default_network_acl_name=dict( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), + address_prefix_management=dict( + required=False, + type='str'), name=dict( required=False, type='str'), + resource_group=dict( + required=False, + type='str'), + default_network_acl_name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_is_vpc', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -253,7 +253,7 @@ def run_module(): resource_type='ibm_is_vpc', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_vpc_address_prefix.py b/plugins/modules/ibm_is_vpc_address_prefix.py index 8075978a5..07a072a2e 100644 --- a/plugins/modules/ibm_is_vpc_address_prefix.py +++ b/plugins/modules/ibm_is_vpc_address_prefix.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc_address_prefix' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + is_default: + description: + - Is default prefix for this zone in this VPC + required: False + type: bool + default: False + vpc: + description: + - (Required for new resource) VPC id + required: True + type: str name: description: - (Required for new resource) Name @@ -37,17 +48,6 @@ - (Required for new resource) CIDIR address prefix required: True type: str - is_default: - description: - - Is default prefix for this zone in this VPC - required: False - type: bool - default: False - vpc: - description: - - (Required for new resource) VPC id - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,19 +94,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('vpc', 'str'), ('name', 'str'), ('zone', 'str'), ('cidr', 'str'), - ('vpc', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'is_default', + 'vpc', 'name', 'zone', 'cidr', - 'is_default', - 'vpc', ] # Params for Data source @@ -114,10 +114,10 @@ ] TL_ALL_PARAMETERS_DS = [ + 'address_prefix_name', 'vpc', 'vpc_name', 'address_prefix', - 'address_prefix_name', ] TL_CONFLICTS_MAP = { @@ -127,6 +127,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + is_default=dict( + required=False, + type='bool'), + vpc=dict( + required=False, + type='str'), name=dict( required=False, type='str'), @@ -136,12 +142,6 @@ cidr=dict( required=False, type='str'), - is_default=dict( - required=False, - type='bool'), - vpc=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -219,7 +219,7 @@ def run_module(): resource_type='ibm_is_vpc_address_prefix', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -228,7 +228,7 @@ def run_module(): resource_type='ibm_is_vpc_address_prefix', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_vpc_address_prefix_info.py b/plugins/modules/ibm_is_vpc_address_prefix_info.py index ed05543d9..c68979b3f 100644 --- a/plugins/modules/ibm_is_vpc_address_prefix_info.py +++ b/plugins/modules/ibm_is_vpc_address_prefix_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_address_prefix' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + address_prefix_name: + description: + - The address prefix name. + required: False + type: str vpc: description: - The VPC identifier. @@ -36,11 +41,6 @@ - The address prefix identifier. required: False type: str - address_prefix_name: - description: - - The address prefix name. - required: False - type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -78,10 +78,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'address_prefix_name', 'vpc', 'vpc_name', 'address_prefix', - 'address_prefix_name', ] @@ -92,6 +92,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + address_prefix_name=dict( + required=False, + type='str'), vpc=dict( required=False, type='str'), @@ -101,9 +104,6 @@ address_prefix=dict( required=False, type='str'), - address_prefix_name=dict( - required=False, - type='str'), generation=dict( type='int', required=False, @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_is_vpc_address_prefix', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_address_prefixes_info.py b/plugins/modules/ibm_is_vpc_address_prefixes_info.py index 8aea8865d..4b1be5518 100644 --- a/plugins/modules/ibm_is_vpc_address_prefixes_info.py +++ b/plugins/modules/ibm_is_vpc_address_prefixes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_address_prefixes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_vpc_address_prefixes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_default_routing_table_info.py b/plugins/modules/ibm_is_vpc_default_routing_table_info.py index d9bf1b5f7..6d49d1eb8 100644 --- a/plugins/modules/ibm_is_vpc_default_routing_table_info.py +++ b/plugins/modules/ibm_is_vpc_default_routing_table_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_default_routing_table' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_vpc_default_routing_table', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_info.py b/plugins/modules/ibm_is_vpc_info.py index cd16fc024..28be58d41 100644 --- a/plugins/modules/ibm_is_vpc_info.py +++ b/plugins/modules/ibm_is_vpc_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_vpc', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_route.py b/plugins/modules/ibm_is_vpc_route.py index 96bf47c24..6cc7cbbd4 100644 --- a/plugins/modules/ibm_is_vpc_route.py +++ b/plugins/modules/ibm_is_vpc_route.py @@ -18,20 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc_route' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - vpc: - description: - - (Required for new resource) VPC instance ID - required: True - type: str - next_hop: - description: - - (Required for new resource) VPC route next hop value - required: True - type: str name: description: - (Required for new resource) VPC route name @@ -47,6 +37,16 @@ - (Required for new resource) VPC route destination CIDR value required: True type: str + vpc: + description: + - (Required for new resource) VPC instance ID + required: True + type: str + next_hop: + description: + - (Required for new resource) VPC route next hop value + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -93,20 +93,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('vpc', 'str'), - ('next_hop', 'str'), ('name', 'str'), ('zone', 'str'), ('destination', 'str'), + ('vpc', 'str'), + ('next_hop', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'vpc', - 'next_hop', 'name', 'zone', 'destination', + 'vpc', + 'next_hop', ] # Params for Data source @@ -123,19 +123,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - vpc=dict( + name=dict( required=False, type='str'), - next_hop=dict( + zone=dict( required=False, type='str'), - name=dict( + destination=dict( required=False, type='str'), - zone=dict( + vpc=dict( required=False, type='str'), - destination=dict( + next_hop=dict( required=False, type='str'), id=dict( @@ -215,7 +215,7 @@ def run_module(): resource_type='ibm_is_vpc_route', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_routing_table.py b/plugins/modules/ibm_is_vpc_routing_table.py index 8745e7bec..7e15b7c6f 100644 --- a/plugins/modules/ibm_is_vpc_routing_table.py +++ b/plugins/modules/ibm_is_vpc_routing_table.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc_routing_table' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -115,8 +115,8 @@ TL_ALL_PARAMETERS_DS = [ 'name', - 'routing_table', 'vpc', + 'routing_table', ] TL_CONFLICTS_MAP = { @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_vpc_routing_table_info.py b/plugins/modules/ibm_is_vpc_routing_table_info.py index 48fa3809d..3dc77b10c 100644 --- a/plugins/modules/ibm_is_vpc_routing_table_info.py +++ b/plugins/modules/ibm_is_vpc_routing_table_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_routing_table' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,16 +26,16 @@ - The user-defined name for this routing table. required: False type: str - routing_table: - description: - - The routing table identifier. - required: False - type: str vpc: description: - The VPC identifier. required: True type: str + routing_table: + description: + - The routing table identifier. + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -75,8 +75,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'routing_table', 'vpc', + 'routing_table', ] @@ -92,12 +92,12 @@ name=dict( required=False, type='str'), - routing_table=dict( - required=False, - type='str'), vpc=dict( required=True, type='str'), + routing_table=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_routing_table_route.py b/plugins/modules/ibm_is_vpc_routing_table_route.py index 0cabe2bae..0a0b8beda 100644 --- a/plugins/modules/ibm_is_vpc_routing_table_route.py +++ b/plugins/modules/ibm_is_vpc_routing_table_route.py @@ -18,34 +18,23 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc_routing_table_route' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - action: - description: - - The action to perform with a packet matching the route. - required: False - type: str - default: deliver - routing_table: - description: - - (Required for new resource) The routing table identifier. - required: True - type: str vpc: description: - (Required for new resource) The VPC identifier. required: True type: str - destination: + zone: description: - - (Required for new resource) The destination of the route. + - (Required for new resource) The zone to apply the route to. Traffic from subnets in this zone will be subject to this route. required: True type: str - zone: + routing_table: description: - - (Required for new resource) The zone to apply the route to. Traffic from subnets in this zone will be subject to this route. + - (Required for new resource) The routing table identifier. required: True type: str next_hop: @@ -53,11 +42,22 @@ - (Required for new resource) If action is deliver, the next hop that packets will be delivered to. For other action values, its address will be 0.0.0.0. required: True type: str + action: + description: + - The action to perform with a packet matching the route. + required: False + type: str + default: deliver name: description: - The user-defined name for this route. required: False type: str + destination: + description: + - (Required for new resource) The destination of the route. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,35 +104,35 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('routing_table', 'str'), ('vpc', 'str'), - ('destination', 'str'), ('zone', 'str'), + ('routing_table', 'str'), ('next_hop', 'str'), + ('destination', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'action', - 'routing_table', 'vpc', - 'destination', 'zone', + 'routing_table', 'next_hop', + 'action', 'name', + 'destination', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('vpc', 'str'), ('routing_table', 'str'), + ('vpc', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'vpc', 'routing_table', - 'route_id', 'name', + 'vpc', + 'route_id', ] TL_CONFLICTS_MAP = { @@ -142,25 +142,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - action=dict( + vpc=dict( required=False, type='str'), - routing_table=dict( + zone=dict( required=False, type='str'), - vpc=dict( + routing_table=dict( required=False, type='str'), - destination=dict( + next_hop=dict( required=False, type='str'), - zone=dict( + action=dict( required=False, type='str'), - next_hop=dict( + name=dict( required=False, type='str'), - name=dict( + destination=dict( required=False, type='str'), id=dict( @@ -240,7 +240,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table_route', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -249,7 +249,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table_route', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_vpc_routing_table_route_info.py b/plugins/modules/ibm_is_vpc_routing_table_route_info.py index 4855dd645..a1e92b009 100644 --- a/plugins/modules/ibm_is_vpc_routing_table_route_info.py +++ b/plugins/modules/ibm_is_vpc_routing_table_route_info.py @@ -17,28 +17,28 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_routing_table_route' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - vpc: - description: - - The VPC identifier. - required: True - type: str routing_table: description: - The routing table identifier. required: True type: str - route_id: + name: description: - - The VPC routing table route identifier. + - The user-defined name for this route. required: False type: str - name: + vpc: description: - - The user-defined name for this route. + - The VPC identifier. + required: True + type: str + route_id: + description: + - The VPC routing table route identifier. required: False type: str generation: @@ -74,38 +74,38 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('vpc', 'str'), ('routing_table', 'str'), + ('vpc', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'vpc', 'routing_table', - 'route_id', 'name', + 'vpc', + 'route_id', ] TL_CONFLICTS_MAP = { - 'route_id': ['name'], 'name': ['route_id'], + 'route_id': ['name'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - vpc=dict( - required=True, - type='str'), routing_table=dict( required=True, type='str'), - route_id=dict( + name=dict( required=False, type='str'), - name=dict( + vpc=dict( + required=True, + type='str'), + route_id=dict( required=False, type='str'), generation=dict( @@ -154,7 +154,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table_route', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_routing_table_routes_info.py b/plugins/modules/ibm_is_vpc_routing_table_routes_info.py index f8e86f3c3..e7b1feb41 100644 --- a/plugins/modules/ibm_is_vpc_routing_table_routes_info.py +++ b/plugins/modules/ibm_is_vpc_routing_table_routes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_routing_table_routes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table_routes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpc_routing_tables_info.py b/plugins/modules/ibm_is_vpc_routing_tables_info.py index 313ea8247..21c2f1a5b 100644 --- a/plugins/modules/ibm_is_vpc_routing_tables_info.py +++ b/plugins/modules/ibm_is_vpc_routing_tables_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_routing_tables' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_tables', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpcs_info.py b/plugins/modules/ibm_is_vpcs_info.py index d1c2c02f8..8a12472d7 100644 --- a/plugins/modules/ibm_is_vpcs_info.py +++ b/plugins/modules/ibm_is_vpcs_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpcs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_vpcs', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpn_gateway.py b/plugins/modules/ibm_is_vpn_gateway.py index d0e115b06..5cf0b741c 100644 --- a/plugins/modules/ibm_is_vpn_gateway.py +++ b/plugins/modules/ibm_is_vpn_gateway.py @@ -18,24 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpn_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - subnet: - description: - - (Required for new resource) VPNGateway subnet info - required: True - type: str tags: description: - VPN Gateway tags list required: False type: list elements: str - name: + subnet: description: - - (Required for new resource) VPN Gateway instance name + - (Required for new resource) VPNGateway subnet info required: True type: str resource_group: @@ -43,6 +38,11 @@ - The resource group for this VPN gateway required: False type: str + name: + description: + - (Required for new resource) VPN Gateway instance name + required: True + type: str mode: description: - mode in VPN gateway(route/policy) @@ -101,10 +101,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'subnet', 'tags', - 'name', + 'subnet', 'resource_group', + 'name', 'mode', ] @@ -113,8 +113,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'vpn_gateway_name', 'vpn_gateway', + 'vpn_gateway_name', ] TL_CONFLICTS_MAP = { @@ -124,19 +124,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - subnet=dict( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), - name=dict( + subnet=dict( required=False, type='str'), resource_group=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), mode=dict( required=False, type='str'), @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_is_vpn_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_is_vpn_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_vpn_gateway_connection.py b/plugins/modules/ibm_is_vpn_gateway_connection.py index 6fc789fa8..6d24a432a 100644 --- a/plugins/modules/ibm_is_vpn_gateway_connection.py +++ b/plugins/modules/ibm_is_vpn_gateway_connection.py @@ -18,76 +18,76 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpn_gateway_connection' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - interval: + vpn_gateway: description: - - Interval for dead peer detection interval - required: False - type: int - default: 2 - name: + - (Required for new resource) VPN Gateway info + required: True + type: str + peer_address: description: - - (Required for new resource) VPN Gateway connection name + - (Required for new resource) VPN gateway connection peer address required: True type: str - vpn_gateway: + preshared_key: description: - - (Required for new resource) VPN Gateway info + - (Required for new resource) vpn gateway required: True type: str - local_cidrs: + peer_cidrs: description: - - VPN gateway connection local CIDRs + - VPN gateway connection peer CIDRs required: False type: list elements: str - action: + ipsec_policy: description: - - Action detection for dead peer detection action + - IP security policy for vpn gateway connection required: False type: str - default: restart ike_policy: description: - VPN gateway connection IKE Policy required: False type: str - peer_address: - description: - - (Required for new resource) VPN gateway connection peer address - required: True - type: str - peer_cidrs: + local_cidrs: description: - - VPN gateway connection peer CIDRs + - VPN gateway connection local CIDRs required: False type: list elements: str - preshared_key: + action: description: - - (Required for new resource) vpn gateway - required: True + - Action detection for dead peer detection action + required: False type: str + default: restart + interval: + description: + - Interval for dead peer detection interval + required: False + type: int + default: 2 admin_state_up: description: - VPN gateway connection admin state required: False type: bool default: False + name: + description: + - (Required for new resource) VPN Gateway connection name + required: True + type: str timeout: description: - Timeout for dead peer detection required: False type: int default: 10 - ipsec_policy: - description: - - IP security policy for vpn gateway connection - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -134,26 +134,26 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('vpn_gateway', 'str'), ('peer_address', 'str'), ('preshared_key', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'interval', - 'name', 'vpn_gateway', - 'local_cidrs', - 'action', - 'ike_policy', 'peer_address', - 'peer_cidrs', 'preshared_key', + 'peer_cidrs', + 'ipsec_policy', + 'ike_policy', + 'local_cidrs', + 'action', + 'interval', 'admin_state_up', + 'name', 'timeout', - 'ipsec_policy', ] # Params for Data source @@ -162,8 +162,8 @@ TL_ALL_PARAMETERS_DS = [ 'vpn_gateway_connection', - 'vpn_gateway_connection_name', 'vpn_gateway', + 'vpn_gateway_connection_name', 'vpn_gateway_name', ] @@ -174,44 +174,44 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - interval=dict( + vpn_gateway=dict( required=False, - type='int'), - name=dict( + type='str'), + peer_address=dict( required=False, type='str'), - vpn_gateway=dict( + preshared_key=dict( required=False, type='str'), - local_cidrs=dict( + peer_cidrs=dict( required=False, elements='', type='list'), - action=dict( + ipsec_policy=dict( required=False, type='str'), ike_policy=dict( required=False, type='str'), - peer_address=dict( - required=False, - type='str'), - peer_cidrs=dict( + local_cidrs=dict( required=False, elements='', type='list'), - preshared_key=dict( + action=dict( required=False, type='str'), + interval=dict( + required=False, + type='int'), admin_state_up=dict( required=False, type='bool'), + name=dict( + required=False, + type='str'), timeout=dict( required=False, type='int'), - ipsec_policy=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -289,7 +289,7 @@ def run_module(): resource_type='ibm_is_vpn_gateway_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -298,7 +298,7 @@ def run_module(): resource_type='ibm_is_vpn_gateway_connection', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_is_vpn_gateway_connection_info.py b/plugins/modules/ibm_is_vpn_gateway_connection_info.py index e155f46dc..6555d87a3 100644 --- a/plugins/modules/ibm_is_vpn_gateway_connection_info.py +++ b/plugins/modules/ibm_is_vpn_gateway_connection_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpn_gateway_connection' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,14 +26,14 @@ - The VPN gateway connection identifier. required: False type: str - vpn_gateway_connection_name: + vpn_gateway: description: - - The VPN gateway connection name. + - The VPN gateway identifier. required: False type: str - vpn_gateway: + vpn_gateway_connection_name: description: - - The VPN gateway identifier. + - The VPN gateway connection name. required: False type: str vpn_gateway_name: @@ -79,8 +79,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'vpn_gateway_connection', - 'vpn_gateway_connection_name', 'vpn_gateway', + 'vpn_gateway_connection_name', 'vpn_gateway_name', ] @@ -95,10 +95,10 @@ vpn_gateway_connection=dict( required=False, type='str'), - vpn_gateway_connection_name=dict( + vpn_gateway=dict( required=False, type='str'), - vpn_gateway=dict( + vpn_gateway_connection_name=dict( required=False, type='str'), vpn_gateway_name=dict( @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_is_vpn_gateway_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpn_gateway_connections_info.py b/plugins/modules/ibm_is_vpn_gateway_connections_info.py index 9db1e6cc1..841cbb71f 100644 --- a/plugins/modules/ibm_is_vpn_gateway_connections_info.py +++ b/plugins/modules/ibm_is_vpn_gateway_connections_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpn_gateway_connections' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -124,7 +124,7 @@ def run_module(): resource_type='ibm_is_vpn_gateway_connections', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpn_gateway_info.py b/plugins/modules/ibm_is_vpn_gateway_info.py index 013cba3fa..388cb202c 100644 --- a/plugins/modules/ibm_is_vpn_gateway_info.py +++ b/plugins/modules/ibm_is_vpn_gateway_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpn_gateway' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - vpn_gateway_name: + vpn_gateway: description: - - The VPN gateway name. + - The VPN gateway identifier. required: False type: str - vpn_gateway: + vpn_gateway_name: description: - - The VPN gateway identifier. + - The VPN gateway name. required: False type: str generation: @@ -68,8 +68,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'vpn_gateway_name', 'vpn_gateway', + 'vpn_gateway_name', ] @@ -80,10 +80,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - vpn_gateway_name=dict( + vpn_gateway=dict( required=False, type='str'), - vpn_gateway=dict( + vpn_gateway_name=dict( required=False, type='str'), generation=dict( @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_vpn_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_vpn_gateways_info.py b/plugins/modules/ibm_is_vpn_gateways_info.py index 07cc1280b..00d60bee6 100644 --- a/plugins/modules/ibm_is_vpn_gateways_info.py +++ b/plugins/modules/ibm_is_vpn_gateways_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpn_gateways' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -114,7 +114,7 @@ def run_module(): resource_type='ibm_is_vpn_gateways', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_zone_info.py b/plugins/modules/ibm_is_zone_info.py index f667e0963..9967575a3 100644 --- a/plugins/modules/ibm_is_zone_info.py +++ b/plugins/modules/ibm_is_zone_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_zone' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_zone', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_is_zones_info.py b/plugins/modules/ibm_is_zones_info.py index 108defd9f..969ce18ca 100644 --- a/plugins/modules/ibm_is_zones_info.py +++ b/plugins/modules/ibm_is_zones_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_zones' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_zones', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_kms_key.py b/plugins/modules/ibm_kms_key.py index 6a5b1a4cf..0ce6edbf5 100644 --- a/plugins/modules/ibm_kms_key.py +++ b/plugins/modules/ibm_kms_key.py @@ -18,62 +18,62 @@ - Create, update or destroy an IBM Cloud 'ibm_kms_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - encrypted_nonce: + key_ring_id: description: - - Only for imported root key + - Key Ring for the Key required: False type: str - iv_value: + default: default + key_name: description: - - Only for imported root key - required: False + - (Required for new resource) Key name + required: True type: str - expiration_date: + endpoint_type: description: - - The date the key material expires. The date format follows RFC 3339. You can set an expiration date on any key on its creation. A key moves into the Deactivated state within one hour past its expiration date, if one is assigned. If you create a key without specifying an expiration date, the key does not expire + - public or private required: False type: str - instance_id: - description: - - (Required for new resource) Key protect or hpcs instance GUID or CRN - required: True - type: str - force_delete: + standard_key: description: - - set to true to force delete the key + - Standard key type required: False type: bool default: False - endpoint_type: + payload: description: - - public or private + - None required: False type: str - payload: + instance_id: description: - - None + - (Required for new resource) Key protect or hpcs instance GUID or CRN + required: True + type: str + encrypted_nonce: + description: + - Only for imported root key required: False type: str - standard_key: + force_delete: description: - - Standard key type + - set to true to force delete the key required: False type: bool default: False - key_ring_id: + expiration_date: description: - - Key Ring for the Key + - The date the key material expires. The date format follows RFC 3339. You can set an expiration date on any key on its creation. A key moves into the Deactivated state within one hour past its expiration date, if one is assigned. If you create a key without specifying an expiration date, the key does not expire required: False type: str - default: default - key_name: + iv_value: description: - - (Required for new resource) Key name - required: True + - Only for imported root key + required: False type: str id: description: @@ -121,22 +121,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), ('key_name', 'str'), + ('instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'encrypted_nonce', - 'iv_value', - 'expiration_date', - 'instance_id', - 'force_delete', - 'endpoint_type', - 'payload', - 'standard_key', 'key_ring_id', 'key_name', + 'endpoint_type', + 'standard_key', + 'payload', + 'instance_id', + 'encrypted_nonce', + 'force_delete', + 'expiration_date', + 'iv_value', ] # Params for Data source @@ -160,34 +160,34 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - encrypted_nonce=dict( - required=False, - type='str'), - iv_value=dict( + key_ring_id=dict( required=False, type='str'), - expiration_date=dict( + key_name=dict( required=False, type='str'), - instance_id=dict( + endpoint_type=dict( required=False, type='str'), - force_delete=dict( + standard_key=dict( required=False, type='bool'), - endpoint_type=dict( + payload=dict( required=False, type='str'), - payload=dict( + instance_id=dict( required=False, type='str'), - standard_key=dict( + encrypted_nonce=dict( + required=False, + type='str'), + force_delete=dict( required=False, type='bool'), - key_ring_id=dict( + expiration_date=dict( required=False, type='str'), - key_name=dict( + iv_value=dict( required=False, type='str'), id=dict( @@ -255,7 +255,7 @@ def run_module(): resource_type='ibm_kms_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -264,7 +264,7 @@ def run_module(): resource_type='ibm_kms_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_kms_key_alias.py b/plugins/modules/ibm_kms_key_alias.py index f2829833b..7c9dc8ea9 100644 --- a/plugins/modules/ibm_kms_key_alias.py +++ b/plugins/modules/ibm_kms_key_alias.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_kms_key_alias' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_id: - description: - - (Required for new resource) Key ID - required: True - type: str alias: description: - (Required for new resource) Key protect or hpcs key alias name @@ -47,6 +42,11 @@ - public or private required: False type: str + instance_id: + description: + - (Required for new resource) Key ID + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -93,17 +93,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), ('alias', 'str'), + ('instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_id', 'alias', 'key_id', 'existing_alias', 'endpoint_type', + 'instance_id', ] # Params for Data source @@ -120,9 +120,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_id=dict( - required=False, - type='str'), alias=dict( required=False, type='str'), @@ -135,6 +132,9 @@ endpoint_type=dict( required=False, type='str'), + instance_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -200,7 +200,7 @@ def run_module(): resource_type='ibm_kms_key_alias', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_kms_key_info.py b/plugins/modules/ibm_kms_key_info.py index cfbd86742..47c0f6465 100644 --- a/plugins/modules/ibm_kms_key_info.py +++ b/plugins/modules/ibm_kms_key_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_kms_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -158,7 +158,7 @@ def run_module(): resource_type='ibm_kms_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_kms_key_policies.py b/plugins/modules/ibm_kms_key_policies.py index 19454b6c7..d9cd7852f 100644 --- a/plugins/modules/ibm_kms_key_policies.py +++ b/plugins/modules/ibm_kms_key_policies.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_kms_key_policies' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,22 +27,11 @@ - (Required for new resource) Key protect or hpcs instance GUID required: True type: str - key_id: - description: - - Key ID - required: False - type: str alias: description: - None required: False type: str - rotation: - description: - - Specifies the key rotation time interval in months, with a minimum of 1, and a maximum of 12 - required: False - type: list - elements: dict endpoint_type: description: - public or private @@ -55,6 +44,17 @@ required: False type: list elements: dict + key_id: + description: + - Key ID + required: False + type: str + rotation: + description: + - Specifies the key rotation time interval in months, with a minimum of 1, and a maximum of 12 + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,11 +107,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'instance_id', - 'key_id', 'alias', - 'rotation', 'endpoint_type', 'dual_auth_delete', + 'key_id', + 'rotation', ] # Params for Data source @@ -137,20 +137,20 @@ instance_id=dict( required=False, type='str'), - key_id=dict( + alias=dict( required=False, type='str'), - alias=dict( + endpoint_type=dict( required=False, type='str'), - rotation=dict( + dual_auth_delete=dict( required=False, elements='', type='list'), - endpoint_type=dict( + key_id=dict( required=False, type='str'), - dual_auth_delete=dict( + rotation=dict( required=False, elements='', type='list'), @@ -219,7 +219,7 @@ def run_module(): resource_type='ibm_kms_key_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -228,7 +228,7 @@ def run_module(): resource_type='ibm_kms_key_policies', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_kms_key_policies_info.py b/plugins/modules/ibm_kms_key_policies_info.py index 5245dce5a..02fd130c5 100644 --- a/plugins/modules/ibm_kms_key_policies_info.py +++ b/plugins/modules/ibm_kms_key_policies_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_kms_key_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -151,7 +151,7 @@ def run_module(): resource_type='ibm_kms_key_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_kms_key_rings.py b/plugins/modules/ibm_kms_key_rings.py index d23ed3ac8..9363d0fe5 100644 --- a/plugins/modules/ibm_kms_key_rings.py +++ b/plugins/modules/ibm_kms_key_rings.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_kms_key_rings' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_kms_key_rings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -194,7 +194,7 @@ def run_module(): resource_type='ibm_kms_key_rings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_kms_key_rings_info.py b/plugins/modules/ibm_kms_key_rings_info.py index 44567bf65..fa8fe5054 100644 --- a/plugins/modules/ibm_kms_key_rings_info.py +++ b/plugins/modules/ibm_kms_key_rings_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_kms_key_rings' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_kms_key_rings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_kms_keys_info.py b/plugins/modules/ibm_kms_keys_info.py index d7a56b069..6f37a5707 100644 --- a/plugins/modules/ibm_kms_keys_info.py +++ b/plugins/modules/ibm_kms_keys_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_kms_keys' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -161,7 +161,7 @@ def run_module(): resource_type='ibm_kms_keys', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_kp_key.py b/plugins/modules/ibm_kp_key.py index d1210e76b..739dadffa 100644 --- a/plugins/modules/ibm_kp_key.py +++ b/plugins/modules/ibm_kp_key.py @@ -18,24 +18,34 @@ - Create, update or destroy an IBM Cloud 'ibm_kp_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + key_protect_id: + description: + - (Required for new resource) Key protect instance ID + required: True + type: str key_name: description: - (Required for new resource) Key name required: True type: str + iv_value: + description: + - Only for imported root key + required: False + type: str payload: description: - None required: False type: str - key_protect_id: + encrypted_nonce: description: - - (Required for new resource) Key protect instance ID - required: True + - Only for imported root key + required: False type: str standard_key: description: @@ -49,16 +59,6 @@ required: False type: bool default: False - iv_value: - description: - - Only for imported root key - required: False - type: str - encrypted_nonce: - description: - - Only for imported root key - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -105,19 +105,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('key_name', 'str'), ('key_protect_id', 'str'), + ('key_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'key_protect_id', 'key_name', + 'iv_value', 'payload', - 'key_protect_id', + 'encrypted_nonce', 'standard_key', 'force_delete', - 'iv_value', - 'encrypted_nonce', ] # Params for Data source @@ -137,13 +137,19 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + key_protect_id=dict( + required=False, + type='str'), key_name=dict( required=False, type='str'), + iv_value=dict( + required=False, + type='str'), payload=dict( required=False, type='str'), - key_protect_id=dict( + encrypted_nonce=dict( required=False, type='str'), standard_key=dict( @@ -152,12 +158,6 @@ force_delete=dict( required=False, type='bool'), - iv_value=dict( - required=False, - type='str'), - encrypted_nonce=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_kp_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -232,7 +232,7 @@ def run_module(): resource_type='ibm_kp_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_kp_key_info.py b/plugins/modules/ibm_kp_key_info.py index 3ec8faac3..24ae658ab 100644 --- a/plugins/modules/ibm_kp_key_info.py +++ b/plugins/modules/ibm_kp_key_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_kp_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_kp_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lb.py b/plugins/modules/ibm_lb.py index 46977edfb..bae960aef 100644 --- a/plugins/modules/ibm_lb.py +++ b/plugins/modules/ibm_lb.py @@ -18,20 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_lb' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - datacenter: - description: - - (Required for new resource) Datacenter name info - required: True - type: str - security_certificate_id: + dedicated: description: - - Security certificate ID + - Boolena value true if Load balncer is dedicated type required: False - type: int + type: bool + default: False ssl_offload: description: - boolean value true if SSL offload is enabled @@ -49,18 +45,22 @@ - (Required for new resource) Connections value required: True type: int - dedicated: + datacenter: description: - - Boolena value true if Load balncer is dedicated type - required: False - type: bool - default: False + - (Required for new resource) Datacenter name info + required: True + type: str ha_enabled: description: - true if High availability is enabled required: False type: bool default: False + security_certificate_id: + description: + - Security certificate ID + required: False + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,19 +107,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('datacenter', 'str'), ('connections', 'int'), + ('datacenter', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'datacenter', - 'security_certificate_id', + 'dedicated', 'ssl_offload', 'tags', 'connections', - 'dedicated', + 'datacenter', 'ha_enabled', + 'security_certificate_id', ] # Params for Data source @@ -136,12 +136,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - datacenter=dict( - required=False, - type='str'), - security_certificate_id=dict( + dedicated=dict( required=False, - type='int'), + type='bool'), ssl_offload=dict( required=False, type='bool'), @@ -152,12 +149,15 @@ connections=dict( required=False, type='int'), - dedicated=dict( + datacenter=dict( required=False, - type='bool'), + type='str'), ha_enabled=dict( required=False, type='bool'), + security_certificate_id=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_lb', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lb_service.py b/plugins/modules/ibm_lb_service.py index 360a59cc5..100b9dc9d 100644 --- a/plugins/modules/ibm_lb_service.py +++ b/plugins/modules/ibm_lb_service.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_service' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - weight: - description: - - (Required for new resource) Weight value - required: True - type: int tags: description: - Tags for the resource @@ -58,6 +53,11 @@ - (Required for new resource) health check type required: True type: str + weight: + description: + - (Required for new resource) Weight value + required: True + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,23 +104,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('weight', 'int'), ('service_group_id', 'int'), ('ip_address_id', 'int'), ('port', 'int'), ('enabled', 'bool'), ('health_check_type', 'str'), + ('weight', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'weight', 'tags', 'service_group_id', 'ip_address_id', 'port', 'enabled', 'health_check_type', + 'weight', ] # Params for Data source @@ -137,9 +137,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - weight=dict( - required=False, - type='int'), tags=dict( required=False, elements='', @@ -159,6 +156,9 @@ health_check_type=dict( required=False, type='str'), + weight=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_lb_service', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lb_service_group.py b/plugins/modules/ibm_lb_service_group.py index b0f11e383..17373b3d4 100644 --- a/plugins/modules/ibm_lb_service_group.py +++ b/plugins/modules/ibm_lb_service_group.py @@ -18,15 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_service_group' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - load_balancer_id: + routing_method: description: - - (Required for new resource) Loadbalancer ID + - (Required for new resource) Routing method required: True - type: int + type: str port: description: - (Required for new resource) Port number @@ -48,16 +48,16 @@ required: False type: list elements: str - allocation: + load_balancer_id: description: - - (Required for new resource) Allocation type + - (Required for new resource) Loadbalancer ID required: True type: int - routing_method: + allocation: description: - - (Required for new resource) Routing method + - (Required for new resource) Allocation type required: True - type: str + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,22 +104,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('load_balancer_id', 'int'), + ('routing_method', 'str'), ('port', 'int'), ('routing_type', 'str'), + ('load_balancer_id', 'int'), ('allocation', 'int'), - ('routing_method', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'load_balancer_id', + 'routing_method', 'port', 'routing_type', 'timeout', 'tags', + 'load_balancer_id', 'allocation', - 'routing_method', ] # Params for Data source @@ -136,9 +136,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - load_balancer_id=dict( + routing_method=dict( required=False, - type='int'), + type='str'), port=dict( required=False, type='int'), @@ -152,12 +152,12 @@ required=False, elements='', type='list'), - allocation=dict( + load_balancer_id=dict( required=False, type='int'), - routing_method=dict( + allocation=dict( required=False, - type='str'), + type='int'), id=dict( required=False, type='str'), @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_lb_service_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lb_vpx.py b/plugins/modules/ibm_lb_vpx.py index 93cd2583e..2183611e1 100644 --- a/plugins/modules/ibm_lb_vpx.py +++ b/plugins/modules/ibm_lb_vpx.py @@ -18,15 +18,25 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_vpx' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + datacenter: + description: + - (Required for new resource) Datacenter name + required: True + type: str public_vlan_id: description: - Piblic VLAN id required: False type: int + public_subnet: + description: + - Public subnet + required: False + type: str tags: description: - List of the tags @@ -38,21 +48,16 @@ - (Required for new resource) Plan info required: True type: str - public_subnet: - description: - - Public subnet - required: False - type: str - datacenter: - description: - - (Required for new resource) Datacenter name - required: True - type: str - speed: + ip_count: description: - - (Required for new resource) Speed value + - (Required for new resource) IP address count required: True type: int + private_subnet: + description: + - Private subnet + required: False + type: str version: description: - (Required for new resource) version info @@ -63,16 +68,11 @@ - Private VLAN id required: False type: int - ip_count: + speed: description: - - (Required for new resource) IP address count + - (Required for new resource) Speed value required: True type: int - private_subnet: - description: - - Private subnet - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -119,25 +119,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('plan', 'str'), ('datacenter', 'str'), - ('speed', 'int'), - ('version', 'str'), + ('plan', 'str'), ('ip_count', 'int'), + ('version', 'str'), + ('speed', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'datacenter', 'public_vlan_id', + 'public_subnet', 'tags', 'plan', - 'public_subnet', - 'datacenter', - 'speed', - 'version', - 'private_vlan_id', 'ip_count', 'private_subnet', + 'version', + 'private_vlan_id', + 'speed', ] # Params for Data source @@ -154,9 +154,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + datacenter=dict( + required=False, + type='str'), public_vlan_id=dict( required=False, type='int'), + public_subnet=dict( + required=False, + type='str'), tags=dict( required=False, elements='', @@ -164,27 +170,21 @@ plan=dict( required=False, type='str'), - public_subnet=dict( + ip_count=dict( required=False, - type='str'), - datacenter=dict( + type='int'), + private_subnet=dict( required=False, type='str'), - speed=dict( - required=False, - type='int'), version=dict( required=False, type='str'), private_vlan_id=dict( required=False, type='int'), - ip_count=dict( + speed=dict( required=False, type='int'), - private_subnet=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -250,7 +250,7 @@ def run_module(): resource_type='ibm_lb_vpx', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lb_vpx_ha.py b/plugins/modules/ibm_lb_vpx_ha.py index 753b00d29..7691a566c 100644 --- a/plugins/modules/ibm_lb_vpx_ha.py +++ b/plugins/modules/ibm_lb_vpx_ha.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_vpx_ha' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - primary_id: - description: - - (Required for new resource) primary ID - required: True - type: int secondary_id: description: - (Required for new resource) Secondary ID @@ -43,6 +38,11 @@ required: False type: list elements: str + primary_id: + description: + - (Required for new resource) primary ID + required: True + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,16 +89,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('primary_id', 'int'), ('secondary_id', 'int'), + ('primary_id', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'primary_id', 'secondary_id', 'stay_secondary', 'tags', + 'primary_id', ] # Params for Data source @@ -115,9 +115,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - primary_id=dict( - required=False, - type='int'), secondary_id=dict( required=False, type='int'), @@ -128,6 +125,9 @@ required=False, elements='', type='list'), + primary_id=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_lb_vpx_ha', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lb_vpx_service.py b/plugins/modules/ibm_lb_vpx_service.py index 12176ce8e..4e6b7e2a3 100644 --- a/plugins/modules/ibm_lb_vpx_service.py +++ b/plugins/modules/ibm_lb_vpx_service.py @@ -18,57 +18,57 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_vpx_service' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) name - required: True - type: str destination_ip_address: description: - (Required for new resource) Destination IP Address required: True type: str - health_check: + destination_port: description: - - (Required for new resource) Health check info + - (Required for new resource) Destination Port number required: True - type: str - usip: + type: int + connection_limit: description: - - usip info + - (Required for new resource) Number of connections limit + required: True + type: int + tags: + description: + - list of tags associated with the resource required: False - type: str - default: NO + type: list + elements: str vip_id: description: - (Required for new resource) VIP id required: True type: str - destination_port: + name: description: - - (Required for new resource) Destination Port number + - (Required for new resource) name required: True - type: int + type: str weight: description: - (Required for new resource) Weight value required: True type: int - connection_limit: + health_check: description: - - (Required for new resource) Number of connections limit + - (Required for new resource) Health check info required: True - type: int - tags: + type: str + usip: description: - - list of tags associated with the resource + - usip info required: False - type: list - elements: str + type: str + default: NO id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -115,26 +115,26 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('destination_ip_address', 'str'), - ('health_check', 'str'), - ('vip_id', 'str'), ('destination_port', 'int'), - ('weight', 'int'), ('connection_limit', 'int'), + ('vip_id', 'str'), + ('name', 'str'), + ('weight', 'int'), + ('health_check', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'destination_ip_address', - 'health_check', - 'usip', - 'vip_id', 'destination_port', - 'weight', 'connection_limit', 'tags', + 'vip_id', + 'name', + 'weight', + 'health_check', + 'usip', ] # Params for Data source @@ -151,34 +151,34 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=False, - type='str'), destination_ip_address=dict( required=False, type='str'), - health_check=dict( + destination_port=dict( required=False, - type='str'), - usip=dict( + type='int'), + connection_limit=dict( required=False, - type='str'), + type='int'), + tags=dict( + required=False, + elements='', + type='list'), vip_id=dict( required=False, type='str'), - destination_port=dict( + name=dict( required=False, - type='int'), + type='str'), weight=dict( required=False, type='int'), - connection_limit=dict( + health_check=dict( required=False, - type='int'), - tags=dict( + type='str'), + usip=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_lb_vpx_service', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lb_vpx_vip.py b/plugins/modules/ibm_lb_vpx_vip.py index 459cd9af1..8302a5ba9 100644 --- a/plugins/modules/ibm_lb_vpx_vip.py +++ b/plugins/modules/ibm_lb_vpx_vip.py @@ -18,33 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_vpx_vip' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - source_port: - description: - - (Required for new resource) Source Port number - required: True - type: int - nad_controller_id: + load_balancing_method: description: - - (Required for new resource) NAD controller ID + - (Required for new resource) Load balancing method required: True - type: int + type: str persistence: description: - Persistance value required: False type: str - name: + source_port: description: - - (Required for new resource) Name + - (Required for new resource) Source Port number required: True - type: str - virtual_ip_address: + type: int + type: description: - - (Required for new resource) Virtual IP address + - (Required for new resource) Type required: True type: str tags: @@ -53,14 +48,14 @@ required: False type: list elements: str - load_balancing_method: + nad_controller_id: description: - - (Required for new resource) Load balancing method + - (Required for new resource) NAD controller ID required: True - type: str - type: + type: int + name: description: - - (Required for new resource) Type + - (Required for new resource) Name required: True type: str security_certificate_id: @@ -68,6 +63,11 @@ - security certificate ID required: False type: int + virtual_ip_address: + description: + - (Required for new resource) Virtual IP address + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -114,25 +114,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('load_balancing_method', 'str'), ('source_port', 'int'), + ('type', 'str'), ('nad_controller_id', 'int'), ('name', 'str'), ('virtual_ip_address', 'str'), - ('load_balancing_method', 'str'), - ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'load_balancing_method', + 'persistence', 'source_port', + 'type', + 'tags', 'nad_controller_id', - 'persistence', 'name', - 'virtual_ip_address', - 'tags', - 'load_balancing_method', - 'type', 'security_certificate_id', + 'virtual_ip_address', ] # Params for Data source @@ -149,34 +149,34 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - source_port=dict( - required=False, - type='int'), - nad_controller_id=dict( + load_balancing_method=dict( required=False, - type='int'), + type='str'), persistence=dict( required=False, type='str'), - name=dict( + source_port=dict( required=False, - type='str'), - virtual_ip_address=dict( + type='int'), + type=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - load_balancing_method=dict( + nad_controller_id=dict( required=False, - type='str'), - type=dict( + type='int'), + name=dict( required=False, type='str'), security_certificate_id=dict( required=False, type='int'), + virtual_ip_address=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -242,7 +242,7 @@ def run_module(): resource_type='ibm_lb_vpx_vip', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lbaas.py b/plugins/modules/ibm_lbaas.py index aba53cb63..12d76f22f 100644 --- a/plugins/modules/ibm_lbaas.py +++ b/plugins/modules/ibm_lbaas.py @@ -18,55 +18,55 @@ - Create, update or destroy an IBM Cloud 'ibm_lbaas' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - use_system_public_ip_pool: + name: description: - - "in public loadbalancer - Public IP address allocation done by system public IP pool or public subnet." - required: False - type: bool - ssl_ciphers: + - (Required for new resource) The load balancer's name. + required: True + type: str + description: description: - - None + - Description of a load balancer. required: False - type: list - elements: str + type: str subnets: description: - (Required for new resource) The subnet where this Load Balancer will be provisioned. required: True type: list elements: int - name: + use_system_public_ip_pool: description: - - (Required for new resource) The load balancer's name. - required: True - type: str - description: + - "in public loadbalancer - Public IP address allocation done by system public IP pool or public subnet." + required: False + type: bool + protocols: description: - - Description of a load balancer. + - Protocols to be assigned to this load balancer. required: False - type: str - type: + type: list + elements: dict + ssl_ciphers: description: - - Specifies if a load balancer is public or private + - None required: False - type: str - default: PUBLIC + type: list + elements: str wait_time_minutes: description: - None required: False type: int default: 90 - protocols: + type: description: - - Protocols to be assigned to this load balancer. + - Specifies if a load balancer is public or private required: False - type: list - elements: dict + type: str + default: PUBLIC id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -113,20 +113,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('subnets', 'list'), ('name', 'str'), + ('subnets', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'use_system_public_ip_pool', - 'ssl_ciphers', - 'subnets', 'name', 'description', - 'type', - 'wait_time_minutes', + 'subnets', + 'use_system_public_ip_pool', 'protocols', + 'ssl_ciphers', + 'wait_time_minutes', + 'type', ] # Params for Data source @@ -145,33 +145,33 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - use_system_public_ip_pool=dict( + name=dict( required=False, - type='bool'), - ssl_ciphers=dict( + type='str'), + description=dict( required=False, - elements='', - type='list'), + type='str'), subnets=dict( required=False, elements='', type='list'), - name=dict( + use_system_public_ip_pool=dict( required=False, - type='str'), - description=dict( + type='bool'), + protocols=dict( required=False, - type='str'), - type=dict( + elements='', + type='list'), + ssl_ciphers=dict( required=False, - type='str'), + elements='', + type='list'), wait_time_minutes=dict( required=False, type='int'), - protocols=dict( + type=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -237,7 +237,7 @@ def run_module(): resource_type='ibm_lbaas', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -246,7 +246,7 @@ def run_module(): resource_type='ibm_lbaas', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_lbaas_health_monitor.py b/plugins/modules/ibm_lbaas_health_monitor.py index ed19e21c9..62aef594c 100644 --- a/plugins/modules/ibm_lbaas_health_monitor.py +++ b/plugins/modules/ibm_lbaas_health_monitor.py @@ -18,31 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_lbaas_health_monitor' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - lbaas_id: - description: - - (Required for new resource) LBAAS id - required: True - type: str - protocol: - description: - - (Required for new resource) Protocol value - required: True - type: str - port: - description: - - (Required for new resource) Port number - required: True - type: int - interval: - description: - - Interval value - required: False - type: int - default: 5 max_retries: description: - Maximum retry counts @@ -66,6 +45,27 @@ - (Required for new resource) Monitor ID required: True type: str + lbaas_id: + description: + - (Required for new resource) LBAAS id + required: True + type: str + protocol: + description: + - (Required for new resource) Protocol value + required: True + type: str + port: + description: + - (Required for new resource) Port number + required: True + type: int + interval: + description: + - Interval value + required: False + type: int + default: 5 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -112,22 +112,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('monitor_id', 'str'), ('lbaas_id', 'str'), ('protocol', 'str'), ('port', 'int'), - ('monitor_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'lbaas_id', - 'protocol', - 'port', - 'interval', 'max_retries', 'timeout', 'url_path', 'monitor_id', + 'lbaas_id', + 'protocol', + 'port', + 'interval', ] # Params for Data source @@ -144,18 +144,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - lbaas_id=dict( - required=False, - type='str'), - protocol=dict( - required=False, - type='str'), - port=dict( - required=False, - type='int'), - interval=dict( - required=False, - type='int'), max_retries=dict( required=False, type='int'), @@ -168,6 +156,18 @@ monitor_id=dict( required=False, type='str'), + lbaas_id=dict( + required=False, + type='str'), + protocol=dict( + required=False, + type='str'), + port=dict( + required=False, + type='int'), + interval=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -233,7 +233,7 @@ def run_module(): resource_type='ibm_lbaas_health_monitor', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lbaas_info.py b/plugins/modules/ibm_lbaas_info.py index 040517ed5..1c819a67d 100644 --- a/plugins/modules/ibm_lbaas_info.py +++ b/plugins/modules/ibm_lbaas_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_lbaas' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_lbaas', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_lbaas_server_instance_attachment.py b/plugins/modules/ibm_lbaas_server_instance_attachment.py index 9132ee151..9cb326a4a 100644 --- a/plugins/modules/ibm_lbaas_server_instance_attachment.py +++ b/plugins/modules/ibm_lbaas_server_instance_attachment.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_lbaas_server_instance_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + private_ip_address: + description: + - (Required for new resource) The Private IP address of a load balancer member. + required: True + type: str weight: description: - The weight of a load balancer member. @@ -32,11 +37,6 @@ - (Required for new resource) The UUID of a load balancer required: True type: str - private_ip_address: - description: - - (Required for new resource) The Private IP address of a load balancer member. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,15 +83,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('lbaas_id', 'str'), ('private_ip_address', 'str'), + ('lbaas_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'private_ip_address', 'weight', 'lbaas_id', - 'private_ip_address', ] # Params for Data source @@ -108,15 +108,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + private_ip_address=dict( + required=False, + type='str'), weight=dict( required=False, type='int'), lbaas_id=dict( required=False, type='str'), - private_ip_address=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -182,7 +182,7 @@ def run_module(): resource_type='ibm_lbaas_server_instance_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_multi_vlan_firewall.py b/plugins/modules/ibm_multi_vlan_firewall.py index 7b716c9ea..c17cecc72 100644 --- a/plugins/modules/ibm_multi_vlan_firewall.py +++ b/plugins/modules/ibm_multi_vlan_firewall.py @@ -18,18 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_multi_vlan_firewall' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - datacenter: + pod: description: - - (Required for new resource) Datacenter name + - (Required for new resource) POD name required: True type: str - pod: + name: description: - - (Required for new resource) POD name + - (Required for new resource) name required: True type: str firewall_type: @@ -37,17 +37,17 @@ - (Required for new resource) Firewall type required: True type: str + datacenter: + description: + - (Required for new resource) Datacenter name + required: True + type: str addon_configuration: description: - High Availability - [Web Filtering Add-on, NGFW Add-on, AV Add-on] or [Web Filtering Add-on, NGFW Add-on, AV Add-on] required: False type: list elements: str - name: - description: - - (Required for new resource) name - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,19 +94,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('datacenter', 'str'), ('pod', 'str'), - ('firewall_type', 'str'), ('name', 'str'), + ('firewall_type', 'str'), + ('datacenter', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'datacenter', 'pod', + 'name', 'firewall_type', + 'datacenter', 'addon_configuration', - 'name', ] # Params for Data source @@ -123,22 +123,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - datacenter=dict( + pod=dict( required=False, type='str'), - pod=dict( + name=dict( required=False, type='str'), firewall_type=dict( required=False, type='str'), + datacenter=dict( + required=False, + type='str'), addon_configuration=dict( required=False, elements='', type='list'), - name=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_multi_vlan_firewall', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_network_gateway.py b/plugins/modules/ibm_network_gateway.py index 920feb2b4..d5df90f21 100644 --- a/plugins/modules/ibm_network_gateway.py +++ b/plugins/modules/ibm_network_gateway.py @@ -18,16 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_network_gateway' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - members: + name: description: - - (Required for new resource) The hardware members of this network Gateway + - (Required for new resource) The name of the gateway required: True - type: list - elements: dict + type: str ssh_key_ids: description: - None @@ -39,11 +38,12 @@ - None required: False type: str - name: + members: description: - - (Required for new resource) The name of the gateway + - (Required for new resource) The hardware members of this network Gateway required: True - type: str + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,16 +90,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('members', 'list'), ('name', 'str'), + ('members', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'members', + 'name', 'ssh_key_ids', 'post_install_script_uri', - 'name', + 'members', ] # Params for Data source @@ -116,10 +116,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - members=dict( + name=dict( required=False, - elements='', - type='list'), + type='str'), ssh_key_ids=dict( required=False, elements='', @@ -127,9 +126,10 @@ post_install_script_uri=dict( required=False, type='str'), - name=dict( + members=dict( required=False, - type='str'), + elements='', + type='list'), id=dict( required=False, type='str'), @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_network_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_network_gateway_vlan_association.py b/plugins/modules/ibm_network_gateway_vlan_association.py index 41f0ab0c2..ca457a6d4 100644 --- a/plugins/modules/ibm_network_gateway_vlan_association.py +++ b/plugins/modules/ibm_network_gateway_vlan_association.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_network_gateway_vlan_association' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_network_gateway_vlan_association', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_network_interface_sg_attachment.py b/plugins/modules/ibm_network_interface_sg_attachment.py index edbd1be35..9420471d1 100644 --- a/plugins/modules/ibm_network_interface_sg_attachment.py +++ b/plugins/modules/ibm_network_interface_sg_attachment.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_network_interface_sg_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_network_interface_sg_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_network_public_ip.py b/plugins/modules/ibm_network_public_ip.py index 37c4bdfde..a28c94265 100644 --- a/plugins/modules/ibm_network_public_ip.py +++ b/plugins/modules/ibm_network_public_ip.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_network_public_ip' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_network_public_ip', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_network_vlan.py b/plugins/modules/ibm_network_vlan.py index 663f0c338..a211d79d4 100644 --- a/plugins/modules/ibm_network_vlan.py +++ b/plugins/modules/ibm_network_vlan.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_network_vlan' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - List of tags - required: False - type: list - elements: str datacenter: description: - (Required for new resource) Datacenter name @@ -38,6 +32,12 @@ - (Required for new resource) VLAN type required: True type: str + tags: + description: + - List of tags + required: False + type: list + elements: str name: description: - VLAN name @@ -100,9 +100,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'datacenter', 'type', + 'tags', 'name', 'router_hostname', ] @@ -112,9 +112,9 @@ ] TL_ALL_PARAMETERS_DS = [ - 'router_hostname', 'name', 'number', + 'router_hostname', ] TL_CONFLICTS_MAP = { @@ -124,16 +124,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - elements='', - type='list'), datacenter=dict( required=False, type='str'), type=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), name=dict( required=False, type='str'), @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_network_vlan', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -214,7 +214,7 @@ def run_module(): resource_type='ibm_network_vlan', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_network_vlan_info.py b/plugins/modules/ibm_network_vlan_info.py index 1781d2f73..dabe97684 100644 --- a/plugins/modules/ibm_network_vlan_info.py +++ b/plugins/modules/ibm_network_vlan_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_network_vlan' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - router_hostname: - description: - - None - required: False - type: str name: description: - None @@ -36,6 +31,11 @@ - None required: False type: int + router_hostname: + description: + - None + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -73,9 +73,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'router_hostname', 'name', 'number', + 'router_hostname', ] @@ -86,15 +86,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - router_hostname=dict( - required=False, - type='str'), name=dict( required=False, type='str'), number=dict( required=False, type='int'), + router_hostname=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -129,7 +129,7 @@ def run_module(): resource_type='ibm_network_vlan', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_network_vlan_spanning.py b/plugins/modules/ibm_network_vlan_spanning.py index f66468053..e5250f1bd 100644 --- a/plugins/modules/ibm_network_vlan_spanning.py +++ b/plugins/modules/ibm_network_vlan_spanning.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_network_vlan_spanning' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -163,7 +163,7 @@ def run_module(): resource_type='ibm_network_vlan_spanning', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_ob_logging.py b/plugins/modules/ibm_ob_logging.py index caca93546..02e4cfc08 100644 --- a/plugins/modules/ibm_ob_logging.py +++ b/plugins/modules/ibm_ob_logging.py @@ -18,30 +18,30 @@ - Create, update or destroy an IBM Cloud 'ibm_ob_logging' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + private_endpoint: + description: + - Add this option to connect to your LogDNA service instance through the private service endpoint + required: False + type: bool cluster: description: - (Required for new resource) Name or ID of the cluster to be used. required: True type: str - instance_id: - description: - - (Required for new resource) ID of the LogDNA service instance to latch - required: True - type: str logdna_ingestion_key: description: - LogDNA ingestion key required: False type: str - private_endpoint: + instance_id: description: - - Add this option to connect to your LogDNA service instance through the private service endpoint - required: False - type: bool + - (Required for new resource) ID of the LogDNA service instance to latch + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -94,10 +94,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'private_endpoint', 'cluster', - 'instance_id', 'logdna_ingestion_key', - 'private_endpoint', + 'instance_id', ] # Params for Data source @@ -114,18 +114,18 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cluster=dict( + private_endpoint=dict( required=False, - type='str'), - instance_id=dict( + type='bool'), + cluster=dict( required=False, type='str'), logdna_ingestion_key=dict( required=False, type='str'), - private_endpoint=dict( + instance_id=dict( required=False, - type='bool'), + type='str'), id=dict( required=False, type='str'), @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_ob_logging', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_ob_monitoring.py b/plugins/modules/ibm_ob_monitoring.py index 606482f3a..c94cbb8ca 100644 --- a/plugins/modules/ibm_ob_monitoring.py +++ b/plugins/modules/ibm_ob_monitoring.py @@ -18,28 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_ob_monitoring' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - instance_id: - description: - - (Required for new resource) ID of the Sysdig service instance to latch - required: True - type: str sysdig_access_key: description: - Sysdig ingestion key required: False type: str + cluster: + description: + - (Required for new resource) Name or ID of the cluster to be used. + required: True + type: str private_endpoint: description: - Add this option to connect to your Sysdig service instance through the private service endpoint required: False type: bool - cluster: + instance_id: description: - - (Required for new resource) Name or ID of the cluster to be used. + - (Required for new resource) ID of the Sysdig service instance to latch required: True type: str id: @@ -88,16 +88,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), ('cluster', 'str'), + ('instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_id', 'sysdig_access_key', - 'private_endpoint', 'cluster', + 'private_endpoint', + 'instance_id', ] # Params for Data source @@ -114,16 +114,16 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - instance_id=dict( + sysdig_access_key=dict( required=False, type='str'), - sysdig_access_key=dict( + cluster=dict( required=False, type='str'), private_endpoint=dict( required=False, type='bool'), - cluster=dict( + instance_id=dict( required=False, type='str'), id=dict( @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_ob_monitoring', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_object_storage_account.py b/plugins/modules/ibm_object_storage_account.py index 062d47847..4006b99e5 100644 --- a/plugins/modules/ibm_object_storage_account.py +++ b/plugins/modules/ibm_object_storage_account.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_object_storage_account' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -173,7 +173,7 @@ def run_module(): resource_type='ibm_object_storage_account', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_org.py b/plugins/modules/ibm_org.py index f40811310..3f61c5b12 100644 --- a/plugins/modules/ibm_org.py +++ b/plugins/modules/ibm_org.py @@ -18,22 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_org' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - users: - description: - - The IBMID of the users who will have user role in this org, ex - user@example.com - required: False - type: list - elements: str - tags: - description: - - None - required: False - type: list - elements: str name: description: - (Required for new resource) Org name, for example myorg@domain @@ -62,6 +50,18 @@ required: False type: list elements: str + users: + description: + - The IBMID of the users who will have user role in this org, ex - user@example.com + required: False + type: list + elements: str + tags: + description: + - None + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -113,13 +113,13 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'users', - 'tags', 'name', 'org_quota_definition_guid', 'billing_managers', 'managers', 'auditors', + 'users', + 'tags', ] # Params for Data source @@ -138,14 +138,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - users=dict( - required=False, - elements='', - type='list'), - tags=dict( - required=False, - elements='', - type='list'), name=dict( required=False, type='str'), @@ -164,6 +156,14 @@ required=False, elements='', type='list'), + users=dict( + required=False, + elements='', + type='list'), + tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_org', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -238,7 +238,7 @@ def run_module(): resource_type='ibm_org', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_org_info.py b/plugins/modules/ibm_org_info.py index 6169cad4b..8a2c2cc5c 100644 --- a/plugins/modules/ibm_org_info.py +++ b/plugins/modules/ibm_org_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_org' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_org', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_org_quota_info.py b/plugins/modules/ibm_org_quota_info.py index a52de5422..e18c60dc6 100644 --- a/plugins/modules/ibm_org_quota_info.py +++ b/plugins/modules/ibm_org_quota_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_org_quota' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_org_quota', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_capture.py b/plugins/modules/ibm_pi_capture.py index aad5c9346..4eae8f7b8 100644 --- a/plugins/modules/ibm_pi_capture.py +++ b/plugins/modules/ibm_pi_capture.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_capture' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,25 +27,25 @@ - (Required for new resource) Instance Name of the Power VM required: True type: str - pi_capture_name: - description: - - (Required for new resource) Name of the capture to create. Note : this must be unique - required: True - type: str pi_capture_volume_ids: description: - List of Data volume IDs required: False type: list elements: str - pi_capture_cloud_storage_secret_key: + pi_capture_cloud_storage_region: description: - - Name of the Cloud Storage Secret Key + - List of Regions to use required: False type: str - pi_capture_storage_image_path: + pi_capture_cloud_storage_access_key: description: - - Cloud Storage Image Path (bucket-name [/folder/../..]) + - Name of Cloud Storage Access Key + required: False + type: str + pi_capture_cloud_storage_secret_key: + description: + - Name of the Cloud Storage Secret Key required: False type: str pi_cloud_instance_id: @@ -53,19 +53,19 @@ - (Required for new resource) Cloud Instance ID - This is the service_instance_id. required: True type: str - pi_capture_destination: + pi_capture_name: description: - - (Required for new resource) Destination for the deployable image + - (Required for new resource) Name of the capture to create. Note : this must be unique required: True type: str - pi_capture_cloud_storage_region: + pi_capture_destination: description: - - List of Regions to use - required: False + - (Required for new resource) Destination for the deployable image + required: True type: str - pi_capture_cloud_storage_access_key: + pi_capture_storage_image_path: description: - - Name of Cloud Storage Access Key + - Cloud Storage Image Path (bucket-name [/folder/../..]) required: False type: str id: @@ -111,22 +111,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('pi_instance_name', 'str'), - ('pi_capture_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_capture_name', 'str'), ('pi_capture_destination', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'pi_instance_name', - 'pi_capture_name', 'pi_capture_volume_ids', + 'pi_capture_cloud_storage_region', + 'pi_capture_cloud_storage_access_key', 'pi_capture_cloud_storage_secret_key', - 'pi_capture_storage_image_path', 'pi_cloud_instance_id', + 'pi_capture_name', 'pi_capture_destination', - 'pi_capture_cloud_storage_region', - 'pi_capture_cloud_storage_access_key', + 'pi_capture_storage_image_path', ] # Params for Data source @@ -146,29 +146,29 @@ pi_instance_name=dict( required=False, type='str'), - pi_capture_name=dict( - required=False, - type='str'), pi_capture_volume_ids=dict( required=False, elements='', type='list'), - pi_capture_cloud_storage_secret_key=dict( + pi_capture_cloud_storage_region=dict( required=False, type='str'), - pi_capture_storage_image_path=dict( + pi_capture_cloud_storage_access_key=dict( + required=False, + type='str'), + pi_capture_cloud_storage_secret_key=dict( required=False, type='str'), pi_cloud_instance_id=dict( required=False, type='str'), - pi_capture_destination=dict( + pi_capture_name=dict( required=False, type='str'), - pi_capture_cloud_storage_region=dict( + pi_capture_destination=dict( required=False, type='str'), - pi_capture_cloud_storage_access_key=dict( + pi_capture_storage_image_path=dict( required=False, type='str'), id=dict( @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_pi_capture', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_catalog_images_info.py b/plugins/modules/ibm_pi_catalog_images_info.py index f21fc908d..5b31a621e 100644 --- a/plugins/modules/ibm_pi_catalog_images_info.py +++ b/plugins/modules/ibm_pi_catalog_images_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_pi_catalog_images' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + vtl: + description: + - None + required: False + type: bool pi_cloud_instance_id: description: - None @@ -31,11 +36,6 @@ - None required: False type: bool - vtl: - description: - - None - required: False - type: bool zone: description: - Denotes which IBM Cloud zone to connect to in multizone @@ -70,9 +70,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'vtl', 'pi_cloud_instance_id', 'sap', - 'vtl', ] @@ -83,15 +83,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + vtl=dict( + required=False, + type='bool'), pi_cloud_instance_id=dict( required=True, type='str'), sap=dict( required=False, type='bool'), - vtl=dict( - required=False, - type='bool'), zone=dict( type='str', fallback=(env_fallback, ['IC_ZONE'])), @@ -119,7 +119,7 @@ def run_module(): resource_type='ibm_pi_catalog_images', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_cloud_connection.py b/plugins/modules/ibm_pi_cloud_connection.py index 111b4b486..95a6a8105 100644 --- a/plugins/modules/ibm_pi_cloud_connection.py +++ b/plugins/modules/ibm_pi_cloud_connection.py @@ -18,21 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_cloud_connection' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_cloud_connection_speed: + pi_cloud_connection_name: description: - - (Required for new resource) Speed of the cloud connection (speed in megabits per second) + - (Required for new resource) Name of the cloud connection required: True - type: int + type: str pi_cloud_connection_classic_enabled: description: - Enable classic endpoint destination required: False type: bool default: False + pi_cloud_connection_gre_destination_address: + description: + - GRE destination IP address + required: False + type: str pi_cloud_connection_vpc_enabled: description: - Enable VPC for this cloud connection @@ -51,11 +56,6 @@ required: False type: bool default: False - pi_cloud_connection_name: - description: - - (Required for new resource) Name of the cloud connection - required: True - type: str pi_cloud_connection_metered: description: - Enable metered for this cloud connection @@ -78,17 +78,17 @@ - (Required for new resource) PI cloud instance ID required: True type: str + pi_cloud_connection_speed: + description: + - (Required for new resource) Speed of the cloud connection (speed in megabits per second) + required: True + type: int pi_cloud_connection_global_routing: description: - Enable global routing for this cloud connection required: False type: bool default: False - pi_cloud_connection_gre_destination_address: - description: - - GRE destination IP address - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -131,25 +131,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_connection_speed', 'int'), ('pi_cloud_connection_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_cloud_connection_speed', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_connection_speed', + 'pi_cloud_connection_name', 'pi_cloud_connection_classic_enabled', + 'pi_cloud_connection_gre_destination_address', 'pi_cloud_connection_vpc_enabled', 'pi_cloud_connection_vpc_crns', 'pi_cloud_connection_transit_enabled', - 'pi_cloud_connection_name', 'pi_cloud_connection_metered', 'pi_cloud_connection_networks', 'pi_cloud_connection_gre_cidr', 'pi_cloud_instance_id', + 'pi_cloud_connection_speed', 'pi_cloud_connection_global_routing', - 'pi_cloud_connection_gre_destination_address', ] # Params for Data source @@ -170,12 +170,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_cloud_connection_speed=dict( + pi_cloud_connection_name=dict( required=False, - type='int'), + type='str'), pi_cloud_connection_classic_enabled=dict( required=False, type='bool'), + pi_cloud_connection_gre_destination_address=dict( + required=False, + type='str'), pi_cloud_connection_vpc_enabled=dict( required=False, type='bool'), @@ -186,9 +189,6 @@ pi_cloud_connection_transit_enabled=dict( required=False, type='bool'), - pi_cloud_connection_name=dict( - required=False, - type='str'), pi_cloud_connection_metered=dict( required=False, type='bool'), @@ -202,12 +202,12 @@ pi_cloud_instance_id=dict( required=False, type='str'), + pi_cloud_connection_speed=dict( + required=False, + type='int'), pi_cloud_connection_global_routing=dict( required=False, type='bool'), - pi_cloud_connection_gre_destination_address=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -266,7 +266,7 @@ def run_module(): resource_type='ibm_pi_cloud_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -275,7 +275,7 @@ def run_module(): resource_type='ibm_pi_cloud_connection', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_cloud_connection_info.py b/plugins/modules/ibm_pi_cloud_connection_info.py index 3ca39616c..05058676e 100644 --- a/plugins/modules/ibm_pi_cloud_connection_info.py +++ b/plugins/modules/ibm_pi_cloud_connection_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_cloud_connection' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_cloud_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_cloud_connection_network_attach.py b/plugins/modules/ibm_pi_cloud_connection_network_attach.py index f115d0f82..699fc02f4 100644 --- a/plugins/modules/ibm_pi_cloud_connection_network_attach.py +++ b/plugins/modules/ibm_pi_cloud_connection_network_attach.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_cloud_connection_network_attach' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -172,7 +172,7 @@ def run_module(): resource_type='ibm_pi_cloud_connection_network_attach', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_cloud_connections_info.py b/plugins/modules/ibm_pi_cloud_connections_info.py index e183bfeee..93674c0b5 100644 --- a/plugins/modules/ibm_pi_cloud_connections_info.py +++ b/plugins/modules/ibm_pi_cloud_connections_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_cloud_connections' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_cloud_connections', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_cloud_instance_info.py b/plugins/modules/ibm_pi_cloud_instance_info.py index 23ece47a5..1e9775740 100644 --- a/plugins/modules/ibm_pi_cloud_instance_info.py +++ b/plugins/modules/ibm_pi_cloud_instance_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_cloud_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_cloud_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_console_language.py b/plugins/modules/ibm_pi_console_language.py index 3659d0413..73ac109f9 100644 --- a/plugins/modules/ibm_pi_console_language.py +++ b/plugins/modules/ibm_pi_console_language.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_console_language' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + pi_cloud_instance_id: + description: + - (Required for new resource) PI cloud instance ID + required: True + type: str pi_instance_name: description: - (Required for new resource) The unique identifier or name of the instance @@ -32,11 +37,6 @@ - (Required for new resource) Language code required: True type: str - pi_cloud_instance_id: - description: - - (Required for new resource) PI cloud instance ID - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -79,16 +79,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('pi_cloud_instance_id', 'str'), ('pi_instance_name', 'str'), ('pi_language_code', 'str'), - ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'pi_cloud_instance_id', 'pi_instance_name', 'pi_language_code', - 'pi_cloud_instance_id', ] # Params for Data source @@ -105,13 +105,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_instance_name=dict( + pi_cloud_instance_id=dict( required=False, type='str'), - pi_language_code=dict( + pi_instance_name=dict( required=False, type='str'), - pi_cloud_instance_id=dict( + pi_language_code=dict( required=False, type='str'), id=dict( @@ -172,7 +172,7 @@ def run_module(): resource_type='ibm_pi_console_language', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_console_languages_info.py b/plugins/modules/ibm_pi_console_languages_info.py index 778697a80..5250a6095 100644 --- a/plugins/modules/ibm_pi_console_languages_info.py +++ b/plugins/modules/ibm_pi_console_languages_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_console_languages' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_console_languages', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_dhcp.py b/plugins/modules/ibm_pi_dhcp.py index ae5d03f52..e6b296bed 100644 --- a/plugins/modules/ibm_pi_dhcp.py +++ b/plugins/modules/ibm_pi_dhcp.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_dhcp' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -165,7 +165,7 @@ def run_module(): resource_type='ibm_pi_dhcp', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -174,7 +174,7 @@ def run_module(): resource_type='ibm_pi_dhcp', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_dhcp_info.py b/plugins/modules/ibm_pi_dhcp_info.py index db78b94bc..a8a3a8469 100644 --- a/plugins/modules/ibm_pi_dhcp_info.py +++ b/plugins/modules/ibm_pi_dhcp_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_dhcp' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_dhcp', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_dhcps_info.py b/plugins/modules/ibm_pi_dhcps_info.py index cac50b3d5..27607e95b 100644 --- a/plugins/modules/ibm_pi_dhcps_info.py +++ b/plugins/modules/ibm_pi_dhcps_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_dhcps' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_dhcps', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_ike_policy.py b/plugins/modules/ibm_pi_ike_policy.py index 135e712db..96315bd27 100644 --- a/plugins/modules/ibm_pi_ike_policy.py +++ b/plugins/modules/ibm_pi_ike_policy.py @@ -18,36 +18,31 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_ike_policy' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_policy_preshared_key: - description: - - (Required for new resource) Preshared key used in this IKE Policy (length of preshared key must be even) - required: True - type: str pi_policy_authentication: description: - Authentication for the IKE Policy required: False type: str default: none - pi_policy_dh_group: + pi_cloud_instance_id: description: - - (Required for new resource) DH group of the IKE Policy + - (Required for new resource) PI cloud instance ID required: True - type: int + type: str pi_policy_name: description: - (Required for new resource) Name of the IKE Policy required: True type: str - pi_policy_encryption: + pi_policy_dh_group: description: - - (Required for new resource) Encryption of the IKE Policy + - (Required for new resource) DH group of the IKE Policy required: True - type: str + type: int pi_policy_key_lifetime: description: - (Required for new resource) Policy key lifetime @@ -58,9 +53,14 @@ - (Required for new resource) Version of the IKE Policy required: True type: int - pi_cloud_instance_id: + pi_policy_encryption: description: - - (Required for new resource) PI cloud instance ID + - (Required for new resource) Encryption of the IKE Policy + required: True + type: str + pi_policy_preshared_key: + description: + - (Required for new resource) Preshared key used in this IKE Policy (length of preshared key must be even) required: True type: str id: @@ -105,25 +105,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_policy_preshared_key', 'str'), - ('pi_policy_dh_group', 'int'), + ('pi_cloud_instance_id', 'str'), ('pi_policy_name', 'str'), - ('pi_policy_encryption', 'str'), + ('pi_policy_dh_group', 'int'), ('pi_policy_key_lifetime', 'int'), ('pi_policy_version', 'int'), - ('pi_cloud_instance_id', 'str'), + ('pi_policy_encryption', 'str'), + ('pi_policy_preshared_key', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_policy_preshared_key', 'pi_policy_authentication', - 'pi_policy_dh_group', + 'pi_cloud_instance_id', 'pi_policy_name', - 'pi_policy_encryption', + 'pi_policy_dh_group', 'pi_policy_key_lifetime', 'pi_policy_version', - 'pi_cloud_instance_id', + 'pi_policy_encryption', + 'pi_policy_preshared_key', ] # Params for Data source @@ -140,28 +140,28 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_policy_preshared_key=dict( - required=False, - type='str'), pi_policy_authentication=dict( required=False, type='str'), - pi_policy_dh_group=dict( + pi_cloud_instance_id=dict( required=False, - type='int'), + type='str'), pi_policy_name=dict( required=False, type='str'), - pi_policy_encryption=dict( + pi_policy_dh_group=dict( required=False, - type='str'), + type='int'), pi_policy_key_lifetime=dict( required=False, type='int'), pi_policy_version=dict( required=False, type='int'), - pi_cloud_instance_id=dict( + pi_policy_encryption=dict( + required=False, + type='str'), + pi_policy_preshared_key=dict( required=False, type='str'), id=dict( @@ -222,7 +222,7 @@ def run_module(): resource_type='ibm_pi_ike_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_image.py b/plugins/modules/ibm_pi_image.py index 2c456494d..28150e0f9 100644 --- a/plugins/modules/ibm_pi_image.py +++ b/plugins/modules/ibm_pi_image.py @@ -18,91 +18,91 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_image' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_image_id: - description: - - Instance image id - required: False - type: str - pi_image_access_key: + pi_cloud_instance_id: description: - - Cloud Object Storage access key; required for buckets with private access - required: False + - (Required for new resource) PI cloud instance ID + required: True type: str pi_image_bucket_region: description: - Cloud Object Storage region required: False type: str - pi_image_storage_type: + pi_affinity_instance: description: - - Type of storage + - PVM Instance (ID or Name) to base storage affinity policy against; required if requesting storage affinity and pi_affinity_volume is not provided required: False type: str - pi_affinity_volume: + pi_image_storage_pool: description: - - Volume (ID or Name) to base storage affinity policy against; required if requesting affinity and pi_affinity_instance is not provided + - Storage pool where the image will be loaded, if provided then pi_image_storage_type and pi_affinity_policy will be ignored required: False type: str - pi_image_name: + pi_anti_affinity_instances: description: - - (Required for new resource) Image name - required: True - type: str - pi_image_bucket_access: + - List of pvmInstances to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_volumes is not provided + required: False + type: list + elements: str + pi_image_id: description: - - Indicates if the bucket has public or private access + - Instance image id required: False type: str - default: public - pi_image_bucket_file_name: + pi_image_access_key: description: - - Cloud Object Storage image filename + - Cloud Object Storage access key; required for buckets with private access required: False type: str - pi_image_storage_pool: + pi_image_secret_key: description: - - Storage pool where the image will be loaded, if provided then pi_image_storage_type and pi_affinity_policy will be ignored + - Cloud Object Storage secret key; required for buckets with private access required: False type: str - pi_affinity_policy: + pi_image_bucket_file_name: description: - - Affinity policy for image; ignored if pi_image_storage_pool provided; for policy affinity requires one of pi_affinity_instance or pi_affinity_volume to be specified; for policy anti-affinity requires one of pi_anti_affinity_instances or pi_anti_affinity_volumes to be specified + - Cloud Object Storage image filename required: False type: str - pi_affinity_instance: + pi_image_storage_type: description: - - PVM Instance (ID or Name) to base storage affinity policy against; required if requesting storage affinity and pi_affinity_volume is not provided + - Type of storage required: False type: str - pi_anti_affinity_instances: + pi_anti_affinity_volumes: description: - - List of pvmInstances to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_volumes is not provided + - List of volumes to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided required: False type: list elements: str - pi_cloud_instance_id: + pi_image_name: description: - - (Required for new resource) PI cloud instance ID + - (Required for new resource) Image name required: True type: str - pi_image_secret_key: + pi_image_bucket_name: description: - - Cloud Object Storage secret key; required for buckets with private access + - Cloud Object Storage bucket name; bucket-name[/optional/folder] required: False type: str - pi_anti_affinity_volumes: + pi_image_bucket_access: description: - - List of volumes to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided + - Indicates if the bucket has public or private access required: False - type: list - elements: str - pi_image_bucket_name: + type: str + default: public + pi_affinity_policy: description: - - Cloud Object Storage bucket name; bucket-name[/optional/folder] + - Affinity policy for image; ignored if pi_image_storage_pool provided; for policy affinity requires one of pi_affinity_instance or pi_affinity_volume to be specified; for policy anti-affinity requires one of pi_anti_affinity_instances or pi_anti_affinity_volumes to be specified + required: False + type: str + pi_affinity_volume: + description: + - Volume (ID or Name) to base storage affinity policy against; required if requesting affinity and pi_affinity_instance is not provided required: False type: str id: @@ -147,28 +147,28 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_image_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_image_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_image_id', - 'pi_image_access_key', + 'pi_cloud_instance_id', 'pi_image_bucket_region', - 'pi_image_storage_type', - 'pi_affinity_volume', - 'pi_image_name', - 'pi_image_bucket_access', - 'pi_image_bucket_file_name', - 'pi_image_storage_pool', - 'pi_affinity_policy', 'pi_affinity_instance', + 'pi_image_storage_pool', 'pi_anti_affinity_instances', - 'pi_cloud_instance_id', + 'pi_image_id', + 'pi_image_access_key', 'pi_image_secret_key', + 'pi_image_bucket_file_name', + 'pi_image_storage_type', 'pi_anti_affinity_volumes', + 'pi_image_name', 'pi_image_bucket_name', + 'pi_image_bucket_access', + 'pi_affinity_policy', + 'pi_affinity_volume', ] # Params for Data source @@ -183,69 +183,69 @@ ] TL_CONFLICTS_MAP = { - 'pi_image_id': ['pi_image_bucket_name'], 'pi_image_bucket_region': ['pi_image_id'], - 'pi_affinity_volume': ['pi_affinity_instance'], - 'pi_image_bucket_access': ['pi_image_id'], - 'pi_image_bucket_file_name': ['pi_image_id'], 'pi_affinity_instance': ['pi_affinity_volume'], 'pi_anti_affinity_instances': ['pi_anti_affinity_volumes'], + 'pi_image_id': ['pi_image_bucket_name'], + 'pi_image_bucket_file_name': ['pi_image_id'], 'pi_anti_affinity_volumes': ['pi_anti_affinity_instances'], 'pi_image_bucket_name': ['pi_image_id'], + 'pi_image_bucket_access': ['pi_image_id'], + 'pi_affinity_volume': ['pi_affinity_instance'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_image_id=dict( - required=False, - type='str'), - pi_image_access_key=dict( + pi_cloud_instance_id=dict( required=False, type='str'), pi_image_bucket_region=dict( required=False, type='str'), - pi_image_storage_type=dict( + pi_affinity_instance=dict( required=False, type='str'), - pi_affinity_volume=dict( + pi_image_storage_pool=dict( required=False, type='str'), - pi_image_name=dict( + pi_anti_affinity_instances=dict( required=False, - type='str'), - pi_image_bucket_access=dict( + elements='', + type='list'), + pi_image_id=dict( required=False, type='str'), - pi_image_bucket_file_name=dict( + pi_image_access_key=dict( required=False, type='str'), - pi_image_storage_pool=dict( + pi_image_secret_key=dict( required=False, type='str'), - pi_affinity_policy=dict( + pi_image_bucket_file_name=dict( required=False, type='str'), - pi_affinity_instance=dict( + pi_image_storage_type=dict( required=False, type='str'), - pi_anti_affinity_instances=dict( + pi_anti_affinity_volumes=dict( required=False, elements='', type='list'), - pi_cloud_instance_id=dict( + pi_image_name=dict( required=False, type='str'), - pi_image_secret_key=dict( + pi_image_bucket_name=dict( required=False, type='str'), - pi_anti_affinity_volumes=dict( + pi_image_bucket_access=dict( required=False, - elements='', - type='list'), - pi_image_bucket_name=dict( + type='str'), + pi_affinity_policy=dict( + required=False, + type='str'), + pi_affinity_volume=dict( required=False, type='str'), id=dict( @@ -306,7 +306,7 @@ def run_module(): resource_type='ibm_pi_image', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -315,7 +315,7 @@ def run_module(): resource_type='ibm_pi_image', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_image_export.py b/plugins/modules/ibm_pi_image_export.py index 59bc66c70..872cd43f2 100644 --- a/plugins/modules/ibm_pi_image_export.py +++ b/plugins/modules/ibm_pi_image_export.py @@ -18,38 +18,38 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_image_export' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_cloud_instance_id: + pi_image_access_key: description: - - (Required for new resource) PI cloud instance ID + - (Required for new resource) Cloud Object Storage access key; required for buckets with private access required: True type: str - pi_image_id: + pi_image_secret_key: description: - - (Required for new resource) Instance image id + - (Required for new resource) Cloud Object Storage secret key; required for buckets with private access required: True type: str - pi_image_bucket_name: + pi_image_bucket_region: description: - - (Required for new resource) Cloud Object Storage bucket name; bucket-name[/optional/folder] + - (Required for new resource) Cloud Object Storage region required: True type: str - pi_image_access_key: + pi_cloud_instance_id: description: - - (Required for new resource) Cloud Object Storage access key; required for buckets with private access + - (Required for new resource) PI cloud instance ID required: True type: str - pi_image_secret_key: + pi_image_id: description: - - (Required for new resource) Cloud Object Storage secret key; required for buckets with private access + - (Required for new resource) Instance image id required: True type: str - pi_image_bucket_region: + pi_image_bucket_name: description: - - (Required for new resource) Cloud Object Storage region + - (Required for new resource) Cloud Object Storage bucket name; bucket-name[/optional/folder] required: True type: str id: @@ -94,22 +94,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), - ('pi_image_id', 'str'), - ('pi_image_bucket_name', 'str'), ('pi_image_access_key', 'str'), ('pi_image_secret_key', 'str'), ('pi_image_bucket_region', 'str'), + ('pi_cloud_instance_id', 'str'), + ('pi_image_id', 'str'), + ('pi_image_bucket_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_instance_id', - 'pi_image_id', - 'pi_image_bucket_name', 'pi_image_access_key', 'pi_image_secret_key', 'pi_image_bucket_region', + 'pi_cloud_instance_id', + 'pi_image_id', + 'pi_image_bucket_name', ] # Params for Data source @@ -126,22 +126,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_cloud_instance_id=dict( + pi_image_access_key=dict( required=False, type='str'), - pi_image_id=dict( + pi_image_secret_key=dict( required=False, type='str'), - pi_image_bucket_name=dict( + pi_image_bucket_region=dict( required=False, type='str'), - pi_image_access_key=dict( + pi_cloud_instance_id=dict( required=False, type='str'), - pi_image_secret_key=dict( + pi_image_id=dict( required=False, type='str'), - pi_image_bucket_region=dict( + pi_image_bucket_name=dict( required=False, type='str'), id=dict( @@ -202,7 +202,7 @@ def run_module(): resource_type='ibm_pi_image_export', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_image_info.py b/plugins/modules/ibm_pi_image_info.py index 4d79f474d..65c5a9c6f 100644 --- a/plugins/modules/ibm_pi_image_info.py +++ b/plugins/modules/ibm_pi_image_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_image' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_image', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_images_info.py b/plugins/modules/ibm_pi_images_info.py index ce5d0add2..391dbd192 100644 --- a/plugins/modules/ibm_pi_images_info.py +++ b/plugins/modules/ibm_pi_images_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_images' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_images', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_instance.py b/plugins/modules/ibm_pi_instance.py index 5f0b34619..ca83065da 100644 --- a/plugins/modules/ibm_pi_instance.py +++ b/plugins/modules/ibm_pi_instance.py @@ -18,34 +18,45 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_affinity_instance: + pi_replicants: description: - - PVM Instance (ID or Name) to base storage affinity policy against; required if requesting storage affinity and pi_affinity_volume is not provided + - PI Instance replicas count + required: False + type: int + default: 1 + pi_sys_type: + description: + - PI Instance system type required: False type: str - pi_proc_type: + pi_storage_pool_affinity: description: - - Instance processor type + - Indicates if all volumes attached to the server must reside in the same storage pool + required: False + type: bool + default: True + pi_placement_group_id: + description: + - Placement group ID required: False type: str - pi_replicants: + pi_sap_deployment_type: description: - - PI Instance replicas count + - Custom SAP Deployment Type Information required: False - type: int - default: 1 - pi_virtual_cores_assigned: + type: str + pi_storage_connection: description: - - Virtual Cores Assigned to the PVMInstance + - Storage Connectivity Group for server deployment required: False - type: int - pi_instance_name: + type: str + pi_image_id: description: - - (Required for new resource) PI Instance name + - (Required for new resource) PI instance image id required: True type: str pi_replication_policy: @@ -54,73 +65,89 @@ required: False type: str default: none - pi_storage_type: + pi_affinity_policy: description: - - Storage type for server deployment + - Affinity policy for pvm instance being created; ignored if pi_storage_pool provided; for policy affinity requires one of pi_affinity_instance or pi_affinity_volume to be specified; for policy anti-affinity requires one of pi_anti_affinity_instances or pi_anti_affinity_volumes to be specified required: False type: str - pi_storage_connection: + pi_instance_name: description: - - Storage Connectivity Group for server deployment - required: False + - (Required for new resource) PI Instance name + required: True type: str - pi_placement_group_id: + pi_network: description: - - Placement group ID + - (Required for new resource) List of one or more networks to attach to the instance + required: True + type: list + elements: dict + pi_affinity_instance: + description: + - PVM Instance (ID or Name) to base storage affinity policy against; required if requesting storage affinity and pi_affinity_volume is not provided required: False type: str - pi_processors: + pi_replication_scheme: description: - - Processors count + - Replication scheme required: False - type: float - pi_affinity_volume: + type: str + default: suffix + pi_storage_pool: description: - - Volume (ID or Name) to base storage affinity policy against; required if requesting affinity and pi_affinity_instance is not provided + - Storage Pool for server deployment; if provided then pi_affinity_policy and pi_storage_type will be ignored required: False type: str - pi_anti_affinity_volumes: + pi_anti_affinity_instances: description: - - List of volumes to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided + - List of pvmInstances to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_volumes is not provided required: False type: list elements: str + pi_proc_type: + description: + - Instance processor type + required: False + type: str pi_key_pair_name: description: - SSH key name required: False type: str - pi_anti_affinity_instances: + pi_pin_policy: description: - - List of pvmInstances to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_volumes is not provided + - Pin Policy of the instance required: False - type: list - elements: str - pi_storage_pool_affinity: + type: str + default: none + pi_user_data: description: - - Indicates if all volumes attached to the server must reside in the same storage pool + - Base64 encoded data to be passed in for invoking a cloud init script required: False - type: bool - default: True - pi_sap_deployment_type: + type: str + pi_affinity_volume: description: - - Custom SAP Deployment Type Information + - Volume (ID or Name) to base storage affinity policy against; required if requesting affinity and pi_affinity_instance is not provided required: False type: str - pi_volume_ids: + pi_anti_affinity_volumes: description: - - List of PI volumes + - List of volumes to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided required: False type: list elements: str - pi_user_data: + pi_processors: description: - - Base64 encoded data to be passed in for invoking a cloud init script + - Processors count required: False - type: str - pi_storage_pool: + type: float + pi_memory: description: - - Storage Pool for server deployment; if provided then pi_affinity_policy and pi_storage_type will be ignored + - Memory size + required: False + type: float + pi_sap_profile_id: + description: + - SAP Profile ID for the amount of cores and memory required: False type: str pi_health_status: @@ -134,59 +161,32 @@ - set to true to enable migration of the PI instance required: False type: bool - pi_image_id: - description: - - (Required for new resource) PI instance image id - required: True - type: str - pi_sys_type: - description: - - PI Instance system type - required: False - type: str - pi_pin_policy: - description: - - Pin Policy of the instance - required: False - type: str - default: none pi_license_repository_capacity: description: - The VTL license repository capacity TB value required: False type: int - pi_affinity_policy: + pi_volume_ids: description: - - Affinity policy for pvm instance being created; ignored if pi_storage_pool provided; for policy affinity requires one of pi_affinity_instance or pi_affinity_volume to be specified; for policy anti-affinity requires one of pi_anti_affinity_instances or pi_anti_affinity_volumes to be specified + - List of PI volumes required: False - type: str - pi_memory: + type: list + elements: str + pi_storage_type: description: - - Memory size + - Storage type for server deployment required: False - type: float - pi_sap_profile_id: + type: str + pi_virtual_cores_assigned: description: - - SAP Profile ID for the amount of cores and memory + - Virtual Cores Assigned to the PVMInstance required: False - type: str + type: int pi_cloud_instance_id: description: - (Required for new resource) This is the Power Instance id that is assigned to the account required: True type: str - pi_network: - description: - - (Required for new resource) List of one or more networks to attach to the instance - required: True - type: list - elements: dict - pi_replication_scheme: - description: - - Replication scheme - required: False - type: str - default: suffix id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -229,45 +229,45 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_instance_name', 'str'), ('pi_image_id', 'str'), - ('pi_cloud_instance_id', 'str'), + ('pi_instance_name', 'str'), ('pi_network', 'list'), + ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_affinity_instance', - 'pi_proc_type', 'pi_replicants', - 'pi_virtual_cores_assigned', - 'pi_instance_name', - 'pi_replication_policy', - 'pi_storage_type', - 'pi_storage_connection', - 'pi_placement_group_id', - 'pi_processors', - 'pi_affinity_volume', - 'pi_anti_affinity_volumes', - 'pi_key_pair_name', - 'pi_anti_affinity_instances', + 'pi_sys_type', 'pi_storage_pool_affinity', + 'pi_placement_group_id', 'pi_sap_deployment_type', - 'pi_volume_ids', - 'pi_user_data', - 'pi_storage_pool', - 'pi_health_status', - 'pi_migratable', + 'pi_storage_connection', 'pi_image_id', - 'pi_sys_type', - 'pi_pin_policy', - 'pi_license_repository_capacity', + 'pi_replication_policy', 'pi_affinity_policy', + 'pi_instance_name', + 'pi_network', + 'pi_affinity_instance', + 'pi_replication_scheme', + 'pi_storage_pool', + 'pi_anti_affinity_instances', + 'pi_proc_type', + 'pi_key_pair_name', + 'pi_pin_policy', + 'pi_user_data', + 'pi_affinity_volume', + 'pi_anti_affinity_volumes', + 'pi_processors', 'pi_memory', 'pi_sap_profile_id', + 'pi_health_status', + 'pi_migratable', + 'pi_license_repository_capacity', + 'pi_volume_ids', + 'pi_storage_type', + 'pi_virtual_cores_assigned', 'pi_cloud_instance_id', - 'pi_network', - 'pi_replication_scheme', ] # Params for Data source @@ -283,11 +283,11 @@ TL_CONFLICTS_MAP = { 'pi_affinity_instance': ['pi_affinity_volume'], + 'pi_anti_affinity_instances': ['pi_anti_affinity_volumes'], 'pi_proc_type': ['pi_sap_profile_id'], - 'pi_processors': ['pi_sap_profile_id'], 'pi_affinity_volume': ['pi_affinity_instance'], 'pi_anti_affinity_volumes': ['pi_anti_affinity_instances'], - 'pi_anti_affinity_instances': ['pi_anti_affinity_volumes'], + 'pi_processors': ['pi_sap_profile_id'], 'pi_memory': ['pi_sap_profile_id'], 'pi_sap_profile_id': ['pi_processors', 'pi_memory', 'pi_proc_type'], } @@ -296,101 +296,101 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_affinity_instance=dict( - required=False, - type='str'), - pi_proc_type=dict( - required=False, - type='str'), pi_replicants=dict( required=False, type='int'), - pi_virtual_cores_assigned=dict( - required=False, - type='int'), - pi_instance_name=dict( + pi_sys_type=dict( required=False, type='str'), - pi_replication_policy=dict( + pi_storage_pool_affinity=dict( + required=False, + type='bool'), + pi_placement_group_id=dict( required=False, type='str'), - pi_storage_type=dict( + pi_sap_deployment_type=dict( required=False, type='str'), pi_storage_connection=dict( required=False, type='str'), - pi_placement_group_id=dict( + pi_image_id=dict( required=False, type='str'), - pi_processors=dict( - required=False, - type='float'), - pi_affinity_volume=dict( + pi_replication_policy=dict( required=False, type='str'), - pi_anti_affinity_volumes=dict( - required=False, - elements='', - type='list'), - pi_key_pair_name=dict( + pi_affinity_policy=dict( required=False, type='str'), - pi_anti_affinity_instances=dict( - required=False, - elements='', - type='list'), - pi_storage_pool_affinity=dict( - required=False, - type='bool'), - pi_sap_deployment_type=dict( + pi_instance_name=dict( required=False, type='str'), - pi_volume_ids=dict( + pi_network=dict( required=False, elements='', type='list'), - pi_user_data=dict( + pi_affinity_instance=dict( required=False, type='str'), - pi_storage_pool=dict( + pi_replication_scheme=dict( required=False, type='str'), - pi_health_status=dict( + pi_storage_pool=dict( required=False, type='str'), - pi_migratable=dict( + pi_anti_affinity_instances=dict( required=False, - type='bool'), - pi_image_id=dict( + elements='', + type='list'), + pi_proc_type=dict( required=False, type='str'), - pi_sys_type=dict( + pi_key_pair_name=dict( required=False, type='str'), pi_pin_policy=dict( required=False, type='str'), - pi_license_repository_capacity=dict( + pi_user_data=dict( required=False, - type='int'), - pi_affinity_policy=dict( + type='str'), + pi_affinity_volume=dict( required=False, type='str'), + pi_anti_affinity_volumes=dict( + required=False, + elements='', + type='list'), + pi_processors=dict( + required=False, + type='float'), pi_memory=dict( required=False, type='float'), pi_sap_profile_id=dict( required=False, type='str'), - pi_cloud_instance_id=dict( + pi_health_status=dict( required=False, type='str'), - pi_network=dict( + pi_migratable=dict( + required=False, + type='bool'), + pi_license_repository_capacity=dict( + required=False, + type='int'), + pi_volume_ids=dict( required=False, elements='', type='list'), - pi_replication_scheme=dict( + pi_storage_type=dict( + required=False, + type='str'), + pi_virtual_cores_assigned=dict( + required=False, + type='int'), + pi_cloud_instance_id=dict( required=False, type='str'), id=dict( @@ -451,7 +451,7 @@ def run_module(): resource_type='ibm_pi_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -460,7 +460,7 @@ def run_module(): resource_type='ibm_pi_instance', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_instance_info.py b/plugins/modules/ibm_pi_instance_info.py index 601d03079..3ea492d2f 100644 --- a/plugins/modules/ibm_pi_instance_info.py +++ b/plugins/modules/ibm_pi_instance_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_instance_ip_info.py b/plugins/modules/ibm_pi_instance_ip_info.py index 57869b18d..aa670cec3 100644 --- a/plugins/modules/ibm_pi_instance_ip_info.py +++ b/plugins/modules/ibm_pi_instance_ip_info.py @@ -17,13 +17,13 @@ description: - Retrieve an IBM Cloud 'ibm_pi_instance_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_instance_name: + pi_cloud_instance_id: description: - - Server Name to be used for pvminstances + - None required: True type: str pi_network_name: @@ -31,9 +31,9 @@ - None required: True type: str - pi_cloud_instance_id: + pi_instance_name: description: - - None + - Server Name to be used for pvminstances required: True type: str zone: @@ -65,16 +65,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_instance_name', 'str'), - ('pi_network_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_network_name', 'str'), + ('pi_instance_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_instance_name', - 'pi_network_name', 'pi_cloud_instance_id', + 'pi_network_name', + 'pi_instance_name', ] @@ -85,13 +85,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_instance_name=dict( + pi_cloud_instance_id=dict( required=True, type='str'), pi_network_name=dict( required=True, type='str'), - pi_cloud_instance_id=dict( + pi_instance_name=dict( required=True, type='str'), zone=dict( @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_pi_instance_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_instance_snapshots_info.py b/plugins/modules/ibm_pi_instance_snapshots_info.py index a593f303e..503d0e6cd 100644 --- a/plugins/modules/ibm_pi_instance_snapshots_info.py +++ b/plugins/modules/ibm_pi_instance_snapshots_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_instance_snapshots' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_instance_snapshots', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_instance_volumes_info.py b/plugins/modules/ibm_pi_instance_volumes_info.py index 0c4ce27c0..5e733680b 100644 --- a/plugins/modules/ibm_pi_instance_volumes_info.py +++ b/plugins/modules/ibm_pi_instance_volumes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_instance_volumes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_instance_volumes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_instances_info.py b/plugins/modules/ibm_pi_instances_info.py index bb6b198df..c721f6429 100644 --- a/plugins/modules/ibm_pi_instances_info.py +++ b/plugins/modules/ibm_pi_instances_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_instances' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_instances', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_ipsec_policy.py b/plugins/modules/ibm_pi_ipsec_policy.py index 3907ab211..7cf405a70 100644 --- a/plugins/modules/ibm_pi_ipsec_policy.py +++ b/plugins/modules/ibm_pi_ipsec_policy.py @@ -18,25 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_ipsec_policy' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_cloud_instance_id: - description: - - (Required for new resource) PI cloud instance ID - required: True - type: str - pi_policy_name: - description: - - (Required for new resource) Name of the IPSec Policy - required: True - type: str - pi_policy_dh_group: - description: - - (Required for new resource) DH group of the IPSec Policy - required: True - type: int pi_policy_encryption: description: - (Required for new resource) Encryption of the IPSec Policy @@ -58,6 +43,21 @@ required: False type: str default: none + pi_cloud_instance_id: + description: + - (Required for new resource) PI cloud instance ID + required: True + type: str + pi_policy_name: + description: + - (Required for new resource) Name of the IPSec Policy + required: True + type: str + pi_policy_dh_group: + description: + - (Required for new resource) DH group of the IPSec Policy + required: True + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -100,23 +100,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), - ('pi_policy_name', 'str'), - ('pi_policy_dh_group', 'int'), ('pi_policy_encryption', 'str'), ('pi_policy_key_lifetime', 'int'), ('pi_policy_pfs', 'bool'), + ('pi_cloud_instance_id', 'str'), + ('pi_policy_name', 'str'), + ('pi_policy_dh_group', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_instance_id', - 'pi_policy_name', - 'pi_policy_dh_group', 'pi_policy_encryption', 'pi_policy_key_lifetime', 'pi_policy_pfs', 'pi_policy_authentication', + 'pi_cloud_instance_id', + 'pi_policy_name', + 'pi_policy_dh_group', ] # Params for Data source @@ -133,15 +133,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_cloud_instance_id=dict( - required=False, - type='str'), - pi_policy_name=dict( - required=False, - type='str'), - pi_policy_dh_group=dict( - required=False, - type='int'), pi_policy_encryption=dict( required=False, type='str'), @@ -154,6 +145,15 @@ pi_policy_authentication=dict( required=False, type='str'), + pi_cloud_instance_id=dict( + required=False, + type='str'), + pi_policy_name=dict( + required=False, + type='str'), + pi_policy_dh_group=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -212,7 +212,7 @@ def run_module(): resource_type='ibm_pi_ipsec_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_key.py b/plugins/modules/ibm_pi_key.py index 41a2ec7fb..362f0897b 100644 --- a/plugins/modules/ibm_pi_key.py +++ b/plugins/modules/ibm_pi_key.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + pi_key_name: + description: + - (Required for new resource) Key name in the PI instance + required: True + type: str pi_ssh_key: description: - (Required for new resource) PI instance key info @@ -32,11 +37,6 @@ - (Required for new resource) PI cloud instance ID required: True type: str - pi_key_name: - description: - - (Required for new resource) Key name in the PI instance - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -79,27 +79,27 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('pi_key_name', 'str'), ('pi_ssh_key', 'str'), ('pi_cloud_instance_id', 'str'), - ('pi_key_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'pi_key_name', 'pi_ssh_key', 'pi_cloud_instance_id', - 'pi_key_name', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('pi_cloud_instance_id', 'str'), ('pi_key_name', 'str'), + ('pi_cloud_instance_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'pi_cloud_instance_id', 'pi_key_name', + 'pi_cloud_instance_id', ] TL_CONFLICTS_MAP = { @@ -109,13 +109,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_ssh_key=dict( + pi_key_name=dict( required=False, type='str'), - pi_cloud_instance_id=dict( + pi_ssh_key=dict( required=False, type='str'), - pi_key_name=dict( + pi_cloud_instance_id=dict( required=False, type='str'), id=dict( @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_pi_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_pi_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_key_info.py b/plugins/modules/ibm_pi_key_info.py index bb37b6f3e..b2f39cfc0 100644 --- a/plugins/modules/ibm_pi_key_info.py +++ b/plugins/modules/ibm_pi_key_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_pi_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_cloud_instance_id: + pi_key_name: description: - - None + - SSHKey Name to be used for pvminstances required: True type: str - pi_key_name: + pi_cloud_instance_id: description: - - SSHKey Name to be used for pvminstances + - None required: True type: str zone: @@ -60,14 +60,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), ('pi_key_name', 'str'), + ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_instance_id', 'pi_key_name', + 'pi_cloud_instance_id', ] @@ -78,10 +78,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_cloud_instance_id=dict( + pi_key_name=dict( required=True, type='str'), - pi_key_name=dict( + pi_cloud_instance_id=dict( required=True, type='str'), zone=dict( @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_keys_info.py b/plugins/modules/ibm_pi_keys_info.py index 8d658bf4e..aa87f7632 100644 --- a/plugins/modules/ibm_pi_keys_info.py +++ b/plugins/modules/ibm_pi_keys_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_keys' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_keys', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_network.py b/plugins/modules/ibm_pi_network.py index 66c0fc819..ec9bc1b42 100644 --- a/plugins/modules/ibm_pi_network.py +++ b/plugins/modules/ibm_pi_network.py @@ -18,40 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_network' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_network_name: + pi_network_jumbo: description: - - (Required for new resource) PI network name - required: True - type: str + - PI network enable MTU Jumbo option + required: False + type: bool pi_cloud_instance_id: description: - (Required for new resource) PI cloud instance ID required: True type: str - pi_network_type: - description: - - (Required for new resource) PI network type - required: True - type: str - pi_cidr: - description: - - PI network CIDR - required: False - type: str - pi_gateway: - description: - - PI network gateway - required: False - type: str - pi_network_jumbo: - description: - - PI network enable MTU Jumbo option - required: False - type: bool pi_ipaddress_range: description: - List of one or more ip address range(s) @@ -64,6 +44,26 @@ required: False type: list elements: str + pi_gateway: + description: + - PI network gateway + required: False + type: str + pi_cidr: + description: + - PI network CIDR + required: False + type: str + pi_network_type: + description: + - (Required for new resource) PI network type + required: True + type: str + pi_network_name: + description: + - (Required for new resource) PI network name + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -106,21 +106,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_network_name', 'str'), ('pi_cloud_instance_id', 'str'), ('pi_network_type', 'str'), + ('pi_network_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_network_name', - 'pi_cloud_instance_id', - 'pi_network_type', - 'pi_cidr', - 'pi_gateway', 'pi_network_jumbo', + 'pi_cloud_instance_id', 'pi_ipaddress_range', 'pi_dns', + 'pi_gateway', + 'pi_cidr', + 'pi_network_type', + 'pi_network_name', ] # Params for Data source @@ -141,24 +141,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_network_name=dict( + pi_network_jumbo=dict( required=False, - type='str'), + type='bool'), pi_cloud_instance_id=dict( required=False, type='str'), - pi_network_type=dict( - required=False, - type='str'), - pi_cidr=dict( - required=False, - type='str'), - pi_gateway=dict( - required=False, - type='str'), - pi_network_jumbo=dict( - required=False, - type='bool'), pi_ipaddress_range=dict( required=False, elements='', @@ -167,6 +155,18 @@ required=False, elements='', type='list'), + pi_gateway=dict( + required=False, + type='str'), + pi_cidr=dict( + required=False, + type='str'), + pi_network_type=dict( + required=False, + type='str'), + pi_network_name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -225,7 +225,7 @@ def run_module(): resource_type='ibm_pi_network', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -234,7 +234,7 @@ def run_module(): resource_type='ibm_pi_network', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_network_info.py b/plugins/modules/ibm_pi_network_info.py index f8f2b7555..10c966c34 100644 --- a/plugins/modules/ibm_pi_network_info.py +++ b/plugins/modules/ibm_pi_network_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_network' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_network', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_network_port.py b/plugins/modules/ibm_pi_network_port.py index bb1945f41..3e0e5ae24 100644 --- a/plugins/modules/ibm_pi_network_port.py +++ b/plugins/modules/ibm_pi_network_port.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_network_port' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -98,13 +98,13 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('pi_network_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_network_name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'pi_network_name', 'pi_cloud_instance_id', + 'pi_network_name', ] TL_CONFLICTS_MAP = { @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_pi_network_port', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_pi_network_port', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_network_port_attach.py b/plugins/modules/ibm_pi_network_port_attach.py index 3b6fc9c2d..24b0b27bf 100644 --- a/plugins/modules/ibm_pi_network_port_attach.py +++ b/plugins/modules/ibm_pi_network_port_attach.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_network_port_attach' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,9 +27,14 @@ - None required: False type: str - pi_instance_id: + pi_cloud_instance_id: description: - - (Required for new resource) Instance id to attach the network port to + - (Required for new resource) + required: True + type: str + pi_network_name: + description: + - (Required for new resource) Network Name - This is the subnet name in the Cloud instance required: True type: str pi_network_port_description: @@ -38,14 +43,9 @@ required: False type: str default: Port Created via Terraform - pi_cloud_instance_id: - description: - - (Required for new resource) - required: True - type: str - pi_network_name: + pi_instance_id: description: - - (Required for new resource) Network Name - This is the subnet name in the Cloud instance + - (Required for new resource) Instance id to attach the network port to required: True type: str id: @@ -90,18 +90,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_instance_id', 'str'), ('pi_cloud_instance_id', 'str'), ('pi_network_name', 'str'), + ('pi_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'pi_network_port_ipaddress', - 'pi_instance_id', - 'pi_network_port_description', 'pi_cloud_instance_id', 'pi_network_name', + 'pi_network_port_description', + 'pi_instance_id', ] # Params for Data source @@ -121,16 +121,16 @@ pi_network_port_ipaddress=dict( required=False, type='str'), - pi_instance_id=dict( + pi_cloud_instance_id=dict( required=False, type='str'), - pi_network_port_description=dict( + pi_network_name=dict( required=False, type='str'), - pi_cloud_instance_id=dict( + pi_network_port_description=dict( required=False, type='str'), - pi_network_name=dict( + pi_instance_id=dict( required=False, type='str'), id=dict( @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_pi_network_port_attach', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_network_port_info.py b/plugins/modules/ibm_pi_network_port_info.py index bb1c11643..185455f6a 100644 --- a/plugins/modules/ibm_pi_network_port_info.py +++ b/plugins/modules/ibm_pi_network_port_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_pi_network_port' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_network_name: + pi_cloud_instance_id: description: - - Network Name to be used for pvminstances + - None required: True type: str - pi_cloud_instance_id: + pi_network_name: description: - - None + - Network Name to be used for pvminstances required: True type: str zone: @@ -60,14 +60,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_network_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_network_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_network_name', 'pi_cloud_instance_id', + 'pi_network_name', ] @@ -78,10 +78,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_network_name=dict( + pi_cloud_instance_id=dict( required=True, type='str'), - pi_cloud_instance_id=dict( + pi_network_name=dict( required=True, type='str'), zone=dict( @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_network_port', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_operations.py b/plugins/modules/ibm_pi_operations.py index d6b0ea913..082c1401c 100644 --- a/plugins/modules/ibm_pi_operations.py +++ b/plugins/modules/ibm_pi_operations.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_operations' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -172,7 +172,7 @@ def run_module(): resource_type='ibm_pi_operations', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_placement_group.py b/plugins/modules/ibm_pi_placement_group.py index dd09b1950..2bcad7af3 100644 --- a/plugins/modules/ibm_pi_placement_group.py +++ b/plugins/modules/ibm_pi_placement_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_placement_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_pi_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_pi_placement_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_placement_group_info.py b/plugins/modules/ibm_pi_placement_group_info.py index 3b3dfefd3..74443067d 100644 --- a/plugins/modules/ibm_pi_placement_group_info.py +++ b/plugins/modules/ibm_pi_placement_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_placement_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_placement_groups_info.py b/plugins/modules/ibm_pi_placement_groups_info.py index b38456a18..20bd72b3f 100644 --- a/plugins/modules/ibm_pi_placement_groups_info.py +++ b/plugins/modules/ibm_pi_placement_groups_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_placement_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_placement_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_public_network_info.py b/plugins/modules/ibm_pi_public_network_info.py index f7907e24e..919db4d62 100644 --- a/plugins/modules/ibm_pi_public_network_info.py +++ b/plugins/modules/ibm_pi_public_network_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_public_network' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_public_network', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_pvm_snapshots_info.py b/plugins/modules/ibm_pi_pvm_snapshots_info.py index d8d878cf1..c34adf8d0 100644 --- a/plugins/modules/ibm_pi_pvm_snapshots_info.py +++ b/plugins/modules/ibm_pi_pvm_snapshots_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_pvm_snapshots' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_pvm_snapshots', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_sap_profile_info.py b/plugins/modules/ibm_pi_sap_profile_info.py index d9f9a5adc..09f89ddf8 100644 --- a/plugins/modules/ibm_pi_sap_profile_info.py +++ b/plugins/modules/ibm_pi_sap_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_sap_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_sap_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_sap_profiles_info.py b/plugins/modules/ibm_pi_sap_profiles_info.py index 657362b04..332b1693f 100644 --- a/plugins/modules/ibm_pi_sap_profiles_info.py +++ b/plugins/modules/ibm_pi_sap_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_sap_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_sap_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_snapshot.py b/plugins/modules/ibm_pi_snapshot.py index 045207bfc..508345334 100644 --- a/plugins/modules/ibm_pi_snapshot.py +++ b/plugins/modules/ibm_pi_snapshot.py @@ -18,29 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_snapshot' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_volume_ids: - description: - - List of PI volumes - required: False - type: list - elements: str - pi_cloud_instance_id: + pi_snap_shot_name: description: - - (Required for new resource) Cloud Instance ID - This is the service_instance_id. + - (Required for new resource) Unique name of the snapshot required: True type: str - pi_description: - description: - - Description of the PVM instance snapshot - required: False - type: str - pi_snap_shot_name: + pi_cloud_instance_id: description: - - (Required for new resource) Unique name of the snapshot + - (Required for new resource) Cloud Instance ID - This is the service_instance_id. required: True type: str pi_instance_name: @@ -48,6 +37,17 @@ - (Required for new resource) Instance name / id of the pvm required: True type: str + pi_volume_ids: + description: + - List of PI volumes + required: False + type: list + elements: str + pi_description: + description: + - Description of the PVM instance snapshot + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,18 +90,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), ('pi_snap_shot_name', 'str'), + ('pi_cloud_instance_id', 'str'), ('pi_instance_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_volume_ids', - 'pi_cloud_instance_id', - 'pi_description', 'pi_snap_shot_name', + 'pi_cloud_instance_id', 'pi_instance_name', + 'pi_volume_ids', + 'pi_description', ] # Params for Data source @@ -118,20 +118,20 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_volume_ids=dict( + pi_snap_shot_name=dict( required=False, - elements='', - type='list'), + type='str'), pi_cloud_instance_id=dict( required=False, type='str'), - pi_description=dict( + pi_instance_name=dict( required=False, type='str'), - pi_snap_shot_name=dict( + pi_volume_ids=dict( required=False, - type='str'), - pi_instance_name=dict( + elements='', + type='list'), + pi_description=dict( required=False, type='str'), id=dict( @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_pi_snapshot', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_storage_pool_capacity_info.py b/plugins/modules/ibm_pi_storage_pool_capacity_info.py index a5ef57f7e..c54e9b209 100644 --- a/plugins/modules/ibm_pi_storage_pool_capacity_info.py +++ b/plugins/modules/ibm_pi_storage_pool_capacity_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_storage_pool_capacity' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_storage_pool_capacity', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_storage_pools_capacity_info.py b/plugins/modules/ibm_pi_storage_pools_capacity_info.py index a8284860d..5396031ba 100644 --- a/plugins/modules/ibm_pi_storage_pools_capacity_info.py +++ b/plugins/modules/ibm_pi_storage_pools_capacity_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_storage_pools_capacity' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_storage_pools_capacity', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_storage_type_capacity_info.py b/plugins/modules/ibm_pi_storage_type_capacity_info.py index 7eb01cb53..016781baa 100644 --- a/plugins/modules/ibm_pi_storage_type_capacity_info.py +++ b/plugins/modules/ibm_pi_storage_type_capacity_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_pi_storage_type_capacity' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_storage_type: + pi_cloud_instance_id: description: - - Storage type name + - None required: True type: str - pi_cloud_instance_id: + pi_storage_type: description: - - None + - Storage type name required: True type: str zone: @@ -60,14 +60,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_storage_type', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_storage_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_storage_type', 'pi_cloud_instance_id', + 'pi_storage_type', ] @@ -78,10 +78,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_storage_type=dict( + pi_cloud_instance_id=dict( required=True, type='str'), - pi_cloud_instance_id=dict( + pi_storage_type=dict( required=True, type='str'), zone=dict( @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_storage_type_capacity', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_storage_types_capacity_info.py b/plugins/modules/ibm_pi_storage_types_capacity_info.py index 88a0548f1..bff1841c4 100644 --- a/plugins/modules/ibm_pi_storage_types_capacity_info.py +++ b/plugins/modules/ibm_pi_storage_types_capacity_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_storage_types_capacity' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_storage_types_capacity', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_system_pools_info.py b/plugins/modules/ibm_pi_system_pools_info.py index 9315fda90..a99f442d8 100644 --- a/plugins/modules/ibm_pi_system_pools_info.py +++ b/plugins/modules/ibm_pi_system_pools_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_system_pools' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_system_pools', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_tenant_info.py b/plugins/modules/ibm_pi_tenant_info.py index b19f35f37..d6cb08e36 100644 --- a/plugins/modules/ibm_pi_tenant_info.py +++ b/plugins/modules/ibm_pi_tenant_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_tenant' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -101,7 +101,7 @@ def run_module(): resource_type='ibm_pi_tenant', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_volume.py b/plugins/modules/ibm_pi_volume.py index 1f1ac87db..7f1212322 100644 --- a/plugins/modules/ibm_pi_volume.py +++ b/plugins/modules/ibm_pi_volume.py @@ -18,64 +18,64 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_volume' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + pi_affinity_volume: + description: + - Volume (ID or Name) to base volume affinity policy against; required if requesting affinity and pi_affinity_instance is not provided + required: False + type: str + pi_anti_affinity_instances: + description: + - List of pvmInstances to base volume anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_volumes is not provided + required: False + type: list + elements: str pi_cloud_instance_id: description: - (Required for new resource) Cloud Instance ID - This is the service_instance_id. required: True type: str - pi_affinity_policy: + pi_volume_name: description: - - Affinity policy for data volume being created; ignored if pi_volume_pool provided; for policy affinity requires one of pi_affinity_instance or pi_affinity_volume to be specified; for policy anti-affinity requires one of pi_anti_affinity_instances or pi_anti_affinity_volumes to be specified - required: False + - (Required for new resource) Volume Name to create + required: True type: str pi_volume_shareable: description: - Flag to indicate if the volume can be shared across multiple instances? required: False type: bool - pi_volume_size: - description: - - (Required for new resource) Size of the volume in GB - required: True - type: float - pi_volume_pool: + pi_affinity_policy: description: - - Volume pool where the volume will be created; if provided then pi_volume_type and pi_affinity_policy values will be ignored + - Affinity policy for data volume being created; ignored if pi_volume_pool provided; for policy affinity requires one of pi_affinity_instance or pi_affinity_volume to be specified; for policy anti-affinity requires one of pi_anti_affinity_instances or pi_anti_affinity_volumes to be specified required: False type: str - pi_anti_affinity_volumes: - description: - - List of volumes to base volume anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided - required: False - type: list - elements: str - pi_affinity_volume: + pi_volume_pool: description: - - Volume (ID or Name) to base volume affinity policy against; required if requesting affinity and pi_affinity_instance is not provided + - Volume pool where the volume will be created; if provided then pi_volume_type and pi_affinity_policy values will be ignored required: False type: str - pi_volume_name: - description: - - (Required for new resource) Volume Name to create - required: True - type: str pi_volume_type: description: - Type of Disk, required if pi_affinity_policy and pi_volume_pool not provided, otherwise ignored required: False type: str + pi_volume_size: + description: + - (Required for new resource) Size of the volume in GB + required: True + type: float pi_affinity_instance: description: - PVM Instance (ID or Name) to base volume affinity policy against; required if requesting affinity and pi_affinity_volume is not provided required: False type: str - pi_anti_affinity_instances: + pi_anti_affinity_volumes: description: - - List of pvmInstances to base volume anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_volumes is not provided + - List of volumes to base volume anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided required: False type: list elements: str @@ -122,23 +122,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('pi_cloud_instance_id', 'str'), - ('pi_volume_size', 'float'), ('pi_volume_name', 'str'), + ('pi_volume_size', 'float'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'pi_affinity_volume', + 'pi_anti_affinity_instances', 'pi_cloud_instance_id', - 'pi_affinity_policy', + 'pi_volume_name', 'pi_volume_shareable', - 'pi_volume_size', + 'pi_affinity_policy', 'pi_volume_pool', - 'pi_anti_affinity_volumes', - 'pi_affinity_volume', - 'pi_volume_name', 'pi_volume_type', + 'pi_volume_size', 'pi_affinity_instance', - 'pi_anti_affinity_instances', + 'pi_anti_affinity_volumes', ] # Params for Data source @@ -153,48 +153,48 @@ ] TL_CONFLICTS_MAP = { - 'pi_anti_affinity_volumes': ['pi_anti_affinity_instances'], 'pi_affinity_volume': ['pi_affinity_instance'], - 'pi_affinity_instance': ['pi_affinity_volume'], 'pi_anti_affinity_instances': ['pi_anti_affinity_volumes'], + 'pi_affinity_instance': ['pi_affinity_volume'], + 'pi_anti_affinity_volumes': ['pi_anti_affinity_instances'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + pi_affinity_volume=dict( + required=False, + type='str'), + pi_anti_affinity_instances=dict( + required=False, + elements='', + type='list'), pi_cloud_instance_id=dict( required=False, type='str'), - pi_affinity_policy=dict( + pi_volume_name=dict( required=False, type='str'), pi_volume_shareable=dict( required=False, type='bool'), - pi_volume_size=dict( - required=False, - type='float'), - pi_volume_pool=dict( - required=False, - type='str'), - pi_anti_affinity_volumes=dict( - required=False, - elements='', - type='list'), - pi_affinity_volume=dict( + pi_affinity_policy=dict( required=False, type='str'), - pi_volume_name=dict( + pi_volume_pool=dict( required=False, type='str'), pi_volume_type=dict( required=False, type='str'), + pi_volume_size=dict( + required=False, + type='float'), pi_affinity_instance=dict( required=False, type='str'), - pi_anti_affinity_instances=dict( + pi_anti_affinity_volumes=dict( required=False, elements='', type='list'), @@ -256,7 +256,7 @@ def run_module(): resource_type='ibm_pi_volume', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -265,7 +265,7 @@ def run_module(): resource_type='ibm_pi_volume', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pi_volume_attach.py b/plugins/modules/ibm_pi_volume_attach.py index f5e7eb391..11ac685a5 100644 --- a/plugins/modules/ibm_pi_volume_attach.py +++ b/plugins/modules/ibm_pi_volume_attach.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_volume_attach' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -172,7 +172,7 @@ def run_module(): resource_type='ibm_pi_volume_attach', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_volume_info.py b/plugins/modules/ibm_pi_volume_info.py index 4a9e26abc..092f2265b 100644 --- a/plugins/modules/ibm_pi_volume_info.py +++ b/plugins/modules/ibm_pi_volume_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_volume' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_volume', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pi_vpn_connection.py b/plugins/modules/ibm_pi_vpn_connection.py index 1106cc867..42b5c3318 100644 --- a/plugins/modules/ibm_pi_vpn_connection.py +++ b/plugins/modules/ibm_pi_vpn_connection.py @@ -18,22 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_vpn_connection' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - pi_networks: + pi_ipsec_policy_id: description: - - (Required for new resource) Set of network IDs to attach to this VPN connection + - (Required for new resource) Unique identifier of IPSec Policy selected for this VPN Connection required: True - type: list - elements: str - pi_peer_subnets: + type: str + pi_cloud_instance_id: description: - - (Required for new resource) Set of CIDR of peer subnets + - (Required for new resource) PI cloud instance ID required: True - type: list - elements: str + type: str pi_vpn_connection_name: description: - (Required for new resource) Name of the VPN Connection @@ -44,21 +42,23 @@ - (Required for new resource) Unique identifier of IKE Policy selected for this VPN Connection required: True type: str - pi_ipsec_policy_id: + pi_peer_subnets: description: - - (Required for new resource) Unique identifier of IPSec Policy selected for this VPN Connection + - (Required for new resource) Set of CIDR of peer subnets required: True - type: str + type: list + elements: str pi_vpn_connection_mode: description: - (Required for new resource) Mode used by this VPN Connection, either 'policy' or 'route' required: True type: str - pi_cloud_instance_id: + pi_networks: description: - - (Required for new resource) PI cloud instance ID + - (Required for new resource) Set of network IDs to attach to this VPN connection required: True - type: str + type: list + elements: str pi_peer_gateway_address: description: - (Required for new resource) Peer Gateway address @@ -106,25 +106,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_networks', 'list'), - ('pi_peer_subnets', 'list'), + ('pi_ipsec_policy_id', 'str'), + ('pi_cloud_instance_id', 'str'), ('pi_vpn_connection_name', 'str'), ('pi_ike_policy_id', 'str'), - ('pi_ipsec_policy_id', 'str'), + ('pi_peer_subnets', 'list'), ('pi_vpn_connection_mode', 'str'), - ('pi_cloud_instance_id', 'str'), + ('pi_networks', 'list'), ('pi_peer_gateway_address', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_networks', - 'pi_peer_subnets', + 'pi_ipsec_policy_id', + 'pi_cloud_instance_id', 'pi_vpn_connection_name', 'pi_ike_policy_id', - 'pi_ipsec_policy_id', + 'pi_peer_subnets', 'pi_vpn_connection_mode', - 'pi_cloud_instance_id', + 'pi_networks', 'pi_peer_gateway_address', ] @@ -142,29 +142,29 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - pi_networks=dict( + pi_ipsec_policy_id=dict( required=False, - elements='', - type='list'), - pi_peer_subnets=dict( + type='str'), + pi_cloud_instance_id=dict( required=False, - elements='', - type='list'), + type='str'), pi_vpn_connection_name=dict( required=False, type='str'), pi_ike_policy_id=dict( required=False, type='str'), - pi_ipsec_policy_id=dict( + pi_peer_subnets=dict( required=False, - type='str'), + elements='', + type='list'), pi_vpn_connection_mode=dict( required=False, type='str'), - pi_cloud_instance_id=dict( + pi_networks=dict( required=False, - type='str'), + elements='', + type='list'), pi_peer_gateway_address=dict( required=False, type='str'), @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_pi_vpn_connection', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_pn_application_chrome.py b/plugins/modules/ibm_pn_application_chrome.py index 4c4d536fa..355a4c70d 100644 --- a/plugins/modules/ibm_pn_application_chrome.py +++ b/plugins/modules/ibm_pn_application_chrome.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pn_application_chrome' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_pn_application_chrome', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -194,7 +194,7 @@ def run_module(): resource_type='ibm_pn_application_chrome', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_pn_application_chrome_info.py b/plugins/modules/ibm_pn_application_chrome_info.py index 51a84336b..e3df8e9cf 100644 --- a/plugins/modules/ibm_pn_application_chrome_info.py +++ b/plugins/modules/ibm_pn_application_chrome_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pn_application_chrome' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_pn_application_chrome', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_resource_group.py b/plugins/modules/ibm_resource_group.py index 43625fb23..771381188 100644 --- a/plugins/modules/ibm_resource_group.py +++ b/plugins/modules/ibm_resource_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_resource_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_resource_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_resource_group_info.py b/plugins/modules/ibm_resource_group_info.py index 76617f671..2bb0383b7 100644 --- a/plugins/modules/ibm_resource_group_info.py +++ b/plugins/modules/ibm_resource_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_resource_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -120,7 +120,7 @@ def run_module(): resource_type='ibm_resource_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_resource_instance.py b/plugins/modules/ibm_resource_instance.py index 3d494744f..7228a693c 100644 --- a/plugins/modules/ibm_resource_instance.py +++ b/plugins/modules/ibm_resource_instance.py @@ -18,54 +18,54 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + plan: + description: + - (Required for new resource) The plan type of the service + required: True + type: str name: description: - (Required for new resource) A name for the resource instance required: True type: str - tags: - description: - - None - required: False - type: list - elements: str service_endpoints: description: - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. required: False type: str - plan: + service: description: - - (Required for new resource) The plan type of the service + - (Required for new resource) The name of the service offering like cloud-object-storage, kms etc required: True type: str - parameters: + parameters_json: description: - - Arbitrary parameters to pass. Must be a JSON object + - Arbitrary parameters to pass in Json string format required: False - type: dict - location: - description: - - (Required for new resource) The location where the instance available - required: True type: str resource_group_id: description: - The resource group id required: False type: str - parameters_json: + tags: description: - - Arbitrary parameters to pass in Json string format + - None required: False - type: str - service: + type: list + elements: str + parameters: description: - - (Required for new resource) The name of the service offering like cloud-object-storage, kms etc + - Arbitrary parameters to pass. Must be a JSON object + required: False + type: dict + location: + description: + - (Required for new resource) The location where the instance available required: True type: str id: @@ -114,23 +114,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('plan', 'str'), - ('location', 'str'), + ('name', 'str'), ('service', 'str'), + ('location', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'plan', 'name', - 'tags', 'service_endpoints', - 'plan', + 'service', + 'parameters_json', + 'resource_group_id', + 'tags', 'parameters', 'location', - 'resource_group_id', - 'parameters_json', - 'service', ] # Params for Data source @@ -140,46 +140,46 @@ TL_ALL_PARAMETERS_DS = [ 'resource_group_id', - 'service', - 'name', 'location', + 'name', + 'service', ] TL_CONFLICTS_MAP = { - 'parameters': ['parameters_json'], 'parameters_json': ['parameters'], + 'parameters': ['parameters_json'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + plan=dict( required=False, type='str'), - tags=dict( + name=dict( required=False, - elements='', - type='list'), + type='str'), service_endpoints=dict( required=False, type='str'), - plan=dict( + service=dict( required=False, type='str'), - parameters=dict( - required=False, - type='dict'), - location=dict( + parameters_json=dict( required=False, type='str'), resource_group_id=dict( required=False, type='str'), - parameters_json=dict( + tags=dict( required=False, - type='str'), - service=dict( + elements='', + type='list'), + parameters=dict( + required=False, + type='dict'), + location=dict( required=False, type='str'), id=dict( @@ -247,7 +247,7 @@ def run_module(): resource_type='ibm_resource_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -256,7 +256,7 @@ def run_module(): resource_type='ibm_resource_instance', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_resource_instance_info.py b/plugins/modules/ibm_resource_instance_info.py index 6fca7c3f6..e17fc7af8 100644 --- a/plugins/modules/ibm_resource_instance_info.py +++ b/plugins/modules/ibm_resource_instance_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_resource_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -26,9 +26,9 @@ - The id of the resource group in which the instance is present required: False type: str - service: + location: description: - - The service type of the instance + - The location or the environment in which instance exists required: False type: str name: @@ -36,9 +36,9 @@ - Resource instance name for example, myobjectstorage required: True type: str - location: + service: description: - - The location or the environment in which instance exists + - The service type of the instance required: False type: str iaas_classic_username: @@ -80,9 +80,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'resource_group_id', - 'service', - 'name', 'location', + 'name', + 'service', ] @@ -96,13 +96,13 @@ resource_group_id=dict( required=False, type='str'), - service=dict( + location=dict( required=False, type='str'), name=dict( required=True, type='str'), - location=dict( + service=dict( required=False, type='str'), iaas_classic_username=dict( @@ -139,7 +139,7 @@ def run_module(): resource_type='ibm_resource_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_resource_key.py b/plugins/modules/ibm_resource_key.py index 0b0ee7f38..b61df20fe 100644 --- a/plugins/modules/ibm_resource_key.py +++ b/plugins/modules/ibm_resource_key.py @@ -18,41 +18,41 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_alias_id: + name: description: - - The id of the resource alias for which to create resource key - required: False + - (Required for new resource) The name of the resource key + required: True type: str - parameters: + role: description: - - Arbitrary parameters to pass. Must be a JSON object + - Name of the user role.Valid roles are Writer, Reader, Manager, Administrator, Operator, Viewer, Editor and Custom Roles. required: False - type: dict + type: str tags: description: - None required: False type: list elements: str - role: - description: - - Name of the user role.Valid roles are Writer, Reader, Manager, Administrator, Operator, Viewer, Editor and Custom Roles. - required: False - type: str resource_instance_id: description: - The id of the resource instance for which to create resource key required: False type: str - name: + resource_alias_id: description: - - (Required for new resource) The name of the resource key - required: True + - The id of the resource alias for which to create resource key + required: False type: str + parameters: + description: + - Arbitrary parameters to pass. Must be a JSON object + required: False + type: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,12 +104,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_alias_id', - 'parameters', - 'tags', + 'name', 'role', + 'tags', 'resource_instance_id', - 'name', + 'resource_alias_id', + 'parameters', ] # Params for Data source @@ -118,40 +118,40 @@ ] TL_ALL_PARAMETERS_DS = [ + 'name', 'resource_instance_id', 'resource_alias_id', 'most_recent', - 'name', ] TL_CONFLICTS_MAP = { - 'resource_alias_id': ['resource_instance_id'], 'resource_instance_id': ['resource_alias_id'], + 'resource_alias_id': ['resource_instance_id'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_alias_id=dict( + name=dict( required=False, type='str'), - parameters=dict( + role=dict( required=False, - type='dict'), + type='str'), tags=dict( required=False, elements='', type='list'), - role=dict( - required=False, - type='str'), resource_instance_id=dict( required=False, type='str'), - name=dict( + resource_alias_id=dict( required=False, type='str'), + parameters=dict( + required=False, + type='dict'), id=dict( required=False, type='str'), @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_resource_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_resource_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_resource_key_info.py b/plugins/modules/ibm_resource_key_info.py index 842836c2f..cfe76ca61 100644 --- a/plugins/modules/ibm_resource_key_info.py +++ b/plugins/modules/ibm_resource_key_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_resource_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + name: + description: + - The name of the resource key + required: True + type: str resource_instance_id: description: - The id of the resource instance @@ -37,11 +42,6 @@ required: False type: bool default: False - name: - description: - - The name of the resource key - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -80,10 +80,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', 'resource_instance_id', 'resource_alias_id', 'most_recent', - 'name', ] @@ -96,6 +96,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + name=dict( + required=True, + type='str'), resource_instance_id=dict( required=False, type='str'), @@ -105,9 +108,6 @@ most_recent=dict( required=False, type='bool'), - name=dict( - required=True, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_resource_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_resource_quota_info.py b/plugins/modules/ibm_resource_quota_info.py index bb54195e4..a7be77e93 100644 --- a/plugins/modules/ibm_resource_quota_info.py +++ b/plugins/modules/ibm_resource_quota_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_resource_quota' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_resource_quota', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_resource_tag.py b/plugins/modules/ibm_resource_tag.py index caec20803..a5fb73f3b 100644 --- a/plugins/modules/ibm_resource_tag.py +++ b/plugins/modules/ibm_resource_tag.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_tag' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -105,9 +105,9 @@ ] TL_ALL_PARAMETERS_DS = [ + 'tag_type', 'resource_id', 'resource_type', - 'tag_type', ] TL_CONFLICTS_MAP = { @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_resource_tag', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_resource_tag', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_resource_tag_info.py b/plugins/modules/ibm_resource_tag_info.py index e833c834a..ee2e9db0c 100644 --- a/plugins/modules/ibm_resource_tag_info.py +++ b/plugins/modules/ibm_resource_tag_info.py @@ -17,10 +17,16 @@ description: - Retrieve an IBM Cloud 'ibm_resource_tag' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + tag_type: + description: + - Tag type on which the tags should be fetched + required: False + type: str + default: user resource_id: description: - CRN of the resource on which the tags should be attached @@ -31,12 +37,6 @@ - Resource type on which the tags should be fetched required: False type: str - tag_type: - description: - - Tag type on which the tags should be fetched - required: False - type: str - default: user iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -74,9 +74,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tag_type', 'resource_id', 'resource_type', - 'tag_type', ] @@ -87,13 +87,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_id=dict( + tag_type=dict( required=False, type='str'), - resource_type=dict( + resource_id=dict( required=False, type='str'), - tag_type=dict( + resource_type=dict( required=False, type='str'), iaas_classic_username=dict( @@ -130,7 +130,7 @@ def run_module(): resource_type='ibm_resource_tag', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_attach_host_script_info.py b/plugins/modules/ibm_satellite_attach_host_script_info.py index e56ff6e05..c1d88355f 100644 --- a/plugins/modules/ibm_satellite_attach_host_script_info.py +++ b/plugins/modules/ibm_satellite_attach_host_script_info.py @@ -17,10 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_attach_host_script' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + custom_script: + description: + - The custom script that has to be appended to generated host script file + required: False + type: str + location: + description: + - A unique name for the new Satellite location + required: True + type: str labels: description: - List of labels for the attach host @@ -37,16 +47,6 @@ - The directory where the satellite attach host script to be downloaded. Default is home directory required: False type: str - custom_script: - description: - - The custom script that has to be appended to generated host script file - required: False - type: str - location: - description: - - A unique name for the new Satellite location - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -85,11 +85,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'custom_script', + 'location', 'labels', 'host_provider', 'script_dir', - 'custom_script', - 'location', ] @@ -100,6 +100,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + custom_script=dict( + required=False, + type='str'), + location=dict( + required=True, + type='str'), labels=dict( required=False, elements='', @@ -110,12 +116,6 @@ script_dir=dict( required=False, type='str'), - custom_script=dict( - required=False, - type='str'), - location=dict( - required=True, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_satellite_attach_host_script', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_cluster.py b/plugins/modules/ibm_satellite_cluster.py index 2453da1c5..1423b4d43 100644 --- a/plugins/modules/ibm_satellite_cluster.py +++ b/plugins/modules/ibm_satellite_cluster.py @@ -18,93 +18,82 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_cluster' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - wait_for_worker_update: - description: - - Wait for worker node to update during kube version update. - required: False - type: bool - default: True - tags: + crn_token: description: - - List of tags for the resources + - The IBM Cloud Identity and Access Management (IAM) service CRN token for the service that creates the cluster. required: False - type: list - elements: str - name: + type: str + location: description: - - (Required for new resource) The unique name for the new IBM Cloud Satellite cluster + - (Required for new resource) The name or ID of the Satellite location required: True type: str - enable_config_admin: - description: - - Grant cluster admin access to Satellite Config to manage Kubernetes resources. - required: False - type: bool - pod_subnet: + kube_version: description: - - User provided value for the pod subnet + - The OpenShift Container Platform version required: False type: str - kube_version: + patch_version: description: - - The OpenShift Container Platform version + - Kubernetes patch version required: False type: str - default_worker_pool_labels: + worker_count: description: - - Labels on the default worker pool + - The number of worker nodes per zone in the default worker pool. Required when '--host-label' is specified. (default: 0) required: False - type: dict - elements: str - crn_token: + type: int + pull_secret: description: - - The IBM Cloud Identity and Access Management (IAM) service CRN token for the service that creates the cluster. + - The RedHat pull secret to create the OpenShift cluster required: False type: str - service_subnet: + tags: description: - - User provided value for service subnet + - List of tags for the resources required: False - type: str + type: list + elements: str + enable_config_admin: + description: + - Grant cluster admin access to Satellite Config to manage Kubernetes resources. + required: False + type: bool disable_public_service_endpoint: description: - Boolean value true if Public service endpoint to be disabled required: False type: bool default: False - location: - description: - - (Required for new resource) The name or ID of the Satellite location - required: True - type: str - patch_version: - description: - - Kubernetes patch version - required: False - type: str zones: description: - Zone info for worker pool required: False type: list elements: dict - pull_secret: + pod_subnet: description: - - The RedHat pull secret to create the OpenShift cluster + - User provided value for the pod subnet required: False type: str - retry_patch_version: + service_subnet: description: - - Argument which helps to retry the patch version updates on worker nodes. Increment the value to retry the patch updates if the previous apply fails + - User provided value for service subnet required: False - type: int - worker_count: + type: str + wait_for_worker_update: description: - - The number of worker nodes per zone in the default worker pool. Required when '--host-label' is specified. (default: 0) + - Wait for worker node to update during kube version update. + required: False + type: bool + default: True + retry_patch_version: + description: + - Argument which helps to retry the patch version updates on worker nodes. Increment the value to retry the patch updates if the previous apply fails required: False type: int resource_group_id: @@ -112,6 +101,17 @@ - ID of the resource group. required: False type: str + name: + description: + - (Required for new resource) The unique name for the new IBM Cloud Satellite cluster + required: True + type: str + default_worker_pool_labels: + description: + - Labels on the default worker pool + required: False + type: dict + elements: str host_labels: description: - Labels that describe a Satellite host for default workerpool @@ -164,29 +164,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('location', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'wait_for_worker_update', - 'tags', - 'name', - 'enable_config_admin', - 'pod_subnet', - 'kube_version', - 'default_worker_pool_labels', 'crn_token', - 'service_subnet', - 'disable_public_service_endpoint', 'location', + 'kube_version', 'patch_version', - 'zones', + 'worker_count', 'pull_secret', + 'tags', + 'enable_config_admin', + 'disable_public_service_endpoint', + 'zones', + 'pod_subnet', + 'service_subnet', + 'wait_for_worker_update', 'retry_patch_version', - 'worker_count', 'resource_group_id', + 'name', + 'default_worker_pool_labels', 'host_labels', ] @@ -196,8 +196,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', 'resource_group_id', + 'name', ] TL_CONFLICTS_MAP = { @@ -207,60 +207,60 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - wait_for_worker_update=dict( - required=False, - type='bool'), - tags=dict( - required=False, - elements='', - type='list'), - name=dict( + crn_token=dict( required=False, type='str'), - enable_config_admin=dict( - required=False, - type='bool'), - pod_subnet=dict( + location=dict( required=False, type='str'), kube_version=dict( required=False, type='str'), - default_worker_pool_labels=dict( - required=False, - elements='', - type='dict'), - crn_token=dict( + patch_version=dict( required=False, type='str'), - service_subnet=dict( + worker_count=dict( + required=False, + type='int'), + pull_secret=dict( required=False, type='str'), - disable_public_service_endpoint=dict( + tags=dict( required=False, - type='bool'), - location=dict( + elements='', + type='list'), + enable_config_admin=dict( required=False, - type='str'), - patch_version=dict( + type='bool'), + disable_public_service_endpoint=dict( required=False, - type='str'), + type='bool'), zones=dict( required=False, elements='', type='list'), - pull_secret=dict( + pod_subnet=dict( required=False, type='str'), - retry_patch_version=dict( + service_subnet=dict( required=False, - type='int'), - worker_count=dict( + type='str'), + wait_for_worker_update=dict( + required=False, + type='bool'), + retry_patch_version=dict( required=False, type='int'), resource_group_id=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), + default_worker_pool_labels=dict( + required=False, + elements='', + type='dict'), host_labels=dict( required=False, elements='', @@ -330,7 +330,7 @@ def run_module(): resource_type='ibm_satellite_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -339,7 +339,7 @@ def run_module(): resource_type='ibm_satellite_cluster', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_satellite_cluster_info.py b/plugins/modules/ibm_satellite_cluster_info.py index b5b4633ae..6d444bcb1 100644 --- a/plugins/modules/ibm_satellite_cluster_info.py +++ b/plugins/modules/ibm_satellite_cluster_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_cluster' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: - description: - - Name or id of the cluster - required: True - type: str resource_group_id: description: - ID of the resource group. required: False type: str + name: + description: + - Name or id of the cluster + required: True + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -69,8 +69,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'resource_group_id', + 'name', ] @@ -81,12 +81,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( - required=True, - type='str'), resource_group_id=dict( required=False, type='str'), + name=dict( + required=True, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_satellite_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_cluster_worker_pool.py b/plugins/modules/ibm_satellite_cluster_worker_pool.py index d4e6f00e7..7f42b7fc5 100644 --- a/plugins/modules/ibm_satellite_cluster_worker_pool.py +++ b/plugins/modules/ibm_satellite_cluster_worker_pool.py @@ -18,55 +18,35 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_cluster_worker_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - disk_encryption: - description: - - Disk encryption for worker node - required: False - type: bool - isolation: - description: - - None - required: False - type: str - worker_count: - description: - - Specify the desired number of workers per zone in this worker pool - required: False - type: int zones: description: - Zone info for worker pool required: False type: list elements: dict - host_labels: + worker_pool_labels: description: - - Labels that describe a Satellite host + - Labels on all the workers in the worker pool required: False - type: list + type: dict elements: str resource_group_id: description: - ID of the resource group. required: False type: str - name: - description: - - (Required for new resource) The name for the worker pool - required: True - type: str cluster: description: - (Required for new resource) The unique name for the new IBM Cloud Satellite cluster required: True type: str - flavor: + isolation: description: - - The flavor defines the amount of virtual CPU, memory, and disk space that is set up in each worker node + - None required: False type: str entitlement: @@ -74,11 +54,31 @@ - None required: False type: str - worker_pool_labels: + worker_count: description: - - Labels on all the workers in the worker pool + - Specify the desired number of workers per zone in this worker pool required: False - type: dict + type: int + name: + description: + - (Required for new resource) The name for the worker pool + required: True + type: str + flavor: + description: + - The flavor defines the amount of virtual CPU, memory, and disk space that is set up in each worker node + required: False + type: str + disk_encryption: + description: + - Disk encryption for worker node + required: False + type: bool + host_labels: + description: + - Labels that describe a Satellite host + required: False + type: list elements: str id: description: @@ -126,23 +126,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('cluster', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'disk_encryption', - 'isolation', - 'worker_count', 'zones', - 'host_labels', + 'worker_pool_labels', 'resource_group_id', - 'name', 'cluster', - 'flavor', + 'isolation', 'entitlement', - 'worker_pool_labels', + 'worker_count', + 'name', + 'flavor', + 'disk_encryption', + 'host_labels', ] # Params for Data source @@ -152,10 +152,10 @@ ] TL_ALL_PARAMETERS_DS = [ - 'resource_group_id', 'name', - 'cluster', + 'resource_group_id', 'region', + 'cluster', ] TL_CONFLICTS_MAP = { @@ -165,42 +165,42 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - disk_encryption=dict( - required=False, - type='bool'), - isolation=dict( - required=False, - type='str'), - worker_count=dict( - required=False, - type='int'), zones=dict( required=False, elements='', type='list'), - host_labels=dict( + worker_pool_labels=dict( required=False, elements='', - type='list'), + type='dict'), resource_group_id=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), cluster=dict( required=False, type='str'), - flavor=dict( + isolation=dict( required=False, type='str'), entitlement=dict( required=False, type='str'), - worker_pool_labels=dict( + worker_count=dict( + required=False, + type='int'), + name=dict( + required=False, + type='str'), + flavor=dict( + required=False, + type='str'), + disk_encryption=dict( + required=False, + type='bool'), + host_labels=dict( required=False, elements='', - type='dict'), + type='list'), id=dict( required=False, type='str'), @@ -266,7 +266,7 @@ def run_module(): resource_type='ibm_satellite_cluster_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -275,7 +275,7 @@ def run_module(): resource_type='ibm_satellite_cluster_worker_pool', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_satellite_cluster_worker_pool_info.py b/plugins/modules/ibm_satellite_cluster_worker_pool_info.py index 35e595288..1835effef 100644 --- a/plugins/modules/ibm_satellite_cluster_worker_pool_info.py +++ b/plugins/modules/ibm_satellite_cluster_worker_pool_info.py @@ -17,30 +17,30 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_cluster_worker_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - resource_group_id: - description: - - ID of the resource group - required: False - type: str name: description: - worker pool name required: True type: str - cluster: + resource_group_id: description: - - Cluster name - required: True + - ID of the resource group + required: False type: str region: description: - Name of the region required: False type: str + cluster: + description: + - Cluster name + required: True + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -80,10 +80,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group_id', 'name', - 'cluster', + 'resource_group_id', 'region', + 'cluster', ] @@ -94,18 +94,18 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - resource_group_id=dict( - required=False, - type='str'), name=dict( required=True, type='str'), - cluster=dict( - required=True, + resource_group_id=dict( + required=False, type='str'), region=dict( required=False, type='str'), + cluster=dict( + required=True, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -140,7 +140,7 @@ def run_module(): resource_type='ibm_satellite_cluster_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment.py b/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment.py index 53466a74b..a615d3010 100644 --- a/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment.py +++ b/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_cluster_worker_pool_zone_attachment' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -199,7 +199,7 @@ def run_module(): resource_type='ibm_satellite_cluster_worker_pool_zone_attachment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -208,7 +208,7 @@ def run_module(): resource_type='ibm_satellite_cluster_worker_pool_zone_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment_info.py b/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment_info.py index 0d9894439..3438cad97 100644 --- a/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment_info.py +++ b/plugins/modules/ibm_satellite_cluster_worker_pool_zone_attachment_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_cluster_worker_pool_zone_attachment' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_satellite_cluster_worker_pool_zone_attachment', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_endpoint.py b/plugins/modules/ibm_satellite_endpoint.py index 1c0c9809d..ce65361b0 100644 --- a/plugins/modules/ibm_satellite_endpoint.py +++ b/plugins/modules/ibm_satellite_endpoint.py @@ -18,26 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_endpoint' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - display_name: + client_protocol: description: - - (Required for new resource) The display name of the endpoint. Endpoint names must start with a letter and end with an alphanumeric character, can contain letters, numbers, and hyphen (-), and must be 63 characters or fewer. + - (Required for new resource) The protocol in the client application side. required: True type: str - server_port: - description: - - (Required for new resource) The port number of the server endpoint. For 'http-tunnel' protocol, server_port can be 0, which means any port. Such as 0 is good for 80 (http) and 443 (https). - required: True - type: int client_mutual_auth: description: - Whether enable mutual auth in the client application side, when client_protocol is 'tls' or 'https', this field is required. required: False type: bool default: False + server_protocol: + description: + - The protocol in the server application side. This parameter will change to default value if it is omitted even when using PATCH API. If client_protocol is 'udp', server_protocol must be 'udp'. If client_protocol is 'tcp'/'http', server_protocol could be 'tcp'/'tls' and default to 'tcp'. If client_protocol is 'tls'/'https', server_protocol could be 'tcp'/'tls' and default to 'tls'. If client_protocol is 'http-tunnel', server_protocol must be 'tcp'. + required: False + type: str server_mutual_auth: description: - Whether enable mutual auth in the server application side, when client_protocol is 'tls', this field is required. @@ -49,19 +49,20 @@ - The inactivity timeout in the Endpoint side. required: False type: int - created_by: + certs: description: - - The service or person who created the endpoint. Must be 1000 characters or fewer. + - The certs. required: False - type: str + type: list + elements: dict location: description: - (Required for new resource) The Location ID. required: True type: str - connection_type: + display_name: description: - - (Required for new resource) The type of the endpoint. + - (Required for new resource) The display name of the endpoint. Endpoint names must start with a letter and end with an alphanumeric character, can contain letters, numbers, and hyphen (-), and must be 63 characters or fewer. required: True type: str server_host: @@ -69,16 +70,6 @@ - (Required for new resource) The host name or IP address of the server endpoint. For 'http-tunnel' protocol, server_host can start with '*.' , which means a wildcard to it's sub domains. Such as '*.example.com' can accept request to 'api.example.com' and 'www.example.com'. required: True type: str - server_protocol: - description: - - The protocol in the server application side. This parameter will change to default value if it is omitted even when using PATCH API. If client_protocol is 'udp', server_protocol must be 'udp'. If client_protocol is 'tcp'/'http', server_protocol could be 'tcp'/'tls' and default to 'tcp'. If client_protocol is 'tls'/'https', server_protocol could be 'tcp'/'tls' and default to 'tls'. If client_protocol is 'http-tunnel', server_protocol must be 'tcp'. - required: False - type: str - client_protocol: - description: - - (Required for new resource) The protocol in the client application side. - required: True - type: str sni: description: - The server name indicator (SNI) which used to connect to the server endpoint. Only useful if server side requires SNI. @@ -90,12 +81,21 @@ required: False type: bool default: False - certs: + connection_type: description: - - The certs. + - (Required for new resource) The type of the endpoint. + required: True + type: str + server_port: + description: + - (Required for new resource) The port number of the server endpoint. For 'http-tunnel' protocol, server_port can be 0, which means any port. Such as 0 is good for 80 (http) and 443 (https). + required: True + type: int + created_by: + description: + - The service or person who created the endpoint. Must be 1000 characters or fewer. required: False - type: list - elements: dict + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -142,30 +142,30 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('display_name', 'str'), - ('server_port', 'int'), + ('client_protocol', 'str'), ('location', 'str'), - ('connection_type', 'str'), + ('display_name', 'str'), ('server_host', 'str'), - ('client_protocol', 'str'), + ('connection_type', 'str'), + ('server_port', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'display_name', - 'server_port', + 'client_protocol', 'client_mutual_auth', + 'server_protocol', 'server_mutual_auth', 'timeout', - 'created_by', + 'certs', 'location', - 'connection_type', + 'display_name', 'server_host', - 'server_protocol', - 'client_protocol', 'sni', 'reject_unauth', - 'certs', + 'connection_type', + 'server_port', + 'created_by', ] # Params for Data source @@ -186,49 +186,49 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - display_name=dict( + client_protocol=dict( required=False, type='str'), - server_port=dict( - required=False, - type='int'), client_mutual_auth=dict( required=False, type='bool'), + server_protocol=dict( + required=False, + type='str'), server_mutual_auth=dict( required=False, type='bool'), timeout=dict( required=False, type='int'), - created_by=dict( + certs=dict( required=False, - type='str'), + elements='', + type='list'), location=dict( required=False, type='str'), - connection_type=dict( + display_name=dict( required=False, type='str'), server_host=dict( required=False, type='str'), - server_protocol=dict( - required=False, - type='str'), - client_protocol=dict( - required=False, - type='str'), sni=dict( required=False, type='str'), reject_unauth=dict( required=False, type='bool'), - certs=dict( + connection_type=dict( required=False, - elements='', - type='list'), + type='str'), + server_port=dict( + required=False, + type='int'), + created_by=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -294,7 +294,7 @@ def run_module(): resource_type='ibm_satellite_endpoint', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -303,7 +303,7 @@ def run_module(): resource_type='ibm_satellite_endpoint', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_satellite_endpoint_info.py b/plugins/modules/ibm_satellite_endpoint_info.py index 1bb69f8c5..c31e8b0bf 100644 --- a/plugins/modules/ibm_satellite_endpoint_info.py +++ b/plugins/modules/ibm_satellite_endpoint_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_endpoint' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_satellite_endpoint', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_host.py b/plugins/modules/ibm_satellite_host.py index 88a3b9bbf..c559ba38c 100644 --- a/plugins/modules/ibm_satellite_host.py +++ b/plugins/modules/ibm_satellite_host.py @@ -18,18 +18,24 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_host' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - cluster: + labels: description: - - The name or ID of a Satellite location or cluster to assign the host to + - List of labels for the host + required: False + type: list + elements: str + zone: + description: + - The zone within the cluster to assign the host to required: False type: str - wait_till: + worker_pool: description: - - Wait until location is normal + - The name or ID of the worker pool within the cluster to assign the host to required: False type: str location: @@ -37,30 +43,24 @@ - (Required for new resource) The name or ID of the Satellite location required: True type: str + cluster: + description: + - The name or ID of a Satellite location or cluster to assign the host to + required: False + type: str host_id: description: - (Required for new resource) The specific host ID to assign to a Satellite location or cluster required: True type: str - labels: - description: - - List of labels for the host - required: False - type: list - elements: str - zone: - description: - - The zone within the cluster to assign the host to - required: False - type: str - worker_pool: + host_provider: description: - - The name or ID of the worker pool within the cluster to assign the host to + - Host Provider required: False type: str - host_provider: + wait_till: description: - - Host Provider + - Wait until location is normal required: False type: str id: @@ -115,14 +115,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cluster', - 'wait_till', - 'location', - 'host_id', 'labels', 'zone', 'worker_pool', + 'location', + 'cluster', + 'host_id', 'host_provider', + 'wait_till', ] # Params for Data source @@ -139,29 +139,29 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cluster=dict( + labels=dict( + required=False, + elements='', + type='list'), + zone=dict( required=False, type='str'), - wait_till=dict( + worker_pool=dict( required=False, type='str'), location=dict( required=False, type='str'), - host_id=dict( + cluster=dict( required=False, type='str'), - labels=dict( - required=False, - elements='', - type='list'), - zone=dict( + host_id=dict( required=False, type='str'), - worker_pool=dict( + host_provider=dict( required=False, type='str'), - host_provider=dict( + wait_till=dict( required=False, type='str'), id=dict( @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_satellite_host', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_link.py b/plugins/modules/ibm_satellite_link.py index 960543e7c..49f6f82ad 100644 --- a/plugins/modules/ibm_satellite_link.py +++ b/plugins/modules/ibm_satellite_link.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_link' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_satellite_link', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_satellite_link', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_satellite_link_info.py b/plugins/modules/ibm_satellite_link_info.py index f010d6204..0a59560ad 100644 --- a/plugins/modules/ibm_satellite_link_info.py +++ b/plugins/modules/ibm_satellite_link_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_link' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_satellite_link', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_location.py b/plugins/modules/ibm_satellite_location.py index 4c0a137c5..5ab95dc09 100644 --- a/plugins/modules/ibm_satellite_location.py +++ b/plugins/modules/ibm_satellite_location.py @@ -18,14 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_location' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - managed_from: + description: description: - - (Required for new resource) The IBM Cloud metro from which the Satellite location is managed - required: True + - A description of the new Satellite location + required: False + type: str + logging_account_id: + description: + - The account ID for IBM Log Analysis with LogDNA log forwarding + required: False type: str zones: description: @@ -38,16 +43,17 @@ - (Required for new resource) A unique name for the new Satellite location required: True type: str - description: + managed_from: description: - - A description of the new Satellite location - required: False + - (Required for new resource) The IBM Cloud metro from which the Satellite location is managed + required: True type: str - logging_account_id: + cos_credentials: description: - - The account ID for IBM Log Analysis with LogDNA log forwarding + - COSAuthorization - IBM Cloud Object Storage authorization keys required: False - type: str + type: list + elements: dict resource_group_id: description: - ID of the resource group. @@ -59,12 +65,6 @@ required: False type: list elements: dict - cos_credentials: - description: - - COSAuthorization - IBM Cloud Object Storage authorization keys - required: False - type: list - elements: dict tags: description: - List of tags associated with resource instance @@ -117,20 +117,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('managed_from', 'str'), ('location', 'str'), + ('managed_from', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'managed_from', - 'zones', - 'location', 'description', 'logging_account_id', + 'zones', + 'location', + 'managed_from', + 'cos_credentials', 'resource_group_id', 'cos_config', - 'cos_credentials', 'tags', ] @@ -150,7 +150,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - managed_from=dict( + description=dict( + required=False, + type='str'), + logging_account_id=dict( required=False, type='str'), zones=dict( @@ -160,12 +163,13 @@ location=dict( required=False, type='str'), - description=dict( + managed_from=dict( required=False, type='str'), - logging_account_id=dict( + cos_credentials=dict( required=False, - type='str'), + elements='', + type='list'), resource_group_id=dict( required=False, type='str'), @@ -173,10 +177,6 @@ required=False, elements='', type='list'), - cos_credentials=dict( - required=False, - elements='', - type='list'), tags=dict( required=False, elements='', @@ -246,7 +246,7 @@ def run_module(): resource_type='ibm_satellite_location', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -255,7 +255,7 @@ def run_module(): resource_type='ibm_satellite_location', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_satellite_location_info.py b/plugins/modules/ibm_satellite_location_info.py index 19adfcd8a..e8f73e750 100644 --- a/plugins/modules/ibm_satellite_location_info.py +++ b/plugins/modules/ibm_satellite_location_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_location' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_satellite_location', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_satellite_location_nlb_dns.py b/plugins/modules/ibm_satellite_location_nlb_dns.py index e2d1084d3..b454f4896 100644 --- a/plugins/modules/ibm_satellite_location_nlb_dns.py +++ b/plugins/modules/ibm_satellite_location_nlb_dns.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_location_nlb_dns' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -177,7 +177,7 @@ def run_module(): resource_type='ibm_satellite_location_nlb_dns', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_satellite_location_nlb_dns', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_satellite_location_nlb_dns_info.py b/plugins/modules/ibm_satellite_location_nlb_dns_info.py index 779f13b2b..6c2b69390 100644 --- a/plugins/modules/ibm_satellite_location_nlb_dns_info.py +++ b/plugins/modules/ibm_satellite_location_nlb_dns_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_location_nlb_dns' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_satellite_location_nlb_dns', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_account_location_info.py b/plugins/modules/ibm_scc_account_location_info.py index dc630041b..aa508831f 100644 --- a/plugins/modules/ibm_scc_account_location_info.py +++ b/plugins/modules/ibm_scc_account_location_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_account_location' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_scc_account_location', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_account_location_settings_info.py b/plugins/modules/ibm_scc_account_location_settings_info.py index 9fd2413b4..a63f28695 100644 --- a/plugins/modules/ibm_scc_account_location_settings_info.py +++ b/plugins/modules/ibm_scc_account_location_settings_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_account_location_settings' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_scc_account_location_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_account_locations_info.py b/plugins/modules/ibm_scc_account_locations_info.py index 020886e28..5fffd2195 100644 --- a/plugins/modules/ibm_scc_account_locations_info.py +++ b/plugins/modules/ibm_scc_account_locations_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_account_locations' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_scc_account_locations', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_account_notification_settings_info.py b/plugins/modules/ibm_scc_account_notification_settings_info.py index 56e9ac1dc..4f023ea19 100644 --- a/plugins/modules/ibm_scc_account_notification_settings_info.py +++ b/plugins/modules/ibm_scc_account_notification_settings_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_account_notification_settings' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_scc_account_notification_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_account_settings.py b/plugins/modules/ibm_scc_account_settings.py index bbe0d3276..57823c7b3 100644 --- a/plugins/modules/ibm_scc_account_settings.py +++ b/plugins/modules/ibm_scc_account_settings.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_account_settings' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_scc_account_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_collector.py b/plugins/modules/ibm_scc_posture_collector.py index f80bf498d..264bc2627 100644 --- a/plugins/modules/ibm_scc_posture_collector.py +++ b/plugins/modules/ibm_scc_posture_collector.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_posture_collector' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + passphrase: + description: + - To protect the credentials that you add to the service, a passphrase is used to generate a data encryption key. The key is used to securely store your credentials and prevent anyone from accessing them. + required: False + type: str + is_ubi_image: + description: + - Determines whether the collector has a Ubi image. + required: False + type: bool name: description: - (Required for new resource) A unique name for your collector. @@ -43,16 +53,6 @@ required: False type: str default: - passphrase: - description: - - To protect the credentials that you add to the service, a passphrase is used to generate a data encryption key. The key is used to securely store your credentials and prevent anyone from accessing them. - required: False - type: str - is_ubi_image: - description: - - Determines whether the collector has a Ubi image. - required: False - type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -106,12 +106,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'passphrase', + 'is_ubi_image', 'name', 'is_public', 'managed_by', 'description', - 'passphrase', - 'is_ubi_image', ] # Params for Data source @@ -128,6 +128,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + passphrase=dict( + required=False, + type='str'), + is_ubi_image=dict( + required=False, + type='bool'), name=dict( required=False, type='str'), @@ -140,12 +146,6 @@ description=dict( required=False, type='str'), - passphrase=dict( - required=False, - type='str'), - is_ubi_image=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -211,7 +211,7 @@ def run_module(): resource_type='ibm_scc_posture_collector', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_credential.py b/plugins/modules/ibm_scc_posture_credential.py index 0bf03f1e7..fce2b8b00 100644 --- a/plugins/modules/ibm_scc_posture_credential.py +++ b/plugins/modules/ibm_scc_posture_credential.py @@ -18,10 +18,27 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_posture_credential' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + display_fields: + description: + - (Required for new resource) Details the fields on the credential. This will change as per credential type selected. + required: True + type: list + elements: dict + group: + description: + - (Required for new resource) Credential group details. + required: True + type: list + elements: dict + purpose: + description: + - (Required for new resource) Purpose for which the credential is created. + required: True + type: str enabled: description: - (Required for new resource) Credentials status enabled/disbaled. @@ -42,23 +59,6 @@ - (Required for new resource) Credentials description. required: True type: str - display_fields: - description: - - (Required for new resource) Details the fields on the credential. This will change as per credential type selected. - required: True - type: list - elements: dict - group: - description: - - (Required for new resource) Credential group details. - required: True - type: list - elements: dict - purpose: - description: - - (Required for new resource) Purpose for which the credential is created. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -105,24 +105,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('display_fields', 'list'), + ('group', 'list'), + ('purpose', 'str'), ('enabled', 'bool'), ('type', 'str'), ('name', 'str'), ('description', 'str'), - ('display_fields', 'list'), - ('group', 'list'), - ('purpose', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'display_fields', + 'group', + 'purpose', 'enabled', 'type', 'name', 'description', - 'display_fields', - 'group', - 'purpose', ] # Params for Data source @@ -139,6 +139,17 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + display_fields=dict( + required=False, + elements='', + type='list'), + group=dict( + required=False, + elements='', + type='list'), + purpose=dict( + required=False, + type='str'), enabled=dict( required=False, type='bool'), @@ -151,17 +162,6 @@ description=dict( required=False, type='str'), - display_fields=dict( - required=False, - elements='', - type='list'), - group=dict( - required=False, - elements='', - type='list'), - purpose=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_scc_posture_credential', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_group_profile_info.py b/plugins/modules/ibm_scc_posture_group_profile_info.py index bd45d00f9..df5ba4e7b 100644 --- a/plugins/modules/ibm_scc_posture_group_profile_info.py +++ b/plugins/modules/ibm_scc_posture_group_profile_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_group_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_scc_posture_group_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_latest_scans_info.py b/plugins/modules/ibm_scc_posture_latest_scans_info.py index 1a3900ce6..fecb94874 100644 --- a/plugins/modules/ibm_scc_posture_latest_scans_info.py +++ b/plugins/modules/ibm_scc_posture_latest_scans_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_latest_scans' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_scc_posture_latest_scans', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_profile_info.py b/plugins/modules/ibm_scc_posture_profile_info.py index b57645116..c3600a054 100644 --- a/plugins/modules/ibm_scc_posture_profile_info.py +++ b/plugins/modules/ibm_scc_posture_profile_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_profile' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - profile_id: + profile_type: description: - - The id for the given API. + - The profile type ID. This will be 4 for profiles and 6 for group profiles. required: True type: str - profile_type: + profile_id: description: - - The profile type ID. This will be 4 for profiles and 6 for group profiles. + - The id for the given API. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('profile_id', 'str'), ('profile_type', 'str'), + ('profile_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'profile_id', 'profile_type', + 'profile_id', ] @@ -82,10 +82,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - profile_id=dict( + profile_type=dict( required=True, type='str'), - profile_type=dict( + profile_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_scc_posture_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_profiles_info.py b/plugins/modules/ibm_scc_posture_profiles_info.py index a943540b9..cd6dccacc 100644 --- a/plugins/modules/ibm_scc_posture_profiles_info.py +++ b/plugins/modules/ibm_scc_posture_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_scc_posture_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_scan_summaries_info.py b/plugins/modules/ibm_scc_posture_scan_summaries_info.py index ee130ccc8..e66cc4d57 100644 --- a/plugins/modules/ibm_scc_posture_scan_summaries_info.py +++ b/plugins/modules/ibm_scc_posture_scan_summaries_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_scan_summaries' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_scc_posture_scan_summaries', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_scan_summary_info.py b/plugins/modules/ibm_scc_posture_scan_summary_info.py index ff8280124..f0d3bb86d 100644 --- a/plugins/modules/ibm_scc_posture_scan_summary_info.py +++ b/plugins/modules/ibm_scc_posture_scan_summary_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_scan_summary' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_scc_posture_scan_summary', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_scope.py b/plugins/modules/ibm_scc_posture_scope.py index dce6d17b0..f1808dc81 100644 --- a/plugins/modules/ibm_scc_posture_scope.py +++ b/plugins/modules/ibm_scc_posture_scope.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_posture_scope' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_scc_posture_scope', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_scope_correlation_info.py b/plugins/modules/ibm_scc_posture_scope_correlation_info.py index 2c624f7ae..363da5fef 100644 --- a/plugins/modules/ibm_scc_posture_scope_correlation_info.py +++ b/plugins/modules/ibm_scc_posture_scope_correlation_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_scope_correlation' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_scc_posture_scope_correlation', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_posture_scopes_info.py b/plugins/modules/ibm_scc_posture_scopes_info.py index 47282f805..7def0df99 100644 --- a/plugins/modules/ibm_scc_posture_scopes_info.py +++ b/plugins/modules/ibm_scc_posture_scopes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_scopes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_scc_posture_scopes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_rule.py b/plugins/modules/ibm_scc_rule.py index a1b983559..321cd6581 100644 --- a/plugins/modules/ibm_scc_rule.py +++ b/plugins/modules/ibm_scc_rule.py @@ -18,21 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - description: - description: - - (Required for new resource) An extended description of your rule. - required: True - type: str - enforcement_actions: + labels: description: - - The actions that the service must run on your behalf when a request to create or modify the target resource does not comply with your conditions. + - Labels that you can use to group and search for similar rules, such as those that help you to meet a specific organization guideline. required: False type: list - elements: dict + elements: str required_config: description: - (Required for new resource) The requirements that must be met to determine the resource's level of compliance in accordance with the rule. Use logical operators (and/or) to define multiple property checks and conditions. To define requirements for a rule, list one or more property check objects in the and array. To add conditions to a property check, use or. @@ -44,23 +39,28 @@ - (Required for new resource) Your IBM Cloud account ID. required: True type: str - name: + description: description: - - (Required for new resource) A human-readable alias to assign to your rule. + - (Required for new resource) An extended description of your rule. required: True type: str - labels: + enforcement_actions: description: - - Labels that you can use to group and search for similar rules, such as those that help you to meet a specific organization guideline. + - The actions that the service must run on your behalf when a request to create or modify the target resource does not comply with your conditions. required: False type: list - elements: str + elements: dict target: description: - (Required for new resource) The properties that describe the resource that you want to targetwith the rule or template. required: True type: list elements: dict + name: + description: + - (Required for new resource) A human-readable alias to assign to your rule. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,22 +107,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('description', 'str'), ('required_config', 'list'), ('account_id', 'str'), - ('name', 'str'), + ('description', 'str'), ('target', 'list'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'enforcement_actions', + 'labels', 'required_config', 'account_id', - 'name', - 'labels', + 'description', + 'enforcement_actions', 'target', + 'name', ] # Params for Data source @@ -139,10 +139,7 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - description=dict( - required=False, - type='str'), - enforcement_actions=dict( + labels=dict( required=False, elements='', type='list'), @@ -153,10 +150,10 @@ account_id=dict( required=False, type='str'), - name=dict( + description=dict( required=False, type='str'), - labels=dict( + enforcement_actions=dict( required=False, elements='', type='list'), @@ -164,6 +161,9 @@ required=False, elements='', type='list'), + name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_scc_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_rule_attachment.py b/plugins/modules/ibm_scc_rule_attachment.py index e1f3c0196..0610026a1 100644 --- a/plugins/modules/ibm_scc_rule_attachment.py +++ b/plugins/modules/ibm_scc_rule_attachment.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_rule_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + rule_id: + description: + - (Required for new resource) The UUID that uniquely identifies the rule. + required: True + type: str account_id: description: - (Required for new resource) Your IBM Cloud account ID. @@ -39,11 +44,6 @@ required: False type: list elements: dict - rule_id: - description: - - (Required for new resource) The UUID that uniquely identifies the rule. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,17 +90,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('rule_id', 'str'), ('account_id', 'str'), ('included_scope', 'list'), - ('rule_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'rule_id', 'account_id', 'included_scope', 'excluded_scopes', - 'rule_id', ] # Params for Data source @@ -117,6 +117,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + rule_id=dict( + required=False, + type='str'), account_id=dict( required=False, type='str'), @@ -128,9 +131,6 @@ required=False, elements='', type='list'), - rule_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_scc_rule_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_si_note.py b/plugins/modules/ibm_scc_si_note.py index 87b8e67d2..750a28131 100644 --- a/plugins/modules/ibm_scc_si_note.py +++ b/plugins/modules/ibm_scc_si_note.py @@ -18,77 +18,77 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_si_note' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - account_id: - description: - - None - required: False - type: str - long_description: + note_id: description: - - (Required for new resource) A more detailed description of your note. + - (Required for new resource) The ID of the note. required: True type: str - finding: + related_url: description: - - FindingType provides details about a finding note. + - None required: False type: list elements: dict - kpi: + shared: description: - - KpiType provides details about a KPI note. + - True if this note can be shared by multiple accounts. + required: False + type: bool + default: True + section: + description: + - Card provides details about a card kind of note. required: False type: list elements: dict - kind: + long_description: description: - - (Required for new resource) The type of note. Use this field to filter notes and occurences by kind. - FINDING: The note and occurrence represent a finding. - KPI: The note and occurrence represent a KPI value. - CARD: The note represents a card showing findings and related metric values. - CARD_CONFIGURED: The note represents a card configured for a user account. - SECTION: The note represents a section in a dashboard. + - (Required for new resource) A more detailed description of your note. required: True type: str - card: + reported_by: description: - - Card provides details about a card kind of note. - required: False + - (Required for new resource) The entity reporting a note. + required: True type: list elements: dict - short_description: + account_id: description: - - (Required for new resource) A one sentence description of your note. + - None + required: False + type: str + provider_id: + description: + - (Required for new resource) Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. required: True type: str - note_id: + kind: description: - - (Required for new resource) The ID of the note. + - (Required for new resource) The type of note. Use this field to filter notes and occurences by kind. - FINDING: The note and occurrence represent a finding. - KPI: The note and occurrence represent a KPI value. - CARD: The note represents a card showing findings and related metric values. - CARD_CONFIGURED: The note represents a card configured for a user account. - SECTION: The note represents a section in a dashboard. required: True type: str - related_url: + finding: description: - - None + - FindingType provides details about a finding note. required: False type: list elements: dict - shared: - description: - - True if this note can be shared by multiple accounts. - required: False - type: bool - default: True - provider_id: + short_description: description: - - (Required for new resource) Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. + - (Required for new resource) A one sentence description of your note. required: True type: str - reported_by: + kpi: description: - - (Required for new resource) The entity reporting a note. - required: True + - KpiType provides details about a KPI note. + required: False type: list elements: dict - section: + card: description: - Card provides details about a card kind of note. required: False @@ -140,41 +140,41 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('note_id', 'str'), ('long_description', 'str'), + ('reported_by', 'list'), + ('provider_id', 'str'), ('kind', 'str'), ('short_description', 'str'), - ('note_id', 'str'), - ('provider_id', 'str'), - ('reported_by', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'account_id', - 'long_description', - 'finding', - 'kpi', - 'kind', - 'card', - 'short_description', 'note_id', 'related_url', 'shared', - 'provider_id', - 'reported_by', 'section', + 'long_description', + 'reported_by', + 'account_id', + 'provider_id', + 'kind', + 'finding', + 'short_description', + 'kpi', + 'card', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('provider_id', 'str'), ('note_id', 'str'), + ('provider_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'note_id', 'account_id', 'provider_id', - 'note_id', ] TL_CONFLICTS_MAP = { @@ -184,48 +184,48 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - account_id=dict( - required=False, - type='str'), - long_description=dict( + note_id=dict( required=False, type='str'), - finding=dict( + related_url=dict( required=False, elements='', type='list'), - kpi=dict( + shared=dict( + required=False, + type='bool'), + section=dict( required=False, elements='', type='list'), - kind=dict( + long_description=dict( required=False, type='str'), - card=dict( + reported_by=dict( required=False, elements='', type='list'), - short_description=dict( + account_id=dict( required=False, type='str'), - note_id=dict( + provider_id=dict( required=False, type='str'), - related_url=dict( + kind=dict( + required=False, + type='str'), + finding=dict( required=False, elements='', type='list'), - shared=dict( - required=False, - type='bool'), - provider_id=dict( + short_description=dict( required=False, type='str'), - reported_by=dict( + kpi=dict( required=False, elements='', type='list'), - section=dict( + card=dict( required=False, elements='', type='list'), @@ -294,7 +294,7 @@ def run_module(): resource_type='ibm_scc_si_note', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -303,7 +303,7 @@ def run_module(): resource_type='ibm_scc_si_note', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_scc_si_note_info.py b/plugins/modules/ibm_scc_si_note_info.py index cdffa45c6..7226f58ee 100644 --- a/plugins/modules/ibm_scc_si_note_info.py +++ b/plugins/modules/ibm_scc_si_note_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_note' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + note_id: + description: + - Second part of note `name`: providers/{provider_id}/notes/{note_id}. + required: True + type: str account_id: description: - None @@ -31,11 +36,6 @@ - Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. required: True type: str - note_id: - description: - - Second part of note `name`: providers/{provider_id}/notes/{note_id}. - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -69,15 +69,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('provider_id', 'str'), ('note_id', 'str'), + ('provider_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'note_id', 'account_id', 'provider_id', - 'note_id', ] @@ -88,15 +88,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + note_id=dict( + required=True, + type='str'), account_id=dict( required=False, type='str'), provider_id=dict( required=True, type='str'), - note_id=dict( - required=True, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_scc_si_note', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_si_notes_info.py b/plugins/modules/ibm_scc_si_notes_info.py index 50e701d12..782852dd9 100644 --- a/plugins/modules/ibm_scc_si_notes_info.py +++ b/plugins/modules/ibm_scc_si_notes_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_notes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - account_id: - description: - - None - required: False - type: str provider_id: description: - Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. @@ -41,6 +36,11 @@ - Token to provide to skip to a particular spot in the list. required: False type: str + account_id: + description: + - None + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -79,10 +79,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'account_id', 'provider_id', 'page_size', 'page_token', + 'account_id', ] @@ -93,9 +93,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - account_id=dict( - required=False, - type='str'), provider_id=dict( required=True, type='str'), @@ -105,6 +102,9 @@ page_token=dict( required=False, type='str'), + account_id=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -139,7 +139,7 @@ def run_module(): resource_type='ibm_scc_si_notes', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_si_occurrence.py b/plugins/modules/ibm_scc_si_occurrence.py index 634daf76f..b94f45d99 100644 --- a/plugins/modules/ibm_scc_si_occurrence.py +++ b/plugins/modules/ibm_scc_si_occurrence.py @@ -18,35 +18,35 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_si_occurrence' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - context: + finding: description: - - None + - Finding provides details about a finding occurrence. required: False type: list elements: dict - finding: + kpi: description: - - Finding provides details about a finding occurrence. + - Kpi provides details about a KPI occurrence. required: False type: list elements: dict - account_id: + occurrence_id: description: - - None - required: False + - (Required for new resource) The id of the occurrence. + required: True type: str - provider_id: + remediation: description: - - (Required for new resource) Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. - required: True + - A description of actions that can be taken to remedy the `Note`. + required: False type: str - occurrence_id: + kind: description: - - (Required for new resource) The id of the occurrence. + - (Required for new resource) The type of note. Use this field to filter notes and occurences by kind. - FINDING: The note and occurrence represent a finding. - KPI: The note and occurrence represent a KPI value. - CARD: The note represents a card showing findings and related metric values. - CARD_CONFIGURED: The note represents a card configured for a user account. - SECTION: The note represents a section in a dashboard. required: True type: str resource_url: @@ -54,14 +54,9 @@ - The unique URL of the resource, image or the container, for which the `Occurrence` applies. For example, https://gcr.io/provider/image@sha256:foo. This field can be used as a filter in list requests. required: False type: str - remediation: - description: - - A description of actions that can be taken to remedy the `Note`. - required: False - type: str - kpi: + context: description: - - Kpi provides details about a KPI occurrence. + - None required: False type: list elements: dict @@ -71,14 +66,19 @@ required: False type: bool default: False - note_name: + account_id: description: - - (Required for new resource) An analysis note associated with this image, in the form "{account_id}/providers/{provider_id}/notes/{note_id}" This field can be used as a filter in list requests. + - None + required: False + type: str + provider_id: + description: + - (Required for new resource) Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. required: True type: str - kind: + note_name: description: - - (Required for new resource) The type of note. Use this field to filter notes and occurences by kind. - FINDING: The note and occurrence represent a finding. - KPI: The note and occurrence represent a KPI value. - CARD: The note represents a card showing findings and related metric values. - CARD_CONFIGURED: The note represents a card configured for a user account. - SECTION: The note represents a section in a dashboard. + - (Required for new resource) An analysis note associated with this image, in the form "{account_id}/providers/{provider_id}/notes/{note_id}" This field can be used as a filter in list requests. required: True type: str id: @@ -127,37 +127,37 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('provider_id', 'str'), ('occurrence_id', 'str'), - ('note_name', 'str'), ('kind', 'str'), + ('provider_id', 'str'), + ('note_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'context', 'finding', - 'account_id', - 'provider_id', + 'kpi', 'occurrence_id', - 'resource_url', 'remediation', - 'kpi', + 'kind', + 'resource_url', + 'context', 'replace_if_exists', + 'account_id', + 'provider_id', 'note_name', - 'kind', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('occurrence_id', 'str'), ('provider_id', 'str'), + ('occurrence_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'occurrence_id', - 'account_id', 'provider_id', + 'account_id', + 'occurrence_id', ] TL_CONFLICTS_MAP = { @@ -167,40 +167,40 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - context=dict( + finding=dict( required=False, elements='', type='list'), - finding=dict( + kpi=dict( required=False, elements='', type='list'), - account_id=dict( + occurrence_id=dict( required=False, type='str'), - provider_id=dict( + remediation=dict( required=False, type='str'), - occurrence_id=dict( + kind=dict( required=False, type='str'), resource_url=dict( required=False, type='str'), - remediation=dict( - required=False, - type='str'), - kpi=dict( + context=dict( required=False, elements='', type='list'), replace_if_exists=dict( required=False, type='bool'), - note_name=dict( + account_id=dict( required=False, type='str'), - kind=dict( + provider_id=dict( + required=False, + type='str'), + note_name=dict( required=False, type='str'), id=dict( @@ -268,7 +268,7 @@ def run_module(): resource_type='ibm_scc_si_occurrence', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -277,7 +277,7 @@ def run_module(): resource_type='ibm_scc_si_occurrence', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_scc_si_occurrence_info.py b/plugins/modules/ibm_scc_si_occurrence_info.py index 9f429fc4f..46533f1e6 100644 --- a/plugins/modules/ibm_scc_si_occurrence_info.py +++ b/plugins/modules/ibm_scc_si_occurrence_info.py @@ -17,13 +17,13 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_occurrence' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - occurrence_id: + provider_id: description: - - Second part of occurrence `name`: providers/{provider_id}/occurrences/{occurrence_id}. + - Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. required: True type: str account_id: @@ -31,9 +31,9 @@ - None required: False type: str - provider_id: + occurrence_id: description: - - Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. + - Second part of occurrence `name`: providers/{provider_id}/occurrences/{occurrence_id}. required: True type: str iaas_classic_username: @@ -69,15 +69,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('occurrence_id', 'str'), ('provider_id', 'str'), + ('occurrence_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'occurrence_id', - 'account_id', 'provider_id', + 'account_id', + 'occurrence_id', ] @@ -88,13 +88,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - occurrence_id=dict( + provider_id=dict( required=True, type='str'), account_id=dict( required=False, type='str'), - provider_id=dict( + occurrence_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_scc_si_occurrence', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_si_occurrences_info.py b/plugins/modules/ibm_scc_si_occurrences_info.py index 6dd2ffcd4..c2956ec22 100644 --- a/plugins/modules/ibm_scc_si_occurrences_info.py +++ b/plugins/modules/ibm_scc_si_occurrences_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_occurrences' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -139,7 +139,7 @@ def run_module(): resource_type='ibm_scc_si_occurrences', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_si_providers_info.py b/plugins/modules/ibm_scc_si_providers_info.py index 9ab4112a4..db4cb6e13 100644 --- a/plugins/modules/ibm_scc_si_providers_info.py +++ b/plugins/modules/ibm_scc_si_providers_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_providers' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -129,7 +129,7 @@ def run_module(): resource_type='ibm_scc_si_providers', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_template.py b/plugins/modules/ibm_scc_template.py index ce857102a..9f5f2ded6 100644 --- a/plugins/modules/ibm_scc_template.py +++ b/plugins/modules/ibm_scc_template.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_template' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + target: + description: + - (Required for new resource) The properties that describe the resource that you want to targetwith the rule or template. + required: True + type: list + elements: dict customized_defaults: description: - (Required for new resource) A list of default property values to apply to your template. @@ -43,12 +49,6 @@ - (Required for new resource) An extended description of your template. required: True type: str - target: - description: - - (Required for new resource) The properties that describe the resource that you want to targetwith the rule or template. - required: True - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,20 +95,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('target', 'list'), ('customized_defaults', 'list'), ('account_id', 'str'), ('name', 'str'), ('description', 'str'), - ('target', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'target', 'customized_defaults', 'account_id', 'name', 'description', - 'target', ] # Params for Data source @@ -125,6 +125,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + target=dict( + required=False, + elements='', + type='list'), customized_defaults=dict( required=False, elements='', @@ -138,10 +142,6 @@ description=dict( required=False, type='str'), - target=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_scc_template', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_scc_template_attachment.py b/plugins/modules/ibm_scc_template_attachment.py index 069ef2a0b..6f03a83c9 100644 --- a/plugins/modules/ibm_scc_template_attachment.py +++ b/plugins/modules/ibm_scc_template_attachment.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_template_attachment' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + excluded_scopes: + description: + - None + required: False + type: list + elements: dict template_id: description: - (Required for new resource) The UUID that uniquely identifies the template. @@ -38,12 +44,6 @@ required: True type: list elements: dict - excluded_scopes: - description: - - None - required: False - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -97,10 +97,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'excluded_scopes', 'template_id', 'account_id', 'included_scope', - 'excluded_scopes', ] # Params for Data source @@ -117,6 +117,10 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + excluded_scopes=dict( + required=False, + elements='', + type='list'), template_id=dict( required=False, type='str'), @@ -127,10 +131,6 @@ required=False, elements='', type='list'), - excluded_scopes=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_scc_template_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_schematics_action.py b/plugins/modules/ibm_schematics_action.py index 4cbfc7c78..1f25cd27e 100644 --- a/plugins/modules/ibm_schematics_action.py +++ b/plugins/modules/ibm_schematics_action.py @@ -18,117 +18,117 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_action' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - description: + settings: description: - - Action description. + - Environment variables for the Action. required: False - type: str - resource_group: + type: list + elements: dict + location: description: - - Resource-group name for an action. By default, action is created in default resource group. + - List of locations supported by IBM Cloud Schematics service. While creating your workspace or action, choose the right region, since it cannot be changed. Note, this does not limit the location of the IBM Cloud resources, provisioned using Schematics. required: False type: str - command_parameter: + source_type: description: - - Schematics job command parameter (playbook-name). + - Type of source for the Template. required: False type: str - credentials: + bastion: description: - - credentials of the Action. + - Describes a bastion resource. required: False type: list elements: dict - name: - description: - - (Required for new resource) The unique name of your action. The name can be up to 128 characters long and can include alphanumeric characters, spaces, dashes, and underscores. **Example** you can use the name to stop action. - required: True - type: str - source_readme_url: - description: - - URL of the `README` file, for the source URL. - required: False - type: str inventory: description: - Target inventory record ID, used by the action or ansible playbook. required: False type: str - bastion_credential: + x_github_token: description: - - User editable variable data & system generated reference to value. + - The personal access token to authenticate with your private GitHub or GitLab repository and access your Terraform template. required: False - type: list - elements: dict + type: str action_outputs: description: - Output variables for the Action. required: False type: list elements: dict - location: + resource_group: description: - - List of locations supported by IBM Cloud Schematics service. While creating your workspace or action, choose the right region, since it cannot be changed. Note, this does not limit the location of the IBM Cloud resources, provisioned using Schematics. + - Resource-group name for an action. By default, action is created in default resource group. required: False type: str - targets_ini: + command_parameter: description: - - Inventory of host and host group for the playbook in `INI` file format. For example, `"targets_ini": "[webserverhost] 172.22.192.6 [dbhost] 172.22.192.5"`. For more information, about an inventory host group syntax, see [Inventory host groups](https://cloud.ibm.com/docs/schematics?topic=schematics-schematics-cli-reference#schematics-inventory-host-grps). + - Schematics job command parameter (playbook-name). required: False type: str + credentials: + description: + - credentials of the Action. + required: False + type: list + elements: dict action_inputs: description: - Input variables for the Action. required: False type: list elements: dict - settings: + sys_lock: description: - - Environment variables for the Action. + - System lock status. required: False type: list elements: dict - x_github_token: + description: description: - - The personal access token to authenticate with your private GitHub or GitLab repository and access your Terraform template. + - Action description. required: False type: str - sys_lock: + user_state: description: - - System lock status. + - User defined status of the Schematics object. required: False type: list elements: dict + targets_ini: + description: + - Inventory of host and host group for the playbook in `INI` file format. For example, `"targets_ini": "[webserverhost] 172.22.192.6 [dbhost] 172.22.192.5"`. For more information, about an inventory host group syntax, see [Inventory host groups](https://cloud.ibm.com/docs/schematics?topic=schematics-schematics-cli-reference#schematics-inventory-host-grps). + required: False + type: str tags: description: - Action tags. required: False type: list elements: str - user_state: + source_readme_url: description: - - User defined status of the Schematics object. + - URL of the `README` file, for the source URL. required: False - type: list - elements: dict + type: str source: description: - Source of templates, playbooks, or controls. required: False type: list elements: dict - source_type: + name: description: - - Type of source for the Template. - required: False + - (Required for new resource) The unique name of your action. The name can be up to 128 characters long and can include alphanumeric characters, spaces, dashes, and underscores. **Example** you can use the name to stop action. + required: True type: str - bastion: + bastion_credential: description: - - Describes a bastion resource. + - User editable variable data & system generated reference to value. required: False type: list elements: dict @@ -183,26 +183,26 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', + 'settings', + 'location', + 'source_type', + 'bastion', + 'inventory', + 'x_github_token', + 'action_outputs', 'resource_group', 'command_parameter', 'credentials', - 'name', - 'source_readme_url', - 'inventory', - 'bastion_credential', - 'action_outputs', - 'location', - 'targets_ini', 'action_inputs', - 'settings', - 'x_github_token', 'sys_lock', - 'tags', + 'description', 'user_state', + 'targets_ini', + 'tags', + 'source_readme_url', 'source', - 'source_type', - 'bastion', + 'name', + 'bastion_credential', ] # Params for Data source @@ -221,73 +221,73 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - description=dict( + settings=dict( required=False, - type='str'), - resource_group=dict( + elements='', + type='list'), + location=dict( required=False, type='str'), - command_parameter=dict( + source_type=dict( required=False, type='str'), - credentials=dict( + bastion=dict( required=False, elements='', type='list'), - name=dict( - required=False, - type='str'), - source_readme_url=dict( - required=False, - type='str'), inventory=dict( required=False, type='str'), - bastion_credential=dict( + x_github_token=dict( required=False, - elements='', - type='list'), + type='str'), action_outputs=dict( required=False, elements='', type='list'), - location=dict( + resource_group=dict( required=False, type='str'), - targets_ini=dict( + command_parameter=dict( required=False, type='str'), + credentials=dict( + required=False, + elements='', + type='list'), action_inputs=dict( required=False, elements='', type='list'), - settings=dict( + sys_lock=dict( required=False, elements='', type='list'), - x_github_token=dict( + description=dict( required=False, type='str'), - sys_lock=dict( + user_state=dict( required=False, elements='', type='list'), + targets_ini=dict( + required=False, + type='str'), tags=dict( required=False, elements='', type='list'), - user_state=dict( + source_readme_url=dict( required=False, - elements='', - type='list'), + type='str'), source=dict( required=False, elements='', type='list'), - source_type=dict( + name=dict( required=False, type='str'), - bastion=dict( + bastion_credential=dict( required=False, elements='', type='list'), @@ -356,7 +356,7 @@ def run_module(): resource_type='ibm_schematics_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -365,7 +365,7 @@ def run_module(): resource_type='ibm_schematics_action', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_schematics_action_info.py b/plugins/modules/ibm_schematics_action_info.py index 21e6342a3..2aa9d06ff 100644 --- a/plugins/modules/ibm_schematics_action_info.py +++ b/plugins/modules/ibm_schematics_action_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_action' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_schematics_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_schematics_inventory.py b/plugins/modules/ibm_schematics_inventory.py index 4d2a825c5..d445054bb 100644 --- a/plugins/modules/ibm_schematics_inventory.py +++ b/plugins/modules/ibm_schematics_inventory.py @@ -18,13 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_inventory' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - inventories_ini: + description: description: - - Input inventory of host and host group for the playbook, in the `.ini` file format. + - The description of your Inventory definition. The description can be up to 2048 characters long in size. + required: False + type: str + location: + description: + - List of locations supported by IBM Cloud Schematics service. While creating your workspace or action, choose the right region, since it cannot be changed. Note, this does not limit the location of the IBM Cloud resources, provisioned using Schematics. required: False type: str resource_queries: @@ -33,14 +38,9 @@ required: False type: list elements: str - location: - description: - - List of locations supported by IBM Cloud Schematics service. While creating your workspace or action, choose the right region, since it cannot be changed. Note, this does not limit the location of the IBM Cloud resources, provisioned using Schematics. - required: False - type: str - description: + name: description: - - The description of your Inventory definition. The description can be up to 2048 characters long in size. + - The unique name of your Inventory definition. The name can be up to 128 characters long and can include alphanumeric characters, spaces, dashes, and underscores. required: False type: str resource_group: @@ -48,9 +48,9 @@ - Resource-group name for the Inventory definition. By default, Inventory definition will be created in Default Resource Group. required: False type: str - name: + inventories_ini: description: - - The unique name of your Inventory definition. The name can be up to 128 characters long and can include alphanumeric characters, spaces, dashes, and underscores. + - Input inventory of host and host group for the playbook, in the `.ini` file format. required: False type: str id: @@ -103,12 +103,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'inventories_ini', - 'resource_queries', - 'location', 'description', - 'resource_group', + 'location', + 'resource_queries', 'name', + 'resource_group', + 'inventories_ini', ] # Params for Data source @@ -127,23 +127,23 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - inventories_ini=dict( + description=dict( + required=False, + type='str'), + location=dict( required=False, type='str'), resource_queries=dict( required=False, elements='', type='list'), - location=dict( - required=False, - type='str'), - description=dict( + name=dict( required=False, type='str'), resource_group=dict( required=False, type='str'), - name=dict( + inventories_ini=dict( required=False, type='str'), id=dict( @@ -211,7 +211,7 @@ def run_module(): resource_type='ibm_schematics_inventory', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -220,7 +220,7 @@ def run_module(): resource_type='ibm_schematics_inventory', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_schematics_inventory_info.py b/plugins/modules/ibm_schematics_inventory_info.py index a90bf32dc..16ee0c77c 100644 --- a/plugins/modules/ibm_schematics_inventory_info.py +++ b/plugins/modules/ibm_schematics_inventory_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_inventory' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_schematics_inventory', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_schematics_job.py b/plugins/modules/ibm_schematics_job.py index 41d7a196a..4ced704dc 100644 --- a/plugins/modules/ibm_schematics_job.py +++ b/plugins/modules/ibm_schematics_job.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_job' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - command_name: + command_object: description: - - (Required for new resource) Schematics job command name. + - (Required for new resource) Name of the Schematics automation resource. required: True type: str job_env_settings: @@ -33,16 +33,27 @@ required: False type: list elements: dict - command_options: + command_parameter: description: - - Command line options for the command. + - Schematics job command parameter (playbook-name). + required: False + type: str + job_inputs: + description: + - Job inputs used by Action or Workspace. required: False type: list - elements: str - location: + elements: dict + data: description: - - List of locations supported by IBM Cloud Schematics service. While creating your workspace or action, choose the right region, since it cannot be changed. Note, this does not limit the location of the IBM Cloud resources, provisioned using Schematics. + - Job data. required: False + type: list + elements: dict + command_name: + description: + - (Required for new resource) Schematics job command name. + required: True type: str log_summary: description: @@ -55,34 +66,23 @@ - (Required for new resource) Job command object id (workspace-id, action-id). required: True type: str - command_parameter: + command_options: description: - - Schematics job command parameter (playbook-name). + - Command line options for the command. required: False - type: str + type: list + elements: str tags: description: - User defined tags, while running the job. required: False type: list elements: str - data: + location: description: - - Job data. + - List of locations supported by IBM Cloud Schematics service. While creating your workspace or action, choose the right region, since it cannot be changed. Note, this does not limit the location of the IBM Cloud resources, provisioned using Schematics. required: False - type: list - elements: dict - command_object: - description: - - (Required for new resource) Name of the Schematics automation resource. - required: True type: str - job_inputs: - description: - - Job inputs used by Action or Workspace. - required: False - type: list - elements: dict bastion: description: - Describes a bastion resource. @@ -135,24 +135,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('command_object', 'str'), ('command_name', 'str'), ('command_object_id', 'str'), - ('command_object', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'command_name', + 'command_object', 'job_env_settings', - 'command_options', - 'location', + 'command_parameter', + 'job_inputs', + 'data', + 'command_name', 'log_summary', 'command_object_id', - 'command_parameter', + 'command_options', 'tags', - 'data', - 'command_object', - 'job_inputs', + 'location', 'bastion', ] @@ -172,18 +172,25 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - command_name=dict( + command_object=dict( required=False, type='str'), job_env_settings=dict( required=False, elements='', type='list'), - command_options=dict( + command_parameter=dict( + required=False, + type='str'), + job_inputs=dict( required=False, elements='', type='list'), - location=dict( + data=dict( + required=False, + elements='', + type='list'), + command_name=dict( required=False, type='str'), log_summary=dict( @@ -193,24 +200,17 @@ command_object_id=dict( required=False, type='str'), - command_parameter=dict( - required=False, - type='str'), - tags=dict( + command_options=dict( required=False, elements='', type='list'), - data=dict( + tags=dict( required=False, elements='', type='list'), - command_object=dict( + location=dict( required=False, type='str'), - job_inputs=dict( - required=False, - elements='', - type='list'), bastion=dict( required=False, elements='', @@ -280,7 +280,7 @@ def run_module(): resource_type='ibm_schematics_job', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -289,7 +289,7 @@ def run_module(): resource_type='ibm_schematics_job', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_schematics_job_info.py b/plugins/modules/ibm_schematics_job_info.py index beb591ac9..61cabcfa3 100644 --- a/plugins/modules/ibm_schematics_job_info.py +++ b/plugins/modules/ibm_schematics_job_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_job' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_schematics_job', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_schematics_output_info.py b/plugins/modules/ibm_schematics_output_info.py index 1e047ccc7..53dbce481 100644 --- a/plugins/modules/ibm_schematics_output_info.py +++ b/plugins/modules/ibm_schematics_output_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_output' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + output_json: + description: + - The json output in string + required: False + type: str workspace_id: description: - The ID of the workspace for which you want to retrieve output values. To find the workspace ID, use the `GET /workspaces` API. @@ -31,11 +36,6 @@ - The id of template required: True type: str - output_json: - description: - - The json output in string - required: False - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -75,9 +75,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'output_json', 'workspace_id', 'template_id', - 'output_json', ] @@ -88,15 +88,15 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + output_json=dict( + required=False, + type='str'), workspace_id=dict( required=True, type='str'), template_id=dict( required=True, type='str'), - output_json=dict( - required=False, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_schematics_output', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_schematics_resource_query.py b/plugins/modules/ibm_schematics_resource_query.py index e541d232e..c17ddeec9 100644 --- a/plugins/modules/ibm_schematics_resource_query.py +++ b/plugins/modules/ibm_schematics_resource_query.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_resource_query' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_schematics_resource_query', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_schematics_resource_query', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_schematics_resource_query_info.py b/plugins/modules/ibm_schematics_resource_query_info.py index fdf73ce80..163f09979 100644 --- a/plugins/modules/ibm_schematics_resource_query_info.py +++ b/plugins/modules/ibm_schematics_resource_query_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_resource_query' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_schematics_resource_query', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_schematics_state_info.py b/plugins/modules/ibm_schematics_state_info.py index 28a60ec1f..305e119c3 100644 --- a/plugins/modules/ibm_schematics_state_info.py +++ b/plugins/modules/ibm_schematics_state_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_state' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_schematics_state', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_schematics_workspace.py b/plugins/modules/ibm_schematics_workspace.py index 2fcaeacd0..a2a98eb17 100644 --- a/plugins/modules/ibm_schematics_workspace.py +++ b/plugins/modules/ibm_schematics_workspace.py @@ -18,72 +18,81 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_workspace' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - frozen_at: - description: - - The timestamp when the workspace was frozen. - required: False - type: str location: description: - The location where you want to create your Schematics workspace and run the Schematics jobs. The location that you enter must match the API endpoint that you use. For example, if you use the Frankfurt API endpoint, you must specify `eu-de` as your location. If you use an API endpoint for a geography and you do not specify a location, Schematics determines the location based on availability. required: False type: str - x_github_token: - description: - - The personal access token to authenticate with your private GitHub or GitLab repository and access your Terraform template. - required: False - type: str - template_values_metadata: + tags: description: - - List of values metadata. + - A list of tags that are associated with the workspace. required: False type: list - elements: dict + elements: str template_git_release: description: - The repository release. required: False type: str - catalog_ref: + frozen: description: - - Information about the software template that you chose from the IBM Cloud catalog. This information is returned for IBM Cloud catalog offerings only. + - If set to true, the workspace is frozen and changes to the workspace are disabled. + required: False + type: bool + applied_shareddata_ids: + description: + - List of applied shared dataset ID. required: False type: list - elements: dict - shared_data: + elements: str + template_inputs: description: - - Information about the Target used by the templates originating from the IBM Cloud catalog offerings. This information is not relevant for workspace created using your own Terraform template. + - VariablesRequest -. required: False type: list elements: dict - template_uninstall_script_name: + template_git_repo_sha_value: description: - - Uninstall script name. + - The repository SHA value. required: False type: str - template_inputs: + template_git_has_uploadedgitrepotar: description: - - VariablesRequest -. + - Has uploaded git repo tar required: False - type: list - elements: dict - locked_by: + type: bool + resource_group: description: - - The user ID that initiated a resource-related action, such as applying or destroying resources, that locked the workspace. + - The ID of the resource group where you want to provision the workspace. required: False type: str - template_init_state_file: + frozen_at: description: - - The content of an existing Terraform statefile that you want to import in to your workspace. To get the content of a Terraform statefile for a specific Terraform template in an existing workspace, run `ibmcloud terraform state pull --id --template `. + - The timestamp when the workspace was frozen. required: False type: str - template_git_url: + template_git_branch: description: - - The source URL. + - The repository branch. + required: False + type: str + frozen_by: + description: + - The user ID that froze the workspace. + required: False + type: str + locked_by: + description: + - The user ID that initiated a resource-related action, such as applying or destroying resources, that locked the workspace. + required: False + type: str + locked_time: + description: + - The timestamp when the workspace was locked. required: False type: str description: @@ -97,88 +106,79 @@ required: False type: list elements: dict - template_values: - description: - - A list of variable values that you want to apply during the Helm chart installation. The list must be provided in JSON format, such as `"autoscaling: enabled: true minReplicas: 2"`. The values that you define here override the default Helm chart values. This field is supported only for IBM Cloud catalog offerings that are provisioned by using the Terraform Helm provider. - required: False - type: str - template_ref: + template_uninstall_script_name: description: - - Workspace template ref. + - Uninstall script name. required: False type: str - template_git_has_uploadedgitrepotar: + template_values_metadata: description: - - Has uploaded git repo tar + - List of values metadata. required: False - type: bool - locked_time: + type: list + elements: dict + x_github_token: description: - - The timestamp when the workspace was locked. + - The personal access token to authenticate with your private GitHub or GitLab repository and access your Terraform template. required: False type: str - frozen: + template_git_folder: description: - - If set to true, the workspace is frozen and changes to the workspace are disabled. + - The subfolder in your GitHub or GitLab repository where your Terraform template is stored. required: False - type: bool - frozen_by: + type: str + template_ref: description: - - The user ID that froze the workspace. + - Workspace template ref. required: False type: str - template_git_branch: + template_git_url: description: - - The repository branch. + - The source URL. required: False type: str - template_git_repo_sha_value: + locked: description: - - The repository SHA value. + - If set to true, the workspace is locked and disabled for changes. required: False - type: str - applied_shareddata_ids: + type: bool + catalog_ref: description: - - List of applied shared dataset ID. + - Information about the software template that you chose from the IBM Cloud catalog. This information is returned for IBM Cloud catalog offerings only. required: False type: list - elements: str + elements: dict name: description: - (Required for new resource) The name of your workspace. The name can be up to 128 characters long and can include alphanumeric characters, spaces, dashes, and underscores. When you create a workspace for your own Terraform template, consider including the microservice component that you set up with your Terraform template and the IBM Cloud environment where you want to deploy your resources in your name. required: True type: str - resource_group: + template_type: description: - - The ID of the resource group where you want to provision the workspace. - required: False + - (Required for new resource) The Terraform version that you want to use to run your Terraform code. Enter `terraform_v0.12` to use Terraform version 0.12, and `terraform_v0.11` to use Terraform version 0.11. The Terraform config files are run with Terraform version 0.11. This is a required variable. Make sure that your Terraform config files are compatible with the Terraform version that you select. + required: True type: str - tags: + shared_data: description: - - A list of tags that are associated with the workspace. + - Information about the Target used by the templates originating from the IBM Cloud catalog offerings. This information is not relevant for workspace created using your own Terraform template. required: False type: list - elements: str - template_git_folder: + elements: dict + template_init_state_file: description: - - The subfolder in your GitHub or GitLab repository where your Terraform template is stored. + - The content of an existing Terraform statefile that you want to import in to your workspace. To get the content of a Terraform statefile for a specific Terraform template in an existing workspace, run `ibmcloud terraform state pull --id --template `. required: False type: str - template_type: + template_values: description: - - (Required for new resource) The Terraform version that you want to use to run your Terraform code. Enter `terraform_v0.12` to use Terraform version 0.12, and `terraform_v0.11` to use Terraform version 0.11. The Terraform config files are run with Terraform version 0.11. This is a required variable. Make sure that your Terraform config files are compatible with the Terraform version that you select. - required: True + - A list of variable values that you want to apply during the Helm chart installation. The list must be provided in JSON format, such as `"autoscaling: enabled: true minReplicas: 2"`. The values that you define here override the default Helm chart values. This field is supported only for IBM Cloud catalog offerings that are provisioned by using the Terraform Helm provider. + required: False type: str template_git_repo_url: description: - The repository URL. required: False type: str - locked: - description: - - If set to true, the workspace is locked and disabled for changes. - required: False - type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -231,36 +231,36 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'frozen_at', 'location', - 'x_github_token', - 'template_values_metadata', + 'tags', 'template_git_release', - 'catalog_ref', - 'shared_data', - 'template_uninstall_script_name', + 'frozen', + 'applied_shareddata_ids', 'template_inputs', + 'template_git_repo_sha_value', + 'template_git_has_uploadedgitrepotar', + 'resource_group', + 'frozen_at', + 'template_git_branch', + 'frozen_by', 'locked_by', - 'template_init_state_file', - 'template_git_url', + 'locked_time', 'description', 'template_env_settings', - 'template_values', + 'template_uninstall_script_name', + 'template_values_metadata', + 'x_github_token', + 'template_git_folder', 'template_ref', - 'template_git_has_uploadedgitrepotar', - 'locked_time', - 'frozen', - 'frozen_by', - 'template_git_branch', - 'template_git_repo_sha_value', - 'applied_shareddata_ids', + 'template_git_url', + 'locked', + 'catalog_ref', 'name', - 'resource_group', - 'tags', - 'template_git_folder', 'template_type', + 'shared_data', + 'template_init_state_file', + 'template_values', 'template_git_repo_url', - 'locked', ] # Params for Data source @@ -269,8 +269,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'template_values_metadata', 'workspace_id', + 'template_values_metadata', 'template_git_has_uploadedgitrepotar', ] @@ -281,44 +281,49 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - frozen_at=dict( - required=False, - type='str'), location=dict( required=False, type='str'), - x_github_token=dict( - required=False, - type='str'), - template_values_metadata=dict( + tags=dict( required=False, elements='', type='list'), template_git_release=dict( required=False, type='str'), - catalog_ref=dict( + frozen=dict( + required=False, + type='bool'), + applied_shareddata_ids=dict( required=False, elements='', type='list'), - shared_data=dict( + template_inputs=dict( required=False, elements='', type='list'), - template_uninstall_script_name=dict( + template_git_repo_sha_value=dict( required=False, type='str'), - template_inputs=dict( + template_git_has_uploadedgitrepotar=dict( required=False, - elements='', - type='list'), - locked_by=dict( + type='bool'), + resource_group=dict( required=False, type='str'), - template_init_state_file=dict( + frozen_at=dict( required=False, type='str'), - template_git_url=dict( + template_git_branch=dict( + required=False, + type='str'), + frozen_by=dict( + required=False, + type='str'), + locked_by=dict( + required=False, + type='str'), + locked_time=dict( required=False, type='str'), description=dict( @@ -328,56 +333,51 @@ required=False, elements='', type='list'), - template_values=dict( - required=False, - type='str'), - template_ref=dict( + template_uninstall_script_name=dict( required=False, type='str'), - template_git_has_uploadedgitrepotar=dict( + template_values_metadata=dict( required=False, - type='bool'), - locked_time=dict( + elements='', + type='list'), + x_github_token=dict( required=False, type='str'), - frozen=dict( - required=False, - type='bool'), - frozen_by=dict( + template_git_folder=dict( required=False, type='str'), - template_git_branch=dict( + template_ref=dict( required=False, type='str'), - template_git_repo_sha_value=dict( + template_git_url=dict( required=False, type='str'), - applied_shareddata_ids=dict( + locked=dict( + required=False, + type='bool'), + catalog_ref=dict( required=False, elements='', type='list'), name=dict( required=False, type='str'), - resource_group=dict( + template_type=dict( required=False, type='str'), - tags=dict( + shared_data=dict( required=False, elements='', type='list'), - template_git_folder=dict( + template_init_state_file=dict( required=False, type='str'), - template_type=dict( + template_values=dict( required=False, type='str'), template_git_repo_url=dict( required=False, type='str'), - locked=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -443,7 +443,7 @@ def run_module(): resource_type='ibm_schematics_workspace', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -452,7 +452,7 @@ def run_module(): resource_type='ibm_schematics_workspace', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_schematics_workspace_info.py b/plugins/modules/ibm_schematics_workspace_info.py index 9f50d6e0f..471a431c9 100644 --- a/plugins/modules/ibm_schematics_workspace_info.py +++ b/plugins/modules/ibm_schematics_workspace_info.py @@ -17,21 +17,21 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_workspace' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + workspace_id: + description: + - The ID of the workspace. To find the workspace ID, use the `GET /v1/workspaces` API. + required: True + type: str template_values_metadata: description: - A list of input variables that are associated with the workspace. required: False type: list elements: dict - workspace_id: - description: - - The ID of the workspace. To find the workspace ID, use the `GET /v1/workspaces` API. - required: True - type: str template_git_has_uploadedgitrepotar: description: - Has uploaded Git repository tar. @@ -75,8 +75,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'template_values_metadata', 'workspace_id', + 'template_values_metadata', 'template_git_has_uploadedgitrepotar', ] @@ -88,13 +88,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + workspace_id=dict( + required=True, + type='str'), template_values_metadata=dict( required=False, elements='', type='list'), - workspace_id=dict( - required=True, - type='str'), template_git_has_uploadedgitrepotar=dict( required=False, type='bool'), @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_schematics_workspace', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_secrets_manager_secret_info.py b/plugins/modules/ibm_secrets_manager_secret_info.py index 5e1010c04..71753aa77 100644 --- a/plugins/modules/ibm_secrets_manager_secret_info.py +++ b/plugins/modules/ibm_secrets_manager_secret_info.py @@ -17,13 +17,19 @@ description: - Retrieve an IBM Cloud 'ibm_secrets_manager_secret' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - secret_type: + endpoint_type: description: - - The secret type. Supported options include: arbitrary, iam_credentials, username_password. + - Endpoint Type. 'public' or 'private' + required: False + type: str + default: public + instance_id: + description: + - Secrets Manager instance GUID required: True type: str secret_id: @@ -31,17 +37,11 @@ - The v4 UUID that uniquely identifies the secret. required: True type: str - instance_id: + secret_type: description: - - Secrets Manager instance GUID + - The secret type. Supported options include: arbitrary, iam_credentials, username_password. required: True type: str - endpoint_type: - description: - - Endpoint Type. 'public' or 'private' - required: False - type: str - default: public iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -75,17 +75,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('secret_type', 'str'), - ('secret_id', 'str'), ('instance_id', 'str'), + ('secret_id', 'str'), + ('secret_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'secret_type', - 'secret_id', - 'instance_id', 'endpoint_type', + 'instance_id', + 'secret_id', + 'secret_type', ] @@ -96,18 +96,18 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - secret_type=dict( + endpoint_type=dict( + required=False, + type='str'), + instance_id=dict( required=True, type='str'), secret_id=dict( required=True, type='str'), - instance_id=dict( + secret_type=dict( required=True, type='str'), - endpoint_type=dict( - required=False, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_secrets_manager_secret', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_secrets_manager_secrets_info.py b/plugins/modules/ibm_secrets_manager_secrets_info.py index 1690ad587..0f5e878ff 100644 --- a/plugins/modules/ibm_secrets_manager_secrets_info.py +++ b/plugins/modules/ibm_secrets_manager_secrets_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_secrets_manager_secrets' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_secrets_manager_secrets', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_security_group.py b/plugins/modules/ibm_security_group.py index 42beddd33..51e902d5a 100644 --- a/plugins/modules/ibm_security_group.py +++ b/plugins/modules/ibm_security_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_security_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_security_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_security_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_security_group_info.py b/plugins/modules/ibm_security_group_info.py index cc704f50d..b629395f0 100644 --- a/plugins/modules/ibm_security_group_info.py +++ b/plugins/modules/ibm_security_group_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_security_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_security_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_security_group_rule.py b/plugins/modules/ibm_security_group_rule.py index 01ad06367..af27846cc 100644 --- a/plugins/modules/ibm_security_group_rule.py +++ b/plugins/modules/ibm_security_group_rule.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_security_group_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + security_group_id: + description: + - (Required for new resource) Security group ID + required: True + type: int direction: description: - (Required for new resource) Direction of rule: ingress or egress @@ -58,11 +63,6 @@ - icmp, tcp or udp required: False type: str - security_group_id: - description: - - (Required for new resource) Security group ID - required: True - type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -109,12 +109,13 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('direction', 'str'), ('security_group_id', 'int'), + ('direction', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'security_group_id', 'direction', 'ether_type', 'port_range_min', @@ -122,7 +123,6 @@ 'remote_group_id', 'remote_ip', 'protocol', - 'security_group_id', ] # Params for Data source @@ -141,6 +141,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + security_group_id=dict( + required=False, + type='int'), direction=dict( required=False, type='str'), @@ -162,9 +165,6 @@ protocol=dict( required=False, type='str'), - security_group_id=dict( - required=False, - type='int'), id=dict( required=False, type='str'), @@ -230,7 +230,7 @@ def run_module(): resource_type='ibm_security_group_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_service_instance.py b/plugins/modules/ibm_service_instance.py index 06c45493a..0c10b5757 100644 --- a/plugins/modules/ibm_service_instance.py +++ b/plugins/modules/ibm_service_instance.py @@ -18,26 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_service_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - tags: - description: - - None - required: False - type: list - elements: str - space_guid: - description: - - (Required for new resource) The guid of the space in which the instance will be created - required: True - type: str - service: - description: - - (Required for new resource) The name of the service offering like speech_to_text, text_to_speech etc - required: True - type: str parameters: description: - Arbitrary parameters to pass along to the service broker. Must be a JSON object @@ -48,6 +32,12 @@ - (Required for new resource) The plan type of the service required: True type: str + tags: + description: + - None + required: False + type: list + elements: str wait_time_minutes: description: - Define timeout to wait for the service instances to succeeded/deleted etc. @@ -59,6 +49,16 @@ - (Required for new resource) A name for the service instance required: True type: str + service: + description: + - (Required for new resource) The name of the service offering like speech_to_text, text_to_speech etc + required: True + type: str + space_guid: + description: + - (Required for new resource) The guid of the space in which the instance will be created + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -105,21 +105,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('space_guid', 'str'), - ('service', 'str'), ('plan', 'str'), ('name', 'str'), + ('service', 'str'), + ('space_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', - 'space_guid', - 'service', 'parameters', 'plan', + 'tags', 'wait_time_minutes', 'name', + 'service', + 'space_guid', ] # Params for Data source @@ -140,28 +140,28 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - tags=dict( - required=False, - elements='', - type='list'), - space_guid=dict( - required=False, - type='str'), - service=dict( - required=False, - type='str'), parameters=dict( required=False, type='dict'), plan=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), wait_time_minutes=dict( required=False, type='int'), name=dict( required=False, type='str'), + service=dict( + required=False, + type='str'), + space_guid=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -227,7 +227,7 @@ def run_module(): resource_type='ibm_service_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -236,7 +236,7 @@ def run_module(): resource_type='ibm_service_instance', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_service_instance_info.py b/plugins/modules/ibm_service_instance_info.py index 9f47dd816..1d873352a 100644 --- a/plugins/modules/ibm_service_instance_info.py +++ b/plugins/modules/ibm_service_instance_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_service_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_service_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_service_key.py b/plugins/modules/ibm_service_key.py index 95a83c65a..586ab90c8 100644 --- a/plugins/modules/ibm_service_key.py +++ b/plugins/modules/ibm_service_key.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_service_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + parameters: + description: + - Arbitrary parameters to pass along to the service broker. Must be a JSON object + required: False + type: dict tags: description: - None @@ -38,11 +43,6 @@ - (Required for new resource) The guid of the service instance for which to create service key required: True type: str - parameters: - description: - - Arbitrary parameters to pass along to the service broker. Must be a JSON object - required: False - type: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,10 +95,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'parameters', 'tags', 'name', 'service_instance_guid', - 'parameters', ] # Params for Data source @@ -121,6 +121,9 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + parameters=dict( + required=False, + type='dict'), tags=dict( required=False, elements='', @@ -131,9 +134,6 @@ service_instance_guid=dict( required=False, type='str'), - parameters=dict( - required=False, - type='dict'), id=dict( required=False, type='str'), @@ -199,7 +199,7 @@ def run_module(): resource_type='ibm_service_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -208,7 +208,7 @@ def run_module(): resource_type='ibm_service_key', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_service_key_info.py b/plugins/modules/ibm_service_key_info.py index 7e4274c50..ee255d41c 100644 --- a/plugins/modules/ibm_service_key_info.py +++ b/plugins/modules/ibm_service_key_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_service_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_service_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_service_plan_info.py b/plugins/modules/ibm_service_plan_info.py index adba77634..1319bbb00 100644 --- a/plugins/modules/ibm_service_plan_info.py +++ b/plugins/modules/ibm_service_plan_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_service_plan' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_service_plan', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_space.py b/plugins/modules/ibm_space.py index 7bd73d17a..0790eaabd 100644 --- a/plugins/modules/ibm_space.py +++ b/plugins/modules/ibm_space.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_space' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -230,7 +230,7 @@ def run_module(): resource_type='ibm_space', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -239,7 +239,7 @@ def run_module(): resource_type='ibm_space', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_space_info.py b/plugins/modules/ibm_space_info.py index f9c6a2350..480941876 100644 --- a/plugins/modules/ibm_space_info.py +++ b/plugins/modules/ibm_space_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_space' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_space', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_ssl_certificate.py b/plugins/modules/ibm_ssl_certificate.py index dd2766400..70c45f9a6 100644 --- a/plugins/modules/ibm_ssl_certificate.py +++ b/plugins/modules/ibm_ssl_certificate.py @@ -18,36 +18,52 @@ - Create, update or destroy an IBM Cloud 'ibm_ssl_certificate' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + certificate_signing_request: + description: + - (Required for new resource) certificate signing request info + required: True + type: str billing_address_same_as_organization_flag: description: - billing address same as organization flag required: False type: bool default: False - administrative_contact: + organization_information: description: - - None - required: False + - (Required for new resource) Organization information + required: True type: list elements: dict - server_count: + administrative_address_same_as_organization_flag: description: - - (Required for new resource) Server count + - administrative address same as organization flag + required: False + type: bool + default: False + server_type: + description: + - (Required for new resource) server type required: True - type: int + type: str + ssl_type: + description: + - (Required for new resource) ssl type + required: True + type: str renewal_flag: description: - Renewal flag required: False type: bool default: True - technical_contact_same_as_org_address_flag: + administrative_contact_same_as_technical_flag: description: - - Technical contact same as org address flag + - Administrative contact same as technical flag required: False type: bool default: False @@ -57,11 +73,6 @@ required: False type: bool default: False - order_approver_email_address: - description: - - (Required for new resource) Email address of the approver - required: True - type: str technical_contact: description: - (Required for new resource) Technical contact info @@ -74,44 +85,33 @@ required: False type: list elements: dict - administrative_contact_same_as_technical_flag: - description: - - Administrative contact same as technical flag - required: False - type: bool - default: False - administrative_address_same_as_organization_flag: + administrative_contact: description: - - administrative address same as organization flag + - None required: False - type: bool - default: False - organization_information: - description: - - (Required for new resource) Organization information - required: True type: list elements: dict - server_type: + server_count: description: - - (Required for new resource) server type + - (Required for new resource) Server count required: True - type: str + type: int validity_months: description: - (Required for new resource) vslidity of the ssl certificate in month required: True type: int - ssl_type: + order_approver_email_address: description: - - (Required for new resource) ssl type + - (Required for new resource) Email address of the approver required: True type: str - certificate_signing_request: + technical_contact_same_as_org_address_flag: description: - - (Required for new resource) certificate signing request info - required: True - type: str + - Technical contact same as org address flag + required: False + type: bool + default: False id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -158,34 +158,34 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('server_count', 'int'), - ('order_approver_email_address', 'str'), - ('technical_contact', 'list'), + ('certificate_signing_request', 'str'), ('organization_information', 'list'), ('server_type', 'str'), - ('validity_months', 'int'), ('ssl_type', 'str'), - ('certificate_signing_request', 'str'), + ('technical_contact', 'list'), + ('server_count', 'int'), + ('validity_months', 'int'), + ('order_approver_email_address', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'certificate_signing_request', 'billing_address_same_as_organization_flag', - 'administrative_contact', - 'server_count', + 'organization_information', + 'administrative_address_same_as_organization_flag', + 'server_type', + 'ssl_type', 'renewal_flag', - 'technical_contact_same_as_org_address_flag', + 'administrative_contact_same_as_technical_flag', 'billing_contact_same_as_technical_flag', - 'order_approver_email_address', 'technical_contact', 'billing_contact', - 'administrative_contact_same_as_technical_flag', - 'administrative_address_same_as_organization_flag', - 'organization_information', - 'server_type', + 'administrative_contact', + 'server_count', 'validity_months', - 'ssl_type', - 'certificate_signing_request', + 'order_approver_email_address', + 'technical_contact_same_as_org_address_flag', ] # Params for Data source @@ -202,28 +202,34 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + certificate_signing_request=dict( + required=False, + type='str'), billing_address_same_as_organization_flag=dict( required=False, type='bool'), - administrative_contact=dict( + organization_information=dict( required=False, elements='', type='list'), - server_count=dict( + administrative_address_same_as_organization_flag=dict( required=False, - type='int'), + type='bool'), + server_type=dict( + required=False, + type='str'), + ssl_type=dict( + required=False, + type='str'), renewal_flag=dict( required=False, type='bool'), - technical_contact_same_as_org_address_flag=dict( + administrative_contact_same_as_technical_flag=dict( required=False, type='bool'), billing_contact_same_as_technical_flag=dict( required=False, type='bool'), - order_approver_email_address=dict( - required=False, - type='str'), technical_contact=dict( required=False, elements='', @@ -232,28 +238,22 @@ required=False, elements='', type='list'), - administrative_contact_same_as_technical_flag=dict( - required=False, - type='bool'), - administrative_address_same_as_organization_flag=dict( - required=False, - type='bool'), - organization_information=dict( + administrative_contact=dict( required=False, elements='', type='list'), - server_type=dict( + server_count=dict( required=False, - type='str'), + type='int'), validity_months=dict( required=False, type='int'), - ssl_type=dict( + order_approver_email_address=dict( required=False, type='str'), - certificate_signing_request=dict( + technical_contact_same_as_org_address_flag=dict( required=False, - type='str'), + type='bool'), id=dict( required=False, type='str'), @@ -319,7 +319,7 @@ def run_module(): resource_type='ibm_ssl_certificate', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_storage_block.py b/plugins/modules/ibm_storage_block.py index 74bc42b9a..83663b5ac 100644 --- a/plugins/modules/ibm_storage_block.py +++ b/plugins/modules/ibm_storage_block.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_storage_block' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + type: + description: + - (Required for new resource) Storage block type + required: True + type: str + os_format_type: + description: + - (Required for new resource) OS formatr type + required: True + type: str allowed_virtual_guest_ids: description: - List of allowed virtual guest IDs @@ -40,6 +50,16 @@ required: False type: list elements: str + datacenter: + description: + - (Required for new resource) Datacenter name + required: True + type: str + notes: + description: + - Additional note info + required: False + type: str tags: description: - List of tags associated with the resource @@ -67,26 +87,6 @@ - Snapshot capacity in GB required: False type: int - notes: - description: - - Additional note info - required: False - type: str - datacenter: - description: - - (Required for new resource) Datacenter name - required: True - type: str - os_format_type: - description: - - (Required for new resource) OS formatr type - required: True - type: str - type: - description: - - (Required for new resource) Storage block type - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -133,27 +133,27 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('type', 'str'), + ('os_format_type', 'str'), + ('datacenter', 'str'), ('capacity', 'int'), ('iops', 'float'), - ('datacenter', 'str'), - ('os_format_type', 'str'), - ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'type', + 'os_format_type', 'allowed_virtual_guest_ids', 'allowed_hardware_ids', 'allowed_ip_addresses', + 'datacenter', + 'notes', 'tags', 'hourly_billing', 'capacity', 'iops', 'snapshot_capacity', - 'notes', - 'datacenter', - 'os_format_type', - 'type', ] # Params for Data source @@ -170,6 +170,12 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + type=dict( + required=False, + type='str'), + os_format_type=dict( + required=False, + type='str'), allowed_virtual_guest_ids=dict( required=False, elements='', @@ -182,6 +188,12 @@ required=False, elements='', type='list'), + datacenter=dict( + required=False, + type='str'), + notes=dict( + required=False, + type='str'), tags=dict( required=False, elements='', @@ -198,18 +210,6 @@ snapshot_capacity=dict( required=False, type='int'), - notes=dict( - required=False, - type='str'), - datacenter=dict( - required=False, - type='str'), - os_format_type=dict( - required=False, - type='str'), - type=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -275,7 +275,7 @@ def run_module(): resource_type='ibm_storage_block', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_storage_evault.py b/plugins/modules/ibm_storage_evault.py index d68eccdf1..59f69260e 100644 --- a/plugins/modules/ibm_storage_evault.py +++ b/plugins/modules/ibm_storage_evault.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_storage_evault' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + hardware_instance_id: + description: + - Hardware instance ID + required: False + type: int tags: description: - Tags set for the resource @@ -43,11 +48,6 @@ - Virtual instance ID required: False type: int - hardware_instance_id: - description: - - Hardware instance ID - required: False - type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -100,11 +100,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'hardware_instance_id', 'tags', 'datacenter', 'capacity', 'virtual_instance_id', - 'hardware_instance_id', ] # Params for Data source @@ -115,14 +115,17 @@ ] TL_CONFLICTS_MAP = { - 'virtual_instance_id': ['hardware_instance_id'], 'hardware_instance_id': ['virtual_instance_id'], + 'virtual_instance_id': ['hardware_instance_id'], } # define available arguments/parameters a user can pass to the module from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( + hardware_instance_id=dict( + required=False, + type='int'), tags=dict( required=False, elements='', @@ -136,9 +139,6 @@ virtual_instance_id=dict( required=False, type='int'), - hardware_instance_id=dict( - required=False, - type='int'), id=dict( required=False, type='str'), @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_storage_evault', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_storage_file.py b/plugins/modules/ibm_storage_file.py index 0ff144ade..f037ee6b0 100644 --- a/plugins/modules/ibm_storage_file.py +++ b/plugins/modules/ibm_storage_file.py @@ -18,51 +18,43 @@ - Create, update or destroy an IBM Cloud 'ibm_storage_file' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - allowed_ip_addresses: + type: description: - - Allowed range of IP addresses + - (Required for new resource) Storage type + required: True + type: str + allowed_virtual_guest_ids: + description: + - Virtual guest ID required: False type: list - elements: str - snapshot_schedule: + elements: int + allowed_hardware_ids: description: - - None + - Hardaware ID required: False type: list - elements: dict + elements: int datacenter: description: - (Required for new resource) Datacenter name required: True type: str - allowed_hardware_ids: + snapshot_capacity: description: - - Hardaware ID + - Snapshot capacity required: False - type: list - elements: int + type: int allowed_subnets: description: - Allowed network subnets required: False type: list elements: str - tags: - description: - - Tags set for the storage volume - required: False - type: list - elements: str - allowed_virtual_guest_ids: - description: - - Virtual guest ID - required: False - type: list - elements: int capacity: description: - (Required for new resource) Storage capacity @@ -73,21 +65,29 @@ - (Required for new resource) iops rate required: True type: float - snapshot_capacity: + snapshot_schedule: description: - - Snapshot capacity + - None required: False - type: int + type: list + elements: dict + tags: + description: + - Tags set for the storage volume + required: False + type: list + elements: str + allowed_ip_addresses: + description: + - Allowed range of IP addresses + required: False + type: list + elements: str notes: description: - Notes required: False type: str - type: - description: - - (Required for new resource) Storage type - required: True - type: str hourly_billing: description: - Hourly based billing type @@ -140,26 +140,26 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('type', 'str'), ('datacenter', 'str'), ('capacity', 'int'), ('iops', 'float'), - ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'allowed_ip_addresses', - 'snapshot_schedule', - 'datacenter', + 'type', + 'allowed_virtual_guest_ids', 'allowed_hardware_ids', + 'datacenter', + 'snapshot_capacity', 'allowed_subnets', - 'tags', - 'allowed_virtual_guest_ids', 'capacity', 'iops', - 'snapshot_capacity', + 'snapshot_schedule', + 'tags', + 'allowed_ip_addresses', 'notes', - 'type', 'hourly_billing', ] @@ -177,22 +177,34 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - allowed_ip_addresses=dict( + type=dict( + required=False, + type='str'), + allowed_virtual_guest_ids=dict( required=False, elements='', type='list'), - snapshot_schedule=dict( + allowed_hardware_ids=dict( required=False, elements='', type='list'), datacenter=dict( required=False, type='str'), - allowed_hardware_ids=dict( + snapshot_capacity=dict( + required=False, + type='int'), + allowed_subnets=dict( required=False, elements='', type='list'), - allowed_subnets=dict( + capacity=dict( + required=False, + type='int'), + iops=dict( + required=False, + type='float'), + snapshot_schedule=dict( required=False, elements='', type='list'), @@ -200,25 +212,13 @@ required=False, elements='', type='list'), - allowed_virtual_guest_ids=dict( + allowed_ip_addresses=dict( required=False, elements='', type='list'), - capacity=dict( - required=False, - type='int'), - iops=dict( - required=False, - type='float'), - snapshot_capacity=dict( - required=False, - type='int'), notes=dict( required=False, type='str'), - type=dict( - required=False, - type='str'), hourly_billing=dict( required=False, type='bool'), @@ -287,7 +287,7 @@ def run_module(): resource_type='ibm_storage_file', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_subnet.py b/plugins/modules/ibm_subnet.py index 29760f633..59dd79cc0 100644 --- a/plugins/modules/ibm_subnet.py +++ b/plugins/modules/ibm_subnet.py @@ -18,26 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_subnet' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - vlan_id: - description: - - VLAN ID for the subnet - required: False - type: int - endpoint_ip: - description: - - endpoint IP - required: False - type: str - private: - description: - - private subnet - required: False - type: bool - default: False type: description: - (Required for new resource) subnet type @@ -54,17 +38,33 @@ - (Required for new resource) number of ip addresses in the subnet required: True type: int - notes: - description: - - Notes - required: False - type: str tags: description: - tags set for the resource required: False type: list elements: str + private: + description: + - private subnet + required: False + type: bool + default: False + vlan_id: + description: + - VLAN ID for the subnet + required: False + type: int + endpoint_ip: + description: + - endpoint IP + required: False + type: str + notes: + description: + - Notes + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -117,14 +117,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'vlan_id', - 'endpoint_ip', - 'private', 'type', 'ip_version', 'capacity', - 'notes', 'tags', + 'private', + 'vlan_id', + 'endpoint_ip', + 'notes', ] # Params for Data source @@ -143,15 +143,6 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - vlan_id=dict( - required=False, - type='int'), - endpoint_ip=dict( - required=False, - type='str'), - private=dict( - required=False, - type='bool'), type=dict( required=False, type='str'), @@ -161,13 +152,22 @@ capacity=dict( required=False, type='int'), - notes=dict( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), + private=dict( + required=False, + type='bool'), + vlan_id=dict( + required=False, + type='int'), + endpoint_ip=dict( + required=False, + type='str'), + notes=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -233,7 +233,7 @@ def run_module(): resource_type='ibm_subnet', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_connection.py b/plugins/modules/ibm_tg_connection.py index a100b0f92..2ff97baf4 100644 --- a/plugins/modules/ibm_tg_connection.py +++ b/plugins/modules/ibm_tg_connection.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_tg_connection' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -27,19 +27,24 @@ - (Required for new resource) Defines what type of network is connected via this connection. Allowable values (classic,directlink,vpc,gre_tunnel) required: True type: str - network_id: + base_connection_id: description: - - The ID of the network being connected via this connection. This field is required for some types, such as 'vpc' or 'directlink'. The value of this is the CRN of the VPC or direct link gateway to be connected. This field is required to be unspecified for network type 'classic'. + - The ID of a network_type 'classic' connection a tunnel is configured over. This field only applies to network type 'gre_tunnel' connections. required: False type: str - network_account_id: + zone: description: - - The ID of the account which owns the network that is being connected. Generally only used if the network is in a different account than the gateway. + - Location of GRE tunnel. This field only applies to network type 'gre_tunnel' connections. required: False type: str - local_gateway_ip: + gateway: description: - - The local gateway IP address. This field only applies to network type 'gre_tunnel' connections. + - (Required for new resource) The Transit Gateway identifier + required: True + type: str + network_id: + description: + - The ID of the network being connected via this connection. This field is required for some types, such as 'vpc' or 'directlink'. The value of this is the CRN of the VPC or direct link gateway to be connected. This field is required to be unspecified for network type 'classic'. required: False type: str remote_bgp_asn: @@ -47,11 +52,6 @@ - The remote network BGP ASN. This field only applies to network type 'gre_tunnel' connections. required: False type: int - zone: - description: - - Location of GRE tunnel. This field only applies to network type 'gre_tunnel' connections. - required: False - type: str remote_gateway_ip: description: - The remote gateway IP address. This field only applies to network type 'gre_tunnel' connections. @@ -62,24 +62,24 @@ - The remote tunnel IP address. This field only applies to network type 'gre_tunnel' connections. required: False type: str - gateway: + local_tunnel_ip: description: - - (Required for new resource) The Transit Gateway identifier - required: True + - The local tunnel IP address. This field only applies to network type 'gre_tunnel' connections. + required: False type: str name: description: - The user-defined name for this transit gateway. If unspecified, the name will be the network name (the name of the VPC in the case of network type 'vpc', and the word Classic, in the case of network type 'classic'). required: False type: str - base_connection_id: + network_account_id: description: - - The ID of a network_type 'classic' connection a tunnel is configured over. This field only applies to network type 'gre_tunnel' connections. + - The ID of the account which owns the network that is being connected. Generally only used if the network is in a different account than the gateway. required: False type: str - local_tunnel_ip: + local_gateway_ip: description: - - The local tunnel IP address. This field only applies to network type 'gre_tunnel' connections. + - The local gateway IP address. This field only applies to network type 'gre_tunnel' connections. required: False type: str id: @@ -135,17 +135,17 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'network_type', + 'base_connection_id', + 'zone', + 'gateway', 'network_id', - 'network_account_id', - 'local_gateway_ip', 'remote_bgp_asn', - 'zone', 'remote_gateway_ip', 'remote_tunnel_ip', - 'gateway', - 'name', - 'base_connection_id', 'local_tunnel_ip', + 'name', + 'network_account_id', + 'local_gateway_ip', ] # Params for Data source @@ -165,37 +165,37 @@ network_type=dict( required=False, type='str'), - network_id=dict( + base_connection_id=dict( required=False, type='str'), - network_account_id=dict( + zone=dict( required=False, type='str'), - local_gateway_ip=dict( + gateway=dict( + required=False, + type='str'), + network_id=dict( required=False, type='str'), remote_bgp_asn=dict( required=False, type='int'), - zone=dict( - required=False, - type='str'), remote_gateway_ip=dict( required=False, type='str'), remote_tunnel_ip=dict( required=False, type='str'), - gateway=dict( + local_tunnel_ip=dict( required=False, type='str'), name=dict( required=False, type='str'), - base_connection_id=dict( + network_account_id=dict( required=False, type='str'), - local_tunnel_ip=dict( + local_gateway_ip=dict( required=False, type='str'), id=dict( @@ -263,7 +263,7 @@ def run_module(): resource_type='ibm_tg_connection', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_connection_prefix_filter.py b/plugins/modules/ibm_tg_connection_prefix_filter.py index 3d3e59d1d..f079d95fe 100644 --- a/plugins/modules/ibm_tg_connection_prefix_filter.py +++ b/plugins/modules/ibm_tg_connection_prefix_filter.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_tg_connection_prefix_filter' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - connection_id: + gateway: description: - - (Required for new resource) The Transit Gateway Connection identifier + - (Required for new resource) The Transit Gateway identifier required: True type: str action: @@ -37,16 +37,16 @@ - Identifier of prefix filter that handles ordering required: False type: str - gateway: - description: - - (Required for new resource) The Transit Gateway identifier - required: True - type: str ge: description: - IP Prefix GE required: False type: int + connection_id: + description: + - (Required for new resource) The Transit Gateway Connection identifier + required: True + type: str le: description: - IP Prefix LE @@ -103,34 +103,34 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('connection_id', 'str'), - ('action', 'str'), ('gateway', 'str'), + ('action', 'str'), + ('connection_id', 'str'), ('prefix', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'connection_id', + 'gateway', 'action', 'before', - 'gateway', 'ge', + 'connection_id', 'le', 'prefix', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ + ('connection_id', 'str'), ('filter_id', 'str'), ('gateway', 'str'), - ('connection_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'connection_id', 'filter_id', 'gateway', - 'connection_id', ] TL_CONFLICTS_MAP = { @@ -140,7 +140,7 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - connection_id=dict( + gateway=dict( required=False, type='str'), action=dict( @@ -149,12 +149,12 @@ before=dict( required=False, type='str'), - gateway=dict( - required=False, - type='str'), ge=dict( required=False, type='int'), + connection_id=dict( + required=False, + type='str'), le=dict( required=False, type='int'), @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_tg_connection_prefix_filter', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -235,7 +235,7 @@ def run_module(): resource_type='ibm_tg_connection_prefix_filter', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_tg_connection_prefix_filter_info.py b/plugins/modules/ibm_tg_connection_prefix_filter_info.py index 74d384cd5..ca15aeb90 100644 --- a/plugins/modules/ibm_tg_connection_prefix_filter_info.py +++ b/plugins/modules/ibm_tg_connection_prefix_filter_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_tg_connection_prefix_filter' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: + connection_id: + description: + - The Transit Gateway Connection identifier + required: True + type: str filter_id: description: - The Transit Gateway Connection Prefix Filter identifier @@ -31,11 +36,6 @@ - The Transit Gateway identifier required: True type: str - connection_id: - description: - - The Transit Gateway Connection identifier - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('connection_id', 'str'), ('filter_id', 'str'), ('gateway', 'str'), - ('connection_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'connection_id', 'filter_id', 'gateway', - 'connection_id', ] @@ -89,13 +89,13 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - filter_id=dict( + connection_id=dict( required=True, type='str'), - gateway=dict( + filter_id=dict( required=True, type='str'), - connection_id=dict( + gateway=dict( required=True, type='str'), iaas_classic_username=dict( @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_tg_connection_prefix_filter', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_connection_prefix_filters_info.py b/plugins/modules/ibm_tg_connection_prefix_filters_info.py index fa007a350..4c1f6524e 100644 --- a/plugins/modules/ibm_tg_connection_prefix_filters_info.py +++ b/plugins/modules/ibm_tg_connection_prefix_filters_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_tg_connection_prefix_filters' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_tg_connection_prefix_filters', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_gateway.py b/plugins/modules/ibm_tg_gateway.py index a8cc052f8..14f8931ae 100644 --- a/plugins/modules/ibm_tg_gateway.py +++ b/plugins/modules/ibm_tg_gateway.py @@ -18,37 +18,37 @@ - Create, update or destroy an IBM Cloud 'ibm_tg_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: - name: + global_: description: - - (Required for new resource) Name Transit Gateway Services - required: True - type: str + - Allow global routing for a Transit Gateway. If unspecified, the default value is false + required: False + type: bool + default: False tags: description: - Tags for the transit gateway instance required: False type: list elements: str + location: + description: + - (Required for new resource) Location of Transit Gateway Services + required: True + type: str resource_group: description: - None required: False type: str - location: + name: description: - - (Required for new resource) Location of Transit Gateway Services + - (Required for new resource) Name Transit Gateway Services required: True type: str - global_: - description: - - Allow global routing for a Transit Gateway. If unspecified, the default value is false - required: False - type: bool - default: False id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -95,17 +95,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('location', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', + 'global_', 'tags', - 'resource_group', 'location', - 'global_', + 'resource_group', + 'name', ] # Params for Data source @@ -124,22 +124,22 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - name=dict( + global_=dict( required=False, - type='str'), + type='bool'), tags=dict( required=False, elements='', type='list'), - resource_group=dict( + location=dict( required=False, type='str'), - location=dict( + resource_group=dict( required=False, type='str'), - global_=dict( + name=dict( required=False, - type='bool'), + type='str'), id=dict( required=False, type='str'), @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_tg_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -214,7 +214,7 @@ def run_module(): resource_type='ibm_tg_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_tg_gateway_info.py b/plugins/modules/ibm_tg_gateway_info.py index 969841a14..426ad4aa1 100644 --- a/plugins/modules/ibm_tg_gateway_info.py +++ b/plugins/modules/ibm_tg_gateway_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_tg_gateway' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_tg_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_gateways_info.py b/plugins/modules/ibm_tg_gateways_info.py index 2ebe6d660..6757004de 100644 --- a/plugins/modules/ibm_tg_gateways_info.py +++ b/plugins/modules/ibm_tg_gateways_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_tg_gateways' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_tg_gateways', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_location_info.py b/plugins/modules/ibm_tg_location_info.py index da33d259c..29d9f264a 100644 --- a/plugins/modules/ibm_tg_location_info.py +++ b/plugins/modules/ibm_tg_location_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_tg_location' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_tg_location', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_locations_info.py b/plugins/modules/ibm_tg_locations_info.py index 6fe2c8dae..2cf65537f 100644 --- a/plugins/modules/ibm_tg_locations_info.py +++ b/plugins/modules/ibm_tg_locations_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_tg_locations' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -102,7 +102,7 @@ def run_module(): resource_type='ibm_tg_locations', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_route_report.py b/plugins/modules/ibm_tg_route_report.py index fedebbb8d..66220c784 100644 --- a/plugins/modules/ibm_tg_route_report.py +++ b/plugins/modules/ibm_tg_route_report.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_tg_route_report' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -167,7 +167,7 @@ def run_module(): resource_type='ibm_tg_route_report', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_tg_route_report', tf_type='resource', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) if result['rc'] > 0: diff --git a/plugins/modules/ibm_tg_route_report_info.py b/plugins/modules/ibm_tg_route_report_info.py index 6cb5354d5..8e99fb988 100644 --- a/plugins/modules/ibm_tg_route_report_info.py +++ b/plugins/modules/ibm_tg_route_report_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_tg_route_report' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_tg_route_report', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_tg_route_reports_info.py b/plugins/modules/ibm_tg_route_reports_info.py index b109e23cb..2d7c37770 100644 --- a/plugins/modules/ibm_tg_route_reports_info.py +++ b/plugins/modules/ibm_tg_route_reports_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_tg_route_reports' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.42.0 + - IBM-Cloud terraform-provider-ibm v1.43.0 - Terraform v0.12.20 options: @@ -112,7 +112,7 @@ def run_module(): resource_type='ibm_tg_route_reports', tf_type='data', parameters=module.params, - ibm_provider_version='1.42.0', + ibm_provider_version='1.43.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS)