diff --git a/plugins/modules/ibm_account_info.py b/plugins/modules/ibm_account_info.py index 5d996e940..89fb78aa9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 cac6d6dda..d55a1dd27 100644 --- a/plugins/modules/ibm_api_gateway_endpoint.py +++ b/plugins/modules/ibm_api_gateway_endpoint.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -43,18 +43,18 @@ required: False type: bool default: False - routes: - description: - - Invokable routes for an endpoint - required: False - type: list - elements: str provider_id: description: - Provider ID of an endpoint allowable values user-defined and whisk required: False type: str default: user-defined + routes: + description: + - Invokable routes for an endpoint + required: False + type: list + elements: str type: description: - Action type of Endpoint ALoowable values are share, unshare, manage, unmanage @@ -118,8 +118,8 @@ 'open_api_doc_name', 'name', 'managed', - 'routes', 'provider_id', + 'routes', 'type', ] @@ -149,13 +149,13 @@ managed=dict( required=False, type='bool'), + provider_id=dict( + required=False, + type='str'), routes=dict( required=False, elements='', type='list'), - provider_id=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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 98b0e4663..aae3c8a56 100644 --- a/plugins/modules/ibm_api_gateway_endpoint_subscription.py +++ b/plugins/modules/ibm_api_gateway_endpoint_subscription.py @@ -18,15 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - client_secret: - description: - - Client Sercret of a Subscription - required: False - type: str generate_secret: description: - Indicates if Client Sercret has to be autogenerated @@ -52,6 +47,11 @@ - (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. @@ -105,12 +105,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'client_secret', 'generate_secret', 'artifact_id', 'client_id', 'name', 'type', + 'client_secret', ] # Params for Data source @@ -121,17 +121,14 @@ ] TL_CONFLICTS_MAP = { - 'client_secret': ['generate_secret'], 'generate_secret': ['client_secret'], + 'client_secret': ['generate_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( - client_secret=dict( - required=False, - type='str'), generate_secret=dict( required=False, type='bool'), @@ -147,6 +144,9 @@ 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.41.1', + ibm_provider_version='1.42.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 f2c211513..8c72bec38 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c3d101d7c..493d9637b 100644 --- a/plugins/modules/ibm_app.py +++ b/plugins/modules/ibm_app.py @@ -18,24 +18,24 @@ - Create, update or destroy an IBM Cloud 'ibm_app' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 - 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: str + service_instance_guid: + description: + - Define the service instance guids that should be bound to this application. required: False type: list elements: str @@ -44,75 +44,75 @@ - (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: description: - Define timeout to wait for the app instances to start/update/restage etc. required: False type: int default: 20 - tags: + health_check_http_endpoint: description: - - None + - Endpoint called to determine if the app is healthy. required: False - type: list - elements: str - health_check_type: + type: str + health_check_timeout: description: - - Type of health check to perform. + - Timeout in seconds for health checking of an staged app when starting up. required: False - type: str - default: port - name: + type: int + disk_quota: description: - - (Required for new resource) The name for the app - required: True - type: str + - The maximum amount of disk available to an instance of an app. In megabytes. + required: False + type: int space_guid: description: - (Required for new resource) Define space guid to which app belongs required: True 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_version: + environment_json: description: - - Version of the application + - Key/value pairs of all the environment variables to run in your app. Does not include any system or service variables. required: False - type: str - command: + type: dict + health_check_type: description: - - The initial command for the app + - Type of health check to perform. required: False type: str - disk_quota: + default: port + memory: description: - - The maximum amount of disk available to an instance of an app. In megabytes. + - The amount of memory each instance should have. In megabytes. required: False type: int - health_check_timeout: + command: description: - - Timeout in seconds for health checking of an staged app when starting up. + - The initial command for the app required: False - type: int - environment_json: + type: str + name: description: - - Key/value pairs of all the environment variables to run in your app. Does not include any system or service variables. - required: False - type: dict - health_check_http_endpoint: + - (Required for new resource) The name for the app + required: True + type: str + route_guid: description: - - Endpoint called to determine if the app is healthy. + - Define the route guids which should be bound to the application. required: False - type: str - buildpack: + type: list + elements: str + tags: 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. + - None required: False - type: str + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -160,40 +160,40 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('app_path', 'str'), - ('name', 'str'), ('space_guid', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'memory', 'instances', - 'route_guid', - 'app_path', - 'wait_time_minutes', - 'tags', - 'health_check_type', - 'name', - 'space_guid', + 'buildpack', 'service_instance_guid', + 'app_path', 'app_version', - 'command', - 'disk_quota', + 'wait_time_minutes', + 'health_check_http_endpoint', 'health_check_timeout', + 'disk_quota', + 'space_guid', 'environment_json', - 'health_check_http_endpoint', - 'buildpack', + 'health_check_type', + 'memory', + 'command', + 'name', + 'route_guid', + 'tags', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('space_guid', 'str'), ('name', 'str'), + ('space_guid', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'space_guid', 'name', + 'space_guid', ] 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'), - route_guid=dict( - required=False, - elements='', - type='list'), - app_path=dict( + buildpack=dict( required=False, type='str'), - wait_time_minutes=dict( - required=False, - type='int'), - tags=dict( + service_instance_guid=dict( required=False, elements='', type='list'), - health_check_type=dict( - required=False, - type='str'), - name=dict( + app_path=dict( required=False, type='str'), - space_guid=dict( + app_version=dict( required=False, type='str'), - service_instance_guid=dict( + wait_time_minutes=dict( required=False, - elements='', - type='list'), - app_version=dict( + type='int'), + health_check_http_endpoint=dict( required=False, type='str'), - command=dict( + health_check_timeout=dict( required=False, - type='str'), + type='int'), disk_quota=dict( required=False, type='int'), - health_check_timeout=dict( + space_guid=dict( required=False, - type='int'), + type='str'), environment_json=dict( required=False, type='dict'), - health_check_http_endpoint=dict( + health_check_type=dict( required=False, type='str'), - buildpack=dict( + memory=dict( + required=False, + type='int'), + command=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), + route_guid=dict( + required=False, + elements='', + type='list'), + tags=dict( + required=False, + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5d32a1e41..02c310406 100644 --- a/plugins/modules/ibm_app_config_environment.py +++ b/plugins/modules/ibm_app_config_environment.py @@ -18,28 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_app_config_environment' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - guid: + name: description: - - (Required for new resource) GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. + - (Required for new resource) Environment name. required: True type: str - tags: + color_code: description: - - Tags associated with the environment + - Color code to distinguish the environment. required: False type: str - color_code: + tags: description: - - Color code to distinguish the environment. + - Tags associated with the environment required: False type: str - name: + guid: description: - - (Required for new resource) Environment name. + - (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: @@ -98,17 +98,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('guid', 'str'), ('name', 'str'), + ('guid', 'str'), ('environment_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'guid', - 'tags', - 'color_code', 'name', + 'color_code', + 'tags', + 'guid', 'environment_id', 'description', ] @@ -132,16 +132,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( - guid=dict( + name=dict( required=False, type='str'), - tags=dict( + color_code=dict( required=False, type='str'), - color_code=dict( + tags=dict( required=False, type='str'), - name=dict( + guid=dict( required=False, type='str'), environment_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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8fe36c7f5..1587d228c 100644 --- a/plugins/modules/ibm_app_config_environment_info.py +++ b/plugins/modules/ibm_app_config_environment_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_environment' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_app_config_environment', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 678518b15..d071b12d6 100644 --- a/plugins/modules/ibm_app_config_environments_info.py +++ b/plugins/modules/ibm_app_config_environments_info.py @@ -17,10 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_environments' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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: description: - GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. @@ -36,16 +46,6 @@ - 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 - 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 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', 'expand', 'limit', - 'tags', - 'offset', ] @@ -99,6 +99,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( + tags=dict( + required=False, + type='str'), + offset=dict( + required=False, + type='int'), guid=dict( required=True, type='str'), @@ -108,12 +114,6 @@ limit=dict( required=False, type='int'), - tags=dict( - required=False, - type='str'), - offset=dict( - required=False, - type='int'), 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.41.1', + ibm_provider_version='1.42.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 0d4cca5fd..925b3c7e6 100644 --- a/plugins/modules/ibm_app_config_feature.py +++ b/plugins/modules/ibm_app_config_feature.py @@ -18,13 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_app_config_feature' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - type: + guid: description: - - (Required for new resource) Type of the feature (BOOLEAN, STRING, NUMERIC). + - (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: + description: + - (Required for new resource) Feature name. required: True type: str enabled_value: @@ -32,31 +37,24 @@ - (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 - 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 - name: + type: description: - - (Required for new resource) Feature name. + - (Required for new resource) Type of the feature (BOOLEAN, STRING, NUMERIC). required: True type: str - description: + disabled_value: description: - - Feature description. - required: False + - (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 - collections: + tags: description: - - List of collection id representing the collections that are associated with the specified feature flag. + - Tags associated with the feature. required: False - type: list - elements: dict - guid: + type: str + environment_id: description: - - (Required for new resource) GUID of the App Configuration service. Get it from the service instance credentials section of the dashboard. + - (Required for new resource) Environment Id. required: True type: str feature_id: @@ -64,21 +62,28 @@ - (Required for new resource) Feature id. required: True type: str - environment_id: + rollout_percentage: description: - - (Required for new resource) Environment Id. - required: True - type: str - disabled_value: + - Rollout percentage of the feature. + required: False + type: int + collections: 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: True - type: str - tags: + - List of collection id representing the collections that are associated with the specified feature flag. + required: False + type: list + elements: dict + description: description: - - Tags associated with the feature. + - Feature description. required: False type: str + 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 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -125,28 +130,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('type', 'str'), - ('enabled_value', 'str'), - ('name', 'str'), ('guid', 'str'), - ('feature_id', 'str'), - ('environment_id', 'str'), + ('name', 'str'), + ('enabled_value', 'str'), + ('type', 'str'), ('disabled_value', 'str'), + ('environment_id', 'str'), + ('feature_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'type', - 'enabled_value', - 'segment_rules', - 'name', - 'description', - 'collections', 'guid', - 'feature_id', - 'environment_id', + 'name', + 'enabled_value', + 'type', 'disabled_value', 'tags', + 'environment_id', + 'feature_id', + 'rollout_percentage', + 'collections', + 'description', + 'segment_rules', ] # Params for Data source @@ -157,10 +163,10 @@ ] TL_ALL_PARAMETERS_DS = [ + 'includes', 'environment_id', 'guid', 'feature_id', - 'includes', ] TL_CONFLICTS_MAP = { @@ -170,41 +176,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( - type=dict( - required=False, - type='str'), - enabled_value=dict( + guid=dict( required=False, type='str'), - segment_rules=dict( - required=False, - elements='', - type='list'), name=dict( required=False, type='str'), - description=dict( + enabled_value=dict( required=False, type='str'), - collections=dict( + type=dict( required=False, - elements='', - type='list'), - guid=dict( + type='str'), + disabled_value=dict( required=False, type='str'), - feature_id=dict( + tags=dict( required=False, type='str'), environment_id=dict( required=False, type='str'), - disabled_value=dict( + feature_id=dict( required=False, type='str'), - tags=dict( + rollout_percentage=dict( + required=False, + type='int'), + collections=dict( + required=False, + elements='', + type='list'), + description=dict( required=False, type='str'), + segment_rules=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -270,7 +279,7 @@ def run_module(): resource_type='ibm_app_config_feature', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -279,7 +288,7 @@ def run_module(): resource_type='ibm_app_config_feature', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 50db86e0a..f86d64584 100644 --- a/plugins/modules/ibm_app_config_feature_info.py +++ b/plugins/modules/ibm_app_config_feature_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_feature' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + includes: + description: + - Include the associated collections in the response. + required: False + type: str environment_id: description: - Environment Id. @@ -36,11 +41,6 @@ - Feature Id. required: True type: str - includes: - description: - - Include the associated collections in the response. - required: False - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -81,10 +81,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'includes', 'environment_id', 'guid', 'feature_id', - 'includes', ] @@ -95,6 +95,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( + includes=dict( + required=False, + type='str'), environment_id=dict( required=True, type='str'), @@ -104,9 +107,6 @@ feature_id=dict( required=True, type='str'), - includes=dict( - required=False, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_app_config_feature', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 6bee64991..22fa11947 100644 --- a/plugins/modules/ibm_app_config_features_info.py +++ b/plugins/modules/ibm_app_config_features_info.py @@ -17,18 +17,23 @@ description: - Retrieve an IBM Cloud 'ibm_app_config_features' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + 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 environment_id: description: - Environment Id. required: True type: str - sort: + tags: description: - - Sort the feature details based on the specified attribute. + - 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: @@ -37,37 +42,32 @@ required: False type: list elements: str + limit: + 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. + 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 - tags: + sort: description: - - 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. + - Sort the feature details based on the specified attribute. 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 - limit: - 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. - required: False - type: int segments: description: - Filter features by a list of comma separated segments. required: False type: list elements: str - expand: - description: - - If set to `true`, returns expanded view of the resource details. - required: False - type: bool includes: description: - Include the associated collections or targeting rules details in the response. @@ -113,15 +113,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'offset', 'environment_id', - 'sort', - 'collections', - 'guid', 'tags', - 'offset', + 'collections', 'limit', - 'segments', 'expand', + 'guid', + 'sort', + 'segments', 'includes', ] @@ -133,35 +133,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( + offset=dict( + required=False, + type='int'), environment_id=dict( required=True, type='str'), - sort=dict( + tags=dict( required=False, type='str'), collections=dict( required=False, elements='', type='list'), + limit=dict( + required=False, + type='int'), + expand=dict( + required=False, + type='bool'), guid=dict( required=True, type='str'), - tags=dict( + sort=dict( required=False, type='str'), - offset=dict( - required=False, - type='int'), - limit=dict( - required=False, - type='int'), segments=dict( required=False, elements='', type='list'), - expand=dict( - required=False, - type='bool'), includes=dict( required=False, elements='', @@ -200,7 +200,7 @@ def run_module(): resource_type='ibm_app_config_features', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 599ada5c2..b4e5453ac 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5715eb5cb..dbf122f10 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 50ad5c9d4..feb646673 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) The name of the domain - required: True - type: str router_group_guid: description: - The guid of the router group. @@ -38,6 +33,11 @@ required: False type: list elements: str + name: + description: + - (Required for new resource) The name of the domain + 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', 'router_group_guid', 'tags', + 'name', ] # 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( - name=dict( - required=False, - type='str'), router_group_guid=dict( required=False, type='str'), @@ -120,6 +117,9 @@ required=False, elements='', type='list'), + name=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 77249c65a..1b083891d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 25556f190..694e6762a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - space_guid: + name: description: - - Define space guid to which app belongs + - The name for the app required: True type: str - name: + space_guid: description: - - The name for the app + - Define space guid to which app belongs required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('space_guid', 'str'), ('name', 'str'), + ('space_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'space_guid', 'name', + 'space_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( - space_guid=dict( + name=dict( required=True, type='str'), - name=dict( + space_guid=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.41.1', + ibm_provider_version='1.42.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 79ce8f9be..8e1a662a3 100644 --- a/plugins/modules/ibm_app_route.py +++ b/plugins/modules/ibm_app_route.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_app_route' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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. + required: False + type: str space_guid: description: - (Required for new resource) The guid of the associated space @@ -42,17 +53,6 @@ - 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 - host: - description: - - The host portion of the route. Required for shared-domains. - required: False - type: 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', - 'host', ] # Params for Data source @@ -120,11 +120,11 @@ ] TL_ALL_PARAMETERS_DS = [ - 'space_guid', - 'domain_guid', 'host', 'path', 'port', + 'space_guid', + 'domain_guid', ] TL_CONFLICTS_MAP = { @@ -134,6 +134,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( + tags=dict( + required=False, + elements='', + type='list'), + host=dict( + required=False, + type='str'), space_guid=dict( required=False, type='str'), @@ -146,13 +153,6 @@ path=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), - host=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 f28a978e0..5d862c4c0 100644 --- a/plugins/modules/ibm_app_route_info.py +++ b/plugins/modules/ibm_app_route_info.py @@ -17,20 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_app_route' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - space_guid: - description: - - The guid of the space - required: True - type: str - domain_guid: - description: - - The guid of the domain - required: True - type: str host: description: - The host of the route @@ -46,6 +36,16 @@ - The port of the route required: False type: str + space_guid: + description: + - The guid of the space + required: True + type: str + domain_guid: + description: + - The guid of the domain + 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 = [ - 'space_guid', - 'domain_guid', 'host', 'path', 'port', + 'space_guid', + 'domain_guid', ] @@ -100,12 +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( - space_guid=dict( - required=True, - type='str'), - domain_guid=dict( - required=True, - type='str'), host=dict( required=False, type='str'), @@ -115,6 +109,12 @@ port=dict( required=False, type='str'), + space_guid=dict( + required=True, + type='str'), + domain_guid=dict( + required=True, + 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.41.1', + ibm_provider_version='1.42.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 c3329bdb1..d824287f5 100644 --- a/plugins/modules/ibm_appid_action_url.py +++ b/plugins/modules/ibm_appid_action_url.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_action_url' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -37,6 +32,11 @@ - (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,15 +113,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'), action=dict( required=False, type='str'), url=dict( required=False, type='str'), + tenant_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -187,7 +187,7 @@ def run_module(): resource_type='ibm_appid_action_url', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 dc050bed6..1336a42d2 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f4b3420c4..33c894fe3 100644 --- a/plugins/modules/ibm_appid_apm.py +++ b/plugins/modules/ibm_appid_apm.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_apm' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + password_expiration: + description: + - (Required for new resource) + required: True + type: list + elements: dict lockout_policy: description: - (Required for new resource) @@ -56,12 +62,6 @@ required: True type: list elements: dict - password_expiration: - 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 = [ + ('password_expiration', 'list'), ('lockout_policy', 'list'), ('min_password_change_interval', 'list'), ('tenant_id', 'str'), ('enabled', 'bool'), ('password_reuse', 'list'), - ('password_expiration', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'password_expiration', 'lockout_policy', 'min_password_change_interval', 'tenant_id', 'enabled', 'prevent_password_with_username', 'password_reuse', - 'password_expiration', ] # Params for Data source @@ -143,6 +143,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( + password_expiration=dict( + required=False, + elements='', + type='list'), lockout_policy=dict( required=False, elements='', @@ -164,10 +168,6 @@ required=False, elements='', type='list'), - password_expiration=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 d8ac3d469..214e2be19 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ed7ed6a3e..6af23db75 100644 --- a/plugins/modules/ibm_appid_application.py +++ b/plugins/modules/ibm_appid_application.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_application' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tenant_id: - description: - - (Required for new resource) The service `tenantId` - required: True - type: str name: description: - (Required for new resource) The application name to be registered. Application name cannot exceed 50 characters. @@ -38,6 +33,11 @@ required: False type: str default: regularwebapp + 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. @@ -84,15 +84,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('tenant_id', 'str'), ('name', 'str'), + ('tenant_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tenant_id', 'name', 'type', + 'tenant_id', ] # Params for Data source @@ -113,15 +113,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'), name=dict( required=False, type='str'), type=dict( required=False, type='str'), + tenant_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -187,7 +187,7 @@ def run_module(): resource_type='ibm_appid_application', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 d1c643961..0ad7e7c95 100644 --- a/plugins/modules/ibm_appid_application_info.py +++ b/plugins/modules/ibm_appid_application_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_application' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_application', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d516be96f..ed095eb05 100644 --- a/plugins/modules/ibm_appid_application_roles.py +++ b/plugins/modules/ibm_appid_application_roles.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_application_roles' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + tenant_id: + description: + - (Required for new resource) The service `tenantId` + required: True + type: str client_id: description: - (Required for new resource) The `client_id` is a public identifier for applications @@ -33,11 +38,6 @@ required: True type: list elements: 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. @@ -84,16 +84,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('tenant_id', 'str'), ('client_id', 'str'), ('roles', 'list'), - ('tenant_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tenant_id', 'client_id', 'roles', - 'tenant_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( + tenant_id=dict( + required=False, + type='str'), client_id=dict( required=False, type='str'), @@ -121,9 +124,6 @@ required=False, elements='', type='list'), - tenant_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -189,7 +189,7 @@ def run_module(): resource_type='ibm_appid_application_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 1ccc73ef9..821c3f8bd 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3b385d4f5..7aab3a146 100644 --- a/plugins/modules/ibm_appid_application_scopes.py +++ b/plugins/modules/ibm_appid_application_scopes.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_application_scopes' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -189,7 +189,7 @@ def run_module(): resource_type='ibm_appid_application_scopes', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 c261293f2..e4339c54f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 adedf115b..127be68c4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0a55bcf1b..81f4c861e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 459e2a1ed..cb15915da 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 bff964e02..bc3d1fc89 100644 --- a/plugins/modules/ibm_appid_cloud_directory_template.py +++ b/plugins/modules/ibm_appid_cloud_directory_template.py @@ -18,16 +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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 subject: description: - (Required for new resource) The subject of the email @@ -53,6 +47,12 @@ - (Required for new resource) 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 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 = [ - 'language', 'subject', 'html_body', 'plain_text_body', 'tenant_id', 'template_name', + 'language', ] # Params for Data source @@ -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( - language=dict( - required=False, - type='str'), subject=dict( required=False, type='str'), @@ -151,6 +148,9 @@ template_name=dict( required=False, type='str'), + language=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 05ac2b8b9..611b53870 100644 --- a/plugins/modules/ibm_appid_cloud_directory_template_info.py +++ b/plugins/modules/ibm_appid_cloud_directory_template_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_appid_cloud_directory_template' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_appid_cloud_directory_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 28d34ba8a..5d2608a05 100644 --- a/plugins/modules/ibm_appid_cloud_directory_user.py +++ b/plugins/modules/ibm_appid_cloud_directory_user.py @@ -18,32 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_cloud_directory_user' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - password: - description: - - (Required for new resource) User password - required: True - type: str - status: - description: - - Accepted values `PENDING` or `CONFIRMED` - required: False - type: str - default: PENDING create_profile: description: - 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 locked_until: description: - Integer (epoch time in milliseconds), determines till when the user account will be locked @@ -54,6 +38,12 @@ - Cloud Directory user display name required: False type: str + status: + description: + - Accepted values `PENDING` or `CONFIRMED` + required: False + type: str + default: PENDING email: description: - (Required for new resource) A set of user emails @@ -71,6 +61,16 @@ 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 = [ - 'password', - 'status', 'create_profile', - 'user_name', 'locked_until', 'display_name', + 'status', 'email', 'tenant_id', 'active', + 'user_name', + 'password', ] # Params for Data source @@ -153,24 +153,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( - password=dict( - required=False, - type='str'), - status=dict( - required=False, - type='str'), create_profile=dict( required=False, type='bool'), - user_name=dict( - required=False, - type='str'), locked_until=dict( required=False, type='int'), display_name=dict( required=False, type='str'), + status=dict( + required=False, + type='str'), email=dict( required=False, elements='', @@ -181,6 +175,12 @@ active=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5a608f501..cf985e1ee 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 7d720dcab..7feed00df 100644 --- a/plugins/modules/ibm_appid_idp_cloud_directory.py +++ b/plugins/modules/ibm_appid_idp_cloud_directory.py @@ -18,33 +18,38 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_idp_cloud_directory' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - welcome_enabled: + self_service_enabled: description: - None required: False type: bool default: True - tenant_id: - description: - - (Required for new resource) - required: True - type: str - self_service_enabled: + signup_enabled: description: - None required: False type: bool default: True - signup_enabled: + welcome_enabled: description: - None required: False type: bool default: True + tenant_id: + description: + - (Required for new resource) + required: True + type: str + is_active: + description: + - (Required for new resource) + required: True + type: bool identity_confirm_access_mode: description: - None @@ -62,11 +67,6 @@ - None required: False type: str - is_active: - description: - - (Required for new resource) - required: True - type: bool reset_password_enabled: description: - None @@ -131,14 +131,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'welcome_enabled', - 'tenant_id', 'self_service_enabled', 'signup_enabled', + 'welcome_enabled', + 'tenant_id', + 'is_active', 'identity_confirm_access_mode', 'identity_confirm_methods', 'identity_field', - 'is_active', 'reset_password_enabled', 'reset_password_notification_enabled', ] @@ -159,16 +159,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( + self_service_enabled=dict( + required=False, + type='bool'), + signup_enabled=dict( + required=False, + type='bool'), welcome_enabled=dict( required=False, type='bool'), tenant_id=dict( required=False, type='str'), - self_service_enabled=dict( - required=False, - type='bool'), - signup_enabled=dict( + is_active=dict( required=False, type='bool'), identity_confirm_access_mode=dict( @@ -181,9 +184,6 @@ identity_field=dict( required=False, type='str'), - is_active=dict( - required=False, - type='bool'), reset_password_enabled=dict( required=False, type='bool'), @@ -255,7 +255,7 @@ def run_module(): resource_type='ibm_appid_idp_cloud_directory', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 49d542a4f..0376ba2b0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 de311c7a3..ec4c3951c 100644 --- a/plugins/modules/ibm_appid_idp_custom.py +++ b/plugins/modules/ibm_appid_idp_custom.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_idp_custom' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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) @@ -37,6 +32,11 @@ - 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 = [ - ('tenant_id', 'str'), ('is_active', 'bool'), + ('tenant_id', 'str'), ] # 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 91f73fc70..3d2cb1390 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 49b483080..52a65901b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 905a3a9eb..d42d5f105 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c3456f86b..ac8bb8c05 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 3cd976a50..03273b846 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ea4f81995..8993c6d71 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 2d2d2844b..64ce89ff9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 1c9938659..a179f182a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ec033e39e..bf1dcdd29 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 832c0d3aa..6e614c33d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5f7fd7009..69233c4c8 100644 --- a/plugins/modules/ibm_appid_mfa.py +++ b/plugins/modules/ibm_appid_mfa.py @@ -18,20 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_mfa' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - is_active: - description: - - (Required for new resource) `true` if MFA is active - required: True - type: bool tenant_id: description: - (Required for new resource) The AppID instance GUID required: True type: str + is_active: + description: + - (Required for new resource) `true` if MFA is active + required: True + type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -78,14 +78,14 @@ # 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 = [ - 'is_active', 'tenant_id', + 'is_active', ] # Params for Data source @@ -104,12 +104,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_active=dict( - required=False, - type='bool'), tenant_id=dict( required=False, type='str'), + is_active=dict( + required=False, + type='bool'), id=dict( required=False, type='str'), @@ -175,7 +175,7 @@ def run_module(): resource_type='ibm_appid_mfa', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 84acaa136..bc35d67ad 100644 --- a/plugins/modules/ibm_appid_mfa_channel.py +++ b/plugins/modules/ibm_appid_mfa_channel.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_mfa_channel' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -186,7 +186,7 @@ def run_module(): resource_type='ibm_appid_mfa_channel', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 9d76b4a6e..f2d4c7819 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5623f78a5..3e64b033f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 105eb982f..3f8e1a36a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8b1d7d22c..8c2d3158b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 409038116..dfcdabe81 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 73951e9c9..5fb2176cd 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 7d603b92a..73c32581b 100644 --- a/plugins/modules/ibm_appid_role.py +++ b/plugins/modules/ibm_appid_role.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_role' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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` @@ -37,12 +43,6 @@ - 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,6 +119,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( + access=dict( + required=False, + elements='', + type='list'), tenant_id=dict( required=False, type='str'), @@ -128,10 +132,6 @@ 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4b73eed62..b5f49de76 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 d6c0be0cc..639e68aa8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 53232343a..632e534d0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 ad6ab0092..4bde3dd5f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 bb14cd399..9253fd41a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4469d80fc..685ed9825 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 6c1c6e96f..a07b8aefb 100644 --- a/plugins/modules/ibm_appid_token_config.py +++ b/plugins/modules/ibm_appid_token_config.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_token_config' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -55,17 +66,6 @@ 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 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', ] # Params for Data source @@ -143,6 +143,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( + 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'), @@ -162,13 +169,6 @@ required=False, elements='', type='list'), - id_token_claim=dict( - required=False, - elements='', - type='list'), - tenant_id=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 f7843295a..9ad99fb5d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ebf013b58..7a3cfd916 100644 --- a/plugins/modules/ibm_appid_user_roles.py +++ b/plugins/modules/ibm_appid_user_roles.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_appid_user_roles' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + tenant_id: + description: + - (Required for new resource) The AppID instance GUID + required: True + type: str subject: description: - (Required for new resource) The user's identifier ('subject' in identity token) @@ -33,11 +38,6 @@ required: True type: list elements: 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. @@ -84,27 +84,27 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('tenant_id', 'str'), ('subject', 'str'), ('role_ids', 'list'), - ('tenant_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tenant_id', 'subject', 'role_ids', - 'tenant_id', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('subject', 'str'), ('tenant_id', 'str'), + ('subject', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'subject', 'tenant_id', + 'subject', ] TL_CONFLICTS_MAP = { @@ -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( + tenant_id=dict( + required=False, + type='str'), subject=dict( required=False, type='str'), @@ -121,9 +124,6 @@ required=False, elements='', type='list'), - tenant_id=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 f4a634de0..00e5f7dce 100644 --- a/plugins/modules/ibm_appid_user_roles_info.py +++ b/plugins/modules/ibm_appid_user_roles_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_appid_user_roles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - subject: + tenant_id: description: - - The user's identifier ('subject' in identity token) + - The AppID instance GUID required: True type: str - tenant_id: + subject: description: - - The AppID instance GUID + - The user's identifier ('subject' in identity token) required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('subject', 'str'), ('tenant_id', 'str'), + ('subject', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'subject', 'tenant_id', + 'subject', ] @@ -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( - subject=dict( + tenant_id=dict( required=True, type='str'), - tenant_id=dict( + subject=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_appid_user_roles', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 e4f32101a..9630b2211 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 94645cf23..fb4242974 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,11 +27,6 @@ - (Required for new resource) The name of the route. The name must be 1000 characters or less and cannot include any special characters other than `(space) - . _ :`. required: True type: str - receive_global_events: - description: - - (Required for new resource) Indicates whether or not all global events should be forwarded to this region. - required: True - type: bool rules: description: - (Required for new resource) Routing rules that will be evaluated in their order of the array. @@ -85,14 +80,12 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('name', 'str'), - ('receive_global_events', 'bool'), ('rules', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'receive_global_events', 'rules', ] @@ -113,9 +106,6 @@ name=dict( required=False, type='str'), - receive_global_events=dict( - required=False, - type='bool'), rules=dict( required=False, elements='', @@ -185,7 +175,7 @@ def run_module(): resource_type='ibm_atracker_route', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5f63872be..3905e6c82 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..b07858caf --- /dev/null +++ b/plugins/modules/ibm_atracker_settings.py @@ -0,0 +1,214 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_atracker_settings +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/atracker_settings + +short_description: Configure IBM Cloud 'ibm_atracker_settings' resource + +version_added: "2.8" + +description: + - 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 + - Terraform v0.12.20 + +options: + metadata_region_primary: + description: + - (Required for new resource) To store all your meta data in a single region. + required: True + type: str + private_api_endpoint_only: + description: + - (Required for new resource) If you set this true then you cannot access api through public network. + required: True + type: bool + default_targets: + description: + - The target ID List. In the event that no routing rule causes the event to be sent to a target, these targets will receive the event. + required: False + type: list + elements: str + permitted_target_regions: + description: + - If present then only these regions may be used to define a target. + required: False + type: list + elements: 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 = [ + ('metadata_region_primary', 'str'), + ('private_api_endpoint_only', 'bool'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'metadata_region_primary', + 'private_api_endpoint_only', + 'default_targets', + 'permitted_target_regions', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ +] + +TL_ALL_PARAMETERS_DS = [ +] + +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( + metadata_region_primary=dict( + required=False, + type='str'), + private_api_endpoint_only=dict( + required=False, + type='bool'), + default_targets=dict( + required=False, + elements='', + type='list'), + permitted_target_regions=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 = ibmcloud_terraform( + resource_type='ibm_atracker_settings', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.42.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_atracker_target.py b/plugins/modules/ibm_atracker_target.py index 7d2f57d66..9b124efce 100644 --- a/plugins/modules/ibm_atracker_target.py +++ b/plugins/modules/ibm_atracker_target.py @@ -18,24 +18,35 @@ - Create, update or destroy an IBM Cloud 'ibm_atracker_target' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) The name of the target. The name must be 1000 characters or less, and cannot include any special characters other than `(space) - . _ :`. - required: True - type: str target_type: description: - - (Required for new resource) The type of the target. + - (Required for new resource) The type of the target. It can be cloud_object_storage or logdna. Based on this type you must include cos_endpoint or logdna_endpoint. required: True type: str cos_endpoint: description: - - (Required for new resource) Property values for a Cloud Object Storage Endpoint. + - Property values for a Cloud Object Storage Endpoint. + required: False + type: list + elements: dict + region: + description: + - Include this optional field if you want to create a target in a different region other than the one you are connected. + required: False + type: str + name: + description: + - (Required for new resource) The name of the target. The name must be 1000 characters or less, and cannot include any special characters other than `(space) - . _ :`. required: True + type: str + logdna_endpoint: + description: + - Property values for a LogDNA Endpoint. + required: False type: list elements: dict id: @@ -84,16 +95,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('target_type', 'str'), - ('cos_endpoint', 'list'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'target_type', 'cos_endpoint', + 'region', + 'name', + 'logdna_endpoint', ] # Params for Data source @@ -110,9 +122,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'), target_type=dict( required=False, type='str'), @@ -120,6 +129,16 @@ required=False, elements='', type='list'), + region=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + logdna_endpoint=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -185,7 +204,7 @@ def run_module(): resource_type='ibm_atracker_target', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 c5130f507..fcc02e2de 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 2ad304f5b..aa6804c41 100644 --- a/plugins/modules/ibm_cbr_rule.py +++ b/plugins/modules/ibm_cbr_rule.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_cbr_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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. @@ -33,12 +39,6 @@ required: True type: list elements: dict - resources: - description: - - (Required for new resource) The resources this rule apply to. - required: True - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -85,15 +85,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('contexts', 'list'), ('resources', 'list'), + ('contexts', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'resources', 'description', 'contexts', - 'resources', ] # Params for Data source @@ -112,6 +112,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'), description=dict( required=False, type='str'), @@ -119,10 +123,6 @@ required=False, elements='', type='list'), - resources=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -188,7 +188,7 @@ def run_module(): resource_type='ibm_cbr_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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_cbr_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 a8f435db6..fc5d59c43 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 59f1faf19..ce62e6b99 100644 --- a/plugins/modules/ibm_cbr_zone.py +++ b/plugins/modules/ibm_cbr_zone.py @@ -18,32 +18,32 @@ - Create, update or destroy an IBM Cloud 'ibm_cbr_zone' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: - description: - - The description of the zone. - required: False - type: str - addresses: - description: - - (Required for new resource) The list of addresses in the zone. - required: True - type: list - elements: dict excluded: description: - The list of excluded addresses in the zone. Only addresses of type `ipAddress`, `ipRange`, and `subnet` can be excluded. required: False type: list elements: dict + description: + description: + - The description of the zone. + required: False + type: str name: description: - (Required for new resource) The name of the zone. required: True type: str + addresses: + description: + - (Required for new resource) The list of addresses in the zone. + required: True + 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 = [ - ('addresses', 'list'), ('name', 'str'), + ('addresses', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'addresses', 'excluded', + 'description', 'name', + 'addresses', ] # 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( - description=dict( - required=False, - type='str'), - addresses=dict( - required=False, - elements='', - type='list'), excluded=dict( required=False, elements='', type='list'), + description=dict( + required=False, + type='str'), name=dict( required=False, type='str'), + addresses=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -197,7 +197,7 @@ def run_module(): resource_type='ibm_cbr_zone', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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_cbr_zone', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 48793606c..b765c5a51 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_cdn.py b/plugins/modules/ibm_cdn.py index 3fc1d5950..23fdfed69 100644 --- a/plugins/modules/ibm_cdn.py +++ b/plugins/modules/ibm_cdn.py @@ -18,43 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_cdn' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cache_key_query_rule: - description: - - query rule info - required: False - type: str - default: include-all - path: - description: - - Path details - required: False - type: str - default: /* host_name: description: - (Required for new resource) Host name required: True type: str - origin_address: - description: - - (Required for new resource) origin address info - required: True - type: str origin_type: description: - Origin type info required: False type: str default: HOST_SERVER - bucket_name: - description: - - Bucket name - required: False - type: str file_extension: description: - File extension info @@ -65,18 +43,35 @@ - Certificate type required: False type: str - performance_configuration: + protocol: description: - - performance configuration info + - Protocol name required: False type: str - default: General web delivery - https_port: + default: HTTP + http_port: description: - - HTTPS port number + - HTTP port number required: False type: int - default: 443 + default: 80 + cache_key_query_rule: + description: + - query rule info + required: False + type: str + default: include-all + path: + description: + - Path details + required: False + type: str + default: /* + origin_address: + description: + - (Required for new resource) origin address info + required: True + type: str cname: description: - cname info @@ -87,30 +82,35 @@ - Header info required: False type: str - respect_headers: + performance_configuration: description: - - respect headers info + - performance configuration info required: False - type: bool - default: True + type: str + default: General web delivery vendor_name: description: - Vendor name required: False type: str default: akamai - protocol: + bucket_name: description: - - Protocol name + - Bucket name required: False type: str - default: HTTP - http_port: + https_port: description: - - HTTP port number + - HTTPS port number required: False type: int - default: 80 + default: 443 + respect_headers: + description: + - respect headers info + required: False + type: bool + default: True 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 = [ - 'cache_key_query_rule', - 'path', 'host_name', - 'origin_address', 'origin_type', - 'bucket_name', 'file_extension', 'certificate_type', - 'performance_configuration', - 'https_port', + 'protocol', + 'http_port', + 'cache_key_query_rule', + 'path', + 'origin_address', 'cname', 'header', - 'respect_headers', + 'performance_configuration', 'vendor_name', - 'protocol', - 'http_port', + 'bucket_name', + 'https_port', + 'respect_headers', ] # 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( - cache_key_query_rule=dict( + host_name=dict( required=False, type='str'), - path=dict( + origin_type=dict( required=False, type='str'), - host_name=dict( + file_extension=dict( required=False, type='str'), - origin_address=dict( + certificate_type=dict( required=False, type='str'), - origin_type=dict( + protocol=dict( required=False, type='str'), - bucket_name=dict( + http_port=dict( required=False, - type='str'), - file_extension=dict( + type='int'), + cache_key_query_rule=dict( required=False, type='str'), - certificate_type=dict( + path=dict( required=False, type='str'), - performance_configuration=dict( + origin_address=dict( required=False, type='str'), - https_port=dict( - required=False, - type='int'), cname=dict( required=False, type='str'), header=dict( required=False, type='str'), - respect_headers=dict( + performance_configuration=dict( required=False, - type='bool'), + type='str'), vendor_name=dict( required=False, type='str'), - protocol=dict( + bucket_name=dict( required=False, type='str'), - http_port=dict( + https_port=dict( required=False, type='int'), + respect_headers=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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 11a5c93a4..efa77d06f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 1cfd57c56..adf919a50 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 45321d0e0..a498dbbff 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,11 +27,6 @@ - (Required for new resource) Name of the instance required: True type: str - data: - description: - - (Required for new resource) certificate data - required: True - type: dict description: description: - Description of the certificate instance @@ -42,6 +37,11 @@ - (Required for new resource) Instance ID of the certificate manager resource required: True type: str + data: + description: + - (Required for new resource) certificate data + required: True + type: 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 = [ ('name', 'str'), - ('data', 'dict'), ('certificate_manager_instance_id', 'str'), + ('data', 'dict'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'data', 'description', 'certificate_manager_instance_id', + 'data', ] # Params for Data source @@ -118,15 +118,15 @@ name=dict( required=False, type='str'), - data=dict( - required=False, - type='dict'), description=dict( required=False, type='str'), certificate_manager_instance_id=dict( required=False, type='str'), + data=dict( + required=False, + type='dict'), 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.41.1', + ibm_provider_version='1.42.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 8434a4818..02175ce97 100644 --- a/plugins/modules/ibm_certificate_manager_order.py +++ b/plugins/modules/ibm_certificate_manager_order.py @@ -18,13 +18,13 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - rotate_keys: + auto_renew_enabled: description: - - Keys are sorated if set to true + - None required: False type: bool default: False @@ -33,45 +33,45 @@ - (Required for new resource) Certificate name 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: + description: + - DNS provider instance CRN + required: False + type: str key_algorithm: description: - Keyalgorithm info required: False type: str default: rsaEncryption 2048 bit - domains: + certificate_manager_instance_id: description: - - (Required for new resource) List of domain names + - (Required for new resource) Certificate manager instance ID required: True - type: list - elements: str - renew_certificate: - description: - - Invokes renew functionality - required: False - type: bool - default: False - dns_provider_instance_crn: - description: - - DNS provider instance CRN - required: False type: str - auto_renew_enabled: + rotate_keys: description: - - None + - Keys are sorated if set to true required: False type: bool default: False - 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 domain_validation_method: description: - Domain validation methods @@ -125,21 +125,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('name', 'str'), - ('domains', 'list'), ('certificate_manager_instance_id', 'str'), + ('domains', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'rotate_keys', + 'auto_renew_enabled', 'name', - 'description', - 'key_algorithm', - 'domains', 'renew_certificate', + 'description', 'dns_provider_instance_crn', - 'auto_renew_enabled', + 'key_algorithm', 'certificate_manager_instance_id', + 'rotate_keys', + 'domains', 'domain_validation_method', ] @@ -157,34 +157,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( - rotate_keys=dict( + auto_renew_enabled=dict( required=False, type='bool'), name=dict( required=False, type='str'), + renew_certificate=dict( + required=False, + type='bool'), description=dict( required=False, type='str'), - key_algorithm=dict( + dns_provider_instance_crn=dict( required=False, type='str'), - domains=dict( - required=False, - elements='', - type='list'), - renew_certificate=dict( + key_algorithm=dict( required=False, - type='bool'), - dns_provider_instance_crn=dict( + type='str'), + certificate_manager_instance_id=dict( required=False, type='str'), - auto_renew_enabled=dict( + rotate_keys=dict( required=False, type='bool'), - certificate_manager_instance_id=dict( + domains=dict( required=False, - type='str'), + elements='', + type='list'), domain_validation_method=dict( required=False, type='str'), @@ -253,7 +253,7 @@ def run_module(): resource_type='ibm_certificate_manager_order', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 b29c1af61..356bfc33b 100644 --- a/plugins/modules/ibm_cis.py +++ b/plugins/modules/ibm_cis.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cis' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - parameters: - description: - - Arbitrary parameters to pass. Must be a JSON object - required: False - type: dict resource_group_id: description: - The resource group id @@ -53,6 +48,11 @@ - (Required for new resource) The location where the instance available required: True 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. @@ -106,12 +106,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'parameters', 'resource_group_id', 'tags', 'name', 'plan', 'location', + 'parameters', ] # Params for Data source @@ -120,8 +120,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', 'resource_group_id', + 'name', ] TL_CONFLICTS_MAP = { @@ -131,9 +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( - parameters=dict( - required=False, - type='dict'), resource_group_id=dict( required=False, type='str'), @@ -150,6 +147,9 @@ location=dict( required=False, type='str'), + parameters=dict( + required=False, + type='dict'), id=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 68a5cc06b..b043bc34d 100644 --- a/plugins/modules/ibm_cis_alert.py +++ b/plugins/modules/ibm_cis_alert.py @@ -18,24 +18,34 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_alert' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cis_id: + description: description: - - (Required for new resource) CIS instance crn + - 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 + required: False type: str - name: + cis_id: description: - - (Required for new resource) Policy name + - (Required for new resource) CIS instance crn required: True type: str - description: + alert_type: description: - - Policy Description - required: False + - (Required for new resource) Condition for the alert + required: True type: str mechanisms: description: @@ -48,21 +58,11 @@ - Filters based on filter type required: False type: str - enabled: - description: - - (Required for new resource) Is the alert policy active - required: True - type: bool - alert_type: + name: description: - - (Required for new resource) Condition for the alert + - (Required for new resource) Policy name required: True type: str - conditions: - description: - - Conditions based on filter type - required: False - type: str 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 = [ - ('cis_id', 'str'), - ('name', 'str'), - ('mechanisms', 'list'), ('enabled', 'bool'), + ('cis_id', 'str'), ('alert_type', 'str'), + ('mechanisms', 'list'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cis_id', - 'name', 'description', - 'mechanisms', - 'filters', 'enabled', - 'alert_type', 'conditions', + 'cis_id', + 'alert_type', + 'mechanisms', + 'filters', + 'name', ] # Params for Data source @@ -142,13 +142,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( + description=dict( required=False, type='str'), - name=dict( + enabled=dict( + required=False, + type='bool'), + conditions=dict( required=False, type='str'), - description=dict( + cis_id=dict( + required=False, + type='str'), + alert_type=dict( required=False, type='str'), mechanisms=dict( @@ -158,13 +164,7 @@ filters=dict( required=False, type='str'), - enabled=dict( - required=False, - type='bool'), - alert_type=dict( - required=False, - type='str'), - conditions=dict( + name=dict( required=False, type='str'), id=dict( @@ -232,7 +232,7 @@ def run_module(): resource_type='ibm_cis_alert', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 87cca4fa3..a8472f5b4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5bdff5640..3514bda63 100644 --- a/plugins/modules/ibm_cis_cache_settings.py +++ b/plugins/modules/ibm_cis_cache_settings.py @@ -18,66 +18,66 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_cache_settings' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 required: True type: str - serve_stale_content: + browser_expiration: description: - - Serve Stale Content + - Browser Expiration setting required: False - type: str - default: on + type: int development_mode: description: - Development mode setting required: False type: str + query_string_sort: + description: + - Query String sort setting + required: False + type: str purge_all: description: - Purge all setting required: False type: bool - purge_by_urls: + purge_by_tags: description: - - Purge by URLs + - Purge by tags required: False type: list elements: str - caching_level: + purge_by_hosts: description: - - Cache level setting + - Purge by hosts required: False - type: str - browser_expiration: + type: list + elements: str + cis_id: description: - - Browser Expiration setting - required: False - type: int - query_string_sort: + - (Required for new resource) CIS instance crn + required: True + type: str + caching_level: description: - - Query String sort setting + - Cache level setting required: False type: str - purge_by_tags: + serve_stale_content: description: - - Purge by tags + - Serve Stale Content required: False - type: list - elements: str - purge_by_hosts: + type: str + default: on + purge_by_urls: description: - - Purge by hosts + - Purge by URLs required: False type: list elements: str @@ -127,80 +127,80 @@ # 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', - 'serve_stale_content', - 'development_mode', - 'purge_all', - 'purge_by_urls', - 'caching_level', 'browser_expiration', + 'development_mode', 'query_string_sort', + 'purge_all', 'purge_by_tags', 'purge_by_hosts', + 'cis_id', + 'caching_level', + 'serve_stale_content', + 'purge_by_urls', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('cis_id', 'str'), ('domain_id', 'str'), + ('cis_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'cis_id', 'domain_id', + 'cis_id', ] TL_CONFLICTS_MAP = { 'purge_all': ['purge_by_urls', 'purge_by_tags', 'purge_by_hosts'], - 'purge_by_urls': ['purge_all', '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_by_urls': ['purge_all', 'purge_by_tags', 'purge_by_hosts'], } # 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( - cis_id=dict( - required=False, - type='str'), domain_id=dict( required=False, type='str'), - serve_stale_content=dict( + browser_expiration=dict( required=False, - type='str'), + type='int'), development_mode=dict( required=False, type='str'), + query_string_sort=dict( + required=False, + type='str'), purge_all=dict( required=False, type='bool'), - purge_by_urls=dict( + purge_by_tags=dict( required=False, elements='', type='list'), - caching_level=dict( + purge_by_hosts=dict( required=False, - type='str'), - browser_expiration=dict( + elements='', + type='list'), + cis_id=dict( required=False, - type='int'), - query_string_sort=dict( + type='str'), + caching_level=dict( required=False, type='str'), - purge_by_tags=dict( + serve_stale_content=dict( required=False, - elements='', - type='list'), - purge_by_hosts=dict( + type='str'), + purge_by_urls=dict( required=False, elements='', type='list'), @@ -269,7 +269,7 @@ def run_module(): resource_type='ibm_cis_cache_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8716214fe..dd679b561 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cis_id: + domain_id: description: - - CIS instance crn + - Associated CIS domain required: True type: str - domain_id: + cis_id: description: - - Associated CIS domain + - CIS instance crn 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_cache_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 3688e588b..683037dee 100644 --- a/plugins/modules/ibm_cis_certificate_order.py +++ b/plugins/modules/ibm_cis_certificate_order.py @@ -18,10 +18,16 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + type: + description: + - certificate type + required: False + type: str + default: dedicated hosts: description: - (Required for new resource) Hosts which certificate need to be ordered @@ -38,12 +44,6 @@ - (Required for new resource) Associated CIS domain required: True type: str - type: - description: - - certificate type - required: False - type: str - default: dedicated 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 = [ + 'type', 'hosts', 'cis_id', 'domain_id', - 'type', ] # 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( + type=dict( + required=False, + type='str'), hosts=dict( required=False, elements='', @@ -127,9 +130,6 @@ domain_id=dict( required=False, type='str'), - type=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.41.1', + ibm_provider_version='1.42.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 f2510e091..50e58ef21 100644 --- a/plugins/modules/ibm_cis_certificate_upload.py +++ b/plugins/modules/ibm_cis_certificate_upload.py @@ -18,19 +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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - bundle_method: - description: - - Certificate bundle method - required: False - type: str - default: ubiquitous - cis_id: + private_key: description: - - (Required for new resource) CIS instance crn + - (Required for new resource) Certificate private key required: True type: str certificate: @@ -38,21 +32,27 @@ - (Required for new resource) Certificate key required: True type: str - domain_id: + priority: description: - - (Required for new resource) Associated CIS domain + - Certificate priority + required: False + type: int + cis_id: + description: + - (Required for new resource) CIS instance crn required: True type: str - private_key: + domain_id: description: - - (Required for new resource) Certificate private key + - (Required for new resource) Associated CIS domain required: True type: str - priority: + bundle_method: description: - - Certificate priority + - Certificate bundle method required: False - type: int + type: str + default: ubiquitous 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 = [ - ('cis_id', 'str'), + ('private_key', 'str'), ('certificate', 'str'), + ('cis_id', 'str'), ('domain_id', 'str'), - ('private_key', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bundle_method', - 'cis_id', - 'certificate', - 'domain_id', 'private_key', + 'certificate', 'priority', + 'cis_id', + 'domain_id', + 'bundle_method', ] # 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( - bundle_method=dict( + private_key=dict( required=False, type='str'), - cis_id=dict( + certificate=dict( required=False, type='str'), - certificate=dict( + priority=dict( + required=False, + type='int'), + cis_id=dict( required=False, type='str'), domain_id=dict( required=False, type='str'), - private_key=dict( + bundle_method=dict( required=False, type='str'), - priority=dict( - required=False, - type='int'), 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.41.1', + ibm_provider_version='1.42.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 ad857d15c..a2780842a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 7e7d8eb04..e594f9e72 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ef659a548..53cbd3a2b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + domain_id: + description: + - (Required for new resource) Associated CIS domain + required: True + type: str page_id: description: - (Required for new resource) Custom page identifier @@ -37,11 +42,6 @@ - (Required for new resource) Custom page url 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. @@ -88,18 +88,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('domain_id', 'str'), ('page_id', 'str'), ('cis_id', 'str'), ('url', 'str'), - ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'domain_id', 'page_id', 'cis_id', 'url', - 'domain_id', ] # 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( + domain_id=dict( + required=False, + type='str'), page_id=dict( required=False, type='str'), @@ -125,9 +128,6 @@ url=dict( required=False, type='str'), - domain_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_cis_custom_page', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 6f0b07dce..c18a44b1f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - domain_id: + cis_id: description: - None required: True type: str - cis_id: + domain_id: description: - None required: True @@ -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_custom_pages', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 110f89c6e..f58c8913f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,17 +27,11 @@ - (Required for new resource) CIS object id or CRN required: True type: str - ttl: - description: - - TTL value - required: False - type: int - default: 1 - data: + name: description: - - None + - DNS record name required: False - type: dict + type: str content: description: - DNS record content @@ -48,6 +42,12 @@ - Priority Value required: False type: int + proxied: + description: + - Boolean value true if proxied else flase + required: False + type: bool + default: False domain_id: description: - (Required for new resource) Associated CIS domain @@ -58,17 +58,17 @@ - (Required for new resource) Record type required: True type: str - name: + ttl: description: - - DNS record name + - TTL value required: False - type: str - proxied: + type: int + default: 1 + data: description: - - Boolean value true if proxied else flase + - None required: False - type: bool - default: 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', - 'ttl', - 'data', + 'name', 'content', 'priority', + 'proxied', 'domain_id', 'type', - 'name', - 'proxied', + 'ttl', + 'data', ] # Params for Data source @@ -141,8 +141,8 @@ ] TL_CONFLICTS_MAP = { - 'data': ['content'], 'content': ['data'], + 'data': ['content'], } # define available arguments/parameters a user can pass to the module @@ -152,30 +152,30 @@ cis_id=dict( required=False, type='str'), - ttl=dict( - required=False, - type='int'), - data=dict( + name=dict( required=False, - type='dict'), + 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'), type=dict( required=False, type='str'), - name=dict( + ttl=dict( required=False, - type='str'), - proxied=dict( + type='int'), + data=dict( required=False, - type='bool'), + 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.41.1', + ibm_provider_version='1.42.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 371609dad..2d7bbb5e9 100644 --- a/plugins/modules/ibm_cis_dns_records_import.py +++ b/plugins/modules/ibm_cis_dns_records_import.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_cis_dns_records_import', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 28c8d1e08..1b51960ce 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4bc6c8444..6d81fa782 100644 --- a/plugins/modules/ibm_cis_domain.py +++ b/plugins/modules/ibm_cis_domain.py @@ -18,18 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_domain' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - domain: + cis_id: description: - - (Required for new resource) CISzone - Domain + - (Required for new resource) CIS object id required: True type: str - cis_id: + domain: description: - - (Required for new resource) CIS object id + - (Required for new resource) CISzone - Domain required: True type: str id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('domain', 'str'), ('cis_id', 'str'), + ('domain', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'domain', 'cis_id', + 'domain', ] # 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( - domain=dict( + cis_id=dict( required=False, type='str'), - cis_id=dict( + domain=dict( required=False, type='str'), id=dict( @@ -177,7 +177,7 @@ def run_module(): resource_type='ibm_cis_domain', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b2c6a01cd..f499a2601 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ee9682bc0..828e7f45c 100644 --- a/plugins/modules/ibm_cis_domain_settings.py +++ b/plugins/modules/ibm_cis_domain_settings.py @@ -18,49 +18,79 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cis_id: + server_side_exclude: description: - - (Required for new resource) CIS instance crn - required: True + - server_side_exclude setting + required: False + type: str + true_client_ip_header: + description: + - true_client_ip_header setting + required: False + type: str + websockets: + description: + - websockets setting + required: False type: str waf: description: - WAF setting required: False type: str + cname_flattening: + description: + - cname_flattening setting + required: False + type: str + ipv6: + description: + - ipv6 setting + required: False + type: str hotlink_protection: description: - hotlink_protection setting required: False type: str - pseudo_ipv4: + ip_geolocation: description: - - pseudo_ipv4 setting + - ip_geolocation setting required: False type: str - script_load_optimization: + domain_id: description: - - script_load_optimization setting + - (Required for new resource) Associated CIS domain + required: True + type: str + dnssec: + description: + - DNS Sec setting required: False type: str - server_side_exclude: + http2: description: - - server_side_exclude setting + - http2 setting required: False type: str - security_header: + brotli: description: - - Security Header Setting + - brotli setting + required: False + type: str + mobile_redirect: + description: + - None required: False type: list elements: dict - http2: + always_use_https: description: - - http2 setting + - always_use_https setting required: False type: str tls_client_auth: @@ -68,42 +98,36 @@ - tls_client_auth setting required: False type: str - cipher: + minify: description: - - Cipher settings + - Minify setting required: False type: list - elements: str - cname_flattening: - description: - - cname_flattening setting - required: False - type: str - mobile_redirect: + elements: dict + security_header: description: - - None + - Security Header Setting required: False type: list elements: dict - domain_id: + image_size_optimization: description: - - (Required for new resource) Associated CIS domain - required: True + - image_size_optimization setting + required: False type: str - min_tls_version: + pseudo_ipv4: description: - - Minimum version of TLS required + - pseudo_ipv4 setting required: False type: str - default: 1.1 - always_use_https: + prefetch_preload: description: - - always_use_https setting + - prefetch_preload setting required: False type: str - true_client_ip_header: + opportunistic_encryption: description: - - true_client_ip_header setting + - opportunistic_encryption setting required: False type: str challenge_ttl: @@ -111,75 +135,50 @@ - Challenge TTL setting required: False type: int - max_upload: - description: - - Maximum upload - required: False - type: int - dnssec: - description: - - DNS Sec setting - required: False - type: str automatic_https_rewrites: description: - automatic_https_rewrites setting required: False type: str - browser_check: + response_buffering: description: - - browser_check setting + - response_buffering setting required: False type: str - ipv6: + script_load_optimization: description: - - ipv6 setting + - script_load_optimization setting required: False type: str - image_size_optimization: + max_upload: description: - - image_size_optimization setting + - Maximum upload required: False - type: str - websockets: + type: int + cis_id: description: - - websockets setting - required: False + - (Required for new resource) CIS instance crn + required: True type: str - minify: - description: - - Minify setting - required: False - type: list - elements: dict ssl: description: - SSL/TLS setting required: False type: str - opportunistic_encryption: + min_tls_version: description: - - opportunistic_encryption setting + - Minimum version of TLS required required: False type: str + default: 1.1 origin_error_page_pass_thru: description: - origin_error_page_pass_thru setting required: False type: str - brotli: - description: - - brotli setting - required: False - type: str - prefetch_preload: - description: - - prefetch_preload setting - required: False - type: str - response_buffering: + browser_check: description: - - response_buffering setting + - browser_check setting required: False type: str image_load_optimization: @@ -187,11 +186,12 @@ - image_load_optimization setting required: False type: str - ip_geolocation: + cipher: description: - - ip_geolocation setting + - Cipher settings required: False - type: str + type: list + elements: 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 = [ - ('cis_id', 'str'), ('domain_id', 'str'), + ('cis_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cis_id', + 'server_side_exclude', + 'true_client_ip_header', + 'websockets', 'waf', + 'cname_flattening', + 'ipv6', 'hotlink_protection', - 'pseudo_ipv4', - 'script_load_optimization', - 'server_side_exclude', - 'security_header', + 'ip_geolocation', + 'domain_id', + 'dnssec', 'http2', - 'tls_client_auth', - 'cipher', - 'cname_flattening', + 'brotli', 'mobile_redirect', - 'domain_id', - 'min_tls_version', 'always_use_https', - 'true_client_ip_header', + 'tls_client_auth', + 'minify', + 'security_header', + 'image_size_optimization', + 'pseudo_ipv4', + 'prefetch_preload', + 'opportunistic_encryption', 'challenge_ttl', - 'max_upload', - 'dnssec', 'automatic_https_rewrites', - 'browser_check', - 'ipv6', - 'image_size_optimization', - 'websockets', - 'minify', + 'response_buffering', + 'script_load_optimization', + 'max_upload', + 'cis_id', 'ssl', - 'opportunistic_encryption', + 'min_tls_version', 'origin_error_page_pass_thru', - 'brotli', - 'prefetch_preload', - 'response_buffering', + 'browser_check', 'image_load_optimization', - 'ip_geolocation', + 'cipher', ] # 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( - cis_id=dict( + server_side_exclude=dict( + required=False, + type='str'), + true_client_ip_header=dict( + required=False, + type='str'), + websockets=dict( required=False, type='str'), waf=dict( required=False, type='str'), + cname_flattening=dict( + required=False, + type='str'), + ipv6=dict( + required=False, + type='str'), hotlink_protection=dict( required=False, type='str'), - pseudo_ipv4=dict( + ip_geolocation=dict( required=False, type='str'), - script_load_optimization=dict( + domain_id=dict( required=False, type='str'), - server_side_exclude=dict( + dnssec=dict( required=False, type='str'), - security_header=dict( + http2=dict( + required=False, + type='str'), + brotli=dict( + required=False, + type='str'), + mobile_redirect=dict( required=False, elements='', type='list'), - http2=dict( + always_use_https=dict( required=False, type='str'), tls_client_auth=dict( required=False, type='str'), - cipher=dict( + minify=dict( required=False, elements='', type='list'), - cname_flattening=dict( - required=False, - type='str'), - mobile_redirect=dict( + security_header=dict( required=False, elements='', type='list'), - domain_id=dict( + image_size_optimization=dict( required=False, type='str'), - min_tls_version=dict( + pseudo_ipv4=dict( required=False, type='str'), - always_use_https=dict( + prefetch_preload=dict( required=False, type='str'), - true_client_ip_header=dict( + opportunistic_encryption=dict( required=False, type='str'), challenge_ttl=dict( required=False, type='int'), - max_upload=dict( - required=False, - type='int'), - dnssec=dict( - required=False, - type='str'), automatic_https_rewrites=dict( required=False, type='str'), - browser_check=dict( + response_buffering=dict( required=False, type='str'), - ipv6=dict( + script_load_optimization=dict( required=False, type='str'), - image_size_optimization=dict( + max_upload=dict( required=False, - type='str'), - websockets=dict( + type='int'), + cis_id=dict( required=False, type='str'), - minify=dict( - required=False, - elements='', - type='list'), ssl=dict( required=False, type='str'), - opportunistic_encryption=dict( + min_tls_version=dict( required=False, type='str'), origin_error_page_pass_thru=dict( required=False, type='str'), - brotli=dict( - required=False, - type='str'), - prefetch_preload=dict( - required=False, - type='str'), - response_buffering=dict( + browser_check=dict( required=False, type='str'), image_load_optimization=dict( required=False, type='str'), - ip_geolocation=dict( + cipher=dict( required=False, - type='str'), + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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 ffb6ad259..c9a465707 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 005058b7a..b1eb979d5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cis_id: + domain_id: description: - - CIS Intance CRN + - CIS Domain ID required: True type: str - domain_id: + cis_id: description: - - CIS Domain ID + - CIS Intance CRN 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_edge_functions_actions', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5bab4aa4d..973e1bfa9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + pattern_url: + description: + - (Required for new resource) Edge function trigger pattern + required: True + type: str action_name: description: - Edge function trigger action name @@ -37,11 +42,6 @@ - (Required for new resource) CIS Domain ID required: True type: str - pattern_url: - description: - - (Required for new resource) Edge function trigger pattern - 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 = [ + ('pattern_url', 'str'), ('cis_id', 'str'), ('domain_id', 'str'), - ('pattern_url', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'pattern_url', 'action_name', 'cis_id', 'domain_id', - 'pattern_url', ] # 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( + pattern_url=dict( + required=False, + type='str'), action_name=dict( required=False, type='str'), @@ -124,9 +127,6 @@ domain_id=dict( required=False, type='str'), - pattern_url=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.41.1', + ibm_provider_version='1.42.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 b063bba4c..45067e6fa 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5f903e37e..5c4a71720 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 cb471d201..935e59f03 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c94fd6af2..248fb029a 100644 --- a/plugins/modules/ibm_cis_firewall.py +++ b/plugins/modules/ibm_cis_firewall.py @@ -18,10 +18,22 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_firewall' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -43,18 +55,6 @@ 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,25 +108,25 @@ # 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 TL_REQUIRED_PARAMETERS_DS = [ - ('firewall_type', 'str'), ('cis_id', 'str'), ('domain_id', 'str'), + ('firewall_type', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'firewall_type', 'cis_id', 'domain_id', + 'firewall_type', ] TL_CONFLICTS_MAP = { @@ -136,6 +136,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( + access_rule=dict( + required=False, + elements='', + type='list'), + ua_rule=dict( + required=False, + elements='', + type='list'), cis_id=dict( required=False, type='str'), @@ -149,14 +157,6 @@ 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 660cc83af..d12075666 100644 --- a/plugins/modules/ibm_cis_firewall_info.py +++ b/plugins/modules/ibm_cis_firewall_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_cis_firewall' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - firewall_type: - description: - - Type of firewall.Allowable values are access-rules,ua-rules,lockdowns - required: True - type: str cis_id: description: - CIS object id @@ -36,6 +31,11 @@ - Associated CIS domain required: True type: str + firewall_type: + description: + - Type of firewall.Allowable values are access-rules,ua-rules,lockdowns + 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 = [ - ('firewall_type', 'str'), ('cis_id', 'str'), ('domain_id', 'str'), + ('firewall_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'firewall_type', 'cis_id', 'domain_id', + 'firewall_type', ] @@ -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( - firewall_type=dict( - required=True, - type='str'), cis_id=dict( required=True, type='str'), domain_id=dict( required=True, type='str'), + firewall_type=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_firewall', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 b94edfee8..d57cba4f6 100644 --- a/plugins/modules/ibm_cis_firewall_rule.py +++ b/plugins/modules/ibm_cis_firewall_rule.py @@ -18,10 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + paused: + description: + - Firewallrules Paused + required: False + type: bool + cis_id: + description: + - (Required for new resource) CIS instance crn + required: True + type: str domain_id: description: - (Required for new resource) Associated CIS domain @@ -47,16 +57,6 @@ - Firewallrules Description required: False type: str - paused: - description: - - Firewallrules Paused - required: False - type: bool - 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. @@ -103,21 +103,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('cis_id', 'str'), ('domain_id', 'str'), ('filter_id', 'str'), ('action', 'str'), - ('cis_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'paused', + 'cis_id', 'domain_id', 'filter_id', 'action', 'priority', 'description', - 'paused', - 'cis_id', ] # Params for Data source @@ -134,6 +134,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( + paused=dict( + required=False, + type='bool'), + cis_id=dict( + required=False, + type='str'), domain_id=dict( required=False, type='str'), @@ -149,12 +155,6 @@ description=dict( required=False, type='str'), - paused=dict( - required=False, - type='bool'), - cis_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -220,7 +220,7 @@ def run_module(): resource_type='ibm_cis_firewall_rule', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 2aac8efd9..d7b7492a4 100644 --- a/plugins/modules/ibm_cis_firewall_rules_info.py +++ b/plugins/modules/ibm_cis_firewall_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_firewall_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cis_firewall_rules', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 e1a0d0b95..55e88d13c 100644 --- a/plugins/modules/ibm_cis_global_load_balancer.py +++ b/plugins/modules/ibm_cis_global_load_balancer.py @@ -18,15 +18,22 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + enabled: description: - - (Required for new resource) name - required: True - type: str + - set to true of LB needs to enabled + required: False + type: bool + default: True + region_pools: + description: + - None + required: False + type: list + elements: dict ttl: description: - TTL value @@ -44,27 +51,16 @@ - (Required for new resource) CIS instance crn required: True type: str - fallback_pool_id: + name: description: - - (Required for new resource) fallback pool ID + - (Required for new resource) name required: True type: str - description: - description: - - Description for the load balancer instance - required: False - type: str - steering_policy: + fallback_pool_id: description: - - Steering policy info - required: False + - (Required for new resource) fallback pool ID + required: True type: str - proxied: - description: - - set to true if proxy needs to be enabled - required: False - type: bool - default: False default_pool_ids: description: - (Required for new resource) List of default Pool IDs @@ -82,18 +78,22 @@ - (Required for new resource) Associated CIS domain required: True type: str - enabled: + description: description: - - set to true of LB needs to enabled + - Description for the load balancer instance required: False - type: bool - default: True - region_pools: + type: str + steering_policy: description: - - None + - Steering policy info required: False - type: list - elements: dict + type: str + proxied: + description: + - set to true if proxy needs to be enabled + required: False + type: bool + default: False id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -140,8 +140,8 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('cis_id', 'str'), + ('name', 'str'), ('fallback_pool_id', 'str'), ('default_pool_ids', 'list'), ('domain_id', 'str'), @@ -149,19 +149,19 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', + 'enabled', + 'region_pools', 'ttl', 'session_affinity', 'cis_id', + 'name', 'fallback_pool_id', - 'description', - 'steering_policy', - 'proxied', 'default_pool_ids', 'pop_pools', 'domain_id', - 'enabled', - 'region_pools', + 'description', + 'steering_policy', + 'proxied', ] # Params for Data source @@ -180,9 +180,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( + enabled=dict( required=False, - type='str'), + type='bool'), + region_pools=dict( + required=False, + elements='', + type='list'), ttl=dict( required=False, type='int'), @@ -192,18 +196,12 @@ cis_id=dict( required=False, type='str'), - fallback_pool_id=dict( - required=False, - type='str'), - description=dict( + name=dict( required=False, type='str'), - steering_policy=dict( + fallback_pool_id=dict( required=False, type='str'), - proxied=dict( - required=False, - type='bool'), default_pool_ids=dict( required=False, elements='', @@ -215,13 +213,15 @@ domain_id=dict( required=False, type='str'), - enabled=dict( + description=dict( required=False, - type='bool'), - region_pools=dict( + type='str'), + steering_policy=dict( required=False, - elements='', - type='list'), + 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.41.1', + ibm_provider_version='1.42.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 bf84261c6..fd7506127 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a8034a0b5..1b6417843 100644 --- a/plugins/modules/ibm_cis_healthcheck.py +++ b/plugins/modules/ibm_cis_healthcheck.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_healthcheck' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -34,35 +45,18 @@ required: False type: str default: - retries: + timeout: description: - - retries + - timeout required: False type: int - default: 2 - headers: - description: - - None - required: False - type: list - elements: dict - expected_body: - description: - - expected_body - required: False - type: str - type: + default: 5 + method: description: - - type + - method required: False type: str - default: http - follow_redirects: - description: - - follow_redirects - required: False - type: bool - default: False + default: GET allow_insecure: description: - allow_insecure @@ -74,34 +68,40 @@ - (Required for new resource) CIS instance crn required: True type: str - expected_codes: + expected_body: description: - - expected_codes + - expected_body required: False type: str - method: + type: description: - - method + - type required: False type: str - default: GET - timeout: + default: http + retries: description: - - timeout + - retries required: False type: int - default: 5 - interval: + default: 2 + headers: description: - - interval + - None required: False - type: int - default: 60 - port: + type: list + elements: dict + expected_codes: description: - - port number + - expected_codes required: False - type: int + type: str + follow_redirects: + description: + - follow_redirects + required: False + type: bool + default: False 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', - 'retries', - 'headers', - 'expected_body', - 'type', - 'follow_redirects', + 'timeout', + 'method', 'allow_insecure', 'cis_id', + 'expected_body', + 'type', + 'retries', + 'headers', 'expected_codes', - 'method', - 'timeout', - 'interval', - 'port', + 'follow_redirects', ] # 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'), - retries=dict( + timeout=dict( required=False, type='int'), - headers=dict( - required=False, - elements='', - type='list'), - expected_body=dict( - required=False, - type='str'), - type=dict( + method=dict( required=False, type='str'), - follow_redirects=dict( - required=False, - type='bool'), allow_insecure=dict( required=False, type='bool'), cis_id=dict( required=False, type='str'), - expected_codes=dict( + expected_body=dict( required=False, type='str'), - method=dict( + type=dict( required=False, type='str'), - timeout=dict( + retries=dict( required=False, type='int'), - interval=dict( + headers=dict( required=False, - type='int'), - port=dict( + elements='', + type='list'), + expected_codes=dict( required=False, - type='int'), + type='str'), + follow_redirects=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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 0e4193d08..cb991c4b0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 dd787a722..8811ec09a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 + name: + description: + - Resource instance name for example, my cis instance + 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_cis', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 7340d779c..b9e9a4ad0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 1e280d9a3..cdfee86d7 100644 --- a/plugins/modules/ibm_cis_logpush_job.py +++ b/plugins/modules/ibm_cis_logpush_job.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_cis_logpush_job', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d7ddf11d6..12502907e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cis_id: + domain_id: description: - - CIS instance crn + - Associated CIS domain required: True type: str - domain_id: + cis_id: description: - - Associated CIS domain + - CIS instance crn 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_logpush_jobs', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 442c2da6f..af0c9564b 100644 --- a/plugins/modules/ibm_cis_origin_pool.py +++ b/plugins/modules/ibm_cis_origin_pool.py @@ -18,41 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - origins: - description: - - (Required for new resource) Origins info - required: True - type: list - elements: dict - monitor: + description: description: - - Monitor value + - Description of the CIS Origin Pool required: False type: str - name: - description: - - (Required for new resource) name - required: True - 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 - cis_id: - description: - - (Required for new resource) CIS instance crn - required: True - type: str - description: - description: - - Description of the CIS Origin Pool - required: False - type: str minimum_origins: description: - Minimum number of Origins @@ -64,12 +43,33 @@ - Email address configured to recieve the notifications required: False type: str + origins: + description: + - (Required for new resource) Origins info + required: True + type: list + elements: dict + name: + description: + - (Required for new resource) name + required: True + type: str + cis_id: + description: + - (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 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'), ('name', 'str'), - ('enabled', 'bool'), ('cis_id', 'str'), ('check_regions', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'origins', - 'monitor', - 'name', - 'enabled', - 'cis_id', 'description', + 'enabled', 'minimum_origins', 'notification_email', + 'origins', + 'name', + 'cis_id', 'check_regions', + 'monitor', ] # Params for Data source @@ -150,35 +150,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( - origins=dict( - required=False, - elements='', - type='list'), - monitor=dict( - required=False, - type='str'), - name=dict( + description=dict( required=False, type='str'), enabled=dict( required=False, type='bool'), - cis_id=dict( - required=False, - type='str'), - description=dict( - required=False, - type='str'), minimum_origins=dict( required=False, type='int'), notification_email=dict( required=False, type='str'), + origins=dict( + required=False, + elements='', + type='list'), + 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'), 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.41.1', + ibm_provider_version='1.42.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 8769fcf74..e89d408d2 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ddf7063dd..2a0e6434e 100644 --- a/plugins/modules/ibm_cis_page_rule.py +++ b/plugins/modules/ibm_cis_page_rule.py @@ -18,21 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - actions: - description: - - (Required for new resource) Page rule actions - required: True - type: list - elements: dict - cis_id: - description: - - (Required for new resource) CIS instance crn - required: True - type: str domain_id: description: - (Required for new resource) Associated CIS domain @@ -56,6 +45,17 @@ required: True type: list elements: dict + actions: + description: + - (Required for new resource) Page rule actions + 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 = [ - ('actions', 'list'), - ('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 = [ - 'actions', - 'cis_id', 'domain_id', 'priority', 'status', 'targets', + 'actions', + 'cis_id', ] # Params for Data source @@ -132,13 +132,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( - actions=dict( - required=False, - elements='', - type='list'), - cis_id=dict( - required=False, - type='str'), domain_id=dict( required=False, type='str'), @@ -152,6 +145,13 @@ required=False, elements='', type='list'), + actions=dict( + 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.41.1', + ibm_provider_version='1.42.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 e1a82e1b1..efc5f02c5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 fe172209b..67e59ada1 100644 --- a/plugins/modules/ibm_cis_range_app.py +++ b/plugins/modules/ibm_cis_range_app.py @@ -18,42 +18,16 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - dns_type: - description: - - (Required for new resource) Type of the DNS record for this application - required: True - type: str origin_direct: description: - IP address and port of the origin for this Range application. required: False type: list elements: str - proxy_protocol: - description: - - Allows for the true client IP to be passed to the service. - required: False - type: str - traffic_type: - description: - - Configure how traffic is handled at the edge. - required: False - type: str - default: direct - cis_id: - description: - - (Required for new resource) CIS Intance CRN - required: True - type: str - protocol: - description: - - (Required for new resource) Defines the protocol and port for this application - required: True - type: str dns: description: - (Required for new resource) Name of the DNS record for this application @@ -64,39 +38,65 @@ - DNS record pointing to the origin for this Range application. required: False type: str - domain_id: + origin_port: description: - - (Required for new resource) CIS Domain ID + - 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: + description: + - Allows for the true client IP to be passed to the service. + required: False + type: str edge_ips_type: description: - The type of edge IP configuration. required: False type: str default: dynamic - edge_ips_connectivity: + traffic_type: description: - - Specifies the IP version. + - Configure how traffic is handled at the edge. required: False type: str - default: all - origin_port: + default: direct + tls: description: - - Port at the origin that listens to traffic + - Configure if and how TLS connections are terminated at the edge. required: False - type: int + type: str + default: off + cis_id: + description: + - (Required for new resource) CIS Intance CRN + required: True + type: str + protocol: + description: + - (Required for new resource) Defines the protocol and port for this application + required: True + type: str ip_firewall: description: - Enables the IP Firewall for this application. Only available for TCP applications. required: False type: bool - tls: + edge_ips_connectivity: description: - - Configure if and how TLS connections are terminated at the edge. + - Specifies the IP version. required: False type: str - default: off + default: all + 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. @@ -143,29 +143,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('dns', 'str'), ('dns_type', 'str'), ('cis_id', 'str'), ('protocol', 'str'), - ('dns', 'str'), ('domain_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'dns_type', 'origin_direct', + 'dns', + 'origin_dns', + 'origin_port', + 'dns_type', 'proxy_protocol', + 'edge_ips_type', 'traffic_type', + 'tls', 'cis_id', 'protocol', - 'dns', - 'origin_dns', - 'domain_id', - 'edge_ips_type', - 'edge_ips_connectivity', - 'origin_port', 'ip_firewall', - 'tls', + 'edge_ips_connectivity', + 'domain_id', ] # Params for Data source @@ -183,47 +183,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( - dns_type=dict( - required=False, - type='str'), origin_direct=dict( required=False, elements='', type='list'), - proxy_protocol=dict( + dns=dict( required=False, type='str'), - traffic_type=dict( + origin_dns=dict( required=False, type='str'), - cis_id=dict( + origin_port=dict( required=False, - type='str'), - protocol=dict( + type='int'), + dns_type=dict( required=False, type='str'), - dns=dict( + proxy_protocol=dict( required=False, type='str'), - origin_dns=dict( + edge_ips_type=dict( required=False, type='str'), - domain_id=dict( + traffic_type=dict( required=False, type='str'), - edge_ips_type=dict( + tls=dict( required=False, type='str'), - edge_ips_connectivity=dict( + cis_id=dict( required=False, type='str'), - origin_port=dict( + protocol=dict( required=False, - type='int'), + type='str'), ip_firewall=dict( required=False, type='bool'), - tls=dict( + edge_ips_connectivity=dict( + required=False, + type='str'), + domain_id=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.41.1', + ibm_provider_version='1.42.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 5a0820fdd..66c1143cf 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e5ce51fae..168f7300a 100644 --- a/plugins/modules/ibm_cis_rate_limit.py +++ b/plugins/modules/ibm_cis_rate_limit.py @@ -18,26 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_rate_limit' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - period: + cis_id: description: - - (Required for new resource) Rate Limiting Period + - (Required for new resource) CIS Intance CRN required: True - type: int - bypass: - description: - - Bypass URL - required: False - type: list - elements: dict + type: str domain_id: description: - (Required for new resource) CIS Domain ID required: True type: str + action: + description: + - (Required for new resource) Rate Limiting Action + required: True + type: list + elements: dict disabled: description: - Whether this rate limiting rule is currently disabled. @@ -49,34 +49,34 @@ - A note that you can use to describe the reason for a rate limiting rule. required: False type: str + bypass: + description: + - Bypass URL + required: False + type: list + elements: dict threshold: description: - (Required for new resource) Rate Limiting Threshold required: True type: int + period: + description: + - (Required for new resource) Rate Limiting Period + required: True + type: int correlate: description: - Ratelimiting Correlate required: False type: list elements: dict - action: - description: - - (Required for new resource) Rate Limiting Action - required: True - type: list - elements: dict match: description: - Rate Limiting Match required: False type: list elements: dict - 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. @@ -123,25 +123,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('period', 'int'), + ('cis_id', 'str'), ('domain_id', 'str'), - ('threshold', 'int'), ('action', 'list'), - ('cis_id', 'str'), + ('threshold', 'int'), + ('period', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'period', - 'bypass', + 'cis_id', 'domain_id', + 'action', 'disabled', 'description', + 'bypass', 'threshold', + 'period', 'correlate', - 'action', 'match', - 'cis_id', ] # Params for Data source @@ -162,30 +162,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( - period=dict( - required=False, - type='int'), - bypass=dict( + cis_id=dict( required=False, - elements='', - type='list'), + type='str'), domain_id=dict( required=False, type='str'), + action=dict( + required=False, + elements='', + type='list'), disabled=dict( required=False, type='bool'), description=dict( required=False, type='str'), + bypass=dict( + required=False, + elements='', + type='list'), threshold=dict( required=False, type='int'), - correlate=dict( + period=dict( required=False, - elements='', - type='list'), - action=dict( + type='int'), + correlate=dict( required=False, elements='', type='list'), @@ -193,9 +196,6 @@ required=False, elements='', type='list'), - cis_id=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 3faed027f..af791b2e0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 40124aad0..b4959926f 100644 --- a/plugins/modules/ibm_cis_routing.py +++ b/plugins/modules/ibm_cis_routing.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_routing' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -182,7 +182,7 @@ def run_module(): resource_type='ibm_cis_routing', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 b85e93eff..e12a29b6b 100644 --- a/plugins/modules/ibm_cis_tls_settings.py +++ b/plugins/modules/ibm_cis_tls_settings.py @@ -18,10 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 + required: True + type: str universal_ssl: description: - Universal SSL setting @@ -38,16 +48,6 @@ required: False type: str default: 1.1 - cis_id: - description: - - (Required for new resource) CIS instance 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. @@ -100,11 +100,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cis_id', + 'domain_id', 'universal_ssl', 'tls_1_3', 'min_tls_version', - 'cis_id', - 'domain_id', ] # Params for Data source @@ -121,6 +121,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'), universal_ssl=dict( required=False, type='bool'), @@ -130,12 +136,6 @@ min_tls_version=dict( required=False, type='str'), - cis_id=dict( - required=False, - type='str'), - domain_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -201,7 +201,7 @@ def run_module(): resource_type='ibm_cis_tls_settings', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 f0ebfb4b0..83c926e93 100644 --- a/plugins/modules/ibm_cis_waf_group.py +++ b/plugins/modules/ibm_cis_waf_group.py @@ -18,10 +18,15 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -32,9 +37,9 @@ - (Required for new resource) WAF Rule package id required: True type: str - cis_id: + mode: description: - - (Required for new resource) CIS Intance CRN + - (Required for new resource) WAF Rule group mode on/off required: True type: str group_id: @@ -42,11 +47,6 @@ - (Required for new resource) WAF Rule group id required: True type: str - mode: - description: - - (Required for new resource) WAF Rule group mode on/off - 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 = [ + ('cis_id', 'str'), ('domain_id', 'str'), ('package_id', 'str'), - ('cis_id', 'str'), - ('group_id', 'str'), ('mode', 'str'), + ('group_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cis_id', 'domain_id', 'package_id', - 'cis_id', - 'group_id', 'mode', + 'group_id', ] # 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( + cis_id=dict( + required=False, + type='str'), domain_id=dict( required=False, type='str'), package_id=dict( required=False, type='str'), - cis_id=dict( + mode=dict( required=False, type='str'), group_id=dict( required=False, type='str'), - mode=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -203,7 +203,7 @@ def run_module(): resource_type='ibm_cis_waf_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 0058e7b24..ba447cfa0 100644 --- a/plugins/modules/ibm_cis_waf_groups_info.py +++ b/plugins/modules/ibm_cis_waf_groups_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_cis_waf_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_cis_waf_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5de562c32..577f677ec 100644 --- a/plugins/modules/ibm_cis_waf_package.py +++ b/plugins/modules/ibm_cis_waf_package.py @@ -18,33 +18,33 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cis_id: + sensitivity: description: - - (Required for new resource) CIS Intance CRN + - (Required for new resource) WAF pakcage sensitivity required: True type: str - domain_id: + action_mode: description: - - (Required for new resource) CIS Domain ID + - (Required for new resource) WAF pakcage action mode required: True type: str - package_id: + cis_id: description: - - (Required for new resource) WAF pakcage ID + - (Required for new resource) CIS Intance CRN required: True type: str - sensitivity: + domain_id: description: - - (Required for new resource) WAF pakcage sensitivity + - (Required for new resource) CIS Domain ID required: True type: str - action_mode: + package_id: description: - - (Required for new resource) WAF pakcage action mode + - (Required for new resource) WAF pakcage ID required: True type: str id: @@ -93,20 +93,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('sensitivity', 'str'), + ('action_mode', 'str'), ('cis_id', 'str'), ('domain_id', 'str'), ('package_id', 'str'), - ('sensitivity', 'str'), - ('action_mode', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'sensitivity', + 'action_mode', 'cis_id', 'domain_id', 'package_id', - 'sensitivity', - 'action_mode', ] # 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( + sensitivity=dict( required=False, type='str'), - domain_id=dict( + action_mode=dict( required=False, type='str'), - package_id=dict( + cis_id=dict( required=False, type='str'), - sensitivity=dict( + domain_id=dict( required=False, type='str'), - action_mode=dict( + package_id=dict( required=False, type='str'), id=dict( @@ -203,7 +203,7 @@ def run_module(): resource_type='ibm_cis_waf_package', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 7f1ca5830..cfec0f24c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 daf724ee2..d8b123443 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - package_id: + cis_id: description: - - (Required for new resource) CIS WAF Rule package id + - (Required for new resource) CIS Intance CRN required: True type: str mode: @@ -42,9 +42,9 @@ - (Required for new resource) CIS WAF Rule id required: True type: str - 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 id: @@ -93,20 +93,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('package_id', 'str'), + ('cis_id', 'str'), ('mode', 'str'), ('domain_id', 'str'), ('rule_id', 'str'), - ('cis_id', 'str'), + ('package_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'package_id', + 'cis_id', 'mode', 'domain_id', 'rule_id', - 'cis_id', + 'package_id', ] # Params for Data source @@ -123,7 +123,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( - package_id=dict( + cis_id=dict( required=False, type='str'), mode=dict( @@ -135,7 +135,7 @@ rule_id=dict( required=False, type='str'), - cis_id=dict( + package_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.41.1', + ibm_provider_version='1.42.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 dabcf8993..e4b9dc5d1 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 cff28981f..cc93e5e59 100644 --- a/plugins/modules/ibm_cis_webhook.py +++ b/plugins/modules/ibm_cis_webhook.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cis_webhook' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_cis_webhook', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 747aed2ef..81f547ad6 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0bc21903c..60b0fe969 100644 --- a/plugins/modules/ibm_cloud_shell_account_settings.py +++ b/plugins/modules/ibm_cloud_shell_account_settings.py @@ -18,20 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_cloud_shell_account_settings' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + 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 + features: + description: + - List of Cloud Shell features. + required: False + type: list + elements: dict account_id: description: - (Required for new resource) The account ID in which the account settings belong to. required: True type: str - rev: - description: - - Unique revision number for the settings object. - required: False - type: str default_enable_new_regions: description: - 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. @@ -48,17 +54,11 @@ required: False type: list elements: dict - 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 - features: + rev: description: - - List of Cloud Shell features. + - Unique revision number for the settings object. required: False - type: list - elements: dict + 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 = [ + 'default_enable_new_features', + 'features', 'account_id', - 'rev', 'default_enable_new_regions', 'enabled', 'regions', - 'default_enable_new_features', - 'features', + 'rev', ] # Params for Data source @@ -135,10 +135,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( - account_id=dict( + default_enable_new_features=dict( required=False, - type='str'), - rev=dict( + type='bool'), + features=dict( + required=False, + elements='', + type='list'), + account_id=dict( required=False, type='str'), default_enable_new_regions=dict( @@ -151,13 +155,9 @@ required=False, elements='', type='list'), - default_enable_new_features=dict( - required=False, - type='bool'), - features=dict( + rev=dict( required=False, - elements='', - type='list'), + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 3536e2ffe..8758feee8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 8248d5209..4b822d333 100644 --- a/plugins/modules/ibm_cloudant.py +++ b/plugins/modules/ibm_cloudant.py @@ -18,52 +18,32 @@ - Create, update or destroy an IBM Cloud 'ibm_cloudant' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - environment_crn: - description: - - CRN of the IBM Cloudant Dedicated Hardware plan instance - required: False - type: str - plan: - description: - - (Required for new resource) The plan type of the service - required: True - type: str 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 - cors_config: + name: description: - - Configuration for CORS. - required: False - type: list - elements: dict + - (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. @@ -76,28 +56,48 @@ required: False type: bool default: True + 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 legacy_credentials: description: - Use both legacy credentials and IAM for authentication required: False type: bool default: False - name: + environment_crn: description: - - (Required for new resource) A name for the resource instance - required: True + - CRN of the IBM Cloudant Dedicated Hardware plan instance + required: False type: str - service_endpoints: + parameters_json: description: - - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. + - Arbitrary parameters to pass in Json string format required: False type: str - tags: + cors_config: description: - - None + - Configuration for CORS. required: False type: list - elements: str + elements: dict + service_endpoints: + description: + - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. + required: False + type: str 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 = [ - ('location', 'str'), - ('plan', 'str'), ('name', 'str'), + ('plan', 'str'), + ('location', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'location', - 'resource_group_id', - 'parameters_json', - 'environment_crn', - 'plan', 'include_data_events', - 'cors_config', + 'name', 'parameters', + 'tags', 'capacity', 'enable_cors', + 'plan', + 'location', + 'resource_group_id', 'legacy_credentials', - 'name', + 'environment_crn', + 'parameters_json', + 'cors_config', 'service_endpoints', - 'tags', ] # Params for Data source @@ -174,63 +174,63 @@ TL_ALL_PARAMETERS_DS = [ 'resource_group_id', - 'location', 'name', + 'location', ] TL_CONFLICTS_MAP = { - 'parameters_json': ['parameters'], 'parameters': ['parameters_json'], + 'parameters_json': ['parameters'], } # 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( - location=dict( - required=False, - type='str'), - resource_group_id=dict( - required=False, - type='str'), - parameters_json=dict( - required=False, - type='str'), - environment_crn=dict( - required=False, - type='str'), - plan=dict( - required=False, - type='str'), include_data_events=dict( required=False, type='bool'), - cors_config=dict( + name=dict( required=False, - elements='', - type='list'), + type='str'), parameters=dict( required=False, type='dict'), + tags=dict( + required=False, + elements='', + type='list'), capacity=dict( required=False, type='int'), enable_cors=dict( required=False, type='bool'), + plan=dict( + required=False, + type='str'), + location=dict( + required=False, + type='str'), + resource_group_id=dict( + required=False, + type='str'), legacy_credentials=dict( required=False, type='bool'), - name=dict( + environment_crn=dict( required=False, type='str'), - service_endpoints=dict( + parameters_json=dict( required=False, type='str'), - tags=dict( + cors_config=dict( required=False, elements='', type='list'), + service_endpoints=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..7ba1211b8 --- /dev/null +++ b/plugins/modules/ibm_cloudant_database.py @@ -0,0 +1,224 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_cloudant_database +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/cloudant_database + +short_description: Configure IBM Cloud 'ibm_cloudant_database' resource + +version_added: "2.8" + +description: + - Create, update or destroy an IBM Cloud 'ibm_cloudant_database' resource + - This module supports idempotency +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + instance_crn: + description: + - (Required for new resource) Cloudant Instance CRN. + required: True + type: str + db: + description: + - (Required for new resource) Path parameter to specify the database name. + required: True + type: str + partitioned: + description: + - Query parameter to specify whether to enable database partitions when creating a database. + required: False + type: bool + shards: + description: + - The number of shards in the database. Each shard is a partition of the hash value range. You are encouraged to talk to support about appropriate values before changing this. + required: False + type: int + 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_crn', 'str'), + ('db', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'instance_crn', + 'db', + 'partitioned', + 'shards', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('db', 'str'), + ('instance_crn', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'db', + 'instance_crn', +] + +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_crn=dict( + required=False, + type='str'), + db=dict( + required=False, + type='str'), + partitioned=dict( + required=False, + type='bool'), + shards=dict( + required=False, + type='int'), + 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_cloudant_database', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_cloudant_database', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.42.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_cloudant_database_info.py b/plugins/modules/ibm_cloudant_database_info.py new file mode 100644 index 000000000..d644b066b --- /dev/null +++ b/plugins/modules/ibm_cloudant_database_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_cloudant_database_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/cloudant_database + +short_description: Retrieve IBM Cloud 'ibm_cloudant_database' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_cloudant_database' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + db: + description: + - Path parameter to specify the database name. + required: True + type: str + instance_crn: + description: + - Cloudant Instance CRN. + 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 = [ + ('db', 'str'), + ('instance_crn', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'db', + 'instance_crn', +] + + +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( + db=dict( + required=True, + type='str'), + instance_crn=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_cloudant_database', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_cloudant_info.py b/plugins/modules/ibm_cloudant_info.py index 4539200d7..cfb806f4a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 - 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 + location: + description: + - The location or the environment in which instance exists + required: False + 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', - 'location', 'name', + 'location', ] @@ -90,12 +90,12 @@ resource_group_id=dict( required=False, type='str'), - location=dict( - required=False, - type='str'), name=dict( required=True, type='str'), + location=dict( + required=False, + 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.41.1', + ibm_provider_version='1.42.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 52a6a2b0c..e47c933c7 100644 --- a/plugins/modules/ibm_cm_catalog.py +++ b/plugins/modules/ibm_cm_catalog.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_catalog' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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. @@ -33,9 +43,9 @@ - (Required for new resource) Display Name in the requested language. required: True type: str - catalog_icon_url: + short_description: description: - - URL for an icon associated with this catalog. + - Description in the requested language. required: False type: str tags: @@ -44,16 +54,6 @@ required: False type: list elements: str - short_description: - description: - - Description in the requested language. - required: False - type: str - resource_group_id: - description: - - Resource Group ID - required: False - type: 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 = [ + 'catalog_icon_url', + 'resource_group_id', 'kind', 'label', - 'catalog_icon_url', - 'tags', 'short_description', - 'resource_group_id', + 'tags', ] # 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'), - catalog_icon_url=dict( + short_description=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - short_description=dict( - required=False, - type='str'), - resource_group_id=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 2086b94d0..8c73c720d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 745712c0f..21ded49c4 100644 --- a/plugins/modules/ibm_cm_offering.py +++ b/plugins/modules/ibm_cm_offering.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_offering' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - label: - description: - - (Required for new resource) Display Name in the requested language. - required: True - type: str tags: description: - List of tags associated with this catalog. @@ -38,6 +33,11 @@ - (Required for new resource) The id of the catalog containing this offering. required: True type: str + label: + description: + - (Required for new resource) Display Name in the requested language. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,26 +84,26 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('label', 'str'), ('catalog_id', 'str'), + ('label', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'label', 'tags', 'catalog_id', + 'label', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('catalog_identifier', 'str'), ('offering_id', 'str'), + ('catalog_identifier', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'catalog_identifier', 'offering_id', + 'catalog_identifier', ] TL_CONFLICTS_MAP = { @@ -113,9 +113,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( - label=dict( - required=False, - type='str'), tags=dict( required=False, elements='', @@ -123,6 +120,9 @@ catalog_id=dict( required=False, type='str'), + label=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 331b1f5ac..8e87f59fb 100644 --- a/plugins/modules/ibm_cm_offering_info.py +++ b/plugins/modules/ibm_cm_offering_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_cm_offering' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - catalog_identifier: + offering_id: description: - - Catalog identifier. + - The id of the catalog containing this offering. required: True type: str - offering_id: + catalog_identifier: description: - - The id of the catalog containing this offering. + - Catalog identifier. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('catalog_identifier', 'str'), ('offering_id', 'str'), + ('catalog_identifier', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'catalog_identifier', 'offering_id', + 'catalog_identifier', ] @@ -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( - catalog_identifier=dict( + offering_id=dict( required=True, type='str'), - offering_id=dict( + catalog_identifier=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_cm_offering', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9cf768e54..eebb60140 100644 --- a/plugins/modules/ibm_cm_offering_instance.py +++ b/plugins/modules/ibm_cm_offering_instance.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_offering_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,45 +27,50 @@ - (Required for new resource) Catalog ID this instance was created from. required: True type: str - kind_format: + cluster_all_namespaces: description: - - (Required for new resource) the format this instance has (helm, operator, ova...). + - (Required for new resource) designate to install into all namespaces. required: True - type: str - version: + type: bool + channel: description: - - (Required for new resource) The version this instance was installed from (not version id). - required: True + - channel to target for the operator subscription. Required for operator bundles + required: False type: str - cluster_all_namespaces: + cluster_region: description: - - (Required for new resource) designate to install into all namespaces. + - (Required for new resource) Cluster region (e.g., us-south). required: True - type: bool + type: str wait_until_successful: description: - Whether to wait until the offering instance successfully provisions, or to return when accepted required: False type: bool default: True - cluster_id: + label: description: - - (Required for new resource) Cluster ID. + - (Required for new resource) the label for this instance. required: True type: str - install_plan: + offering_id: description: - - install plan for the subscription of the operator- can be either automatic or manual. Required for operator bundles - required: False + - (Required for new resource) Offering ID this instance was created from. + required: True type: str - label: + kind_format: description: - - (Required for new resource) the label for this instance. + - (Required for new resource) the format this instance has (helm, operator, ova...). required: True type: str - offering_id: + version: description: - - (Required for new resource) Offering ID this instance was created from. + - (Required for new resource) The version this instance was installed from (not version id). + required: True + type: str + cluster_id: + description: + - (Required for new resource) Cluster ID. required: True type: str cluster_namespaces: @@ -79,16 +84,11 @@ - id of the resource group required: False type: str - channel: + install_plan: description: - - channel to target for the operator subscription. Required for operator bundles + - install plan for the subscription of the operator- can be either automatic or manual. 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 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -136,31 +136,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('catalog_id', 'str'), - ('kind_format', 'str'), - ('version', 'str'), ('cluster_all_namespaces', 'bool'), - ('cluster_id', 'str'), + ('cluster_region', 'str'), ('label', 'str'), ('offering_id', 'str'), + ('kind_format', 'str'), + ('version', 'str'), + ('cluster_id', 'str'), ('cluster_namespaces', 'list'), - ('cluster_region', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'catalog_id', - 'kind_format', - 'version', 'cluster_all_namespaces', + 'channel', + 'cluster_region', 'wait_until_successful', - 'cluster_id', - 'install_plan', 'label', 'offering_id', + 'kind_format', + 'version', + 'cluster_id', 'cluster_namespaces', 'resource_group_id', - 'channel', - 'cluster_region', + 'install_plan', ] # Params for Data source @@ -182,28 +182,31 @@ catalog_id=dict( required=False, type='str'), - kind_format=dict( + cluster_all_namespaces=dict( required=False, - type='str'), - version=dict( + type='bool'), + channel=dict( required=False, type='str'), - cluster_all_namespaces=dict( + cluster_region=dict( required=False, - type='bool'), + type='str'), wait_until_successful=dict( required=False, type='bool'), - cluster_id=dict( + label=dict( required=False, type='str'), - install_plan=dict( + offering_id=dict( required=False, type='str'), - label=dict( + kind_format=dict( required=False, type='str'), - offering_id=dict( + version=dict( + required=False, + type='str'), + cluster_id=dict( required=False, type='str'), cluster_namespaces=dict( @@ -213,10 +216,7 @@ resource_group_id=dict( required=False, type='str'), - channel=dict( - required=False, - type='str'), - cluster_region=dict( + install_plan=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 68d2bd9b9..1b401a738 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 dd5a8c7ad..fc6137e58 100644 --- a/plugins/modules/ibm_cm_version.py +++ b/plugins/modules/ibm_cm_version.py @@ -18,19 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_cm_version' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: - description: - - Tags array. - required: False - type: list - elements: str - zipurl: + target_version: description: - - URL path to zip location. If not specified, must provide content in the body of this call. + - The semver value for this new version, if not found in the zip url package content. required: False type: str catalog_identifier: @@ -38,16 +32,6 @@ - (Required for new resource) Catalog identifier. required: True type: str - content: - description: - - byte array representing the content to be imported. Only supported for OVA images at this time. - 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 offering_id: description: - (Required for new resource) Offering identification. @@ -59,6 +43,22 @@ required: False type: list elements: str + tags: + description: + - 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 + zipurl: + description: + - URL path to zip location. If not specified, must provide content in the body of this call. + 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 = [ - 'tags', - 'zipurl', - 'catalog_identifier', - 'content', 'target_version', + 'catalog_identifier', 'offering_id', 'target_kinds', + 'tags', + 'content', + 'zipurl', ] # Params for Data source @@ -136,22 +136,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( - tags=dict( - required=False, - elements='', - type='list'), - zipurl=dict( + target_version=dict( required=False, type='str'), catalog_identifier=dict( required=False, type='str'), - content=dict( - required=False, - type='str'), - target_version=dict( - required=False, - type='str'), offering_id=dict( required=False, type='str'), @@ -159,6 +149,16 @@ required=False, elements='', type='list'), + tags=dict( + required=False, + elements='', + type='list'), + content=dict( + required=False, + type='str'), + zipurl=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 da1f214e1..eedf29676 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 71e07e88e..89a72a4a5 100644 --- a/plugins/modules/ibm_compute_autoscale_group.py +++ b/plugins/modules/ibm_compute_autoscale_group.py @@ -18,47 +18,26 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - termination_policy: - description: - - (Required for new resource) Termination policy - required: True - type: str - 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 - name: + minimum_member_count: description: - - (Required for new resource) Name + - (Required for new resource) Minimum member count required: True - type: str + type: int maximum_member_count: description: - (Required for new resource) Maximum member count required: True type: int - cooldown: - description: - - (Required for new resource) Cooldown value - required: True - type: int - port: - description: - - Port number - required: False - type: int health_check: description: - None @@ -70,16 +49,37 @@ 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 + required: True + type: str regional_group: description: - (Required for new resource) regional group required: True type: str - minimum_member_count: + cooldown: description: - - (Required for new resource) Minimum member count + - (Required for new resource) Cooldown value required: True type: int + termination_policy: + description: + - (Required for new resource) Termination policy + required: True + type: str virtual_server_id: description: - virtual server ID @@ -131,28 +131,28 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('termination_policy', 'str'), - ('name', 'str'), + ('minimum_member_count', 'int'), ('maximum_member_count', 'int'), - ('cooldown', 'int'), ('virtual_guest_member_template', 'list'), + ('name', 'str'), ('regional_group', 'str'), - ('minimum_member_count', 'int'), + ('cooldown', 'int'), + ('termination_policy', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'termination_policy', - 'network_vlan_ids', 'tags', - 'name', + 'minimum_member_count', 'maximum_member_count', - 'cooldown', - 'port', 'health_check', 'virtual_guest_member_template', + 'network_vlan_ids', + 'port', + 'name', 'regional_group', - 'minimum_member_count', + 'cooldown', + 'termination_policy', 'virtual_server_id', ] @@ -170,27 +170,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( - termination_policy=dict( - required=False, - type='str'), - network_vlan_ids=dict( - required=False, - elements='', - type='list'), tags=dict( required=False, elements='', type='list'), - name=dict( - required=False, - type='str'), - maximum_member_count=dict( - required=False, - type='int'), - cooldown=dict( + minimum_member_count=dict( required=False, type='int'), - port=dict( + maximum_member_count=dict( required=False, type='int'), health_check=dict( @@ -200,12 +187,25 @@ required=False, elements='', type='list'), + network_vlan_ids=dict( + required=False, + elements='', + type='list'), + port=dict( + required=False, + type='int'), + name=dict( + required=False, + type='str'), regional_group=dict( required=False, type='str'), - minimum_member_count=dict( + cooldown=dict( required=False, type='int'), + termination_policy=dict( + required=False, + type='str'), virtual_server_id=dict( required=False, type='int'), @@ -274,7 +274,7 @@ def run_module(): resource_type='ibm_compute_autoscale_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 50ff8aac1..3c2e4a678 100644 --- a/plugins/modules/ibm_compute_autoscale_policy.py +++ b/plugins/modules/ibm_compute_autoscale_policy.py @@ -18,10 +18,27 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 + required: False + type: list + elements: str name: description: - (Required for new resource) Name @@ -42,23 +59,6 @@ - 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 - tags: - description: - - List of tags - required: False - type: list - elements: 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 = [ + ('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', - 'tags', ] # Params for Data source @@ -136,6 +136,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( + scale_group_id=dict( + required=False, + type='int'), + triggers=dict( + required=False, + elements='', + type='list'), + tags=dict( + required=False, + elements='', + type='list'), name=dict( required=False, type='str'), @@ -148,17 +159,6 @@ cooldown=dict( required=False, type='int'), - scale_group_id=dict( - required=False, - type='int'), - triggers=dict( - required=False, - elements='', - type='list'), - tags=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.41.1', + ibm_provider_version='1.42.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 ca88cfb05..2f0dfdcf9 100644 --- a/plugins/modules/ibm_compute_bare_metal.py +++ b/plugins/modules/ibm_compute_bare_metal.py @@ -18,153 +18,137 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_bare_metal' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - ipv6_static_enabled: + redundant_power_supply: description: - - boolean value true if ipv6 static is enabled else false + - None required: False type: bool - default: False - user_metadata: - description: - - User metadata info - required: False - type: str - software_guard_extensions: + public_bandwidth: description: - None required: False - type: bool - default: False - memory: + type: int + private_vlan_id: description: - None required: False type: int - public_subnet: + post_install_script_uri: description: - None required: False type: str - os_key_name: + network_speed: description: - - None + - Network speed in MBPS required: False - type: str + type: int + default: 100 gpu_key_name: description: - None required: False type: str + restricted_network: + description: + - None + required: False + type: bool + default: False storage_groups: description: - None required: False type: list elements: dict - ssh_key_ids: + ipv6_static_enabled: description: - - SSH KEY IDS list + - boolean value true if ipv6 static is enabled else false required: False - type: list - elements: int - post_install_script_uri: + type: bool + default: False + notes: description: - - None + - Optional notes info required: False type: str - network_speed: - description: - - Network speed in MBPS - required: False - type: int - default: 100 - tcp_monitoring: + package_key_name: description: - - TCP monitoring enabled if set as true + - None required: False - type: bool - default: False - domain: - description: - - (Required for new resource) Domain name - required: True type: str - unbonded_network: + gpu_secondary_key_name: description: - None required: False - type: bool - default: False - extended_hardware_testing: + type: str + disk_key_names: description: - None required: False - type: bool - default: False + type: list + elements: str secondary_ip_count: description: - Secondary IP addresses count required: False type: int - os_reference_code: + user_metadata: description: - - OS refernece code value + - User metadata info required: False type: str - datacenter: + os_key_name: description: - None required: False type: str - private_network_only: + tcp_monitoring: description: - - only private network configured if is true + - TCP monitoring enabled if set as true required: False type: bool default: False - private_vlan_id: + quote_id: description: - - None + - Quote ID for Quote based provisioning required: False type: int - private_subnet: + ipv6_enabled: description: - - None + - Boolean value true if IPV6 ia enabled or false required: False - type: str - hostname: + type: bool + default: False + domain: description: - - Host name - required: False + - (Required for new resource) Domain name + required: True type: str - file_storage_ids: + ssh_key_ids: description: - - None + - SSH KEY IDS list required: False type: list elements: int - redundant_power_supply: + private_network_only: description: - - None + - only private network configured if is true required: False type: bool - package_key_name: + default: False + public_subnet: description: - None required: False type: str - quote_id: - description: - - Quote ID for Quote based provisioning - required: False - type: int - notes: + fixed_config_preset: description: - - Optional notes info + - Fixed config preset value required: False type: str hourly_billing: @@ -173,72 +157,88 @@ required: False type: bool default: True - process_key_name: + tags: description: - None required: False - type: str - gpu_secondary_key_name: + type: list + elements: str + image_template_id: + description: + - OS image template ID + required: False + type: int + datacenter: description: - None required: False type: str - ipv6_enabled: + software_guard_extensions: description: - - Boolean value true if IPV6 ia enabled or false + - None required: False type: bool default: False - block_storage_ids: + redundant_network: description: - None required: False - type: list - elements: int - fixed_config_preset: + type: bool + default: False + extended_hardware_testing: description: - - Fixed config preset value + - None required: False - type: str - image_template_id: + type: bool + default: False + hostname: description: - - OS image template ID + - Host name required: False - type: int - disk_key_names: + type: str + file_storage_ids: description: - None required: False type: list - elements: str - public_vlan_id: + elements: int + memory: description: - None required: False type: int - tags: + private_subnet: description: - None required: False - type: list - elements: str - redundant_network: + type: str + block_storage_ids: description: - None required: False - type: bool - default: False - restricted_network: + type: list + elements: int + process_key_name: description: - None required: False - type: bool - default: False - public_bandwidth: + type: str + public_vlan_id: description: - None required: False type: int + os_reference_code: + description: + - OS refernece code value + required: False + type: str + unbonded_network: + description: + - None + required: False + type: bool + default: False 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', + 'private_vlan_id', + 'post_install_script_uri', + 'network_speed', + 'gpu_key_name', + 'restricted_network', + 'storage_groups', 'ipv6_static_enabled', + 'notes', + 'package_key_name', + 'gpu_secondary_key_name', + 'disk_key_names', + 'secondary_ip_count', 'user_metadata', - 'software_guard_extensions', - 'memory', - 'public_subnet', 'os_key_name', - 'gpu_key_name', - 'storage_groups', - 'ssh_key_ids', - 'post_install_script_uri', - 'network_speed', 'tcp_monitoring', + 'quote_id', + 'ipv6_enabled', 'domain', - 'unbonded_network', - 'extended_hardware_testing', - 'secondary_ip_count', - 'os_reference_code', - 'datacenter', + 'ssh_key_ids', 'private_network_only', - 'private_vlan_id', - 'private_subnet', + 'public_subnet', + 'fixed_config_preset', + 'hourly_billing', + 'tags', + 'image_template_id', + 'datacenter', + 'software_guard_extensions', + 'redundant_network', + 'extended_hardware_testing', 'hostname', 'file_storage_ids', - 'redundant_power_supply', - 'package_key_name', - 'quote_id', - 'notes', - 'hourly_billing', - 'process_key_name', - 'gpu_secondary_key_name', - 'ipv6_enabled', + 'memory', + 'private_subnet', 'block_storage_ids', - 'fixed_config_preset', - 'image_template_id', - 'disk_key_names', + 'process_key_name', 'public_vlan_id', - 'tags', - 'redundant_network', - 'restricted_network', - 'public_bandwidth', + 'os_reference_code', + 'unbonded_network', ] # Params for Data source @@ -337,147 +337,147 @@ ] TL_ALL_PARAMETERS_DS = [ - 'global_identifier', + 'most_recent', 'domain', 'hostname', - 'most_recent', + 'global_identifier', ] TL_CONFLICTS_MAP = { - 'os_reference_code': ['image_template_id'], 'image_template_id': ['os_reference_code'], + 'os_reference_code': ['image_template_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( - ipv6_static_enabled=dict( + redundant_power_supply=dict( required=False, type='bool'), - user_metadata=dict( - required=False, - type='str'), - software_guard_extensions=dict( + public_bandwidth=dict( required=False, - type='bool'), - memory=dict( + type='int'), + private_vlan_id=dict( required=False, type='int'), - public_subnet=dict( + post_install_script_uri=dict( required=False, type='str'), - os_key_name=dict( + network_speed=dict( required=False, - type='str'), + type='int'), gpu_key_name=dict( required=False, type='str'), + restricted_network=dict( + required=False, + type='bool'), storage_groups=dict( required=False, elements='', type='list'), - ssh_key_ids=dict( + ipv6_static_enabled=dict( required=False, - elements='', - type='list'), - post_install_script_uri=dict( + type='bool'), + notes=dict( required=False, type='str'), - network_speed=dict( - required=False, - type='int'), - tcp_monitoring=dict( - required=False, - type='bool'), - domain=dict( + package_key_name=dict( required=False, type='str'), - unbonded_network=dict( + gpu_secondary_key_name=dict( required=False, - type='bool'), - extended_hardware_testing=dict( + type='str'), + disk_key_names=dict( required=False, - type='bool'), + elements='', + type='list'), secondary_ip_count=dict( required=False, type='int'), - os_reference_code=dict( + user_metadata=dict( required=False, type='str'), - datacenter=dict( + os_key_name=dict( required=False, type='str'), - private_network_only=dict( + tcp_monitoring=dict( required=False, type='bool'), - private_vlan_id=dict( + quote_id=dict( required=False, type='int'), - private_subnet=dict( + ipv6_enabled=dict( required=False, - type='str'), - hostname=dict( + type='bool'), + domain=dict( required=False, type='str'), - file_storage_ids=dict( + ssh_key_ids=dict( required=False, elements='', type='list'), - redundant_power_supply=dict( + private_network_only=dict( required=False, type='bool'), - package_key_name=dict( + public_subnet=dict( required=False, type='str'), - quote_id=dict( - required=False, - type='int'), - notes=dict( + fixed_config_preset=dict( required=False, type='str'), hourly_billing=dict( required=False, type='bool'), - process_key_name=dict( + tags=dict( required=False, - type='str'), - gpu_secondary_key_name=dict( + elements='', + type='list'), + image_template_id=dict( + required=False, + type='int'), + datacenter=dict( required=False, type='str'), - ipv6_enabled=dict( + software_guard_extensions=dict( required=False, type='bool'), - block_storage_ids=dict( + redundant_network=dict( required=False, - elements='', - type='list'), - fixed_config_preset=dict( + type='bool'), + extended_hardware_testing=dict( required=False, - type='str'), - image_template_id=dict( + type='bool'), + hostname=dict( required=False, - type='int'), - disk_key_names=dict( + type='str'), + file_storage_ids=dict( required=False, elements='', type='list'), - public_vlan_id=dict( + memory=dict( required=False, type='int'), - tags=dict( + private_subnet=dict( + required=False, + type='str'), + block_storage_ids=dict( required=False, elements='', type='list'), - redundant_network=dict( - required=False, - type='bool'), - restricted_network=dict( + process_key_name=dict( required=False, - type='bool'), - public_bandwidth=dict( + type='str'), + public_vlan_id=dict( required=False, type='int'), + os_reference_code=dict( + required=False, + type='str'), + unbonded_network=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5633dcb21..54b3614ed 100644 --- a/plugins/modules/ibm_compute_bare_metal_info.py +++ b/plugins/modules/ibm_compute_bare_metal_info.py @@ -17,15 +17,16 @@ description: - Retrieve an IBM Cloud 'ibm_compute_bare_metal' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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: str + type: bool + default: False domain: description: - The domain of the bare metal server @@ -36,12 +37,11 @@ - The hostname of the bare metal server required: False type: str - most_recent: + global_identifier: description: - - If true and multiple entries are found, the most recently created bare metal is used. If false, an error is returned + - The unique global identifier of the bare metal server required: False - type: bool - default: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -79,36 +79,36 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'global_identifier', + 'most_recent', 'domain', 'hostname', - 'most_recent', + 'global_identifier', ] TL_CONFLICTS_MAP = { - 'global_identifier': ['hostname', 'domain', 'most_recent'], + 'most_recent': ['global_identifier'], 'domain': ['global_identifier'], 'hostname': ['global_identifier'], - 'most_recent': ['global_identifier'], + 'global_identifier': ['hostname', 'domain', 'most_recent'], } # 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( - global_identifier=dict( + most_recent=dict( required=False, - type='str'), + type='bool'), domain=dict( required=False, type='str'), hostname=dict( required=False, type='str'), - most_recent=dict( + global_identifier=dict( required=False, - type='bool'), + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -143,7 +143,7 @@ def run_module(): resource_type='ibm_compute_bare_metal', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 102f0c72d..69b419da9 100644 --- a/plugins/modules/ibm_compute_dedicated_host.py +++ b/plugins/modules/ibm_compute_dedicated_host.py @@ -18,20 +18,31 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - hostname: + router_hostname: description: - - (Required for new resource) The host name of dedicatated host. + - (Required for new resource) The hostname of the primary router that the dedicated host is associated with. required: True type: str + wait_time_minutes: + description: + - None + required: False + type: int + default: 90 datacenter: description: - (Required for new resource) The data center in which the dedicatated host is to be provisioned. required: True type: str + domain: + description: + - (Required for new resource) The domain of dedicatated host. + required: True + type: str flavor: description: - The flavor of the dedicatated host. @@ -44,28 +55,17 @@ required: False type: bool default: True - domain: - description: - - (Required for new resource) The domain of dedicatated host. - required: True - type: str - router_hostname: - description: - - (Required for new resource) The hostname of the primary router that the dedicated host is associated with. - required: True - type: str - wait_time_minutes: - description: - - None - required: False - type: int - default: 90 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 = [ - ('hostname', 'str'), + ('router_hostname', 'str'), ('datacenter', 'str'), ('domain', 'str'), - ('router_hostname', 'str'), + ('hostname', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'hostname', + 'router_hostname', + 'wait_time_minutes', 'datacenter', + 'domain', 'flavor', 'hourly_billing', - 'domain', - 'router_hostname', - 'wait_time_minutes', 'tags', + 'hostname', ] # 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( - hostname=dict( + router_hostname=dict( required=False, type='str'), - datacenter=dict( + wait_time_minutes=dict( required=False, - type='str'), - flavor=dict( + type='int'), + datacenter=dict( required=False, type='str'), - hourly_billing=dict( - required=False, - type='bool'), domain=dict( required=False, type='str'), - router_hostname=dict( + flavor=dict( required=False, type='str'), - wait_time_minutes=dict( + hourly_billing=dict( required=False, - type='int'), + type='bool'), tags=dict( required=False, elements='', type='list'), + hostname=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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 97494d52b..78a2c1cd9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a960cbb30..055d1fc8e 100644 --- a/plugins/modules/ibm_compute_monitor.py +++ b/plugins/modules/ibm_compute_monitor.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_monitor' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_compute_monitor', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 c67de0c96..26a32cccd 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 e99b0fb3b..5e0da4311 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3836a6646..6b37565d2 100644 --- a/plugins/modules/ibm_compute_provisioning_hook.py +++ b/plugins/modules/ibm_compute_provisioning_hook.py @@ -18,10 +18,16 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + tags: + description: + - Tags associated with resource + required: False + type: list + elements: str name: description: - (Required for new resource) Provision hook name @@ -32,12 +38,6 @@ - (Required for new resource) URI of the hook required: True type: str - tags: - description: - - Tags associated with resource - 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', 'name', 'uri', - 'tags', ] # Params for Data source @@ -109,16 +109,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'), name=dict( required=False, type='str'), uri=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), 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.41.1', + ibm_provider_version='1.42.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 3cc5b5c34..e7c002ba1 100644 --- a/plugins/modules/ibm_compute_reserved_capacity.py +++ b/plugins/modules/ibm_compute_reserved_capacity.py @@ -18,10 +18,25 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_reserved_capacity' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + pod: + description: + - (Required for new resource) Pod name + required: True + type: str + name: + description: + - (Required for new resource) Name + required: True + type: str + instances: + description: + - (Required for new resource) no of the instances + required: True + type: int flavor: description: - (Required for new resource) flavor of the reserved capacity @@ -43,21 +58,6 @@ - (Required for new resource) Dataceneter name required: True type: str - pod: - description: - - (Required for new resource) Pod name - required: True - type: str - name: - description: - - (Required for new resource) Name - required: True - type: str - instances: - description: - - (Required for new resource) no of the instances - required: True - 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 = [ - ('flavor', 'str'), - ('datacenter', 'str'), ('pod', 'str'), ('name', 'str'), ('instances', 'int'), + ('flavor', 'str'), + ('datacenter', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'pod', + 'name', + 'instances', 'flavor', 'tags', 'force_create', 'datacenter', - 'pod', - 'name', - 'instances', ] # Params for Data source @@ -139,6 +139,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( + pod=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), + instances=dict( + required=False, + type='int'), flavor=dict( required=False, type='str'), @@ -152,15 +161,6 @@ datacenter=dict( required=False, type='str'), - pod=dict( - required=False, - type='str'), - name=dict( - required=False, - type='str'), - instances=dict( - required=False, - type='int'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 cfa8b91f4..a8c4801d1 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 803bc40b4..b356cf724 100644 --- a/plugins/modules/ibm_compute_ssh_key.py +++ b/plugins/modules/ibm_compute_ssh_key.py @@ -18,20 +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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - label: - description: - - (Required for new resource) SSH Key label - required: True - type: str - public_key: - description: - - (Required for new resource) Plublic Key info - required: True - type: str notes: description: - Additional notes @@ -43,6 +33,16 @@ required: False type: list elements: str + label: + description: + - (Required for new resource) SSH Key label + required: True + type: str + public_key: + description: + - (Required for new resource) Plublic Key info + required: True + 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 = [ - 'label', - 'public_key', 'notes', 'tags', + 'label', + 'public_key', ] # Params for Data source @@ -107,8 +107,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'label', 'most_recent', + 'label', ] TL_CONFLICTS_MAP = { @@ -118,12 +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( - label=dict( - required=False, - type='str'), - public_key=dict( - required=False, - type='str'), notes=dict( required=False, type='str'), @@ -131,6 +125,12 @@ required=False, elements='', type='list'), + label=dict( + required=False, + type='str'), + public_key=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 cecede721..2d09fab58 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 = [ - 'label', 'most_recent', + 'label', ] @@ -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( - label=dict( - required=True, - type='str'), most_recent=dict( required=False, type='bool'), + label=dict( + required=True, + type='str'), 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.41.1', + ibm_provider_version='1.42.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 cd6d7bb10..fcd8c1c21 100644 --- a/plugins/modules/ibm_compute_ssl_certificate.py +++ b/plugins/modules/ibm_compute_ssl_certificate.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_compute_ssl_certificate', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 79e60ff0c..0bc435766 100644 --- a/plugins/modules/ibm_compute_user.py +++ b/plugins/modules/ibm_compute_user.py @@ -18,10 +18,35 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_user' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + first_name: + description: + - (Required for new resource) First name of the user + required: True + type: str + company_name: + description: + - (Required for new resource) comapany name + required: True + type: str + address2: + description: + - Address info of the user + required: False + type: str + country: + description: + - (Required for new resource) Country name + required: True + type: str + api_key: + description: + - API key for the user + required: False + type: str tags: description: - Tags set for the resources @@ -38,61 +63,35 @@ - (Required for new resource) Last name of the user required: True type: str - company_name: - description: - - (Required for new resource) comapany name - required: True - type: str - city: + state_: description: - - (Required for new resource) City name + - (Required for new resource) Satate name required: True type: str - password: - description: - - password for the user - required: False - type: str address1: description: - (Required for new resource) Address info of the user required: True type: str - address2: + password: description: - - Address info of the user + - password for the user required: False type: str - permissions: - description: - - set of persmissions assigned for the user - required: False - type: list - elements: 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 email: description: - (Required for new resource) email address of the user required: True type: str - state_: - description: - - (Required for new resource) Satate name - required: True - type: str - country: + city: description: - - (Required for new resource) Country name + - (Required for new resource) City name required: True type: str timezone: @@ -106,11 +105,12 @@ required: False type: str default: ACTIVE - api_key: + permissions: description: - - API key for the user + - set of persmissions assigned for the user required: False - type: str + 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 = [ - ('last_name', 'str'), + ('first_name', 'str'), ('company_name', 'str'), - ('city', 'str'), + ('country', 'str'), + ('last_name', 'str'), + ('state_', 'str'), ('address1', 'str'), - ('first_name', 'str'), ('email', 'str'), - ('state_', 'str'), - ('country', 'str'), + ('city', 'str'), ('timezone', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'first_name', + 'company_name', + 'address2', + 'country', + 'api_key', 'tags', 'username', 'last_name', - 'company_name', - 'city', - 'password', + 'state_', 'address1', - 'address2', - 'permissions', + 'password', 'has_api_key', - 'first_name', 'email', - 'state_', - 'country', + 'city', 'timezone', 'user_status', - 'api_key', + 'permissions', ] # Params for Data source @@ -203,6 +203,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( + first_name=dict( + required=False, + type='str'), + company_name=dict( + required=False, + type='str'), + address2=dict( + required=False, + type='str'), + country=dict( + required=False, + type='str'), + api_key=dict( + required=False, + type='str'), tags=dict( required=False, elements='', @@ -213,38 +228,22 @@ last_name=dict( required=False, type='str'), - company_name=dict( - required=False, - type='str'), - city=dict( - required=False, - type='str'), - password=dict( + state_=dict( required=False, type='str'), address1=dict( required=False, type='str'), - address2=dict( + password=dict( required=False, type='str'), - permissions=dict( - required=False, - elements='', - type='list'), has_api_key=dict( required=False, type='bool'), - first_name=dict( - required=False, - type='str'), email=dict( required=False, type='str'), - state_=dict( - required=False, - type='str'), - country=dict( + city=dict( required=False, type='str'), timezone=dict( @@ -253,9 +252,10 @@ user_status=dict( required=False, type='str'), - api_key=dict( + permissions=dict( required=False, - type='str'), + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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 cf481661e..c59dd5783 100644 --- a/plugins/modules/ibm_compute_vm_instance.py +++ b/plugins/modules/ibm_compute_vm_instance.py @@ -18,135 +18,146 @@ - Create, update or destroy an IBM Cloud 'ibm_compute_vm_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - reserved_capacity_id: + post_install_script_uri: description: - - The reserved group id + - None required: False - type: int - ssh_key_ids: + type: str + os_reference_code: description: - None required: False + type: str + datacenter_choice: + description: + - The user provided datacenter options + required: False type: list - elements: int - hostname: + elements: dict + reserved_instance_primary_disk: description: - - None + - The primary disk of reserved instance required: False - type: str - placement_group_name: + type: int + reserved_capacity_id: description: - - The placement group name + - The reserved group id required: False - type: str - disks: + type: int + memory: description: - None required: False - type: list - elements: int - bulk_vms: + type: int + dedicated_acct_host_only: description: - None required: False - type: list - elements: dict - private_network_only: + type: bool + ipv6_static_enabled: description: - None required: False type: bool default: False - user_metadata: + public_bandwidth_unlimited: description: - None required: False - type: str - notes: + type: bool + default: False + domain: description: - None required: False type: str - ipv6_enabled: + placement_group_id: description: - - None + - The placement group id required: False - type: bool - default: False - memory: + type: int + private_vlan_id: description: - None required: False type: int - public_subnet: + placement_group_name: description: - - None + - The placement group name required: False type: str - public_bandwidth_limited: + hourly_billing: description: - None required: False - type: int + type: bool + default: True datacenter: description: - None required: False type: str - evault: + file_storage_ids: description: - None required: False - type: int - secondary_ip_count: + type: list + elements: int + bulk_vms: description: - None required: False - type: int - quote_id: + type: list + elements: dict + private_network_only: description: - - Quote ID for Quote based provisioning + - None required: False - type: int - placement_group_id: + type: bool + default: False + public_subnet: description: - - The placement group id + - None required: False - type: int - public_security_group_ids: + type: str + block_storage_ids: description: - None required: False type: list elements: int - private_subnet: + cores: description: - None required: False - type: str - private_security_group_ids: + type: int + dedicated_host_id: + description: + - None + required: False + type: int + disks: description: - None required: False type: list elements: int - ipv6_static_enabled: + network_speed: description: - None required: False - type: bool - default: False - block_storage_ids: + type: int + default: 100 + reserved_capacity_name: description: - - None + - The reserved group id required: False - type: list - elements: int - post_install_script_uri: + type: str + notes: description: - None required: False @@ -156,108 +167,97 @@ - None required: False type: bool - public_vlan_id: + tags: description: - None required: False - type: int - file_storage_ids: + type: list + elements: str + dedicated_host_name: description: - None required: False - type: list - elements: int - image_id: + type: str + local_disk: description: - None required: False - type: int - dedicated_host_id: + type: bool + default: True + quote_id: description: - - None + - Quote ID for Quote based provisioning required: False type: int - dedicated_host_name: + public_vlan_id: description: - None required: False - type: str - flavor_key_name: - description: - - Flavor key name used to provision vm. - required: False - type: str - reserved_capacity_name: + type: int + private_subnet: description: - - The reserved group id + - None required: False type: str - dedicated_acct_host_only: + evault: description: - None required: False - type: bool - domain: + type: int + hostname: description: - None required: False type: str - network_speed: + secondary_ip_count: description: - None required: False type: int - default: 100 - tags: + ssh_key_ids: description: - None required: False type: list - elements: str - private_vlan_id: + elements: int + user_metadata: description: - None required: False - type: int - cores: + type: str + public_security_group_ids: description: - None required: False - type: int - public_bandwidth_unlimited: + type: list + elements: int + ipv6_enabled: description: - None required: False type: bool default: False - hourly_billing: - description: - - None - required: False - type: bool - default: True - local_disk: + public_bandwidth_limited: description: - None required: False - type: bool - default: True - os_reference_code: + type: int + flavor_key_name: description: - - None + - Flavor key name used to provision vm. required: False type: str - reserved_instance_primary_disk: + image_id: description: - - The primary disk of reserved instance + - None required: False type: int - datacenter_choice: + private_security_group_ids: description: - - The user provided datacenter options + - None required: False type: list - elements: dict + elements: 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 = [ + 'post_install_script_uri', + 'os_reference_code', + 'datacenter_choice', + 'reserved_instance_primary_disk', 'reserved_capacity_id', - 'ssh_key_ids', - 'hostname', + 'memory', + 'dedicated_acct_host_only', + 'ipv6_static_enabled', + 'public_bandwidth_unlimited', + 'domain', + 'placement_group_id', + 'private_vlan_id', 'placement_group_name', - 'disks', + 'hourly_billing', + 'datacenter', + 'file_storage_ids', 'bulk_vms', 'private_network_only', - 'user_metadata', - 'notes', - 'ipv6_enabled', - 'memory', 'public_subnet', - 'public_bandwidth_limited', - 'datacenter', - 'evault', - 'secondary_ip_count', - 'quote_id', - 'placement_group_id', - 'public_security_group_ids', - 'private_subnet', - 'private_security_group_ids', - 'ipv6_static_enabled', 'block_storage_ids', - 'post_install_script_uri', - 'transient', - 'public_vlan_id', - 'file_storage_ids', - 'image_id', + 'cores', 'dedicated_host_id', - 'dedicated_host_name', - 'flavor_key_name', - 'reserved_capacity_name', - 'dedicated_acct_host_only', - 'domain', + 'disks', 'network_speed', + 'reserved_capacity_name', + 'notes', + 'transient', 'tags', - 'private_vlan_id', - 'cores', - 'public_bandwidth_unlimited', - 'hourly_billing', + 'dedicated_host_name', 'local_disk', - 'os_reference_code', - 'reserved_instance_primary_disk', - 'datacenter_choice', + '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', + 'image_id', + 'private_security_group_ids', ] # Params for Data source @@ -362,177 +362,177 @@ TL_ALL_PARAMETERS_DS = [ 'domain', - 'hostname', 'most_recent', + 'hostname', ] TL_CONFLICTS_MAP = { + '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'], - 'hostname': ['bulk_vms'], - 'placement_group_name': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_id', 'reserved_capacity_id', 'reserved_capacity_name'], - 'bulk_vms': ['hostname', 'domain'], 'memory': ['flavor_key_name'], - 'public_bandwidth_limited': ['private_network_only', 'public_bandwidth_unlimited'], - 'datacenter': ['datacenter_choice'], - 'placement_group_id': ['datacenter_choice', 'dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'placement_group_name', 'reserved_capacity_id', 'reserved_capacity_name'], - 'transient': ['dedicated_acct_host_only', 'dedicated_host_name', 'dedicated_host_id', 'cores', 'memory', 'public_bandwidth_limited', 'public_bandwidth_unlimited'], - 'public_vlan_id': ['datacenter_choice'], - 'image_id': ['os_reference_code'], - 'dedicated_host_id': ['dedicated_acct_host_only', 'dedicated_host_name', 'placement_group_name', 'placement_group_id'], - 'dedicated_host_name': ['dedicated_acct_host_only', 'dedicated_host_id', 'placement_group_name', 'placement_group_id'], - 'flavor_key_name': ['cores', 'memory'], - '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'], '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'], + 'datacenter': ['datacenter_choice'], + 'bulk_vms': ['hostname', 'domain'], 'cores': ['flavor_key_name'], - 'public_bandwidth_unlimited': ['private_network_only', 'public_bandwidth_limited'], - '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'], + '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'], + 'hostname': ['bulk_vms'], + 'public_bandwidth_limited': ['private_network_only', 'public_bandwidth_unlimited'], + 'flavor_key_name': ['cores', 'memory'], + 'image_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( - reserved_capacity_id=dict( - required=False, - type='int'), - ssh_key_ids=dict( - required=False, - elements='', - type='list'), - hostname=dict( + post_install_script_uri=dict( required=False, type='str'), - placement_group_name=dict( + os_reference_code=dict( required=False, type='str'), - disks=dict( + datacenter_choice=dict( required=False, elements='', type='list'), - bulk_vms=dict( + reserved_instance_primary_disk=dict( required=False, - elements='', - type='list'), - private_network_only=dict( + type='int'), + reserved_capacity_id=dict( required=False, - type='bool'), - user_metadata=dict( + type='int'), + memory=dict( required=False, - type='str'), - notes=dict( + type='int'), + dedicated_acct_host_only=dict( required=False, - type='str'), - ipv6_enabled=dict( + type='bool'), + ipv6_static_enabled=dict( required=False, type='bool'), - memory=dict( + public_bandwidth_unlimited=dict( required=False, - type='int'), - public_subnet=dict( + type='bool'), + domain=dict( required=False, type='str'), - public_bandwidth_limited=dict( + placement_group_id=dict( required=False, type='int'), - datacenter=dict( - required=False, - type='str'), - evault=dict( + private_vlan_id=dict( required=False, type='int'), - secondary_ip_count=dict( + placement_group_name=dict( required=False, - type='int'), - quote_id=dict( + type='str'), + hourly_billing=dict( required=False, - type='int'), - placement_group_id=dict( + type='bool'), + datacenter=dict( required=False, - type='int'), - public_security_group_ids=dict( + type='str'), + file_storage_ids=dict( required=False, elements='', type='list'), - private_subnet=dict( - required=False, - type='str'), - private_security_group_ids=dict( + bulk_vms=dict( required=False, elements='', type='list'), - ipv6_static_enabled=dict( + private_network_only=dict( required=False, type='bool'), + public_subnet=dict( + required=False, + type='str'), block_storage_ids=dict( required=False, elements='', type='list'), - post_install_script_uri=dict( - required=False, - type='str'), - transient=dict( + cores=dict( required=False, - type='bool'), - public_vlan_id=dict( + type='int'), + dedicated_host_id=dict( required=False, type='int'), - file_storage_ids=dict( + disks=dict( required=False, elements='', type='list'), - image_id=dict( - required=False, - type='int'), - dedicated_host_id=dict( + network_speed=dict( required=False, type='int'), - dedicated_host_name=dict( + reserved_capacity_name=dict( required=False, type='str'), - flavor_key_name=dict( + notes=dict( required=False, type='str'), - reserved_capacity_name=dict( + transient=dict( + required=False, + type='bool'), + tags=dict( + required=False, + elements='', + type='list'), + dedicated_host_name=dict( required=False, type='str'), - dedicated_acct_host_only=dict( + local_disk=dict( required=False, type='bool'), - domain=dict( + quote_id=dict( required=False, - type='str'), - network_speed=dict( + type='int'), + public_vlan_id=dict( required=False, type='int'), - tags=dict( + private_subnet=dict( required=False, - elements='', - type='list'), - private_vlan_id=dict( + type='str'), + evault=dict( required=False, type='int'), - cores=dict( + hostname=dict( + required=False, + type='str'), + secondary_ip_count=dict( required=False, type='int'), - public_bandwidth_unlimited=dict( + ssh_key_ids=dict( required=False, - type='bool'), - hourly_billing=dict( + elements='', + type='list'), + user_metadata=dict( required=False, - type='bool'), - local_disk=dict( + type='str'), + public_security_group_ids=dict( + required=False, + elements='', + type='list'), + ipv6_enabled=dict( required=False, type='bool'), - os_reference_code=dict( + public_bandwidth_limited=dict( + required=False, + type='int'), + flavor_key_name=dict( required=False, type='str'), - reserved_instance_primary_disk=dict( + image_id=dict( required=False, type='int'), - datacenter_choice=dict( + private_security_group_ids=dict( required=False, elements='', type='list'), @@ -601,7 +601,7 @@ def run_module(): resource_type='ibm_compute_vm_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4c8bbb56b..21e753b8e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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', - 'hostname', 'most_recent', + 'hostname', ] @@ -92,12 +92,12 @@ domain=dict( required=True, type='str'), - hostname=dict( - required=True, - type='str'), most_recent=dict( required=False, type='bool'), + hostname=dict( + required=True, + type='str'), 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.41.1', + ibm_provider_version='1.42.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 ba060117c..02da9bfee 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 bab59c009..429deb2a8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 605a5921e..90454b962 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 - 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 - disable_deployment: + alb_id: description: - - Set to true if ALB needs to be disabled + - (Required for new resource) ALB ID + required: True + type: str + enable: + description: + - set to true if ALB needs to be enabled required: False type: bool id: @@ -73,10 +73,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'alb_id', 'user_ip', - 'enable', 'disable_deployment', + 'alb_id', + 'enable', ] # Params for Data source @@ -89,24 +89,24 @@ ] TL_CONFLICTS_MAP = { - 'enable': ['disable_deployment'], 'disable_deployment': ['enable'], + 'enable': ['disable_deployment'], } # 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( - alb_id=dict( - required=False, - type='str'), user_ip=dict( required=False, type='str'), - enable=dict( + disable_deployment=dict( required=False, type='bool'), - disable_deployment=dict( + alb_id=dict( + required=False, + type='str'), + enable=dict( required=False, type='bool'), id=dict( @@ -160,7 +160,7 @@ def run_module(): resource_type='ibm_container_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8be194884..4a57ebf09 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + secret_name: + description: + - (Required for new resource) Secret name + required: True + type: str namespace: description: - Namespace of the secret @@ -43,11 +48,6 @@ - (Required for new resource) Cluster ID required: True type: str - secret_name: - description: - - (Required for new resource) Secret name - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -74,29 +74,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('secret_name', 'str'), ('cert_crn', 'str'), ('cluster_id', 'str'), - ('secret_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'secret_name', 'namespace', 'persistence', 'cert_crn', 'cluster_id', - 'secret_name', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('secret_name', 'str'), ('cluster_id', 'str'), + ('secret_name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'secret_name', 'cluster_id', + 'secret_name', 'namespace', ] @@ -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( + secret_name=dict( + required=False, + type='str'), namespace=dict( required=False, type='str'), @@ -119,9 +122,6 @@ cluster_id=dict( required=False, type='str'), - secret_name=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 bb69d6795..2815681ec 100644 --- a/plugins/modules/ibm_container_alb_cert_info.py +++ b/plugins/modules/ibm_container_alb_cert_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_container_alb_cert' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - secret_name: + cluster_id: description: - - Secret name + - Cluster ID required: True type: str - cluster_id: + secret_name: description: - - Cluster ID + - Secret name required: True type: str namespace: @@ -50,14 +50,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('secret_name', 'str'), ('cluster_id', 'str'), + ('secret_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'secret_name', 'cluster_id', + 'secret_name', 'namespace', ] @@ -69,10 +69,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( - secret_name=dict( + cluster_id=dict( required=True, type='str'), - cluster_id=dict( + secret_name=dict( required=True, type='str'), namespace=dict( @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_container_alb_cert', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 82c5f56dc..87a24b31e 100644 --- a/plugins/modules/ibm_container_alb_create.py +++ b/plugins/modules/ibm_container_alb_create.py @@ -18,18 +18,13 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - nlb_version: - description: - - The version of the network load balancer that you want to use for the ALB. - required: False - type: str - zone: + alb_type: description: - - (Required for new resource) The zone where you want to deploy the ALB. + - (Required for new resource) The type of ALB that you want to create. required: True type: str enable: @@ -38,29 +33,34 @@ required: False type: bool default: True - vlan_id: + ingress_image: description: - - (Required for new resource) The VLAN ID that you want to use for your ALBs. - required: True + - The type of Ingress image that you want to use for your ALB deployment. + required: False type: str - cluster: + nlb_version: description: - - (Required for new resource) The ID of the cluster that the ALB belongs to. - required: True + - The version of the network load balancer that you want to use for the ALB. + required: False type: str - ingress_image: + zone: description: - - The type of Ingress image that you want to use for your ALB deployment. - required: False + - (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 - alb_type: + vlan_id: description: - - (Required for new resource) The type of ALB that you want to create. + - (Required for new resource) The VLAN ID that you want to use for your ALBs. + required: True + type: str + cluster: + description: + - (Required for new resource) The ID of the cluster that the ALB belongs to. 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'), ('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', - 'enable', + 'ip', 'vlan_id', 'cluster', - '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( - nlb_version=dict( - required=False, - type='str'), - zone=dict( + alb_type=dict( required=False, type='str'), enable=dict( required=False, type='bool'), - vlan_id=dict( + ingress_image=dict( required=False, type='str'), - cluster=dict( + nlb_version=dict( required=False, type='str'), - ingress_image=dict( + zone=dict( required=False, type='str'), ip=dict( required=False, type='str'), - alb_type=dict( + vlan_id=dict( + required=False, + type='str'), + cluster=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.41.1', + ibm_provider_version='1.42.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 fac6614a9..810e107c9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 01bb4c73a..5d55fbeec 100644 --- a/plugins/modules/ibm_container_api_key_reset.py +++ b/plugins/modules/ibm_container_api_key_reset.py @@ -18,10 +18,15 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + region: + description: + - (Required for new resource) Region which api key has to be reset + required: True + type: str resource_group_id: description: - ID of Resource Group @@ -33,11 +38,6 @@ required: False type: int default: 1 - region: - description: - - (Required for new resource) Region which api key has to be reset - required: True - type: str 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 = [ + 'region', 'resource_group_id', 'reset_api_key', - 'region', ] # 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( + region=dict( + required=False, + type='str'), resource_group_id=dict( required=False, type='str'), reset_api_key=dict( required=False, type='int'), - region=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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 913b303cb..b315f6e94 100644 --- a/plugins/modules/ibm_container_bind_service.py +++ b/plugins/modules/ibm_container_bind_service.py @@ -18,23 +18,23 @@ - Create, update or destroy an IBM Cloud 'ibm_container_bind_service' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - key: + service_instance_id: description: - - Key info + - Service instance ID required: False type: str - role: + namespace_id: description: - - Role info - required: False + - (Required for new resource) namespace ID + required: True type: str - resource_group_id: + role: description: - - ID of the resource group. + - Role info required: False type: str tags: @@ -43,25 +43,25 @@ required: False type: list elements: str + cluster_name_id: + description: + - (Required for new resource) Cluster name or ID + required: True + type: str service_instance_name: description: - serivice instance name required: False type: str - service_instance_id: + key: description: - - Service instance ID + - Key info required: False type: str - namespace_id: - description: - - (Required for new resource) namespace ID - required: True - type: str - cluster_name_id: + resource_group_id: description: - - (Required for new resource) Cluster name or ID - required: True + - ID of the resource group. + required: False type: str id: description: @@ -95,14 +95,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'key', - 'role', - 'resource_group_id', - 'tags', - 'service_instance_name', 'service_instance_id', 'namespace_id', + 'role', + 'tags', 'cluster_name_id', + 'service_instance_name', + 'key', + 'resource_group_id', ] # Params for Data source @@ -119,37 +119,37 @@ ] TL_CONFLICTS_MAP = { - 'service_instance_name': ['service_instance_id'], 'service_instance_id': ['service_instance_name'], + 'service_instance_name': ['service_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( - key=dict( + service_instance_id=dict( required=False, type='str'), - role=dict( + namespace_id=dict( required=False, type='str'), - resource_group_id=dict( + role=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - service_instance_name=dict( + cluster_name_id=dict( required=False, type='str'), - service_instance_id=dict( + service_instance_name=dict( required=False, type='str'), - namespace_id=dict( + key=dict( required=False, type='str'), - cluster_name_id=dict( + resource_group_id=dict( required=False, type='str'), id=dict( @@ -203,7 +203,7 @@ def run_module(): resource_type='ibm_container_bind_service', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 dbe37e6aa..a83977264 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9d55c6c73..612aabfd6 100644 --- a/plugins/modules/ibm_container_cluster.py +++ b/plugins/modules/ibm_container_cluster.py @@ -18,46 +18,39 @@ - Create, update or destroy an IBM Cloud 'ibm_container_cluster' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - default_pool_size: - description: - - The size of the default worker pool - required: False - type: int - default: 1 - retry_patch_version: + datacenter: 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 - update_all_workers: + - (Required for new resource) The datacenter where this cluster will be deployed + required: True + type: str + disk_encryption: description: - - Updates all the woker nodes if sets to true + - disc encryption done, if set to true. required: False type: bool - default: False - hardware: + default: True + patch_version: description: - - (Required for new resource) Hardware type - required: True + - Kubernetes patch version + required: False type: str - public_vlan_id: + retry_patch_version: description: - - Public VLAN ID + - 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: str - gateway_enabled: + type: int + 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 - taints: + type: str + kms_config: description: - - WorkerPool Taints + - Enables KMS on a given cluster required: False type: list elements: dict @@ -67,48 +60,71 @@ required: False type: bool default: True - datacenter: + no_subnet: description: - - (Required for new resource) The datacenter where this cluster will be deployed - required: True - type: str - wait_till: + - Boolean value set to true when subnet creation is not required. + required: False + type: bool + default: False + image_security_enforcement: description: - - wait_till can be configured for Master Ready, One worker Ready or Ingress Ready + - Set true to enable image security enforcement policies + required: False + type: bool + default: False + service_subnet: + description: + - Custom subnet CIDR to provide private IP addresses for services required: False type: str - default: IngressReady - force_delete_storage: + subnet_id: description: - - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered + - List of subnet IDs + required: False + type: list + elements: str + public_service_endpoint: + description: + - None + required: False + type: bool + gateway_enabled: + description: + - Set true for gateway enabled clusters required: False type: bool default: False + webhook: + description: + - None + required: False + type: list + elements: dict private_service_endpoint: description: - None required: False type: bool - kms_config: + labels: description: - - Enables KMS on a given cluster + - list of labels to the default worker pool required: False - type: list - elements: dict - disk_encryption: + type: dict + elements: str + update_all_workers: description: - - disc encryption done, if set to true. + - Updates all the woker nodes if sets to true required: False type: bool - default: True + default: False kube_version: description: - Kubernetes version info required: False type: str - machine_type: + public_vlan_id: description: - - Machine type + - Public VLAN ID required: False type: str entitlement: @@ -116,83 +132,67 @@ - Entitlement option reduces additional OCP Licence cost in Openshift Clusters required: False type: str - subnet_id: - description: - - List of subnet IDs - required: False - type: list - elements: str - webhook: + resource_group_id: description: - - None + - ID of the resource group. required: False - type: list - elements: dict + type: str tags: description: - Tags for the resource required: False type: list elements: str - pod_subnet: + default_pool_size: description: - - Custom subnet CIDR to provide private IP addresses for pods + - The size of the default worker pool required: False + type: int + default: 1 + hardware: + description: + - (Required for new resource) Hardware type + required: True type: str - service_subnet: + private_vlan_id: description: - - Custom subnet CIDR to provide private IP addresses for services + - Private VLAN ID required: False type: str - no_subnet: + force_delete_storage: description: - - Boolean value set to true when subnet creation is not required. + - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered required: False type: bool default: False - public_service_endpoint: - description: - - None - required: False - type: bool - image_security_enforcement: + name: description: - - Set true to enable image security enforcement policies - required: False - type: bool - default: False - labels: + - (Required for new resource) The cluster name + required: True + type: str + taints: description: - - list of labels to the default worker pool + - WorkerPool Taints required: False - type: dict - elements: str + type: list + elements: dict workers_info: description: - The IDs of the worker node required: False type: list elements: dict - resource_group_id: - description: - - ID of the resource group. - required: False - type: str - name: - description: - - (Required for new resource) The cluster name - required: True - type: str - patch_version: + machine_type: description: - - Kubernetes patch version + - Machine type required: False type: str - private_vlan_id: + wait_till: description: - - Private VLAN ID + - wait_till can be configured for Master Ready, One worker Ready or Ingress Ready required: False 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 = [ - ('hardware', 'str'), ('datacenter', 'str'), + ('hardware', 'str'), ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'default_pool_size', - 'retry_patch_version', - 'update_all_workers', - 'hardware', - 'public_vlan_id', - 'gateway_enabled', - 'taints', - 'wait_for_worker_update', 'datacenter', - 'wait_till', - 'force_delete_storage', - 'private_service_endpoint', - 'kms_config', 'disk_encryption', - 'kube_version', - 'machine_type', - 'entitlement', - 'subnet_id', - 'webhook', - 'tags', + 'patch_version', + 'retry_patch_version', 'pod_subnet', - 'service_subnet', + 'kms_config', + 'wait_for_worker_update', 'no_subnet', - 'public_service_endpoint', 'image_security_enforcement', + 'service_subnet', + 'subnet_id', + 'public_service_endpoint', + 'gateway_enabled', + 'webhook', + 'private_service_endpoint', 'labels', - 'workers_info', + 'update_all_workers', + 'kube_version', + 'public_vlan_id', + 'entitlement', 'resource_group_id', - 'name', - 'patch_version', + 'tags', + 'default_pool_size', + 'hardware', 'private_vlan_id', + 'force_delete_storage', + 'name', + 'taints', + 'workers_info', + 'machine_type', + 'wait_till', ] # Params for Data source @@ -264,15 +264,15 @@ ] TL_ALL_PARAMETERS_DS = [ + 'org_guid', 'account_guid', - 'resource_group_id', - 'region', 'space_guid', - 'list_bounded_services', - 'name', + 'resource_group_id', 'alb_type', - 'org_guid', 'cluster_name_id', + 'name', + 'region', + 'list_bounded_services', ] 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( - default_pool_size=dict( - required=False, - type='int'), - retry_patch_version=dict( + datacenter=dict( required=False, - type='int'), - update_all_workers=dict( + type='str'), + disk_encryption=dict( required=False, type='bool'), - hardware=dict( + patch_version=dict( required=False, type='str'), - public_vlan_id=dict( + retry_patch_version=dict( required=False, - type='str'), - gateway_enabled=dict( + type='int'), + pod_subnet=dict( required=False, - type='bool'), - taints=dict( + type='str'), + kms_config=dict( required=False, elements='', type='list'), wait_for_worker_update=dict( required=False, type='bool'), - datacenter=dict( + no_subnet=dict( required=False, - type='str'), - wait_till=dict( + type='bool'), + image_security_enforcement=dict( + required=False, + type='bool'), + service_subnet=dict( required=False, type='str'), - force_delete_storage=dict( + subnet_id=dict( + required=False, + elements='', + type='list'), + public_service_endpoint=dict( required=False, type='bool'), - private_service_endpoint=dict( + gateway_enabled=dict( required=False, type='bool'), - kms_config=dict( + webhook=dict( required=False, elements='', type='list'), - disk_encryption=dict( + private_service_endpoint=dict( + required=False, + type='bool'), + labels=dict( + required=False, + elements='', + type='dict'), + update_all_workers=dict( required=False, type='bool'), kube_version=dict( required=False, type='str'), - machine_type=dict( + public_vlan_id=dict( required=False, type='str'), entitlement=dict( required=False, type='str'), - subnet_id=dict( - required=False, - elements='', - type='list'), - webhook=dict( + resource_group_id=dict( required=False, - elements='', - type='list'), + type='str'), tags=dict( required=False, elements='', type='list'), - pod_subnet=dict( + default_pool_size=dict( required=False, - type='str'), - service_subnet=dict( + type='int'), + hardware=dict( required=False, type='str'), - no_subnet=dict( + private_vlan_id=dict( required=False, - type='bool'), - public_service_endpoint=dict( + type='str'), + force_delete_storage=dict( required=False, type='bool'), - image_security_enforcement=dict( + name=dict( required=False, - type='bool'), - labels=dict( + type='str'), + taints=dict( required=False, elements='', - type='dict'), + type='list'), workers_info=dict( required=False, elements='', type='list'), - resource_group_id=dict( - required=False, - type='str'), - name=dict( - required=False, - type='str'), - patch_version=dict( + machine_type=dict( required=False, type='str'), - private_vlan_id=dict( + wait_till=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 c7a22cd61..05136ef40 100644 --- a/plugins/modules/ibm_container_cluster_config_info.py +++ b/plugins/modules/ibm_container_cluster_config_info.py @@ -17,43 +17,43 @@ description: - Retrieve an IBM Cloud 'ibm_container_cluster_config' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - network: + resource_group_id: description: - - If set to true will download the Calico network config with the Admin config + - ID of the resource group. required: False - type: bool - default: False - cluster_name_id: - description: - - The name/id of the cluster - required: True type: str - admin: + config_dir: description: - - If set to true will download the config for admin + - The directory where the cluster config to be downloaded. Default is home directory required: False - type: bool - default: False + type: str download: description: - If set to false will not download the config, otherwise they are downloaded each time but onto the same path for a given cluster name/id required: False type: bool default: True - resource_group_id: + admin: description: - - ID of the resource group. + - 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 - config_dir: + network: description: - - The directory where the cluster config to be downloaded. Default is home directory + - If set to true will download the Calico network config with the Admin config required: False - type: str + type: bool + default: False ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -72,12 +72,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'network', - 'cluster_name_id', - 'admin', - 'download', 'resource_group_id', 'config_dir', + 'download', + 'admin', + 'cluster_name_id', + 'network', ] @@ -88,24 +88,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( - network=dict( + resource_group_id=dict( required=False, - type='bool'), - cluster_name_id=dict( - required=True, type='str'), - admin=dict( + config_dir=dict( required=False, - type='bool'), + type='str'), download=dict( required=False, type='bool'), - resource_group_id=dict( + admin=dict( required=False, + type='bool'), + cluster_name_id=dict( + required=True, type='str'), - config_dir=dict( + network=dict( required=False, - type='str'), + type='bool'), ibmcloud_api_key=dict( type='str', no_log=True, @@ -126,7 +126,7 @@ def run_module(): resource_type='ibm_container_cluster_config', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4d1faf532..35559b504 100644 --- a/plugins/modules/ibm_container_cluster_feature.py +++ b/plugins/modules/ibm_container_cluster_feature.py @@ -18,25 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cluster: - description: - - (Required for new resource) Cluster name of ID - required: True - type: str - public_service_endpoint: - description: - - None - required: False - type: bool - 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 @@ -54,6 +39,21 @@ - ID of the resource group. required: False type: str + cluster: + description: + - (Required for new resource) Cluster name of ID + required: True + type: str + public_service_endpoint: + description: + - 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 = [ - 'cluster', - 'public_service_endpoint', - 'private_service_endpoint', 'refresh_api_servers', 'reload_workers', 'resource_group_id', + 'cluster', + 'public_service_endpoint', + 'private_service_endpoint', ] # Params for Data source @@ -107,15 +107,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( - cluster=dict( - required=False, - type='str'), - public_service_endpoint=dict( - required=False, - type='bool'), - private_service_endpoint=dict( - required=False, - type='bool'), refresh_api_servers=dict( required=False, type='bool'), @@ -125,6 +116,15 @@ resource_group_id=dict( required=False, type='str'), + cluster=dict( + required=False, + type='str'), + 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.41.1', + ibm_provider_version='1.42.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 6a85a9204..3b8eee74b 100644 --- a/plugins/modules/ibm_container_cluster_info.py +++ b/plugins/modules/ibm_container_cluster_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_cluster' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -26,23 +26,23 @@ - ID of the resource group. required: False type: str - list_bounded_services: + alb_type: description: - - If set to false bounded services won't be listed. + - None required: False - type: bool - default: True + type: str + default: all name: description: - Name or id of the cluster required: False type: str - alb_type: + list_bounded_services: description: - - None + - If set to false bounded services won't be listed. required: False - type: str - default: all + type: bool + default: True ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -61,9 +61,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'resource_group_id', - 'list_bounded_services', - 'name', 'alb_type', + 'name', + 'list_bounded_services', ] @@ -77,15 +77,15 @@ resource_group_id=dict( required=False, type='str'), - list_bounded_services=dict( + alb_type=dict( required=False, - type='bool'), + type='str'), name=dict( required=False, type='str'), - alb_type=dict( + list_bounded_services=dict( required=False, - type='str'), + type='bool'), 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.41.1', + ibm_provider_version='1.42.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 32ad86c09..d10f24208 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 cce1e021c..683a00b82 100644 --- a/plugins/modules/ibm_container_cluster_worker_info.py +++ b/plugins/modules/ibm_container_cluster_worker_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_container_cluster_worker' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - worker_id: - description: - - ID of the worker - required: True - type: str resource_group_id: description: - ID of the resource group. required: False type: str + worker_id: + description: + - ID of the worker + required: True + type: str ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -49,8 +49,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'worker_id', 'resource_group_id', + 'worker_id', ] @@ -61,12 +61,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( - worker_id=dict( - required=True, - type='str'), resource_group_id=dict( required=False, type='str'), + worker_id=dict( + required=True, + type='str'), ibmcloud_api_key=dict( type='str', no_log=True, @@ -87,7 +87,7 @@ def run_module(): resource_type='ibm_container_cluster_worker', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_container_nlb_dns.py b/plugins/modules/ibm_container_nlb_dns.py index 9febaa391..a439d1941 100644 --- a/plugins/modules/ibm_container_nlb_dns.py +++ b/plugins/modules/ibm_container_nlb_dns.py @@ -18,16 +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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - nlb_ips: - description: - - (Required for new resource) - 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. @@ -43,6 +37,12 @@ - (Required for new resource) required: True type: str + nlb_ips: + description: + - (Required for new resource) + required: True + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -69,17 +69,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('nlb_ips', 'list'), ('cluster', 'str'), ('nlb_host', 'str'), + ('nlb_ips', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'nlb_ips', 'resource_group_id', 'cluster', 'nlb_host', + 'nlb_ips', ] # Params for Data source @@ -98,10 +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( - nlb_ips=dict( - required=False, - elements='', - type='list'), resource_group_id=dict( required=False, type='str'), @@ -111,6 +107,10 @@ nlb_host=dict( required=False, type='str'), + nlb_ips=dict( + required=False, + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 9c2e03f2b..91ec3d8b9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3b7d24886..1aa4fb86f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 227288f3b..56c137d17 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 62adfe40d..377d5b78e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -85,8 +85,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'alb_id', 'resource_group_id', + 'alb_id', ] TL_CONFLICTS_MAP = { @@ -161,7 +161,7 @@ def run_module(): resource_type='ibm_container_vpc_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b99b256cc..34b7428b4 100644 --- a/plugins/modules/ibm_container_vpc_alb_create.py +++ b/plugins/modules/ibm_container_vpc_alb_create.py @@ -18,15 +18,25 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + cluster: + description: + - (Required for new resource) The ID of the cluster that the ALB belongs to. + required: True + type: str zone: description: - (Required for new resource) The zone where you want to deploy the ALB. required: True type: str + resource_group_id: + description: + - ID of the resource group. + required: False + type: str enable: description: - Enable the ALB instance in the cluster @@ -37,16 +47,6 @@ - (Required for new resource) The type of ALB that you want to create. required: True type: str - cluster: - description: - - (Required for new resource) The ID of the cluster that the ALB belongs to. - 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. @@ -73,18 +73,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('cluster', 'str'), ('zone', 'str'), ('type', 'str'), - ('cluster', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cluster', 'zone', + 'resource_group_id', 'enable', 'type', - 'cluster', - 'resource_group_id', ] # Params for Data source @@ -101,21 +101,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=dict( + required=False, + type='str'), zone=dict( required=False, type='str'), + resource_group_id=dict( + required=False, + type='str'), enable=dict( required=False, type='bool'), type=dict( required=False, type='str'), - cluster=dict( - required=False, - type='str'), - resource_group_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -167,7 +167,7 @@ def run_module(): resource_type='ibm_container_vpc_alb_create', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d460281f6..682465d2e 100644 --- a/plugins/modules/ibm_container_vpc_alb_info.py +++ b/plugins/modules/ibm_container_vpc_alb_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_alb' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - alb_id: - description: - - ALB ID - required: True - type: str resource_group_id: description: - ID of the resource group. required: False type: str + alb_id: + description: + - ALB ID + required: True + type: str ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -49,8 +49,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'alb_id', 'resource_group_id', + 'alb_id', ] @@ -61,12 +61,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( - alb_id=dict( - required=True, - type='str'), resource_group_id=dict( required=False, type='str'), + alb_id=dict( + required=True, + type='str'), ibmcloud_api_key=dict( type='str', no_log=True, @@ -87,7 +87,7 @@ def run_module(): resource_type='ibm_container_vpc_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 7eafc13cf..d5e174ec8 100644 --- a/plugins/modules/ibm_container_vpc_cluster.py +++ b/plugins/modules/ibm_container_vpc_cluster.py @@ -18,113 +18,129 @@ - Create, update or destroy an IBM Cloud 'ibm_container_vpc_cluster' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - update_all_workers: + service_subnet: description: - - Updates all the woker nodes if sets to true + - Custom subnet CIDR to provide private IP addresses for services required: False - type: bool - default: False - patch_version: + type: str + force_delete_storage: description: - - Kubernetes patch version + - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered required: False - type: str - resource_group_id: + type: bool + default: False + wait_for_worker_update: description: - - ID of the resource group. + - Wait for worker node to update during kube version update. required: False - type: str - vpc_id: + type: bool + default: True + name: description: - - (Required for new resource) The vpc id where the cluster is + - (Required for new resource) The cluster name required: True type: str - zones: - description: - - (Required for new resource) Zone info - required: True - type: list - elements: dict - pod_subnet: - description: - - Custom subnet CIDR to provide private IP addresses for pods - required: False - type: str - tags: + update_all_workers: description: - - List of tags for the resources + - Updates all the woker nodes if sets to true required: False - type: list - elements: str + type: bool + default: False 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 - wait_for_worker_update: + taints: description: - - Wait for worker node to update during kube version update. + - WorkerPool Taints required: False - type: bool - default: True + type: list + elements: dict + flavor: + description: + - (Required for new resource) Cluster nodes flavour + 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 cos_instance_crn: description: - A standard cloud object storage instance CRN to back up the internal registry in your OpenShift on VPC Gen 2 cluster required: False type: str + entitlement: + description: + - Entitlement option reduces additional OCP Licence cost in Openshift Clusters + required: False + type: str + 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 - kms_config: + host_pool_id: description: - - Enables KMS on a given cluster + - The ID of the cluster's associated host pool required: False + type: str + pod_subnet: + description: + - Custom subnet CIDR to provide private IP addresses for pods + required: False + type: str + zones: + description: + - (Required for new resource) Zone info + required: True type: list elements: dict - worker_count: + patch_version: description: - - Number of worker nodes in the cluster + - Kubernetes patch version required: False - type: int - default: 1 + type: str disable_public_service_endpoint: description: - Boolean value true if Public service endpoint to be disabled required: False type: bool default: False - flavor: + tags: description: - - (Required for new resource) Cluster nodes flavour - required: True - type: str - name: + - List of tags for the resources + required: False + type: list + elements: str + kms_instance_id: description: - - (Required for new resource) The cluster name - required: True + - Instance ID for boot volume encryption + required: False type: str - taints: + kms_config: description: - - WorkerPool Taints + - Enables KMS on a given cluster required: False type: list elements: dict - force_delete_storage: - description: - - Force the removal of a cluster and its persistent storage. Deleted data cannot be recovered - required: False - type: bool - default: False - service_subnet: + kube_version: description: - - Custom subnet CIDR to provide private IP addresses for services + - Kubernetes version required: False type: str worker_labels: @@ -133,21 +149,20 @@ required: False type: dict elements: str - wait_till: + crk: description: - - wait_till can be configured for Master Ready, One worker Ready or Ingress Ready + - Root Key ID for boot volume encryption required: False type: str - default: IngressReady - entitlement: + resource_group_id: description: - - Entitlement option reduces additional OCP Licence cost in Openshift Clusters + - ID of the resource group. required: False type: str - kube_version: + vpc_id: description: - - Kubernetes version - required: False + - (Required for new resource) The vpc id where the cluster is + required: True type: str id: description: @@ -175,37 +190,40 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('vpc_id', 'str'), - ('zones', 'list'), - ('flavor', 'str'), ('name', 'str'), + ('flavor', 'str'), + ('zones', 'list'), + ('vpc_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'update_all_workers', - 'patch_version', - 'resource_group_id', - 'vpc_id', - 'zones', - 'pod_subnet', - 'tags', - 'retry_patch_version', + 'service_subnet', + 'force_delete_storage', 'wait_for_worker_update', - 'cos_instance_crn', - 'image_security_enforcement', - 'kms_config', - 'worker_count', - 'disable_public_service_endpoint', - 'flavor', 'name', + 'update_all_workers', + 'retry_patch_version', 'taints', - 'force_delete_storage', - 'service_subnet', - 'worker_labels', + 'flavor', 'wait_till', + 'cos_instance_crn', 'entitlement', + 'worker_count', + 'image_security_enforcement', + 'host_pool_id', + 'pod_subnet', + 'zones', + 'patch_version', + 'disable_public_service_endpoint', + 'tags', + 'kms_instance_id', + 'kms_config', 'kube_version', + 'worker_labels', + 'crk', + 'resource_group_id', + 'vpc_id', ] # Params for Data source @@ -213,9 +231,9 @@ ] TL_ALL_PARAMETERS_DS = [ - 'alb_type', 'name', 'cluster_name_id', + 'alb_type', 'resource_group_id', ] @@ -226,78 +244,87 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - update_all_workers=dict( + service_subnet=dict( + required=False, + type='str'), + force_delete_storage=dict( required=False, type='bool'), - patch_version=dict( + wait_for_worker_update=dict( required=False, - type='str'), - resource_group_id=dict( + type='bool'), + name=dict( required=False, type='str'), - vpc_id=dict( + update_all_workers=dict( required=False, - type='str'), - zones=dict( + type='bool'), + retry_patch_version=dict( + required=False, + type='int'), + taints=dict( required=False, elements='', type='list'), - pod_subnet=dict( + flavor=dict( required=False, type='str'), - tags=dict( + wait_till=dict( required=False, - elements='', - type='list'), - retry_patch_version=dict( + type='str'), + cos_instance_crn=dict( + required=False, + type='str'), + entitlement=dict( + required=False, + type='str'), + worker_count=dict( required=False, type='int'), - wait_for_worker_update=dict( + image_security_enforcement=dict( required=False, type='bool'), - cos_instance_crn=dict( + host_pool_id=dict( required=False, type='str'), - image_security_enforcement=dict( + pod_subnet=dict( required=False, - type='bool'), - kms_config=dict( + type='str'), + zones=dict( required=False, elements='', type='list'), - worker_count=dict( + patch_version=dict( required=False, - type='int'), + type='str'), disable_public_service_endpoint=dict( required=False, type='bool'), - flavor=dict( + tags=dict( required=False, - type='str'), - name=dict( + elements='', + type='list'), + kms_instance_id=dict( required=False, type='str'), - taints=dict( + kms_config=dict( required=False, elements='', type='list'), - force_delete_storage=dict( - required=False, - type='bool'), - service_subnet=dict( + kube_version=dict( required=False, type='str'), worker_labels=dict( required=False, elements='', type='dict'), - wait_till=dict( + crk=dict( required=False, type='str'), - entitlement=dict( + resource_group_id=dict( required=False, type='str'), - kube_version=dict( + vpc_id=dict( required=False, type='str'), id=dict( @@ -351,7 +378,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -360,7 +387,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 c46f39652..492dd0987 100644 --- a/plugins/modules/ibm_container_vpc_cluster_alb_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_alb_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster_alb' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - alb_id: - description: - - ALB ID - required: True - type: str resource_group_id: description: - ID of the resource group. required: False type: str + alb_id: + description: + - ALB ID + required: True + type: str ibmcloud_api_key: description: - The IBM Cloud API key to authenticate with the IBM Cloud @@ -49,8 +49,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'alb_id', 'resource_group_id', + 'alb_id', ] @@ -61,12 +61,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( - alb_id=dict( - required=True, - type='str'), resource_group_id=dict( required=False, type='str'), + alb_id=dict( + required=True, + type='str'), ibmcloud_api_key=dict( type='str', no_log=True, @@ -87,7 +87,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster_alb', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d73e17e8f..7a9c01c09 100644 --- a/plugins/modules/ibm_container_vpc_cluster_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_info.py @@ -17,21 +17,21 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - alb_type: + name: description: - - None + - Name or id of the cluster required: False type: str - default: all - name: + alb_type: description: - - Name or id of the cluster + - None required: False type: str + default: all resource_group_id: description: - ID of the resource group. @@ -54,8 +54,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'alb_type', 'name', + 'alb_type', 'resource_group_id', ] @@ -67,10 +67,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( - alb_type=dict( + name=dict( required=False, type='str'), - name=dict( + alb_type=dict( required=False, type='str'), resource_group_id=dict( @@ -96,7 +96,7 @@ def run_module(): resource_type='ibm_container_vpc_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d5a85cf85..68bd4fced 100644 --- a/plugins/modules/ibm_container_vpc_cluster_worker_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_worker_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster_worker' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -36,6 +31,11 @@ - 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.41.1', + ibm_provider_version='1.42.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 acd4a00c2..a96825c86 100644 --- a/plugins/modules/ibm_container_vpc_cluster_worker_pool_info.py +++ b/plugins/modules/ibm_container_vpc_cluster_worker_pool_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_container_vpc_cluster_worker_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -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.41.1', + ibm_provider_version='1.42.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 49a0b08e9..1ce509ac2 100644 --- a/plugins/modules/ibm_container_vpc_worker_pool.py +++ b/plugins/modules/ibm_container_vpc_worker_pool.py @@ -18,63 +18,78 @@ - Create, update or destroy an IBM Cloud 'ibm_container_vpc_worker_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - worker_pool_name: + crk: description: - - (Required for new resource) worker pool name + - 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: + description: + - (Required for new resource) The vpc id where the cluster is required: True type: str - zones: + worker_count: description: - - (Required for new resource) Zones info + - (Required for new resource) The number of workers required: True - type: list - elements: dict + type: int + worker_pool_name: + description: + - (Required for new resource) worker pool name + required: True + type: str labels: description: - Labels required: False type: dict elements: str + kms_instance_id: + description: + - Instance ID for boot volume encryption + required: False + type: str taints: description: - WorkerPool Taints required: False type: list elements: dict - resource_group_id: - description: - - ID of the resource group. - required: False - type: str - cluster: - description: - - (Required for new resource) Cluster name - required: True - type: str flavor: description: - (Required for new resource) cluster node falvor required: True type: str - vpc_id: + zones: description: - - (Required for new resource) The vpc id where the cluster is + - (Required for new resource) Zones info required: True - type: str - worker_count: + type: list + elements: dict + cluster: description: - - (Required for new resource) The number of workers + - (Required for new resource) Cluster name required: True - type: int + type: str entitlement: description: - Entitlement option reduces additional OCP Licence cost in Openshift Clusters required: False type: str + host_pool_id: + description: + - The ID of the dedicated host pool associated with the worker pool + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -101,37 +116,40 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('vpc_id', 'str'), + ('worker_count', 'int'), ('worker_pool_name', 'str'), + ('flavor', 'str'), ('zones', 'list'), ('cluster', 'str'), - ('flavor', 'str'), - ('vpc_id', 'str'), - ('worker_count', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'crk', + 'resource_group_id', + 'vpc_id', + 'worker_count', 'worker_pool_name', - 'zones', 'labels', + 'kms_instance_id', 'taints', - 'resource_group_id', - 'cluster', 'flavor', - 'vpc_id', - 'worker_count', + 'zones', + 'cluster', 'entitlement', + 'host_pool_id', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('worker_pool_name', 'str'), ('cluster', 'str'), + ('worker_pool_name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'worker_pool_name', 'cluster', + 'worker_pool_name', ] TL_CONFLICTS_MAP = { @@ -141,37 +159,46 @@ 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( + crk=dict( required=False, type='str'), - zones=dict( + resource_group_id=dict( required=False, - elements='', - type='list'), + type='str'), + vpc_id=dict( + required=False, + type='str'), + worker_count=dict( + required=False, + type='int'), + worker_pool_name=dict( + required=False, + type='str'), labels=dict( required=False, elements='', type='dict'), + kms_instance_id=dict( + required=False, + type='str'), taints=dict( required=False, elements='', type='list'), - resource_group_id=dict( + flavor=dict( required=False, type='str'), - cluster=dict( + zones=dict( required=False, - type='str'), - flavor=dict( + elements='', + type='list'), + cluster=dict( required=False, type='str'), - vpc_id=dict( + entitlement=dict( required=False, type='str'), - worker_count=dict( - required=False, - type='int'), - entitlement=dict( + host_pool_id=dict( required=False, type='str'), id=dict( @@ -225,7 +252,7 @@ def run_module(): resource_type='ibm_container_vpc_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -234,7 +261,7 @@ def run_module(): resource_type='ibm_container_vpc_worker_pool', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 19af95e30..f9fadc535 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5340b5c35..9eca5cd8e 100644 --- a/plugins/modules/ibm_container_worker_pool.py +++ b/plugins/modules/ibm_container_worker_pool.py @@ -18,28 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_container_worker_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - hardware: + cluster: description: - - Hardware type - required: False + - (Required for new resource) Cluster name + required: True type: str - default: shared - labels: - description: - - list of labels to worker pool - required: False - type: dict - elements: str - taints: - description: - - WorkerPool Taints - required: False - type: list - elements: dict worker_pool_name: description: - (Required for new resource) worker pool name @@ -50,11 +37,17 @@ - (Required for new resource) Number of nodes per zone required: True type: int - cluster: + entitlement: description: - - (Required for new resource) Cluster name - required: True + - Entitlement option reduces additional OCP Licence cost in Openshift Clusters + required: False type: str + hardware: + description: + - Hardware type + required: False + type: str + default: shared machine_type: description: - (Required for new resource) worker nodes machine type @@ -66,14 +59,21 @@ required: False type: bool default: True - resource_group_id: + labels: description: - - ID of the resource group. + - list of labels to worker pool required: False - type: str - entitlement: + type: dict + elements: str + taints: description: - - Entitlement option reduces additional OCP Licence cost in Openshift Clusters + - WorkerPool Taints + required: False + type: list + elements: dict + resource_group_id: + description: + - ID of the resource group. required: False type: str id: @@ -102,35 +102,35 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('cluster', 'str'), ('worker_pool_name', 'str'), ('size_per_zone', 'int'), - ('cluster', 'str'), ('machine_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'hardware', - 'labels', - 'taints', + 'cluster', 'worker_pool_name', 'size_per_zone', - 'cluster', + 'entitlement', + 'hardware', 'machine_type', 'disk_encryption', + 'labels', + 'taints', 'resource_group_id', - 'entitlement', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('worker_pool_name', 'str'), ('cluster', 'str'), + ('worker_pool_name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'worker_pool_name', 'cluster', + 'worker_pool_name', ] TL_CONFLICTS_MAP = { @@ -140,24 +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( - hardware=dict( + cluster=dict( required=False, type='str'), - labels=dict( - required=False, - elements='', - type='dict'), - taints=dict( - required=False, - elements='', - type='list'), worker_pool_name=dict( required=False, type='str'), size_per_zone=dict( required=False, type='int'), - cluster=dict( + entitlement=dict( + required=False, + type='str'), + hardware=dict( required=False, type='str'), machine_type=dict( @@ -166,10 +161,15 @@ disk_encryption=dict( required=False, type='bool'), - resource_group_id=dict( + labels=dict( required=False, - type='str'), - entitlement=dict( + elements='', + type='dict'), + taints=dict( + required=False, + elements='', + type='list'), + resource_group_id=dict( required=False, type='str'), id=dict( @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_container_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 ed802e9de..5a8b5116c 100644 --- a/plugins/modules/ibm_container_worker_pool_info.py +++ b/plugins/modules/ibm_container_worker_pool_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_container_worker_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - worker_pool_name: + cluster: description: - - worker pool name + - Name or ID of the cluster required: True type: str - cluster: + worker_pool_name: description: - - Name or ID of the cluster + - 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_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 71e4143f0..4716acc29 100644 --- a/plugins/modules/ibm_container_worker_pool_zone_attachment.py +++ b/plugins/modules/ibm_container_worker_pool_zone_attachment.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,6 +27,16 @@ - (Required for new resource) Zone name required: True type: str + worker_pool: + description: + - (Required for new resource) Workerpool name + required: True + type: str + public_vlan_id: + description: + - None + required: False + type: str wait_till_albs: description: - wait_till_albs can be configured to wait for albs during the worker pool zone attachment. @@ -38,21 +48,11 @@ - (Required for new resource) cluster name or ID 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 resource_group_id: description: - ID of the resource group. @@ -85,18 +85,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('zone', 'str'), - ('cluster', 'str'), ('worker_pool', 'str'), + ('cluster', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'zone', + 'worker_pool', + 'public_vlan_id', 'wait_till_albs', 'cluster', - 'worker_pool', 'private_vlan_id', - 'public_vlan_id', 'resource_group_id', ] @@ -117,21 +117,21 @@ zone=dict( required=False, type='str'), + worker_pool=dict( + required=False, + type='str'), + public_vlan_id=dict( + required=False, + type='str'), wait_till_albs=dict( required=False, type='bool'), cluster=dict( required=False, type='str'), - worker_pool=dict( - required=False, - type='str'), private_vlan_id=dict( required=False, type='str'), - public_vlan_id=dict( - required=False, - type='str'), resource_group_id=dict( required=False, type='str'), @@ -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.41.1', + ibm_provider_version='1.42.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 ed541fa13..e5381be97 100644 --- a/plugins/modules/ibm_cos_bucket.py +++ b/plugins/modules/ibm_cos_bucket.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_cos_bucket' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - archive_rule: + abort_incomplete_multipart_upload_days: description: - - Enable configuration archive_rule (glacier/accelerated) to COS Bucket after a defined period of time + - Enable abort incomplete multipart upload to COS Bucket after a defined period of time required: False type: list elements: dict @@ -34,31 +34,31 @@ required: False type: list elements: dict - resource_instance_id: + force_delete: description: - - (Required for new resource) resource instance ID + - 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 - endpoint_type: + key_protect: description: - - public or private + - CRN of the key you want to use data at rest encryption required: False type: str - default: public - abort_incomplete_multipart_upload_days: + object_versioning: description: - - Enable abort incomplete multipart upload to COS Bucket after a defined period of time + - 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 - hard_quota: - description: - - sets a maximum amount of storage (in bytes) available for a bucket - required: False - type: int - single_site_location: + cross_region_location: description: - - single site location info + - Cros region location info required: False type: str allowed_ip: @@ -67,15 +67,26 @@ required: False type: list elements: str - noncurrent_version_expiration: + storage_class: description: - - Enable configuration expire_rule to COS Bucket after a defined period of time + - (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 required: False type: list elements: dict - retention_rule: + metrics_monitoring: description: - - A retention policy is enabled at the IBM Cloud Object Storage bucket level. Minimum, maximum and default retention period are defined by this policy and apply to all objects in the bucket. + - Enables sending metrics to IBM Cloud Monitoring. required: False type: list elements: dict @@ -84,50 +95,39 @@ - Region Location info. required: False type: str - metrics_monitoring: + archive_rule: description: - - Enables sending metrics to IBM Cloud Monitoring. + - Enable configuration archive_rule (glacier/accelerated) to COS Bucket after a defined period of time required: False type: list elements: dict - cross_region_location: + retention_rule: description: - - Cros region location info + - A retention policy is enabled at the IBM Cloud Object Storage bucket level. Minimum, maximum and default retention period are defined by this policy and apply to all objects in the bucket. required: False - type: str - storage_class: - description: - - (Required for new resource) Storage class info - required: True - type: str - activity_tracking: + type: list + elements: dict + noncurrent_version_expiration: description: - - Enables sending log data to Activity Tracker and LogDNA to provide visibility into object read and write events + - Enable configuration expire_rule to COS Bucket after a defined period of time required: False type: list elements: dict - bucket_name: + hard_quota: description: - - (Required for new resource) COS Bucket name + - sets a maximum amount of storage (in bytes) available for a bucket + required: False + type: int + resource_instance_id: + description: + - (Required for new resource) resource instance ID required: True type: str - key_protect: + single_site_location: description: - - CRN of the key you want to use data at rest encryption + - single site 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 - 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 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -174,62 +174,62 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('resource_instance_id', 'str'), - ('storage_class', 'str'), ('bucket_name', 'str'), + ('storage_class', 'str'), + ('resource_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'archive_rule', - 'expire_rule', - 'resource_instance_id', - 'endpoint_type', 'abort_incomplete_multipart_upload_days', - 'hard_quota', - 'single_site_location', - 'allowed_ip', - 'noncurrent_version_expiration', - 'retention_rule', - 'region_location', - 'metrics_monitoring', - 'cross_region_location', - 'storage_class', - 'activity_tracking', + 'expire_rule', + 'force_delete', 'bucket_name', 'key_protect', 'object_versioning', - 'force_delete', + 'cross_region_location', + 'allowed_ip', + 'storage_class', + 'endpoint_type', + 'activity_tracking', + 'metrics_monitoring', + 'region_location', + 'archive_rule', + 'retention_rule', + 'noncurrent_version_expiration', + 'hard_quota', + 'resource_instance_id', + 'single_site_location', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('bucket_name', 'str'), ('resource_instance_id', 'str'), - ('bucket_region', 'str'), + ('bucket_name', 'str'), ('bucket_type', 'str'), + ('bucket_region', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'bucket_name', 'resource_instance_id', + 'bucket_name', + 'bucket_type', 'bucket_region', 'endpoint_type', - 'bucket_type', ] TL_CONFLICTS_MAP = { - 'single_site_location': ['region_location', 'cross_region_location'], - 'region_location': ['cross_region_location', 'single_site_location'], - 'cross_region_location': ['region_location', 'single_site_location'], '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( - archive_rule=dict( + abort_incomplete_multipart_upload_days=dict( required=False, elements='', type='list'), @@ -237,64 +237,64 @@ required=False, elements='', type='list'), - resource_instance_id=dict( + force_delete=dict( + required=False, + type='bool'), + bucket_name=dict( required=False, type='str'), - endpoint_type=dict( + key_protect=dict( required=False, type='str'), - abort_incomplete_multipart_upload_days=dict( + object_versioning=dict( required=False, elements='', type='list'), - hard_quota=dict( - required=False, - type='int'), - single_site_location=dict( + cross_region_location=dict( required=False, type='str'), allowed_ip=dict( required=False, elements='', type='list'), - noncurrent_version_expiration=dict( + storage_class=dict( + required=False, + type='str'), + endpoint_type=dict( + required=False, + type='str'), + activity_tracking=dict( required=False, elements='', type='list'), - retention_rule=dict( + metrics_monitoring=dict( required=False, elements='', type='list'), region_location=dict( required=False, type='str'), - metrics_monitoring=dict( + archive_rule=dict( required=False, elements='', type='list'), - cross_region_location=dict( - required=False, - type='str'), - storage_class=dict( + retention_rule=dict( required=False, - type='str'), - activity_tracking=dict( + elements='', + type='list'), + noncurrent_version_expiration=dict( required=False, elements='', type='list'), - bucket_name=dict( + hard_quota=dict( required=False, - type='str'), - key_protect=dict( + type='int'), + resource_instance_id=dict( required=False, type='str'), - object_versioning=dict( - required=False, - elements='', - type='list'), - force_delete=dict( + single_site_location=dict( required=False, - type='bool'), + type='str'), id=dict( required=False, type='str'), @@ -360,7 +360,7 @@ def run_module(): resource_type='ibm_cos_bucket', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -369,7 +369,7 @@ def run_module(): resource_type='ibm_cos_bucket', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 0ece8741c..2fee4e570 100644 --- a/plugins/modules/ibm_cos_bucket_info.py +++ b/plugins/modules/ibm_cos_bucket_info.py @@ -17,16 +17,21 @@ description: - Retrieve an IBM Cloud 'ibm_cos_bucket' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + resource_instance_id: + description: + - None + required: True + type: str bucket_name: description: - None required: True type: str - resource_instance_id: + bucket_type: description: - None required: True @@ -42,11 +47,6 @@ required: False type: str default: public - bucket_type: - description: - - None - required: True - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -80,19 +80,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('bucket_name', 'str'), ('resource_instance_id', 'str'), - ('bucket_region', 'str'), + ('bucket_name', 'str'), ('bucket_type', 'str'), + ('bucket_region', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bucket_name', 'resource_instance_id', + 'bucket_name', + 'bucket_type', 'bucket_region', 'endpoint_type', - 'bucket_type', ] @@ -103,10 +103,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_instance_id=dict( + required=True, + type='str'), bucket_name=dict( required=True, type='str'), - resource_instance_id=dict( + bucket_type=dict( required=True, type='str'), bucket_region=dict( @@ -115,9 +118,6 @@ endpoint_type=dict( required=False, type='str'), - bucket_type=dict( - required=True, - type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -152,7 +152,7 @@ def run_module(): resource_type='ibm_cos_bucket', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 197dac4d3..039253d35 100644 --- a/plugins/modules/ibm_cos_bucket_object.py +++ b/plugins/modules/ibm_cos_bucket_object.py @@ -18,14 +18,14 @@ - Create, update or destroy an IBM Cloud 'ibm_cos_bucket_object' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - content_base64: + bucket_location: description: - - COS object content in base64 encoding - required: False + - (Required for new resource) COS bucket location + required: True type: str endpoint_type: description: @@ -33,11 +33,6 @@ required: False type: str default: public - bucket_location: - description: - - (Required for new resource) COS bucket location - required: True - type: str etag: description: - COS object MD5 hexdigest @@ -48,16 +43,6 @@ - (Required for new resource) COS object key required: True type: str - content: - description: - - COS object content - required: False - type: str - content_file: - description: - - COS object content file path - required: False - type: str force_delete: description: - COS buckets need to be empty before they can be deleted. force_delete option empty the bucket and delete it. @@ -69,6 +54,21 @@ - (Required for new resource) COS bucket CRN required: True type: str + content_base64: + description: + - COS object content in base64 encoding + required: False + type: str + content: + description: + - COS object content + required: False + type: str + content_file: + description: + - COS object content file path + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -122,28 +122,28 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'content_base64', - 'endpoint_type', 'bucket_location', + 'endpoint_type', 'etag', 'key', - 'content', - 'content_file', 'force_delete', 'bucket_crn', + 'content_base64', + 'content', + 'content_file', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('key', 'str'), ('bucket_crn', 'str'), + ('key', 'str'), ('bucket_location', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'key', 'bucket_crn', 'endpoint_type', + 'key', 'bucket_location', ] @@ -157,31 +157,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( - content_base64=dict( + bucket_location=dict( required=False, type='str'), endpoint_type=dict( required=False, type='str'), - bucket_location=dict( - required=False, - type='str'), etag=dict( required=False, type='str'), key=dict( required=False, type='str'), - content=dict( + force_delete=dict( + required=False, + type='bool'), + bucket_crn=dict( required=False, type='str'), - content_file=dict( + content_base64=dict( required=False, type='str'), - force_delete=dict( + content=dict( required=False, - type='bool'), - bucket_crn=dict( + type='str'), + content_file=dict( required=False, type='str'), id=dict( @@ -249,7 +249,7 @@ def run_module(): resource_type='ibm_cos_bucket_object', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 fff5e3c3e..3d6fbada8 100644 --- a/plugins/modules/ibm_cos_bucket_object_info.py +++ b/plugins/modules/ibm_cos_bucket_object_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_cos_bucket_object' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - key: - description: - - COS object key - required: True - type: str bucket_crn: description: - COS bucket CRN @@ -37,6 +32,11 @@ 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 = [ - ('key', 'str'), ('bucket_crn', 'str'), + ('key', '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.41.1', + ibm_provider_version='1.42.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 ad9090c29..698fc27d0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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', - 'tags', 'resource_group_id', + 'tags', ] # 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.41.1', + ibm_provider_version='1.42.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 7617d6745..94a219207 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4c49568a3..319b21f6d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c3b41b9a2..461bb80cd 100644 --- a/plugins/modules/ibm_database.py +++ b/plugins/modules/ibm_database.py @@ -18,162 +18,127 @@ - Create, update or destroy an IBM Cloud 'ibm_database' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - node_disk_allocation_mb: + plan: description: - - Disk allocation per node - required: False - type: int + - (Required for new resource) The plan type of the Database instance + required: True + type: str remote_leader_id: description: - The CRN of leader database required: False type: str - point_in_time_recovery_deployment_id: - description: - - The CRN of source instance - required: False - type: str - plan_validation: + tags: description: - - For elasticsearch and postgres perform database parameter validation during the plan phase. Otherwise, database parameter validation happens in apply phase. + - None required: False - type: bool - default: True + type: list + elements: str whitelist: description: - None required: False type: list elements: dict - auto_scaling: + group: description: - - ICD Auto Scaling + - None required: False type: list elements: dict - plan: + location: description: - - (Required for new resource) The plan type of the Database instance + - (Required for new resource) The location or the region in which Database instance exists required: True type: str - configuration: + version: description: - - The configuration in JSON format + - The database version to provision if specified required: False type: str - members_memory_allocation_mb: - description: - - Memory allocation required for cluster - required: False - type: int - service_endpoints: + key_protect_key: description: - - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. + - The CRN of Key protect key required: False type: str - default: public - key_protect_instance: + point_in_time_recovery_time: description: - - The CRN of Key protect instance + - The point in time recovery time stamp of the deployed instance required: False type: str - tags: + name: description: - - None - required: False - type: list - elements: str - location: + - (Required for new resource) Resource instance name for example, my Database instance + required: True + type: str + service: description: - - (Required for new resource) The location or the region in which Database instance exists + - (Required for new resource) The name of the Cloud Internet database service required: True type: str - node_count: + configuration: description: - - Total number of nodes in the cluster + - The configuration in JSON format required: False - type: int - resource_group_id: + type: str + service_endpoints: description: - - The id of the resource group in which the Database instance is present + - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. required: False type: str + default: public backup_id: description: - The CRN of backup source database required: False type: str - key_protect_key: - description: - - The CRN of Key protect key - required: False - type: str - point_in_time_recovery_time: + point_in_time_recovery_deployment_id: description: - - The point in time recovery time stamp of the deployed instance + - The CRN of source instance required: False type: str - group: + auto_scaling: description: - - None + - ICD Auto Scaling required: False type: list elements: dict - node_cpu_allocation_count: + plan_validation: description: - - CPU allocation per node + - For elasticsearch and postgres perform database parameter validation during the plan phase. Otherwise, database parameter validation happens in apply phase. required: False - type: int - service: - description: - - (Required for new resource) The name of the Cloud Internet database service - required: True - type: str - node_memory_allocation_mb: + type: bool + default: True + key_protect_instance: description: - - Memory allocation per node + - The CRN of Key protect instance required: False - type: int - name: - description: - - (Required for new resource) Resource instance name for example, my Database instance - required: True type: str - members_disk_allocation_mb: - description: - - Disk allocation required for cluster - required: False - type: int backup_encryption_key_crn: description: - The Backup Encryption Key CRN required: False type: str - users: - description: - - None - required: False - type: list - elements: dict - version: + resource_group_id: description: - - The database version to provision if specified + - The id of the resource group in which the Database instance is present required: False type: str - members_cpu_allocation_count: - description: - - CPU allocation required for cluster - required: False - type: int adminpassword: description: - The admin user password for the instance required: False type: str + users: + description: + - None + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -222,41 +187,34 @@ TL_REQUIRED_PARAMETERS = [ ('plan', 'str'), ('location', 'str'), - ('service', 'str'), ('name', 'str'), + ('service', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'node_disk_allocation_mb', - 'remote_leader_id', - 'point_in_time_recovery_deployment_id', - 'plan_validation', - 'whitelist', - 'auto_scaling', 'plan', - 'configuration', - 'members_memory_allocation_mb', - 'service_endpoints', - 'key_protect_instance', + 'remote_leader_id', 'tags', + 'whitelist', + 'group', 'location', - 'node_count', - 'resource_group_id', - 'backup_id', + 'version', 'key_protect_key', 'point_in_time_recovery_time', - 'group', - 'node_cpu_allocation_count', - 'service', - 'node_memory_allocation_mb', 'name', - 'members_disk_allocation_mb', + 'service', + 'configuration', + 'service_endpoints', + 'backup_id', + 'point_in_time_recovery_deployment_id', + 'auto_scaling', + 'plan_validation', + 'key_protect_instance', 'backup_encryption_key_crn', - 'users', - 'version', - 'members_cpu_allocation_count', + 'resource_group_id', 'adminpassword', + 'users', ] # Params for Data source @@ -266,119 +224,91 @@ TL_ALL_PARAMETERS_DS = [ 'name', - 'tags', - 'resource_group_id', 'location', + 'resource_group_id', + 'tags', 'service', ] TL_CONFLICTS_MAP = { - 'node_disk_allocation_mb': ['members_memory_allocation_mb', 'members_disk_allocation_mb', 'members_cpu_allocation_count', 'group'], - 'members_memory_allocation_mb': ['node_count', 'node_memory_allocation_mb', 'node_disk_allocation_mb', 'node_cpu_allocation_count', 'group'], - 'node_count': ['members_memory_allocation_mb', 'members_disk_allocation_mb', 'members_cpu_allocation_count', 'group'], 'group': ['members_memory_allocation_mb', 'members_disk_allocation_mb', 'members_cpu_allocation_count', 'node_memory_allocation_mb', 'node_disk_allocation_mb', 'node_cpu_allocation_count', 'node_count'], - 'node_cpu_allocation_count': ['members_memory_allocation_mb', 'members_disk_allocation_mb', 'members_cpu_allocation_count', 'group'], - 'node_memory_allocation_mb': ['members_memory_allocation_mb', 'members_disk_allocation_mb', 'members_cpu_allocation_count', 'group'], - 'members_disk_allocation_mb': ['node_count', 'node_memory_allocation_mb', 'node_disk_allocation_mb', 'node_cpu_allocation_count', 'group'], - 'members_cpu_allocation_count': ['node_count', 'node_memory_allocation_mb', 'node_disk_allocation_mb', 'node_cpu_allocation_count', '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( - node_disk_allocation_mb=dict( - required=False, - type='int'), - remote_leader_id=dict( + plan=dict( required=False, type='str'), - point_in_time_recovery_deployment_id=dict( + remote_leader_id=dict( required=False, type='str'), - plan_validation=dict( + tags=dict( required=False, - type='bool'), + elements='', + type='list'), whitelist=dict( required=False, elements='', type='list'), - auto_scaling=dict( + group=dict( required=False, elements='', type='list'), - plan=dict( + location=dict( required=False, type='str'), - configuration=dict( + version=dict( required=False, type='str'), - members_memory_allocation_mb=dict( - required=False, - type='int'), - service_endpoints=dict( + key_protect_key=dict( required=False, type='str'), - key_protect_instance=dict( + point_in_time_recovery_time=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), - location=dict( + name=dict( required=False, type='str'), - node_count=dict( + service=dict( required=False, - type='int'), - resource_group_id=dict( + type='str'), + configuration=dict( required=False, type='str'), - backup_id=dict( + service_endpoints=dict( required=False, type='str'), - key_protect_key=dict( + backup_id=dict( required=False, type='str'), - point_in_time_recovery_time=dict( + point_in_time_recovery_deployment_id=dict( required=False, type='str'), - group=dict( + auto_scaling=dict( required=False, elements='', type='list'), - node_cpu_allocation_count=dict( + plan_validation=dict( required=False, - type='int'), - service=dict( + type='bool'), + key_protect_instance=dict( required=False, type='str'), - node_memory_allocation_mb=dict( - required=False, - type='int'), - name=dict( + backup_encryption_key_crn=dict( required=False, type='str'), - members_disk_allocation_mb=dict( + resource_group_id=dict( required=False, - type='int'), - backup_encryption_key_crn=dict( + type='str'), + adminpassword=dict( required=False, type='str'), users=dict( required=False, elements='', type='list'), - version=dict( - required=False, - type='str'), - members_cpu_allocation_count=dict( - required=False, - type='int'), - adminpassword=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -444,7 +374,7 @@ def run_module(): resource_type='ibm_database', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -453,7 +383,7 @@ def run_module(): resource_type='ibm_database', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..6e70e1b95 --- /dev/null +++ b/plugins/modules/ibm_database_backup_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_database_backup_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/database_backup + +short_description: Retrieve IBM Cloud 'ibm_database_backup' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_database_backup' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + backup_id: + description: + - Backup 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 = [ + ('backup_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'backup_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( + backup_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_database_backup', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_database_backups_info.py b/plugins/modules/ibm_database_backups_info.py new file mode 100644 index 000000000..de084a6d3 --- /dev/null +++ b/plugins/modules/ibm_database_backups_info.py @@ -0,0 +1,130 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_database_backups_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/database_backups + +short_description: Retrieve IBM Cloud 'ibm_database_backups' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_database_backups' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + deployment_id: + description: + - ID of the deployment this backup relates to. + required: False + 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 = [ +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'deployment_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( + deployment_id=dict( + required=False, + 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_database_backups', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_database_connection_info.py b/plugins/modules/ibm_database_connection_info.py index b17b3fcac..8caebfdc6 100644 --- a/plugins/modules/ibm_database_connection_info.py +++ b/plugins/modules/ibm_database_connection_info.py @@ -17,28 +17,28 @@ description: - Retrieve an IBM Cloud 'ibm_database_connection' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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_type: + deployment_id: description: - - User type. + - Deployment ID. required: True type: str - user_id: + endpoint_type: description: - - User ID. + - Endpoint Type. The endpoint must be enabled on the deployment before its connection information can be fetched. required: True type: str - deployment_id: + user_id: description: - - Deployment ID. + - User ID. required: True type: str iaas_classic_username: @@ -74,18 +74,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('endpoint_type', 'str'), ('user_type', 'str'), - ('user_id', 'str'), ('deployment_id', 'str'), + ('endpoint_type', 'str'), + ('user_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'endpoint_type', 'user_type', - 'user_id', 'deployment_id', + 'endpoint_type', + 'user_id', ] @@ -96,16 +96,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( - endpoint_type=dict( + user_type=dict( required=True, type='str'), - user_type=dict( + deployment_id=dict( required=True, type='str'), - user_id=dict( + endpoint_type=dict( required=True, type='str'), - deployment_id=dict( + user_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_database_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 e8a87d46a..180748b9e 100644 --- a/plugins/modules/ibm_database_info.py +++ b/plugins/modules/ibm_database_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_database' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -26,22 +26,22 @@ - Resource instance name for example, my Database instance required: True type: str - tags: + location: description: - - None + - The location or the region in which the Database instance exists required: False - type: list - elements: str + type: str resource_group_id: description: - The id of the resource group in which the Database instance is present required: False type: str - location: + tags: description: - - The location or the region in which the Database instance exists + - None required: False - type: str + type: list + elements: str service: description: - The name of the Cloud Database service @@ -86,9 +86,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'tags', - 'resource_group_id', 'location', + 'resource_group_id', + 'tags', 'service', ] @@ -103,16 +103,16 @@ name=dict( required=True, type='str'), - tags=dict( + location=dict( required=False, - elements='', - type='list'), + type='str'), resource_group_id=dict( required=False, type='str'), - location=dict( + tags=dict( required=False, - type='str'), + elements='', + type='list'), service=dict( required=False, type='str'), @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_database', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..53f394c99 --- /dev/null +++ b/plugins/modules/ibm_database_point_in_time_recovery_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_database_point_in_time_recovery_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/database_point_in_time_recovery + +short_description: Retrieve IBM Cloud 'ibm_database_point_in_time_recovery' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_database_point_in_time_recovery' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + deployment_id: + description: + - Deployment 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 = [ + ('deployment_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'deployment_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( + deployment_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_database_point_in_time_recovery', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_database_remotes_info.py b/plugins/modules/ibm_database_remotes_info.py new file mode 100644 index 000000000..464d61d19 --- /dev/null +++ b/plugins/modules/ibm_database_remotes_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_database_remotes_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/database_remotes + +short_description: Retrieve IBM Cloud 'ibm_database_remotes' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_database_remotes' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + deployment_id: + description: + - Deployment 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 = [ + ('deployment_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'deployment_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( + deployment_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_database_remotes', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_dl_gateway.py b/plugins/modules/ibm_dl_gateway.py index ab0a6ef2d..2c5cfc75f 100644 --- a/plugins/modules/ibm_dl_gateway.py +++ b/plugins/modules/ibm_dl_gateway.py @@ -18,130 +18,130 @@ - Create, update or destroy an IBM Cloud 'ibm_dl_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - bgp_ibm_cidr: + metered: description: - - BGP IBM CIDR - required: False - type: str - bfd_status: + - (Required for new resource) Metered billing option + required: True + type: bool + bgp_cer_cidr: description: - - Gateway BFD status + - BGP customer edge router CIDR required: False type: str - metered: + global_: description: - - (Required for new resource) Metered billing option + - (Required for new resource) Gateways with global routing (true) can connect to networks outside their associated region required: True type: bool - speed_mbps: + bgp_base_cidr: description: - - (Required for new resource) Gateway speed in megabits per second - required: True - type: int - macsec_config: + - BGP base CIDR + required: False + type: str + bgp_ibm_cidr: description: - - MACsec configuration information + - BGP IBM CIDR required: False - type: list - elements: dict + type: str + bfd_multiplier: + description: + - BFD Multiplier + required: False + type: int cross_connect_router: description: - Cross connect router required: False type: str - location_name: + customer_name: description: - - Gateway location + - Customer name required: False type: str - bfd_interval: + macsec_config: description: - - BFD Interval + - MACsec configuration information required: False - type: int - bfd_multiplier: + type: list + elements: dict + tags: description: - - BFD Multiplier + - Tags for the direct link gateway required: False + type: list + elements: str + bgp_asn: + description: + - (Required for new resource) BGP ASN + required: True type: int - port: + name: description: - - Gateway port - required: False + - (Required for new resource) The unique user-defined name for this gateway + required: True type: str - carrier_name: + loa_reject_reason: description: - - Carrier name + - Loa reject reason required: False type: str - bgp_cer_cidr: + bfd_interval: description: - - BGP customer edge router CIDR + - BFD Interval required: False - type: str + type: int bfd_status_updated_at: description: - Date and time BFD status was updated required: False type: str - bgp_base_cidr: + location_name: description: - - BGP base CIDR + - Gateway location required: False type: str - global_: + speed_mbps: description: - - (Required for new resource) Gateways with global routing (true) can connect to networks outside their associated region + - (Required for new resource) Gateway speed in megabits per second required: True - type: bool - customer_name: - description: - - Customer name - required: False - type: str + type: int type: description: - (Required for new resource) Gateway type required: True type: str - tags: + resource_group: description: - - Tags for the direct link gateway + - Gateway resource group required: False - type: list - elements: str - authentication_key: + type: str + bfd_status: description: - - BGP MD5 authentication key + - Gateway BFD status required: False type: str - bgp_asn: - description: - - (Required for new resource) BGP ASN - required: True - type: int - resource_group: + port: description: - - Gateway resource group + - Gateway port required: False type: str - name: + connection_mode: description: - - (Required for new resource) The unique user-defined name for this gateway - required: True + - 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 - loa_reject_reason: + carrier_name: description: - - Loa reject reason + - Carrier name required: False type: str - connection_mode: + authentication_key: description: - - 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 + - BGP MD5 authentication key required: False type: str id: @@ -191,39 +191,39 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('metered', 'bool'), - ('speed_mbps', 'int'), ('global_', 'bool'), - ('type', 'str'), ('bgp_asn', 'int'), ('name', 'str'), + ('speed_mbps', 'int'), + ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bgp_ibm_cidr', - 'bfd_status', 'metered', - 'speed_mbps', - 'macsec_config', - 'cross_connect_router', - 'location_name', - 'bfd_interval', - 'bfd_multiplier', - 'port', - 'carrier_name', 'bgp_cer_cidr', - 'bfd_status_updated_at', - 'bgp_base_cidr', 'global_', + 'bgp_base_cidr', + 'bgp_ibm_cidr', + 'bfd_multiplier', + 'cross_connect_router', 'customer_name', - 'type', + 'macsec_config', 'tags', - 'authentication_key', 'bgp_asn', - 'resource_group', 'name', 'loa_reject_reason', + 'bfd_interval', + 'bfd_status_updated_at', + 'location_name', + 'speed_mbps', + 'type', + 'resource_group', + 'bfd_status', + 'port', 'connection_mode', + 'carrier_name', + 'authentication_key', ] # Params for Data source @@ -243,78 +243,78 @@ 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_ibm_cidr=dict( + metered=dict( required=False, - type='str'), - bfd_status=dict( + type='bool'), + bgp_cer_cidr=dict( required=False, type='str'), - metered=dict( + global_=dict( required=False, type='bool'), - speed_mbps=dict( + bgp_base_cidr=dict( required=False, - type='int'), - macsec_config=dict( + type='str'), + bgp_ibm_cidr=dict( required=False, - elements='', - type='list'), + type='str'), + bfd_multiplier=dict( + required=False, + type='int'), cross_connect_router=dict( required=False, type='str'), - location_name=dict( + customer_name=dict( required=False, type='str'), - bfd_interval=dict( + macsec_config=dict( required=False, - type='int'), - bfd_multiplier=dict( + elements='', + type='list'), + tags=dict( + required=False, + elements='', + type='list'), + bgp_asn=dict( required=False, type='int'), - port=dict( + name=dict( required=False, type='str'), - carrier_name=dict( + loa_reject_reason=dict( required=False, type='str'), - bgp_cer_cidr=dict( + bfd_interval=dict( required=False, - type='str'), + type='int'), bfd_status_updated_at=dict( required=False, type='str'), - bgp_base_cidr=dict( + location_name=dict( required=False, type='str'), - global_=dict( - required=False, - type='bool'), - customer_name=dict( + speed_mbps=dict( required=False, - type='str'), + type='int'), type=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), - authentication_key=dict( + resource_group=dict( required=False, type='str'), - bgp_asn=dict( + bfd_status=dict( required=False, - type='int'), - resource_group=dict( + type='str'), + port=dict( required=False, type='str'), - name=dict( + connection_mode=dict( required=False, type='str'), - loa_reject_reason=dict( + carrier_name=dict( required=False, type='str'), - connection_mode=dict( + authentication_key=dict( required=False, type='str'), id=dict( @@ -382,7 +382,7 @@ def run_module(): resource_type='ibm_dl_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 e9d932bda..30bd7b0cf 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 2b764ae3e..302d5a1f8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 783f99f0f..c782fdd7c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 29fa0de28..f76a487ee 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e2eba4dc1..b215ceb0e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3434f3691..11b8ba7b2 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5160b6225..006dfa29f 100644 --- a/plugins/modules/ibm_dl_provider_gateway.py +++ b/plugins/modules/ibm_dl_provider_gateway.py @@ -18,56 +18,56 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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: description: - (Required for new resource) BGP ASN required: True type: int - tags: - description: - - Tags for the direct link gateway - required: False - type: list - elements: str bgp_ibm_cidr: description: - BGP IBM CIDR required: False type: str - name: - description: - - (Required for new resource) The unique user-defined name for this gateway - required: True - type: str speed_mbps: description: - (Required for new resource) Gateway speed in megabits per second required: True type: int - vlan: - description: - - VLAN allocated for this gateway - required: False - type: int 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 - bgp_cer_cidr: - description: - - BGP customer edge router CIDR - required: False - type: str port: description: - (Required for new resource) Gateway port required: True type: str + name: + description: + - (Required for new resource) The unique user-defined name for this gateway + required: True + type: str + tags: + description: + - Tags for the direct link gateway + required: False + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -115,23 +115,23 @@ # 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'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'bgp_cer_cidr', + 'vlan', 'bgp_asn', - 'tags', 'bgp_ibm_cidr', - 'name', 'speed_mbps', - 'vlan', 'customer_account_id', - 'bgp_cer_cidr', 'port', + 'name', + 'tags', ] # 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_asn=dict( + bgp_cer_cidr=dict( + required=False, + type='str'), + vlan=dict( required=False, type='int'), - tags=dict( + bgp_asn=dict( required=False, - elements='', - type='list'), + type='int'), bgp_ibm_cidr=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), speed_mbps=dict( required=False, type='int'), - vlan=dict( - required=False, - type='int'), customer_account_id=dict( required=False, type='str'), - bgp_cer_cidr=dict( + port=dict( required=False, type='str'), - port=dict( + name=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_dl_provider_gateway', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9fc3cc5ae..d4893fe65 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4509a0041..506fef633 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c97738c37..1e68ac200 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 00119ed36..a3cf1a6d6 100644 --- a/plugins/modules/ibm_dl_virtual_connection.py +++ b/plugins/modules/ibm_dl_virtual_connection.py @@ -18,18 +18,18 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + gateway: 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 + - (Required for new resource) The Direct Link gateway identifier required: True type: str - 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 type: @@ -88,15 +88,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('gateway', 'str'), + ('name', 'str'), ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'gateway', + 'name', 'type', 'network_id', ] @@ -115,10 +115,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( + gateway=dict( required=False, type='str'), - gateway=dict( + name=dict( required=False, type='str'), type=dict( @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_dl_virtual_connection', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 ccc033cc6..19c9e1cc5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 - description: - description: - - Descriptive text of the custom resolver. - required: False - type: str name: description: - (Required for new resource) Name of the custom resolver required: True type: str - enabled: + description: description: - - Whether the custom resolver is enabled + - Descriptive text of the custom resolver. required: False - type: bool - default: True + type: str high_availability: description: - Whether High Availability is enabled in custom resolver required: False type: bool default: True - locations: - description: - - Locations on which the custom resolver will be running - required: False - type: list - elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,12 +107,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'enabled', + 'locations', 'instance_id', - 'description', 'name', - 'enabled', + 'description', 'high_availability', - 'locations', ] # 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( - instance_id=dict( + enabled=dict( required=False, - type='str'), - description=dict( + type='bool'), + locations=dict( + required=False, + elements='', + type='list'), + instance_id=dict( required=False, type='str'), name=dict( required=False, type='str'), - enabled=dict( + description=dict( required=False, - type='bool'), + type='str'), high_availability=dict( required=False, type='bool'), - locations=dict( - required=False, - elements='', - type='list'), 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.41.1', + ibm_provider_version='1.42.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 e1a660b7d..c7c04243d 100644 --- a/plugins/modules/ibm_dns_custom_resolver_forwarding_rule.py +++ b/plugins/modules/ibm_dns_custom_resolver_forwarding_rule.py @@ -18,10 +18,25 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + resolver_id: + description: + - (Required for new resource) The unique identifier of a custom resolver. + required: True + type: str + description: + description: + - Descriptive text of the forwarding rule. + required: False + type: str + type: + description: + - Type of the forwarding rule. + required: False + type: str match: description: - The matching zone or hostname. @@ -38,21 +53,6 @@ - (Required for new resource) The unique identifier of a service instance. required: True type: str - resolver_id: - description: - - (Required for new resource) The unique identifier of a custom resolver. - required: True - type: str - description: - description: - - Descriptive text of the forwarding rule. - required: False - type: str - type: - description: - - Type of the forwarding rule. - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -99,18 +99,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), ('resolver_id', 'str'), + ('instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'match', - 'forward_to', - 'instance_id', 'resolver_id', 'description', 'type', + 'match', + 'forward_to', + 'instance_id', ] # 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( - match=dict( + resolver_id=dict( required=False, type='str'), - forward_to=dict( - required=False, - elements='', - type='list'), - instance_id=dict( + description=dict( required=False, type='str'), - resolver_id=dict( + type=dict( required=False, type='str'), - description=dict( + match=dict( required=False, type='str'), - type=dict( + forward_to=dict( + required=False, + elements='', + type='list'), + instance_id=dict( required=False, type='str'), id=dict( @@ -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.41.1', + ibm_provider_version='1.42.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 25ec37c12..0d4a4d53c 100644 --- a/plugins/modules/ibm_dns_custom_resolver_forwarding_rules_info.py +++ b/plugins/modules/ibm_dns_custom_resolver_forwarding_rules_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_dns_custom_resolver_forwarding_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resolver_id: + instance_id: description: - - The unique identifier of a custom resolver. + - The unique identifier of a service instance. required: True type: str - instance_id: + resolver_id: description: - - The unique identifier of a service instance. + - The unique identifier of a custom resolver. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('resolver_id', 'str'), ('instance_id', 'str'), + ('resolver_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resolver_id', 'instance_id', + 'resolver_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( - resolver_id=dict( + instance_id=dict( required=True, type='str'), - instance_id=dict( + resolver_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -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.41.1', + ibm_provider_version='1.42.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 aa62fc435..fc1fca4e2 100644 --- a/plugins/modules/ibm_dns_custom_resolver_location.py +++ b/plugins/modules/ibm_dns_custom_resolver_location.py @@ -18,10 +18,16 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + cr_enabled: + description: + - None + required: False + type: bool + default: True instance_id: description: - (Required for new resource) Instance ID @@ -43,12 +49,6 @@ required: False type: bool default: False - cr_enabled: - description: - - None - required: False - type: bool - default: True id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -102,11 +102,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'cr_enabled', 'instance_id', 'resolver_id', 'subnet_crn', 'enabled', - 'cr_enabled', ] # Params for Data source @@ -123,6 +123,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( + cr_enabled=dict( + required=False, + type='bool'), instance_id=dict( required=False, type='str'), @@ -135,9 +138,6 @@ enabled=dict( required=False, type='bool'), - cr_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.41.1', + ibm_provider_version='1.42.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 06b6b199a..16e2d5124 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c48f8a741..5c843bd2f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 bb7b33f1a..03f344ce4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4bb352ea3..a6ac7d277 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0d770c03d..52ca8d5fd 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3845a8a13..4a29ff31f 100644 --- a/plugins/modules/ibm_dns_glb.py +++ b/plugins/modules/ibm_dns_glb.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_glb' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,23 +27,28 @@ - (Required for new resource) The GUID of the private DNS. required: True type: str - ttl: + description: description: - - Time to live in second + - Descriptive text of the load balancer required: False - type: int - default: 60 - fallback_pool: - description: - - (Required for new resource) The pool ID to use when all other pools are detected as unhealthy - required: True 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: + description: + - Map availability zones to pool ID's. + required: False + type: list + elements: dict zone_id: description: - (Required for new resource) Zone Id @@ -54,22 +59,17 @@ - (Required for new resource) Name of the load balancer required: True type: str - description: - description: - - Descriptive text of the load balancer - required: False - type: str - enabled: + ttl: description: - - Whether the load balancer is enabled + - Time to live in second required: False - type: bool - az_pools: + type: int + default: 60 + fallback_pool: description: - - Map availability zones to pool ID's. - required: False - type: list - elements: dict + - (Required for new resource) The pool ID to use when all other pools are detected as unhealthy + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -117,23 +117,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('instance_id', 'str'), - ('fallback_pool', 'str'), ('default_pools', 'list'), ('zone_id', 'str'), ('name', 'str'), + ('fallback_pool', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'instance_id', - 'ttl', - 'fallback_pool', - 'default_pools', - 'zone_id', - 'name', 'description', 'enabled', + 'default_pools', 'az_pools', + 'zone_id', + 'name', + 'ttl', + 'fallback_pool', ] # Params for Data source @@ -153,32 +153,32 @@ instance_id=dict( required=False, type='str'), - ttl=dict( - required=False, - type='int'), - fallback_pool=dict( + description=dict( required=False, type='str'), + enabled=dict( + required=False, + type='bool'), default_pools=dict( required=False, elements='', type='list'), + az_pools=dict( + required=False, + elements='', + type='list'), zone_id=dict( required=False, type='str'), name=dict( required=False, type='str'), - description=dict( - required=False, - type='str'), - enabled=dict( + ttl=dict( required=False, - type='bool'), - az_pools=dict( + type='int'), + fallback_pool=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_dns_glb', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4071348d0..83c77586f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - expected_codes: + retries: description: - - The expected HTTP response code or code range of the health check. This parameter is only valid for HTTP and HTTPS + - 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 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 - method: - description: - - The method to use for the health check - required: False - type: str - path: + description: description: - - The endpoint path to health check against + - Descriptive text of the load balancer monitor required: False type: str - allow_insecure: - description: - - Do not validate the certificate when monitor use HTTPS. This parameter is currently only valid for HTTPS monitors. - required: False - type: bool - port: - description: - - Port number to connect to for the health check - required: False - type: int - 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 timeout: description: - The timeout (in seconds) before marking the health check as failed required: False type: int default: 5 - expected_body: + expected_codes: description: - - A case-insensitive sub-string to look for in the response body + - 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 - instance_id: + expected_body: description: - - (Required for new resource) Instance Id - required: True + - A case-insensitive sub-string to look for in the response body + required: False type: str - description: + method: description: - - Descriptive text of the load balancer monitor + - The method to use for the health check required: False type: str - type: + path: description: - - The protocol to use for the health check + - The endpoint path to health check against required: False type: str - default: HTTP headers: description: - The HTTP request headers to send in the health check required: False type: list elements: dict + instance_id: + description: + - (Required for new resource) Instance Id + required: True + type: str + port: + description: + - Port number to connect to for the health check + required: False + type: int + allow_insecure: + description: + - Do not validate the certificate when monitor use HTTPS. This parameter is currently only valid for HTTPS monitors. + required: False + type: bool 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 = [ - 'expected_codes', + 'retries', 'name', + 'type', 'interval', - 'method', - 'path', - 'allow_insecure', - 'port', - 'retries', + 'description', 'timeout', + 'expected_codes', 'expected_body', - 'instance_id', - 'description', - 'type', + 'method', + 'path', 'headers', + 'instance_id', + 'port', + 'allow_insecure', ] # 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( - expected_codes=dict( - required=False, - type='str'), - name=dict( - required=False, - type='str'), - interval=dict( + retries=dict( required=False, type='int'), - method=dict( + name=dict( required=False, type='str'), - path=dict( + type=dict( required=False, type='str'), - allow_insecure=dict( - required=False, - type='bool'), - port=dict( + interval=dict( required=False, type='int'), - retries=dict( + description=dict( required=False, - type='int'), + type='str'), timeout=dict( required=False, type='int'), - expected_body=dict( + expected_codes=dict( required=False, type='str'), - instance_id=dict( + expected_body=dict( required=False, type='str'), - description=dict( + method=dict( required=False, type='str'), - type=dict( + path=dict( required=False, type='str'), headers=dict( required=False, elements='', type='list'), + instance_id=dict( + required=False, + type='str'), + port=dict( + required=False, + type='int'), + allow_insecure=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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 5cfdd5a13..29474eebc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 daddc5cd3..7098fb326 100644 --- a/plugins/modules/ibm_dns_glb_pool.py +++ b/plugins/modules/ibm_dns_glb_pool.py @@ -18,62 +18,62 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - enabled: - description: - - Whether the load balancer pool is enabled - required: False - type: bool - origins: - description: - - (Required for new resource) Origins info - required: True - type: list - elements: dict - healthcheck_subnets: - description: - - Health check subnet crn of VSIs - required: False - type: list - elements: str instance_id: description: - (Required for new resource) Instance Id required: True type: str - monitor: + description: description: - - The ID of the load balancer monitor to be associated to this pool + - Descriptive text of the load balancer pool required: False type: str - notification_channel: + enabled: description: - - The notification channel,It is a webhook url + - Whether the load balancer pool is enabled + required: False + type: bool + healthy_origins_threshold: + description: + - The minimum number of origins that must be healthy for this pool to serve traffic required: False + type: int + name: + description: + - (Required for new resource) The unique identifier of a service instance. + required: True type: str healthcheck_region: description: - Health check region of VSIs required: False type: str - name: + origins: description: - - (Required for new resource) The unique identifier of a service instance. + - (Required for new resource) Origins info required: True + type: list + elements: dict + monitor: + description: + - The ID of the load balancer monitor to be associated to this pool + required: False type: str - description: + notification_channel: description: - - Descriptive text of the load balancer pool + - The notification channel,It is a webhook url required: False type: str - healthy_origins_threshold: + healthcheck_subnets: description: - - The minimum number of origins that must be healthy for this pool to serve traffic + - Health check subnet crn of VSIs required: False - type: int + type: list + elements: 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 = [ - ('origins', 'list'), ('instance_id', 'str'), ('name', 'str'), + ('origins', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'instance_id', + 'description', 'enabled', + 'healthy_origins_threshold', + 'name', + 'healthcheck_region', 'origins', - 'healthcheck_subnets', - 'instance_id', 'monitor', 'notification_channel', - 'healthcheck_region', - 'name', - 'description', - 'healthy_origins_threshold', + 'healthcheck_subnets', ] # Params for Data source @@ -153,38 +153,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( - enabled=dict( - required=False, - type='bool'), - origins=dict( - required=False, - elements='', - type='list'), - healthcheck_subnets=dict( - required=False, - elements='', - type='list'), instance_id=dict( required=False, type='str'), - monitor=dict( + description=dict( required=False, type='str'), - notification_channel=dict( + enabled=dict( + required=False, + type='bool'), + healthy_origins_threshold=dict( + required=False, + type='int'), + name=dict( required=False, type='str'), healthcheck_region=dict( required=False, type='str'), - name=dict( + origins=dict( + required=False, + elements='', + type='list'), + monitor=dict( required=False, type='str'), - description=dict( + notification_channel=dict( required=False, type='str'), - healthy_origins_threshold=dict( + healthcheck_subnets=dict( required=False, - type='int'), + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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 eb0f39a49..8bc53a1ab 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e3c60b51e..8964a3e19 100644 --- a/plugins/modules/ibm_dns_glbs_info.py +++ b/plugins/modules/ibm_dns_glbs_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_dns_glbs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - zone_id: + instance_id: description: - - Zone GUID + - The GUID of the private DNS. required: True type: str - instance_id: + zone_id: description: - - The GUID of the private DNS. + - Zone GUID required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('zone_id', 'str'), ('instance_id', 'str'), + ('zone_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'zone_id', 'instance_id', + 'zone_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( - zone_id=dict( + instance_id=dict( required=True, type='str'), - instance_id=dict( + zone_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_dns_glbs', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 ec0e6498a..6cfe5f003 100644 --- a/plugins/modules/ibm_dns_permitted_network.py +++ b/plugins/modules/ibm_dns_permitted_network.py @@ -18,15 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - vpc_crn: - description: - - (Required for new resource) VPC CRN id - required: True - type: str instance_id: description: - (Required for new resource) Instance Id @@ -43,6 +38,11 @@ required: False type: str default: vpc + vpc_crn: + description: + - (Required for new resource) VPC CRN id + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -89,17 +89,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('vpc_crn', 'str'), ('instance_id', 'str'), ('zone_id', 'str'), + ('vpc_crn', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'vpc_crn', 'instance_id', 'zone_id', 'type', + 'vpc_crn', ] # Params for Data source @@ -116,9 +116,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( - vpc_crn=dict( - required=False, - type='str'), instance_id=dict( required=False, type='str'), @@ -128,6 +125,9 @@ type=dict( required=False, type='str'), + vpc_crn=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_dns_permitted_network', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5d5877074..52f96b73c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 bb84088ee..f5b608534 100644 --- a/plugins/modules/ibm_dns_record.py +++ b/plugins/modules/ibm_dns_record.py @@ -18,77 +18,86 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_record' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - expire: + responsible_person: description: - - DNS record expiry info + - Responsible person for DNS record required: False - type: int - mx_priority: + type: str + minimum_ttl: description: - - Maximum priority + - Minimun TTL configuration required: False type: int - default: 0 ttl: description: - (Required for new resource) TTL configuration required: True type: int - port: + type: description: - - port number - required: False + - (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 - priority: + mx_priority: description: - - priority info + - 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 - tags: + expire: description: - - tags set for the resource + - DNS record expiry info required: False - type: list - elements: str - data: + type: int + retry: description: - - (Required for new resource) DNS record data - required: True - type: str - host: + - Retry count + required: False + type: int + protocol: description: - - (Required for new resource) Hostname - required: True + - protocol info + required: False type: str - refresh: + port: description: - - refresh rate + - port number required: False type: int - minimum_ttl: + priority: description: - - Minimun TTL configuration + - priority info required: False type: int - retry: + default: 0 + data: description: - - Retry count - required: False - type: int - type: + - (Required for new resource) DNS record data + required: True + type: str + host: description: - - (Required for new resource) DNS record type + - (Required for new resource) Hostname required: True type: str service: @@ -96,21 +105,12 @@ - service info required: False type: str - domain_id: - description: - - (Required for new resource) Domain ID of dns record instance - required: True - type: int - responsible_person: - description: - - Responsible person for DNS record - required: False - type: str - protocol: + tags: description: - - protocol info + - tags set for the resource required: False - type: str + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -158,31 +158,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('ttl', 'int'), - ('data', 'str'), - ('host', 'str'), ('type', 'str'), ('domain_id', 'int'), + ('data', 'str'), + ('host', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'expire', - 'mx_priority', + 'responsible_person', + 'minimum_ttl', 'ttl', + 'type', + 'domain_id', + 'mx_priority', + 'refresh', + 'weight', + 'expire', + 'retry', + 'protocol', 'port', 'priority', - 'weight', - 'tags', 'data', 'host', - 'refresh', - 'minimum_ttl', - 'retry', - 'type', 'service', - 'domain_id', - 'responsible_person', - 'protocol', + 'tags', ] # 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( - expire=dict( + responsible_person=dict( required=False, - type='int'), - mx_priority=dict( + type='str'), + minimum_ttl=dict( required=False, type='int'), ttl=dict( required=False, type='int'), - port=dict( + type=dict( required=False, - type='int'), - priority=dict( + type='str'), + domain_id=dict( required=False, type='int'), - weight=dict( + mx_priority=dict( required=False, type='int'), - tags=dict( - required=False, - elements='', - type='list'), - data=dict( - required=False, - type='str'), - host=dict( - required=False, - type='str'), refresh=dict( required=False, type='int'), - minimum_ttl=dict( + weight=dict( + required=False, + type='int'), + expire=dict( required=False, type='int'), retry=dict( required=False, type='int'), - type=dict( + protocol=dict( required=False, type='str'), - service=dict( + port=dict( required=False, - type='str'), - domain_id=dict( + type='int'), + priority=dict( required=False, type='int'), - responsible_person=dict( + data=dict( required=False, type='str'), - protocol=dict( + host=dict( + required=False, + type='str'), + service=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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 a701a86b1..be21c9a87 100644 --- a/plugins/modules/ibm_dns_resource_record.py +++ b/plugins/modules/ibm_dns_resource_record.py @@ -18,49 +18,55 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - type: + ttl: description: - - (Required for new resource) DNS record Type + - DNS record TTL + required: False + type: int + default: 900 + zone_id: + description: + - (Required for new resource) Zone ID + required: True + type: str + rdata: + description: + - (Required for new resource) DNS record Data required: True type: str + port: + description: + - DNS server Port + required: False + type: int priority: description: - DNS server Priority required: False type: int default: 0 - service: - description: - - Service info - required: False - type: str instance_id: description: - (Required for new resource) Instance ID required: True type: str - zone_id: - description: - - (Required for new resource) Zone ID - required: True - type: str name: description: - (Required for new resource) DNS record name required: True type: str - port: + type: description: - - DNS server Port - required: False - type: int - weight: + - (Required for new resource) DNS record Type + required: True + type: str + preference: description: - - DNS server weight + - DNS maximum preference required: False type: int default: 0 @@ -69,23 +75,17 @@ - Protocol required: False type: str - rdata: - description: - - (Required for new resource) DNS record Data - required: True - type: str - ttl: + weight: description: - - DNS record TTL + - DNS server weight required: False type: int - default: 900 - preference: + default: 0 + service: description: - - DNS maximum preference + - Service info required: False - type: int - default: 0 + 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 = [ - ('type', 'str'), - ('instance_id', 'str'), ('zone_id', 'str'), - ('name', 'str'), ('rdata', 'str'), + ('instance_id', 'str'), + ('name', 'str'), + ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'type', + 'ttl', + 'zone_id', + 'rdata', + 'port', 'priority', - 'service', 'instance_id', - 'zone_id', 'name', - 'port', - 'weight', - 'protocol', - 'rdata', - 'ttl', + '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( - type=dict( - required=False, - type='str'), - priority=dict( + ttl=dict( required=False, type='int'), - service=dict( - required=False, - type='str'), - instance_id=dict( - required=False, - type='str'), zone_id=dict( required=False, type='str'), - name=dict( + rdata=dict( required=False, type='str'), port=dict( required=False, type='int'), - weight=dict( + priority=dict( required=False, type='int'), - protocol=dict( + instance_id=dict( required=False, type='str'), - rdata=dict( + name=dict( required=False, type='str'), - ttl=dict( + type=dict( required=False, - type='int'), + type='str'), preference=dict( required=False, type='int'), + protocol=dict( + required=False, + type='str'), + weight=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.41.1', + ibm_provider_version='1.42.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 56305640f..6dcc38e97 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f6d83bfb1..a5e2d5e55 100644 --- a/plugins/modules/ibm_dns_reverse_record.py +++ b/plugins/modules/ibm_dns_reverse_record.py @@ -18,10 +18,15 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + ipaddress: + description: + - (Required for new resource) IP Address + required: True + type: str hostname: description: - (Required for new resource) Host name @@ -32,11 +37,6 @@ - TTL value required: False type: int - ipaddress: - description: - - (Required for new resource) IP Address - 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 = [ - ('hostname', 'str'), ('ipaddress', 'str'), + ('hostname', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'ipaddress', 'hostname', 'ttl', - 'ipaddress', ] # 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( + ipaddress=dict( + required=False, + type='str'), hostname=dict( required=False, type='str'), ttl=dict( required=False, type='int'), - ipaddress=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -182,7 +182,7 @@ def run_module(): resource_type='ibm_dns_reverse_record', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 b413c4369..f7ecb0d37 100644 --- a/plugins/modules/ibm_dns_secondary.py +++ b/plugins/modules/ibm_dns_secondary.py @@ -18,10 +18,16 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_secondary' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + tags: + description: + - List of tags + required: False + type: list + elements: str master_ip_address: description: - (Required for new resource) Master IP Address @@ -37,12 +43,6 @@ - (Required for new resource) Zone name required: True 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. @@ -96,10 +96,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tags', 'master_ip_address', 'transfer_frequency', 'zone_name', - 'tags', ] # Params for Data source @@ -118,6 +118,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( + tags=dict( + required=False, + elements='', + type='list'), master_ip_address=dict( required=False, type='str'), @@ -127,10 +131,6 @@ zone_name=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), id=dict( required=False, type='str'), @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_dns_secondary', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 816052496..67c1a52c6 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 40cbffcec..f28fe6b02 100644 --- a/plugins/modules/ibm_dns_zone.py +++ b/plugins/modules/ibm_dns_zone.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_dns_zone' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + description: + description: + - Zone description + required: False + type: str label: description: - Label @@ -37,11 +42,6 @@ - (Required for new resource) Zone name required: True type: str - description: - description: - - Zone description - required: False - 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 = [ + 'description', 'label', 'instance_id', 'name', - 'description', ] # 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( + description=dict( + required=False, + type='str'), label=dict( required=False, type='str'), @@ -123,9 +126,6 @@ name=dict( required=False, type='str'), - description=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_dns_zone', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 52872cc51..4761d5541 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 32ffd1374..e1ec806b0 100644 --- a/plugins/modules/ibm_en_destination.py +++ b/plugins/modules/ibm_en_destination.py @@ -18,21 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - type: - description: - - (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 + name: + description: + - (Required for new resource) The Destintion name. + required: True + type: str + type: + description: + - (Required for new resource) The type of Destination Webhook. + required: True + type: str description: description: - The Destination description. @@ -43,11 +48,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 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 = [ + ('name', 'str'), ('type', 'str'), ('instance_guid', 'str'), - ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'type', 'config', + 'name', + 'type', 'description', 'instance_guid', - 'name', ] # Params for Data source @@ -126,20 +126,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( - type=dict( - required=False, - type='str'), config=dict( required=False, elements='', type='list'), - description=dict( + name=dict( required=False, type='str'), - instance_guid=dict( + type=dict( required=False, type='str'), - name=dict( + description=dict( + required=False, + type='str'), + instance_guid=dict( required=False, type='str'), id=dict( @@ -207,7 +207,7 @@ def run_module(): resource_type='ibm_en_destination', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 841720026..cb4c29218 100644 --- a/plugins/modules/ibm_en_destination_android.py +++ b/plugins/modules/ibm_en_destination_android.py @@ -18,20 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_android' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - type: - description: - - (Required for new resource) The type of Destination push_android. - required: True - type: str - description: - description: - - The Destination description. - required: False - type: str config: description: - Payload describing a destination configuration. @@ -48,6 +38,16 @@ - (Required for new resource) The Destintion name. required: True type: str + type: + description: + - (Required for new resource) The type of Destination push_android. + required: True + type: str + description: + description: + - The Destination description. + required: False + type: str 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 = [ - ('type', 'str'), ('instance_guid', 'str'), ('name', 'str'), + ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'type', - 'description', 'config', 'instance_guid', 'name', + 'type', + 'description', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('destination_id', 'str'), ('instance_guid', 'str'), + ('destination_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'destination_id', 'instance_guid', + 'destination_id', ] TL_CONFLICTS_MAP = { @@ -126,12 +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( - type=dict( - required=False, - type='str'), - description=dict( - required=False, - type='str'), config=dict( required=False, elements='', @@ -142,6 +136,12 @@ name=dict( required=False, type='str'), + type=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), id=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 93e76266a..15fac0dc2 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - destination_id: + instance_guid: description: - - Unique identifier for Destination. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - instance_guid: + destination_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for Destination. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('destination_id', 'str'), ('instance_guid', 'str'), + ('destination_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'destination_id', 'instance_guid', + 'destination_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( - destination_id=dict( + instance_guid=dict( required=True, type='str'), - instance_guid=dict( + destination_id=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.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..6cf258ede --- /dev/null +++ b/plugins/modules/ibm_en_destination_chrome.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_chrome +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_destination_chrome + +short_description: Configure IBM Cloud 'ibm_en_destination_chrome' resource + +version_added: "2.8" + +description: + - 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 + - Terraform v0.12.20 + +options: + type: + description: + - (Required for new resource) The type of Destination type push_chrome. + required: True + type: str + description: + description: + - 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. + 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'), + ('instance_guid', 'str'), + ('name', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'type', + 'description', + 'instance_guid', + 'name', + 'config', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('destination_id', 'str'), + ('instance_guid', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'destination_id', + 'instance_guid', +] + +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( + type=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + 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'), + 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_chrome', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_chrome', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.42.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_chrome_info.py b/plugins/modules/ibm_en_destination_chrome_info.py new file mode 100644 index 000000000..ef3af6e37 --- /dev/null +++ b/plugins/modules/ibm_en_destination_chrome_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_chrome_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_destination_chrome + +short_description: Retrieve IBM Cloud 'ibm_en_destination_chrome' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_destination_chrome' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + destination_id: + description: + - Unique identifier for Destination. + required: True + type: str + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications 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 = [ + ('destination_id', 'str'), + ('instance_guid', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'destination_id', + 'instance_guid', +] + + +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( + destination_id=dict( + required=True, + type='str'), + instance_guid=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_chrome', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_firefox.py b/plugins/modules/ibm_en_destination_firefox.py new file mode 100644 index 000000000..2c21ce101 --- /dev/null +++ b/plugins/modules/ibm_en_destination_firefox.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_firefox +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_destination_firefox + +short_description: Configure IBM Cloud 'ibm_en_destination_firefox' resource + +version_added: "2.8" + +description: + - 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 + - Terraform v0.12.20 + +options: + name: + description: + - (Required for new resource) The Destintion name. + 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 + 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_firefox. + 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'), + ('instance_guid', 'str'), + ('type', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'name', + 'description', + 'config', + 'instance_guid', + 'type', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('destination_id', 'str'), + ('instance_guid', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'destination_id', + 'instance_guid', +] + +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'), + description=dict( + required=False, + type='str'), + config=dict( + required=False, + elements='', + type='list'), + instance_guid=dict( + required=False, + type='str'), + 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_firefox', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_firefox', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.42.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_firefox_info.py b/plugins/modules/ibm_en_destination_firefox_info.py new file mode 100644 index 000000000..03e6ed280 --- /dev/null +++ b/plugins/modules/ibm_en_destination_firefox_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_firefox_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_destination_firefox + +short_description: Retrieve IBM Cloud 'ibm_en_destination_firefox' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_destination_firefox' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + destination_id: + description: + - Unique identifier for Destination. + required: True + type: str + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications 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 = [ + ('destination_id', 'str'), + ('instance_guid', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'destination_id', + 'instance_guid', +] + + +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( + destination_id=dict( + required=True, + type='str'), + instance_guid=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_firefox', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_info.py b/plugins/modules/ibm_en_destination_info.py index 5e35a65e9..f6af46eef 100644 --- a/plugins/modules/ibm_en_destination_info.py +++ b/plugins/modules/ibm_en_destination_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 b0b1c3be3..0e6665ac7 100644 --- a/plugins/modules/ibm_en_destination_ios.py +++ b/plugins/modules/ibm_en_destination_ios.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_ios' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 type push_ios. @@ -32,6 +42,11 @@ - The Destination description. required: False type: str + certificate_content_type: + description: + - (Required for new resource) The Certificate Content Type to be set p8/p12. + required: True + type: str certificate: description: - (Required for new resource) The Certificate File. @@ -43,21 +58,6 @@ 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) The Destintion name. - required: True - type: str - certificate_content_type: - description: - - (Required for new resource) The Certificate Content Type to be set p8/p12. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,33 +104,33 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('type', 'str'), - ('certificate', 'str'), - ('instance_guid', 'str'), ('name', 'str'), + ('instance_guid', 'str'), + ('type', 'str'), ('certificate_content_type', 'str'), + ('certificate', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', + 'instance_guid', 'type', 'description', + 'certificate_content_type', 'certificate', 'config', - 'instance_guid', - 'name', - 'certificate_content_type', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('destination_id', 'str'), ('instance_guid', 'str'), + ('destination_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'destination_id', 'instance_guid', + 'destination_id', ] TL_CONFLICTS_MAP = { @@ -140,12 +140,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( + 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'), + certificate_content_type=dict( + required=False, + type='str'), certificate=dict( required=False, type='str'), @@ -153,15 +162,6 @@ required=False, elements='', type='list'), - instance_guid=dict( - required=False, - type='str'), - name=dict( - required=False, - type='str'), - certificate_content_type=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 40d8b4f8d..245b6cb52 100644 --- a/plugins/modules/ibm_en_destination_ios_info.py +++ b/plugins/modules/ibm_en_destination_ios_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination_ios' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - destination_id: + instance_guid: description: - - Unique identifier for Destination. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - instance_guid: + destination_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for Destination. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('destination_id', 'str'), ('instance_guid', 'str'), + ('destination_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'destination_id', 'instance_guid', + 'destination_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( - destination_id=dict( + instance_guid=dict( required=True, type='str'), - instance_guid=dict( + destination_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination_ios', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_destination_webhook.py b/plugins/modules/ibm_en_destination_webhook.py index 9f17b82e0..23bf46d26 100644 --- a/plugins/modules/ibm_en_destination_webhook.py +++ b/plugins/modules/ibm_en_destination_webhook.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_en_destination_webhook' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: - description: - - The Destination description. - required: False - type: str name: description: - (Required for new resource) The Destintion name. @@ -37,17 +32,22 @@ - (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: description: - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - config: + description: description: - - Payload describing a destination configuration. + - The Destination description. required: False - type: list - elements: dict + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -101,11 +101,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', 'name', 'type', - 'instance_guid', 'config', + 'instance_guid', + 'description', ] # 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( - description=dict( - required=False, - type='str'), name=dict( required=False, type='str'), type=dict( required=False, type='str'), - instance_guid=dict( - required=False, - type='str'), config=dict( required=False, elements='', type='list'), + instance_guid=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 73fa8cb3e..388fdd34d 100644 --- a/plugins/modules/ibm_en_destination_webhook_info.py +++ b/plugins/modules/ibm_en_destination_webhook_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_en_destination_webhook' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_destination_webhook', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4a75b9f4f..a67e15d06 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription.py b/plugins/modules/ibm_en_subscription.py index 0b4b08631..bd349e392 100644 --- a/plugins/modules/ibm_en_subscription.py +++ b/plugins/modules/ibm_en_subscription.py @@ -18,41 +18,41 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: + topic_id: description: - - Subscription description. - required: False + - (Required for new resource) Topic ID. + required: True type: str - destination_id: + attributes: description: - - (Required for new resource) Destination ID. + - None + required: False + type: list + elements: dict + name: + description: + - (Required for new resource) Subscription name. required: True type: str - topic_id: + description: description: - - (Required for new resource) Topic ID. - required: True + - 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 - name: + destination_id: description: - - (Required for new resource) Subscription name. + - (Required for new resource) Destination 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. @@ -99,31 +99,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('destination_id', 'str'), ('topic_id', 'str'), - ('instance_guid', 'str'), ('name', 'str'), + ('instance_guid', 'str'), + ('destination_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'destination_id', 'topic_id', - 'instance_guid', - 'name', 'attributes', + 'name', + 'description', + 'instance_guid', + 'destination_id', ] # 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( + topic_id=dict( required=False, type='str'), - destination_id=dict( + attributes=dict( + required=False, + elements='', + type='list'), + name=dict( required=False, type='str'), - topic_id=dict( + description=dict( required=False, type='str'), instance_guid=dict( required=False, type='str'), - name=dict( + destination_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', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4f3c41c58..0138f5fe2 100644 --- a/plugins/modules/ibm_en_subscription_android.py +++ b/plugins/modules/ibm_en_subscription_android.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_android' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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: + - Subscription description. + required: False + type: str name: description: - (Required for new resource) Subscription name. @@ -37,16 +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 - description: - description: - - Subscription description. - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource 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'), - ('instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'instance_guid', + 'description', 'name', 'destination_id', 'topic_id', - 'instance_guid', - 'description', ] # 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( - name=dict( + instance_guid=dict( required=False, type='str'), - destination_id=dict( + description=dict( required=False, type='str'), - topic_id=dict( + name=dict( required=False, type='str'), - instance_guid=dict( + destination_id=dict( required=False, type='str'), - description=dict( + topic_id=dict( required=False, type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 7fd890ab0..12eaa83dc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..176be8d25 --- /dev/null +++ b/plugins/modules/ibm_en_subscription_chrome.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_chrome +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_subscription_chrome + +short_description: Configure IBM Cloud 'ibm_en_subscription_chrome' resource + +version_added: "2.8" + +description: + - 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 + - Terraform v0.12.20 + +options: + destination_id: + description: + - (Required for new resource) Destination ID. + required: True + type: str + description: + description: + - Subscription description. + required: False + type: str + name: + description: + - (Required for new resource) Subscription name. + 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 = [ + ('destination_id', 'str'), + ('name', 'str'), + ('topic_id', 'str'), + ('instance_guid', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'destination_id', + 'description', + 'name', + 'topic_id', + 'instance_guid', +] + +# Params for Data source +TL_REQUIRED_PARAMETERS_DS = [ + ('subscription_id', 'str'), + ('instance_guid', 'str'), +] + +TL_ALL_PARAMETERS_DS = [ + 'subscription_id', + 'instance_guid', +] + +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( + destination_id=dict( + required=False, + type='str'), + description=dict( + required=False, + type='str'), + name=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_chrome', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_chrome', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.42.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_chrome_info.py b/plugins/modules/ibm_en_subscription_chrome_info.py new file mode 100644 index 000000000..66cf671ea --- /dev/null +++ b/plugins/modules/ibm_en_subscription_chrome_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_chrome_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_subscription_chrome + +short_description: Retrieve IBM Cloud 'ibm_en_subscription_chrome' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_subscription_chrome' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + subscription_id: + description: + - Unique identifier for result. + required: True + type: str + instance_guid: + description: + - Unique identifier for IBM Cloud Event Notifications 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 = [ + ('subscription_id', 'str'), + ('instance_guid', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'subscription_id', + 'instance_guid', +] + + +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( + subscription_id=dict( + required=True, + type='str'), + instance_guid=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_chrome', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_email.py b/plugins/modules/ibm_en_subscription_email.py index 3c500bdb0..933ad2efe 100644 --- a/plugins/modules/ibm_en_subscription_email.py +++ b/plugins/modules/ibm_en_subscription_email.py @@ -18,18 +18,24 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_email' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - instance_guid: + name: description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + - (Required for new resource) Subscription name. required: True type: str - name: + attributes: description: - - (Required for new resource) Subscription name. + - 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 description: @@ -42,12 +48,6 @@ - (Required for new resource) Destination ID. required: True type: str - attributes: - description: - - None - required: False - type: list - elements: dict topic_id: description: - (Required for new resource) Topic ID. @@ -99,31 +99,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_guid', 'str'), ('name', 'str'), + ('instance_guid', 'str'), ('destination_id', 'str'), ('topic_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_guid', 'name', + 'attributes', + 'instance_guid', 'description', 'destination_id', - 'attributes', 'topic_id', ] # 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,10 +133,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( - instance_guid=dict( + name=dict( required=False, type='str'), - name=dict( + attributes=dict( + required=False, + elements='', + type='list'), + instance_guid=dict( required=False, type='str'), description=dict( @@ -145,10 +149,6 @@ destination_id=dict( required=False, type='str'), - attributes=dict( - required=False, - elements='', - type='list'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 72b0a1a09..e1d0e3b79 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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_email', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..72ad08383 --- /dev/null +++ b/plugins/modules/ibm_en_subscription_firefox.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_firefox +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/en_subscription_firefox + +short_description: Configure IBM Cloud 'ibm_en_subscription_firefox' resource + +version_added: "2.8" + +description: + - 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 + - Terraform v0.12.20 + +options: + description: + description: + - Subscription description. + required: False + type: str + destination_id: + description: + - (Required for new resource) Destination ID. + 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: + - (Required for new resource) Subscription name. + 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 = [ + ('destination_id', 'str'), + ('instance_guid', 'str'), + ('name', 'str'), + ('topic_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'description', + 'destination_id', + 'instance_guid', + 'name', + '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( + description=dict( + required=False, + type='str'), + destination_id=dict( + required=False, + type='str'), + instance_guid=dict( + required=False, + type='str'), + name=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_firefox', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_firefox', + tf_type='resource', + parameters=module.params, + ibm_provider_version='1.42.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_firefox_info.py b/plugins/modules/ibm_en_subscription_firefox_info.py new file mode 100644 index 000000000..543e56b2c --- /dev/null +++ b/plugins/modules/ibm_en_subscription_firefox_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_firefox_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/en_subscription_firefox + +short_description: Retrieve IBM Cloud 'ibm_en_subscription_firefox' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_en_subscription_firefox' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.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_firefox', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_info.py b/plugins/modules/ibm_en_subscription_info.py index 07a70afe9..1c20d34cc 100644 --- a/plugins/modules/ibm_en_subscription_info.py +++ b/plugins/modules/ibm_en_subscription_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_subscription' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 00792a44d..427a57462 100644 --- a/plugins/modules/ibm_en_subscription_ios.py +++ b/plugins/modules/ibm_en_subscription_ios.py @@ -18,28 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_ios' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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: - Subscription description. required: False type: str - destination_id: - description: - - (Required for new resource) Destination ID. - required: True - type: str - instance_guid: + name: description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + - (Required for new resource) Subscription name. required: True type: str - name: + destination_id: description: - - (Required for new resource) Subscription name. + - (Required for new resource) Destination ID. required: True type: str topic_id: @@ -93,18 +93,18 @@ # 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'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'destination_id', 'instance_guid', + 'description', 'name', + 'destination_id', 'topic_id', ] @@ -126,16 +126,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( - description=dict( + instance_guid=dict( required=False, type='str'), - destination_id=dict( + description=dict( required=False, type='str'), - instance_guid=dict( + name=dict( required=False, type='str'), - name=dict( + destination_id=dict( required=False, type='str'), topic_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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 52e51d8f9..94194b243 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_en_subscription_sms.py b/plugins/modules/ibm_en_subscription_sms.py index 45a524257..0fc94f24e 100644 --- a/plugins/modules/ibm_en_subscription_sms.py +++ b/plugins/modules/ibm_en_subscription_sms.py @@ -18,14 +18,14 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_sms' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - topic_id: + description: description: - - (Required for new resource) Topic ID. - required: True + - Subscription description. + required: False type: str attributes: description: @@ -33,10 +33,10 @@ required: False type: list elements: dict - description: + instance_guid: description: - - Subscription description. - required: False + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True type: str name: description: @@ -48,9 +48,9 @@ - (Required for new resource) Destination ID. required: True type: str - instance_guid: + topic_id: description: - - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + - (Required for new resource) Topic ID. required: True type: str id: @@ -99,31 +99,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('topic_id', 'str'), + ('instance_guid', 'str'), ('name', 'str'), ('destination_id', 'str'), - ('instance_guid', 'str'), + ('topic_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'topic_id', - 'attributes', 'description', + 'attributes', + 'instance_guid', 'name', 'destination_id', - 'instance_guid', + '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,14 +133,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( - topic_id=dict( + description=dict( required=False, type='str'), attributes=dict( required=False, elements='', type='list'), - description=dict( + instance_guid=dict( required=False, type='str'), name=dict( @@ -149,7 +149,7 @@ destination_id=dict( required=False, type='str'), - instance_guid=dict( + topic_id=dict( required=False, type='str'), id=dict( @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_en_subscription_sms', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 cb15cdef3..39cc72975 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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_sms', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 0e8a6e374..04d9d5213 100644 --- a/plugins/modules/ibm_en_subscription_webhook.py +++ b/plugins/modules/ibm_en_subscription_webhook.py @@ -18,26 +18,25 @@ - Create, update or destroy an IBM Cloud 'ibm_en_subscription_webhook' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 - destination_id: + topic_id: description: - - (Required for new resource) Destination ID. + - (Required for new resource) Topic ID. required: True type: str - attributes: + instance_guid: description: - - None - required: False - type: list - elements: dict + - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. + required: True + type: str name: description: - (Required for new resource) Subscription name. @@ -48,11 +47,12 @@ - Subscription description. required: False type: str - topic_id: + attributes: description: - - (Required for new resource) Topic ID. - required: True - type: str + - None + required: False + type: list + elements: dict 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 = [ - ('instance_guid', 'str'), ('destination_id', 'str'), - ('name', 'str'), ('topic_id', 'str'), + ('instance_guid', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_guid', 'destination_id', - 'attributes', + 'topic_id', + 'instance_guid', 'name', 'description', - 'topic_id', + 'attributes', ] # Params for Data source @@ -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( - instance_guid=dict( + destination_id=dict( required=False, type='str'), - destination_id=dict( + topic_id=dict( required=False, type='str'), - attributes=dict( + instance_guid=dict( required=False, - elements='', - type='list'), + type='str'), name=dict( required=False, type='str'), description=dict( required=False, type='str'), - topic_id=dict( + attributes=dict( required=False, - type='str'), + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 a6d979f33..b6cf74cba 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5c0d6ae1f..e197328f7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 859a93a0e..30267d5bb 100644 --- a/plugins/modules/ibm_en_topic.py +++ b/plugins/modules/ibm_en_topic.py @@ -18,21 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_en_topic' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: - description: - - Description of the topic. - required: False - type: str sources: description: - List of sources. required: False type: list elements: dict + description: + description: + - Description of the topic. + required: False + type: str instance_guid: description: - (Required for new resource) Unique identifier for IBM Cloud Event Notifications instance. @@ -95,21 +95,21 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', 'sources', + 'description', 'instance_guid', 'name', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('topic_id', 'str'), ('instance_guid', 'str'), + ('topic_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'topic_id', 'instance_guid', + 'topic_id', ] TL_CONFLICTS_MAP = { @@ -119,13 +119,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( - description=dict( - required=False, - type='str'), sources=dict( required=False, elements='', type='list'), + description=dict( + required=False, + type='str'), instance_guid=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 dba973e97..78af75c42 100644 --- a/plugins/modules/ibm_en_topic_info.py +++ b/plugins/modules/ibm_en_topic_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_en_topic' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - topic_id: + instance_guid: description: - - Unique identifier for Topic. + - Unique identifier for IBM Cloud Event Notifications instance. required: True type: str - instance_guid: + topic_id: description: - - Unique identifier for IBM Cloud Event Notifications instance. + - Unique identifier for Topic. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('topic_id', 'str'), ('instance_guid', 'str'), + ('topic_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'topic_id', 'instance_guid', + 'topic_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( - topic_id=dict( + instance_guid=dict( required=True, type='str'), - instance_guid=dict( + topic_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_en_topic', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 e58373b2b..6b335c20c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e6cf55b8d..742dda2d8 100644 --- a/plugins/modules/ibm_enterprise.py +++ b/plugins/modules/ibm_enterprise.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_enterprise' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - primary_contact_iam_id: - description: - - (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 source_account_id: description: - (Required for new resource) The ID of the account that is used to create the enterprise. @@ -37,6 +32,11 @@ - (Required for new resource) The name of the enterprise. This field must have 3 - 60 characters. required: True type: str + primary_contact_iam_id: + description: + - (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`. @@ -88,16 +88,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('primary_contact_iam_id', 'str'), ('source_account_id', 'str'), ('name', 'str'), + ('primary_contact_iam_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'primary_contact_iam_id', 'source_account_id', 'name', + 'primary_contact_iam_id', 'domain', ] @@ -115,15 +115,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( - primary_contact_iam_id=dict( - required=False, - type='str'), source_account_id=dict( required=False, type='str'), name=dict( required=False, type='str'), + primary_contact_iam_id=dict( + required=False, + type='str'), domain=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.41.1', + ibm_provider_version='1.42.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 f121d2df2..177a85429 100644 --- a/plugins/modules/ibm_enterprise_account.py +++ b/plugins/modules/ibm_enterprise_account.py @@ -18,23 +18,23 @@ - Create, update or destroy an IBM Cloud 'ibm_enterprise_account' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - owner_iam_id: + parent: description: - - The IAM ID of the account owner, such as `IBMid-0123ABC`. The IAM ID must already exist. - 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 - account_id: + name: description: - - The source account id of account to be imported + - The name of the account. This field must have 3 - 60 characters. required: False type: str - enterprise_account_id: + owner_iam_id: description: - - The enterprise account ID. + - The IAM ID of the account owner, such as `IBMid-0123ABC`. The IAM ID must already exist. required: False type: str enterprise_id: @@ -42,14 +42,14 @@ - The enterprise ID that the account is a part of. required: False type: str - parent: + enterprise_account_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 enterprise account ID. + required: False type: str - name: + account_id: description: - - The name of the account. This field must have 3 - 60 characters. + - The source account id of account to be imported required: False type: str id: @@ -103,12 +103,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'owner_iam_id', - 'account_id', - 'enterprise_account_id', - 'enterprise_id', 'parent', 'name', + 'owner_iam_id', + 'enterprise_id', + 'enterprise_account_id', + 'account_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( - owner_iam_id=dict( + parent=dict( required=False, type='str'), - account_id=dict( + name=dict( required=False, type='str'), - enterprise_account_id=dict( + owner_iam_id=dict( required=False, type='str'), enterprise_id=dict( required=False, type='str'), - parent=dict( + enterprise_account_id=dict( required=False, type='str'), - name=dict( + account_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.41.1', + ibm_provider_version='1.42.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 d0dc1ad66..eaabd1093 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,14 +27,14 @@ - (Required for new resource) The CRN of the parent under which the account group will be created. The parent can be an existing account group or the enterprise itself. required: True type: str - name: + primary_contact_iam_id: description: - - (Required for new resource) The name of the account group. This field must have 3 - 60 characters. + - (Required for new resource) The IAM ID of the primary contact for this account group, such as `IBMid-0123ABC`. The IAM ID must already exist. required: True type: str - primary_contact_iam_id: + name: description: - - (Required for new resource) The IAM ID of the primary contact for this account group, such as `IBMid-0123ABC`. The IAM ID must already exist. + - (Required for new resource) The name of the account group. This field must have 3 - 60 characters. required: True type: str id: @@ -84,15 +84,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('parent', 'str'), - ('name', 'str'), ('primary_contact_iam_id', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'parent', - 'name', 'primary_contact_iam_id', + 'name', ] # Params for Data source @@ -112,10 +112,10 @@ parent=dict( required=False, type='str'), - name=dict( + primary_contact_iam_id=dict( required=False, type='str'), - primary_contact_iam_id=dict( + name=dict( required=False, type='str'), id=dict( @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_enterprise_account_group', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 6f71915de..c873e7a95 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 b69c330dd..f20d99c79 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 cf4fc78a0..560ee28f5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 8da3023cb..969068ed0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -96,13 +96,13 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('resource_instance_id', 'str'), ('schema_id', 'str'), + ('resource_instance_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'resource_instance_id', 'schema_id', + 'resource_instance_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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 cb2f598c4..e156bf53b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - 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 iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('resource_instance_id', 'str'), ('schema_id', 'str'), + ('resource_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_instance_id', 'schema_id', + '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( + schema_id=dict( required=True, type='str'), - schema_id=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_schema', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 de79740d0..1de24da9f 100644 --- a/plugins/modules/ibm_event_streams_topic.py +++ b/plugins/modules/ibm_event_streams_topic.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_event_streams_topic' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -38,11 +43,6 @@ 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,10 +95,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'config', 'resource_instance_id', 'name', 'partitions', - 'config', ] # Params for Data source @@ -119,6 +119,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( + config=dict( + required=False, + type='dict'), resource_instance_id=dict( required=False, type='str'), @@ -128,9 +131,6 @@ 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 94caa658b..45d33d707 100644 --- a/plugins/modules/ibm_event_streams_topic_info.py +++ b/plugins/modules/ibm_event_streams_topic_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_event_streams_topic' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_event_streams_topic', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 45b6a0ab4..17b8c67d0 100644 --- a/plugins/modules/ibm_firewall.py +++ b/plugins/modules/ibm_firewall.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_firewall' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -45,6 +39,12 @@ 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,9 +116,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( - firewall_type=dict( - required=False, - type='str'), ha_enabled=dict( required=False, type='bool'), @@ -129,6 +126,9 @@ 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.41.1', + ibm_provider_version='1.42.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 ae6fe9370..e44a541bf 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 d497e0d93..4ffb91ead 100644 --- a/plugins/modules/ibm_function_action.py +++ b/plugins/modules/ibm_function_action.py @@ -18,26 +18,32 @@ - Create, update or destroy an IBM Cloud 'ibm_function_action' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + exec: description: - - (Required for new resource) Name of action. + - (Required for new resource) Execution info required: True - type: str - namespace: + type: list + elements: dict + publish: description: - - (Required for new resource) IBM Cloud function namespace. - required: True - type: str + - Action visibilty. + required: False + type: bool limits: description: - None required: False type: list elements: dict + namespace: + description: + - (Required for new resource) IBM Cloud function namespace. + required: True + type: str user_defined_annotations: description: - Annotation values in KEY VALUE format. @@ -50,17 +56,11 @@ required: False type: str default: [] - exec: + name: description: - - (Required for new resource) Execution info + - (Required for new resource) Name of action. required: True - type: list - elements: dict - publish: - description: - - Action visibilty. - required: False - type: bool + 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 = [ - ('name', 'str'), - ('namespace', 'str'), ('exec', 'list'), + ('namespace', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'namespace', + 'exec', + 'publish', 'limits', + 'namespace', 'user_defined_annotations', 'user_defined_parameters', - 'exec', - 'publish', + 'name', ] # Params for Data source @@ -127,29 +127,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( - name=dict( + exec=dict( required=False, - type='str'), - namespace=dict( + elements='', + type='list'), + publish=dict( required=False, - type='str'), + type='bool'), limits=dict( required=False, elements='', type='list'), + namespace=dict( + required=False, + type='str'), user_defined_annotations=dict( required=False, type='str'), user_defined_parameters=dict( required=False, type='str'), - exec=dict( - required=False, - elements='', - type='list'), - publish=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_function_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 261750de6..75bb2ab14 100644 --- a/plugins/modules/ibm_function_action_info.py +++ b/plugins/modules/ibm_function_action_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_function_action' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_function_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 eb7a7e7f3..fb9c53de1 100644 --- a/plugins/modules/ibm_function_namespace.py +++ b/plugins/modules/ibm_function_namespace.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_function_namespace' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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. @@ -32,11 +37,6 @@ - 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 = [ - ('name', 'str'), ('resource_group_id', 'str'), + ('name', '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,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( - name=dict( + resource_group_id=dict( required=False, type='str'), - description=dict( + name=dict( required=False, type='str'), - resource_group_id=dict( + description=dict( required=False, type='str'), id=dict( @@ -160,7 +160,7 @@ def run_module(): resource_type='ibm_function_namespace', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b8daa07b9..80e01a7fa 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 6cae2b287..83a9f3b48 100644 --- a/plugins/modules/ibm_function_package.py +++ b/plugins/modules/ibm_function_package.py @@ -18,37 +18,37 @@ - Create, update or destroy an IBM Cloud 'ibm_function_package' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - bind_package_name: - description: - - Name of package to be binded. - required: False - type: str namespace: description: - (Required for new resource) IBM Cloud function namespace. required: True type: str - user_defined_annotations: - description: - - Annotation values in KEY VALUE format. - required: False - type: str - default: [] name: description: - (Required for new resource) Name of package. required: True type: str + bind_package_name: + description: + - Name of package to be binded. + required: False + type: str publish: description: - Package visibilty. required: False type: bool default: False + user_defined_annotations: + description: + - Annotation values in KEY VALUE format. + 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. @@ -93,11 +93,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bind_package_name', 'namespace', - 'user_defined_annotations', 'name', + 'bind_package_name', 'publish', + 'user_defined_annotations', 'user_defined_parameters', ] @@ -119,21 +119,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( - bind_package_name=dict( - required=False, - type='str'), namespace=dict( required=False, type='str'), - user_defined_annotations=dict( + name=dict( required=False, type='str'), - name=dict( + bind_package_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'), @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_function_package', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 2a0db5343..57f5ade17 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 592bad9a0..3d897c8f4 100644 --- a/plugins/modules/ibm_function_rule.py +++ b/plugins/modules/ibm_function_rule.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_function_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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. @@ -37,11 +42,6 @@ - (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,29 +74,29 @@ # 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 TL_REQUIRED_PARAMETERS_DS = [ - ('namespace', 'str'), ('name', 'str'), + ('namespace', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'namespace', 'name', + 'namespace', ] TL_CONFLICTS_MAP = { @@ -106,6 +106,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( + action_name=dict( + required=False, + type='str'), namespace=dict( required=False, type='str'), @@ -115,9 +118,6 @@ 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 c1d235ef1..e57576e5f 100644 --- a/plugins/modules/ibm_function_rule_info.py +++ b/plugins/modules/ibm_function_rule_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_function_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - namespace: + name: description: - - Name of the namespace. + - Name of the rule. required: True type: str - name: + namespace: description: - - Name of the rule. + - Name of the namespace. required: True type: str function_namespace: @@ -50,14 +50,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('namespace', 'str'), ('name', 'str'), + ('namespace', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'namespace', 'name', + 'namespace', ] @@ -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( - namespace=dict( + name=dict( required=True, type='str'), - name=dict( + namespace=dict( required=True, type='str'), function_namespace=dict( @@ -98,7 +98,7 @@ def run_module(): resource_type='ibm_function_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 80d5bf5a0..55188b688 100644 --- a/plugins/modules/ibm_function_trigger.py +++ b/plugins/modules/ibm_function_trigger.py @@ -18,18 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_function_trigger' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) Name of Trigger. - required: True - type: str - user_defined_parameters: + user_defined_annotations: description: - - Parameters values in KEY VALUE format. Parameter bindings included in the context passed to the trigger. + - Annotation values in KEY VALUE format. required: False type: str default: [] @@ -38,18 +33,23 @@ - (Required for new resource) IBM Cloud function namespace. required: True type: str - user_defined_annotations: + name: description: - - Annotation values in KEY VALUE format. - required: False + - (Required for new resource) Name of Trigger. + required: True type: str - default: [] feed: description: - Trigger feed 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. @@ -82,17 +82,17 @@ # 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', - 'user_defined_parameters', - 'namespace', 'user_defined_annotations', + 'namespace', + 'name', 'feed', + 'user_defined_parameters', ] # Params for Data source @@ -113,22 +113,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'), - user_defined_parameters=dict( + user_defined_annotations=dict( required=False, type='str'), namespace=dict( required=False, type='str'), - user_defined_annotations=dict( + name=dict( required=False, type='str'), feed=dict( 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 fd3b07bb9..96d683ec0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9210193ed..3b8323fe4 100644 --- a/plugins/modules/ibm_hardware_firewall_shared.py +++ b/plugins/modules/ibm_hardware_firewall_shared.py @@ -18,10 +18,15 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + firewall_type: + description: + - (Required for new resource) Firewall type + required: True + type: str virtual_instance_id: description: - Virtual instance ID @@ -32,11 +37,6 @@ - Hardware instance ID required: False type: int - firewall_type: - description: - - (Required for new resource) Firewall type - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -88,9 +88,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'firewall_type', 'virtual_instance_id', 'hardware_instance_id', - 'firewall_type', ] # 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( + firewall_type=dict( + required=False, + type='str'), virtual_instance_id=dict( required=False, type='int'), hardware_instance_id=dict( required=False, type='int'), - firewall_type=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_hardware_firewall_shared', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 db76411fc..d20c4ca22 100644 --- a/plugins/modules/ibm_hpcs.py +++ b/plugins/modules/ibm_hpcs.py @@ -18,38 +18,44 @@ - Create, update or destroy an IBM Cloud 'ibm_hpcs' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - plan: + signature_threshold: description: - - (Required for new resource) The plan type of the HPCS Instance + - (Required for new resource) Signature Threshold Value required: True - type: str - failover_units: - description: - - The number of failover crypto units for your service instance - required: False type: int units: description: - (Required for new resource) The number of operational crypto units for your service instance required: True type: int - signature_server_url: + revocation_threshold: description: - - URL of signing service - required: False - type: str + - (Required for new resource) Revocation Threshold Value + required: True + type: int name: description: - (Required for new resource) A name for the HPCS instance required: True type: str - location: + signature_server_url: description: - - (Required for new resource) The location where the HPCS instance available + - URL of signing service + required: False + type: str + tags: + description: + - None + required: False + type: list + elements: str + plan: + description: + - (Required for new resource) The plan type of the HPCS Instance required: True type: str service: @@ -63,22 +69,16 @@ - The resource group id required: False type: str - tags: + failover_units: description: - - None + - The number of failover crypto units for your service instance required: False - type: list - elements: str - signature_threshold: - description: - - (Required for new resource) Signature Threshold Value - required: True type: int - revocation_threshold: + location: description: - - (Required for new resource) Revocation Threshold Value + - (Required for new resource) The location where the HPCS instance available required: True - type: int + type: str service_endpoints: description: - Types of the service endpoints. Possible values are `public-and-private`, `private-only`. @@ -136,28 +136,28 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('plan', 'str'), + ('signature_threshold', 'int'), ('units', 'int'), + ('revocation_threshold', 'int'), ('name', 'str'), + ('plan', 'str'), ('location', 'str'), - ('signature_threshold', 'int'), - ('revocation_threshold', 'int'), ('admins', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'plan', - 'failover_units', + 'signature_threshold', 'units', - 'signature_server_url', + 'revocation_threshold', 'name', - 'location', + 'signature_server_url', + 'tags', + 'plan', 'service', 'resource_group_id', - 'tags', - 'signature_threshold', - 'revocation_threshold', + 'failover_units', + 'location', 'service_endpoints', 'admins', ] @@ -168,10 +168,10 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', 'resource_group_id', 'location', 'service', + 'name', ] TL_CONFLICTS_MAP = { @@ -181,22 +181,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( - plan=dict( - required=False, - type='str'), - failover_units=dict( + signature_threshold=dict( required=False, type='int'), units=dict( required=False, type='int'), - signature_server_url=dict( + revocation_threshold=dict( required=False, - type='str'), + type='int'), name=dict( required=False, type='str'), - location=dict( + signature_server_url=dict( + required=False, + type='str'), + tags=dict( + required=False, + elements='', + type='list'), + plan=dict( required=False, type='str'), service=dict( @@ -205,16 +209,12 @@ resource_group_id=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), - signature_threshold=dict( + failover_units=dict( required=False, type='int'), - revocation_threshold=dict( + location=dict( required=False, - type='int'), + type='str'), service_endpoints=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 192e10399..277be07a7 100644 --- a/plugins/modules/ibm_hpcs_info.py +++ b/plugins/modules/ibm_hpcs_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_hpcs' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -42,6 +37,11 @@ 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,9 +94,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=True, - type='str'), resource_group_id=dict( required=False, type='str'), @@ -106,6 +103,9 @@ 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.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS) diff --git a/plugins/modules/ibm_iam_access_group.py b/plugins/modules/ibm_iam_access_group.py index b5aad7671..8ba33d22b 100644 --- a/plugins/modules/ibm_iam_access_group.py +++ b/plugins/modules/ibm_iam_access_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_access_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_iam_access_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 f435be418..39f47b167 100644 --- a/plugins/modules/ibm_iam_access_group_dynamic_rule.py +++ b/plugins/modules/ibm_iam_access_group_dynamic_rule.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -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.41.1', + ibm_provider_version='1.42.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 3319803d4..4aaef6145 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f937ebdb8..e4ee62bbf 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 cc27a3c84..8783f88d6 100644 --- a/plugins/modules/ibm_iam_access_group_policy.py +++ b/plugins/modules/ibm_iam_access_group_policy.py @@ -18,22 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_access_group_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resources: - description: - - None - required: False - type: list - elements: dict - tags: - description: - - None - required: False - type: list - elements: str access_group_id: description: - (Required for new resource) ID of access group @@ -45,29 +33,46 @@ required: True type: list elements: str - resource_tags: + account_management: description: - - Set access management tags. + - Give access to all account management services required: False - type: list - elements: dict + type: bool + default: False + transaction_id: + description: + - Set transactionID for debug + required: False + type: str description: description: - Description of the Policy required: False type: str + resources: + description: + - None + required: False + type: list + elements: dict resource_attributes: description: - Set resource attributes. 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 + resource_tags: + description: + - Set access management tags. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -120,14 +125,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resources', - 'tags', 'access_group_id', 'roles', - 'resource_tags', + 'account_management', + 'transaction_id', 'description', + 'resources', 'resource_attributes', - 'account_management', + 'tags', + 'resource_tags', ] # Params for Data source @@ -138,26 +144,19 @@ TL_ALL_PARAMETERS_DS = [ 'access_group_id', 'sort', + 'transaction_id', ] TL_CONFLICTS_MAP = { + 'account_management': ['resources', 'resource_attributes'], 'resources': ['account_management', '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( - resources=dict( - required=False, - elements='', - type='list'), - tags=dict( - required=False, - elements='', - type='list'), access_group_id=dict( required=False, type='str'), @@ -165,20 +164,31 @@ required=False, elements='', type='list'), - resource_tags=dict( + account_management=dict( required=False, - elements='', - type='list'), + type='bool'), + transaction_id=dict( + required=False, + type='str'), description=dict( required=False, type='str'), + resources=dict( + required=False, + elements='', + type='list'), resource_attributes=dict( required=False, elements='', type='list'), - account_management=dict( + tags=dict( required=False, - type='bool'), + elements='', + type='list'), + resource_tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -244,7 +254,7 @@ def run_module(): resource_type='ibm_iam_access_group_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -253,7 +263,7 @@ def run_module(): resource_type='ibm_iam_access_group_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 8ea3a3975..a73bb53c3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -31,6 +31,11 @@ - Sort query for policies required: False type: str + transaction_id: + description: + - Set transactionID for debug + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -71,6 +76,7 @@ TL_ALL_PARAMETERS = [ 'access_group_id', 'sort', + 'transaction_id', ] @@ -87,6 +93,9 @@ sort=dict( required=False, type='str'), + transaction_id=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -121,7 +130,7 @@ def run_module(): resource_type='ibm_iam_access_group_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9223d2f00..f0246fd1f 100644 --- a/plugins/modules/ibm_iam_account_settings.py +++ b/plugins/modules/ibm_iam_account_settings.py @@ -18,28 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_account_settings' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - session_invalidation_in_seconds: - description: - - 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_platform_apikey: + include_history: 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. + - Defines if the entity history is included in the response. required: False - type: str - mfa: + type: bool + default: False + allowed_ip_addresses: 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. + - Defines the IP addresses and subnets from which IAM tokens can be created for the account. required: False type: str if_match: @@ -53,20 +44,24 @@ - 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. required: False type: str - include_history: + session_invalidation_in_seconds: description: - - Defines if the entity history is included in the response. + - 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: bool - default: 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 - allowed_ip_addresses: + restrict_create_platform_apikey: description: - - Defines the IP addresses and subnets from which IAM tokens can be created for the account. + - 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. required: False type: str entity_tag: @@ -74,6 +69,11 @@ - Version of the account settings. required: False type: str + mfa: + 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. + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -124,16 +124,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'session_invalidation_in_seconds', - 'max_sessions_per_identity', - 'restrict_create_platform_apikey', - 'mfa', + 'include_history', + 'allowed_ip_addresses', 'if_match', 'session_expiration_in_seconds', - 'include_history', + 'session_invalidation_in_seconds', + 'max_sessions_per_identity', 'restrict_create_service_id', - 'allowed_ip_addresses', + 'restrict_create_platform_apikey', 'entity_tag', + 'mfa', ] # Params for Data source @@ -151,36 +151,36 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - session_invalidation_in_seconds=dict( + include_history=dict( required=False, - type='str'), - max_sessions_per_identity=dict( + type='bool'), + allowed_ip_addresses=dict( required=False, type='str'), - restrict_create_platform_apikey=dict( + if_match=dict( required=False, type='str'), - mfa=dict( + session_expiration_in_seconds=dict( required=False, type='str'), - if_match=dict( + session_invalidation_in_seconds=dict( required=False, type='str'), - session_expiration_in_seconds=dict( + max_sessions_per_identity=dict( required=False, type='str'), - include_history=dict( - required=False, - type='bool'), restrict_create_service_id=dict( required=False, type='str'), - allowed_ip_addresses=dict( + restrict_create_platform_apikey=dict( required=False, type='str'), entity_tag=dict( required=False, type='str'), + mfa=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -246,7 +246,7 @@ def run_module(): resource_type='ibm_iam_account_settings', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b6da0d3c8..090e42c21 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 747a30697..06ba62271 100644 --- a/plugins/modules/ibm_iam_api_key.py +++ b/plugins/modules/ibm_iam_api_key.py @@ -18,20 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_api_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + entity_lock: + description: + - Indicates if the API key is locked for further write operations. False by default. + required: False + type: str + default: false name: 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 - 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 file: description: - File where api key is to be stored @@ -47,12 +48,11 @@ - 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: + store_value: description: - - Indicates if the API key is locked for further write operations. False by default. + - 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: str - default: 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 = [ + 'entity_lock', 'name', - 'store_value', 'file', 'description', 'apikey', - 'entity_lock', + 'store_value', ] # Params for Data source @@ -128,12 +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( - name=dict( + entity_lock=dict( required=False, type='str'), - store_value=dict( + name=dict( required=False, - type='bool'), + type='str'), file=dict( required=False, type='str'), @@ -143,9 +143,9 @@ apikey=dict( required=False, type='str'), - entity_lock=dict( + store_value=dict( required=False, - type='str'), + 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 9fc826d5c..cfb4392d6 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3c4789047..f797baca8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4b07d56a6..92d21d0ef 100644 --- a/plugins/modules/ibm_iam_authorization_policies_info.py +++ b/plugins/modules/ibm_iam_authorization_policies_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_authorization_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -31,6 +31,11 @@ - Sort query for policies required: False type: str + transaction_id: + description: + - Set transactionID for debug + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -70,6 +75,7 @@ TL_ALL_PARAMETERS = [ 'account_id', 'sort', + 'transaction_id', ] @@ -86,6 +92,9 @@ sort=dict( required=False, type='str'), + transaction_id=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -120,7 +129,7 @@ def run_module(): resource_type='ibm_iam_authorization_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 dfbc0d0de..947bf2e99 100644 --- a/plugins/modules/ibm_iam_authorization_policy.py +++ b/plugins/modules/ibm_iam_authorization_policy.py @@ -18,15 +18,37 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - source_service_name: + subject_attributes: description: - - The source service name + - Set subject attributes. + required: False + type: list + elements: dict + source_resource_type: + description: + - Resource type of source service + required: False + type: str + target_resource_instance_id: + description: + - The target resource instance Id required: False type: str + source_resource_group_id: + description: + - The source resource group Id + required: False + type: str + resource_attributes: + description: + - Set resource attributes. + required: False + type: list + elements: dict target_service_name: description: - The target service name @@ -43,32 +65,11 @@ - The source resource instance Id required: False type: str - target_resource_instance_id: - description: - - The target resource instance Id - required: False - type: str target_resource_group_id: description: - The target resource group Id required: False type: str - source_resource_type: - description: - - Resource type of source service - required: False - type: str - resource_attributes: - description: - - Set resource attributes. - required: False - type: list - elements: dict - source_resource_group_id: - description: - - The source resource group Id - required: False - type: str target_resource_type: description: - Resource type of target service @@ -79,17 +80,21 @@ - Account GUID of source service required: False type: str - subject_attributes: + source_service_name: description: - - Set subject attributes. + - The source service name required: False - type: list - elements: dict + type: str description: description: - Description of the Policy required: False type: str + transaction_id: + description: + - Set transactionID for debug + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -141,19 +146,20 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'source_service_name', + 'subject_attributes', + 'source_resource_type', + 'target_resource_instance_id', + 'source_resource_group_id', + 'resource_attributes', 'target_service_name', 'roles', 'source_resource_instance_id', - 'target_resource_instance_id', 'target_resource_group_id', - 'source_resource_type', - 'resource_attributes', - 'source_resource_group_id', 'target_resource_type', 'source_service_account', - 'subject_attributes', + 'source_service_name', 'description', + 'transaction_id', ] # Params for Data source @@ -164,48 +170,49 @@ ] TL_CONFLICTS_MAP = { - 'source_resource_instance_id': ['subject_attributes'], - 'target_resource_instance_id': ['resource_attributes'], - 'target_resource_group_id': ['resource_attributes'], + 'subject_attributes': ['source_resource_instance_id', 'source_resource_group_id', 'source_resource_type', 'source_service_account'], 'source_resource_type': ['subject_attributes'], - 'resource_attributes': ['target_resource_instance_id', 'target_resource_group_id', 'target_resource_type'], + 'target_resource_instance_id': ['resource_attributes'], 'source_resource_group_id': ['subject_attributes'], + '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'], - 'subject_attributes': ['source_resource_instance_id', 'source_resource_group_id', 'source_resource_type', 'source_service_account'], } # 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( - source_service_name=dict( - required=False, - type='str'), - target_service_name=dict( - required=False, - type='str'), - roles=dict( + subject_attributes=dict( required=False, elements='', type='list'), - source_resource_instance_id=dict( + source_resource_type=dict( required=False, type='str'), target_resource_instance_id=dict( required=False, type='str'), - target_resource_group_id=dict( + source_resource_group_id=dict( required=False, type='str'), - source_resource_type=dict( + resource_attributes=dict( + required=False, + elements='', + type='list'), + target_service_name=dict( required=False, type='str'), - resource_attributes=dict( + roles=dict( required=False, elements='', type='list'), - source_resource_group_id=dict( + source_resource_instance_id=dict( + required=False, + type='str'), + target_resource_group_id=dict( required=False, type='str'), target_resource_type=dict( @@ -214,13 +221,15 @@ source_service_account=dict( required=False, type='str'), - subject_attributes=dict( + source_service_name=dict( required=False, - elements='', - type='list'), + type='str'), description=dict( required=False, type='str'), + transaction_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -286,7 +295,7 @@ def run_module(): resource_type='ibm_iam_authorization_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 c34a48762..c3835faf0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3d9493cd8..ee71163c8 100644 --- a/plugins/modules/ibm_iam_custom_role.py +++ b/plugins/modules/ibm_iam_custom_role.py @@ -18,25 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: - description: - - The description of the role - required: False - 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 + description: + description: + - The description of the role + required: False + type: str service: description: - (Required for new resource) The Service Name @@ -48,6 +43,11 @@ 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 = [ - ('display_name', 'str'), ('name', 'str'), ('service', 'str'), ('actions', 'list'), + ('display_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', - 'display_name', 'name', + 'description', 'service', 'actions', + 'display_name', ] # Params for Data source @@ -123,13 +123,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( - description=dict( - required=False, - type='str'), - display_name=dict( + name=dict( required=False, type='str'), - name=dict( + description=dict( required=False, type='str'), service=dict( @@ -139,6 +136,9 @@ 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.41.1', + ibm_provider_version='1.42.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 28e21ffb6..b6c04e4e7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 1f984c220..512125401 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ec117b252..61052c456 100644 --- a/plugins/modules/ibm_iam_service_api_key.py +++ b/plugins/modules/ibm_iam_service_api_key.py @@ -18,45 +18,45 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + file: + description: + - File where api key is to be stored + required: False + type: str name: description: - (Required for new resource) Name of the Service API key required: True type: str - locked: - description: - - The API key cannot be changed if set to true - required: False - type: bool description: description: - 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 required: True type: str - apikey: + locked: description: - - API key value for this API key + - The API key cannot be changed if set to true required: False - type: str + type: bool store_value: description: - Boolean value deciding whether API key value is retrievable in the future required: False type: bool - file: - description: - - File where api key is to be stored - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -109,13 +109,13 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'file', 'name', - 'locked', 'description', - 'iam_service_id', 'apikey', + 'iam_service_id', + 'locked', 'store_value', - 'file', ] # Params for Data source @@ -132,27 +132,27 @@ 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( + file=dict( required=False, type='str'), - locked=dict( + name=dict( required=False, - type='bool'), + type='str'), description=dict( required=False, type='str'), - iam_service_id=dict( + apikey=dict( required=False, type='str'), - apikey=dict( + iam_service_id=dict( required=False, type='str'), - store_value=dict( + locked=dict( required=False, type='bool'), - file=dict( + store_value=dict( required=False, - type='str'), + type='bool'), 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.41.1', + ibm_provider_version='1.42.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 b368c5731..a0145f980 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 a8112a1f8..7d88d5846 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e2af64cef..19da516d3 100644 --- a/plugins/modules/ibm_iam_service_policy.py +++ b/plugins/modules/ibm_iam_service_policy.py @@ -18,18 +18,35 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_service_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + account_management: + description: + - Give access to all account management services + required: False + type: bool + default: False + tags: + description: + - None + required: False + type: list + elements: str description: description: - Description of the Policy required: False type: str - iam_id: + transaction_id: description: - - IAM ID of ServiceID + - Set transactionID for debug + required: False + type: str + iam_service_id: + description: + - UUID of ServiceID required: False type: str roles: @@ -44,29 +61,17 @@ required: False type: list elements: dict - resource_attributes: - description: - - Set resource attributes. - required: False - type: list - elements: dict - iam_service_id: + iam_id: description: - - UUID of ServiceID + - IAM ID of ServiceID required: False type: str - account_management: - description: - - Give access to all account management services - required: False - type: bool - default: False - tags: + resource_attributes: description: - - None + - Set resource attributes. required: False type: list - elements: str + elements: dict resource_tags: description: - Set access management tags. @@ -124,14 +129,15 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'account_management', + 'tags', 'description', - 'iam_id', + 'transaction_id', + 'iam_service_id', 'roles', 'resources', + 'iam_id', 'resource_attributes', - 'iam_service_id', - 'account_management', - 'tags', 'resource_tags', ] @@ -140,25 +146,36 @@ ] TL_ALL_PARAMETERS_DS = [ + 'iam_service_id', 'iam_id', 'sort', - 'iam_service_id', + 'transaction_id', ] TL_CONFLICTS_MAP = { + 'account_management': ['resources', 'resource_attributes'], 'resources': ['account_management', '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( + account_management=dict( + required=False, + type='bool'), + tags=dict( + required=False, + elements='', + type='list'), description=dict( required=False, type='str'), - iam_id=dict( + transaction_id=dict( + required=False, + type='str'), + iam_service_id=dict( required=False, type='str'), roles=dict( @@ -169,17 +186,10 @@ required=False, elements='', type='list'), - resource_attributes=dict( - required=False, - elements='', - type='list'), - iam_service_id=dict( + iam_id=dict( required=False, type='str'), - account_management=dict( - required=False, - type='bool'), - tags=dict( + resource_attributes=dict( required=False, elements='', type='list'), @@ -252,7 +262,7 @@ def run_module(): resource_type='ibm_iam_service_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -261,7 +271,7 @@ def run_module(): resource_type='ibm_iam_service_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 b6680f5f1..76a7e97b2 100644 --- a/plugins/modules/ibm_iam_service_policy_info.py +++ b/plugins/modules/ibm_iam_service_policy_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_iam_service_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + iam_service_id: + description: + - UUID of ServiceID + required: False + type: str iam_id: description: - IAM ID of ServiceID @@ -31,9 +36,9 @@ - Sort query for policies required: False type: str - iam_service_id: + transaction_id: description: - - UUID of ServiceID + - Set transactionID for debug required: False type: str iaas_classic_username: @@ -73,9 +78,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'iam_service_id', 'iam_id', 'sort', - 'iam_service_id', + 'transaction_id', ] @@ -86,13 +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( + required=False, + type='str'), iam_id=dict( required=False, type='str'), sort=dict( required=False, type='str'), - iam_service_id=dict( + transaction_id=dict( required=False, type='str'), iaas_classic_username=dict( @@ -129,7 +138,7 @@ def run_module(): resource_type='ibm_iam_service_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 565b835c4..88da2a079 100644 --- a/plugins/modules/ibm_iam_trusted_profile.py +++ b/plugins/modules/ibm_iam_trusted_profile.py @@ -18,20 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_trusted_profile' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) Name of the trusted profile. The name is checked for uniqueness. Therefore trusted profiles with the same names can not exist in the same account. - required: True - type: str description: description: - The optional description of the trusted profile. The 'description' property is only available if a description was provided during creation of trusted profile. required: False type: str + name: + description: + - (Required for new resource) Name of the trusted profile. The name is checked for uniqueness. Therefore trusted profiles with the same names can not exist in the same account. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,8 +83,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'description', + 'name', ] # Params for Data source @@ -103,10 +103,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( + description=dict( required=False, type='str'), - description=dict( + name=dict( required=False, type='str'), id=dict( @@ -174,7 +174,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 509dabd46..4509a6cae 100644 --- a/plugins/modules/ibm_iam_trusted_profile_claim_rule.py +++ b/plugins/modules/ibm_iam_trusted_profile_claim_rule.py @@ -18,15 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - type: - description: - - (Required for new resource) Type of the calim rule, either 'Profile-SAML' or 'Profile-CR'. - required: True - type: str conditions: description: - (Required for new resource) Conditions of this claim rule. @@ -38,16 +33,6 @@ - Name of the claim rule to be created or updated. required: False type: str - realm_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'. - required: False - type: str - cr_type: - description: - - 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'. @@ -58,6 +43,21 @@ - (Required for new resource) ID of the trusted profile to create a claim rule. required: True type: str + type: + description: + - (Required for new resource) Type of the calim rule, either 'Profile-SAML' or 'Profile-CR'. + required: True + type: str + realm_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'. + required: False + type: str + cr_type: + description: + - 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 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -104,20 +104,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('type', 'str'), ('conditions', 'list'), ('profile_id', 'str'), + ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'type', 'conditions', 'name', - 'realm_name', - 'cr_type', 'expiration', 'profile_id', + 'type', + 'realm_name', + 'cr_type', ] # Params for Data source @@ -138,9 +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( - type=dict( - required=False, - type='str'), conditions=dict( required=False, elements='', @@ -148,16 +145,19 @@ name=dict( required=False, type='str'), - realm_name=dict( + expiration=dict( + required=False, + type='int'), + profile_id=dict( required=False, type='str'), - cr_type=dict( + type=dict( required=False, type='str'), - expiration=dict( + realm_name=dict( required=False, - type='int'), - profile_id=dict( + type='str'), + cr_type=dict( required=False, type='str'), id=dict( @@ -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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 e8783103b..abf0190d7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 1633f93f1..fc2c23ccd 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 d79937882..49f57203e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a0c7ff241..228aa3433 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -198,7 +198,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_link', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 dc0f13ca6..c6707a319 100644 --- a/plugins/modules/ibm_iam_trusted_profile_link_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_link_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile_link' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_link', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5bec13f05..2028586cf 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 078c846de..4b15a1e73 100644 --- a/plugins/modules/ibm_iam_trusted_profile_policy.py +++ b/plugins/modules/ibm_iam_trusted_profile_policy.py @@ -18,28 +18,32 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_trusted_profile_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + transaction_id: + description: + - Set transactionID for debug + required: False + type: str + iam_id: + description: + - IAM ID of Trusted Profile + required: False + type: str roles: description: - (Required for new resource) Role names of the policy definition required: True type: list elements: str - resources: + resource_attributes: description: - - None + - Set resource attributes. required: False type: list elements: dict - account_management: - description: - - Give access to all account management services - required: False - type: bool - default: False tags: description: - None @@ -62,17 +66,18 @@ - UUID of Trusted Profile required: False type: str - iam_id: - description: - - IAM ID of Trusted Profile - required: False - type: str - resource_attributes: + resources: description: - - Set resource attributes. + - 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. @@ -124,15 +129,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'transaction_id', + 'iam_id', 'roles', - 'resources', - 'account_management', + 'resource_attributes', 'tags', 'resource_tags', 'description', 'profile_id', - 'iam_id', - 'resource_attributes', + 'resources', + 'account_management', ] # Params for Data source @@ -143,29 +149,33 @@ 'profile_id', 'iam_id', 'sort', + 'transaction_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( + required=False, + type='str'), + iam_id=dict( + required=False, + type='str'), roles=dict( required=False, elements='', type='list'), - resources=dict( + resource_attributes=dict( required=False, elements='', type='list'), - account_management=dict( - required=False, - type='bool'), tags=dict( required=False, elements='', @@ -180,13 +190,13 @@ profile_id=dict( required=False, type='str'), - iam_id=dict( - required=False, - type='str'), - resource_attributes=dict( + resources=dict( required=False, elements='', type='list'), + account_management=dict( + required=False, + type='bool'), id=dict( required=False, type='str'), @@ -252,7 +262,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -261,7 +271,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 f68bc5bab..d30546d02 100644 --- a/plugins/modules/ibm_iam_trusted_profile_policy_info.py +++ b/plugins/modules/ibm_iam_trusted_profile_policy_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profile_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -36,6 +36,11 @@ - Sort query for policies required: False type: str + transaction_id: + description: + - Set transactionID for debug + required: False + type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -76,6 +81,7 @@ 'profile_id', 'iam_id', 'sort', + 'transaction_id', ] @@ -95,6 +101,9 @@ sort=dict( required=False, type='str'), + transaction_id=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -129,7 +138,7 @@ def run_module(): resource_type='ibm_iam_trusted_profile_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 8d5786221..16c5f1555 100644 --- a/plugins/modules/ibm_iam_trusted_profiles_info.py +++ b/plugins/modules/ibm_iam_trusted_profiles_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_iam_trusted_profiles' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -129,7 +129,7 @@ def run_module(): resource_type='ibm_iam_trusted_profiles', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 7cb1f1bef..e0f921953 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 de1bc58f6..99bd9493c 100644 --- a/plugins/modules/ibm_iam_user_policy.py +++ b/plugins/modules/ibm_iam_user_policy.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_iam_user_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -28,21 +28,15 @@ required: False type: list elements: str - resource_tags: - description: - - Set access management tags. - required: False - type: list - elements: dict description: description: - Description of the Policy required: False type: str - ibm_id: + transaction_id: description: - - (Required for new resource) The ibm id or email of user - required: True + - Set transactionID for debug + required: False type: str roles: description: @@ -56,18 +50,29 @@ required: False type: list elements: dict + account_management: + description: + - Give access to all account management services + required: False + type: bool + default: False + ibm_id: + description: + - (Required for new resource) The ibm id or email of user + required: True + type: str resource_attributes: description: - Set resource attributes. required: False type: list elements: dict - account_management: + resource_tags: description: - - Give access to all account management services + - Set access management tags. required: False - type: bool - default: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -114,20 +119,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('ibm_id', 'str'), ('roles', 'list'), + ('ibm_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'tags', - 'resource_tags', 'description', - 'ibm_id', + 'transaction_id', 'roles', 'resources', - 'resource_attributes', 'account_management', + 'ibm_id', + 'resource_attributes', + 'resource_tags', ] # Params for Data source @@ -136,14 +142,15 @@ ] TL_ALL_PARAMETERS_DS = [ - 'ibm_id', 'sort', + 'transaction_id', + 'ibm_id', ] TL_CONFLICTS_MAP = { 'resources': ['account_management', 'resource_attributes'], - 'resource_attributes': ['resources', 'account_management'], 'account_management': ['resources', 'resource_attributes'], + 'resource_attributes': ['resources', 'account_management'], } # define available arguments/parameters a user can pass to the module @@ -154,14 +161,10 @@ required=False, elements='', type='list'), - resource_tags=dict( - required=False, - elements='', - type='list'), description=dict( required=False, type='str'), - ibm_id=dict( + transaction_id=dict( required=False, type='str'), roles=dict( @@ -172,13 +175,20 @@ required=False, elements='', type='list'), + account_management=dict( + required=False, + type='bool'), + ibm_id=dict( + required=False, + type='str'), resource_attributes=dict( required=False, elements='', type='list'), - account_management=dict( + resource_tags=dict( required=False, - type='bool'), + elements='', + type='list'), id=dict( required=False, type='str'), @@ -244,7 +254,7 @@ def run_module(): resource_type='ibm_iam_user_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -253,7 +263,7 @@ def run_module(): resource_type='ibm_iam_user_policy', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 91f4f8e18..664962df0 100644 --- a/plugins/modules/ibm_iam_user_policy_info.py +++ b/plugins/modules/ibm_iam_user_policy_info.py @@ -17,20 +17,25 @@ description: - Retrieve an IBM Cloud 'ibm_iam_user_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 required: False type: str + transaction_id: + description: + - 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 @@ -69,8 +74,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'ibm_id', 'sort', + 'transaction_id', + 'ibm_id', ] @@ -81,12 +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, @@ -121,7 +130,7 @@ def run_module(): resource_type='ibm_iam_user_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 35a5880fe..20eed3179 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ebeedc6d8..815c5aeda 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 42be7e145..d689c1cbc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 8c7a5eaf1..85e01e368 100644 --- a/plugins/modules/ibm_ipsec_vpn.py +++ b/plugins/modules/ibm_ipsec_vpn.py @@ -18,37 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_ipsec_vpn' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - phase_one: - description: - - None - required: False - type: list - elements: dict - remote_subnet: - description: - - None - required: False - type: list - elements: dict internal_subnet_id: description: - Internal subnet ID value required: False type: int - remote_subnet_id: + phase_one: description: - - Remote subnet ID value + - None required: False - type: int - datacenter: - description: - - (Required for new resource) Datacenter name - required: True - type: str + type: list + elements: dict phase_two: description: - None @@ -71,11 +55,27 @@ - Customer Peer IP Address required: False type: str + remote_subnet_id: + description: + - Remote subnet ID value + required: False + type: int + remote_subnet: + description: + - None + required: False + type: list + elements: dict 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 = [ - 'phase_one', - 'remote_subnet', 'internal_subnet_id', - 'remote_subnet_id', - 'datacenter', + 'phase_one', 'phase_two', 'address_translation', 'preshared_key', 'customer_peer_ip', + 'remote_subnet_id', + 'remote_subnet', 'service_subnet_id', + 'datacenter', ] # Params for Data source @@ -147,31 +147,21 @@ ] TL_CONFLICTS_MAP = { - 'remote_subnet': ['remote_subnet_id'], 'remote_subnet_id': ['remote_subnet'], + 'remote_subnet': ['remote_subnet_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( - phase_one=dict( - required=False, - elements='', - type='list'), - remote_subnet=dict( - required=False, - elements='', - type='list'), internal_subnet_id=dict( required=False, type='int'), - remote_subnet_id=dict( - required=False, - type='int'), - datacenter=dict( + phase_one=dict( required=False, - type='str'), + elements='', + type='list'), phase_two=dict( required=False, elements='', @@ -186,9 +176,19 @@ customer_peer_ip=dict( required=False, type='str'), + remote_subnet_id=dict( + required=False, + type='int'), + remote_subnet=dict( + required=False, + elements='', + type='list'), service_subnet_id=dict( required=False, type='int'), + datacenter=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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 85d8580f3..4254603ca 100644 --- a/plugins/modules/ibm_is_bare_metal_server.py +++ b/plugins/modules/ibm_is_bare_metal_server.py @@ -18,66 +18,57 @@ - Create, update or destroy an IBM Cloud 'ibm_is_bare_metal_server' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - Bare metal server name - required: False - type: str - image: + keys: description: - - (Required for new resource) image id + - (Required for new resource) SSH key Ids for the bare metal server required: True - type: str - tags: - description: - - Tags for the Bare metal server - required: False type: list elements: str - profile: + image: description: - - (Required for new resource) profile name + - (Required for new resource) image id required: True type: str - vpc: + user_data: description: - - The VPC the bare metal server is to be a part of + - User data given for the bare metal server required: False type: str - resource_group: + zone: description: - - Resource group name - required: False + - (Required for new resource) Zone name + required: True type: str - action: + delete_type: description: - - This restart/start/stops a bare metal server. + - Enables stopping type of the bare metal server before deleting required: False type: str + default: hard network_interfaces: description: - None required: False type: list elements: dict - zone: + tags: description: - - (Required for new resource) Zone name - required: True - type: str - delete_type: + - Tags for the Bare metal server + required: False + type: list + elements: str + name: description: - - Enables stopping type of the bare metal server before deleting + - Bare metal server name required: False type: str - default: hard - user_data: + vpc: description: - - User data given for the bare metal server + - The VPC the bare metal server is to be a part of required: False type: str primary_network_interface: @@ -86,12 +77,21 @@ required: True type: list elements: dict - keys: + resource_group: description: - - (Required for new resource) SSH key Ids for the bare metal server + - Resource group name + required: False + type: str + action: + description: + - This restart/start/stops a bare metal server. + required: False + type: str + profile: + description: + - (Required for new resource) profile name required: True - type: list - elements: str + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -138,28 +138,28 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('keys', 'list'), ('image', 'str'), - ('profile', 'str'), ('zone', 'str'), ('primary_network_interface', 'list'), - ('keys', 'list'), + ('profile', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', + 'keys', 'image', + 'user_data', + 'zone', + 'delete_type', + 'network_interfaces', 'tags', - 'profile', + 'name', 'vpc', + 'primary_network_interface', 'resource_group', 'action', - 'network_interfaces', - 'zone', - 'delete_type', - 'user_data', - 'primary_network_interface', - 'keys', + 'profile', ] # Params for Data source @@ -178,49 +178,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( - name=dict( - required=False, - type='str'), - image=dict( - required=False, - type='str'), - tags=dict( + keys=dict( required=False, elements='', type='list'), - profile=dict( + image=dict( required=False, type='str'), - vpc=dict( + user_data=dict( required=False, type='str'), - resource_group=dict( + zone=dict( required=False, type='str'), - action=dict( + delete_type=dict( required=False, type='str'), network_interfaces=dict( required=False, elements='', type='list'), - zone=dict( + tags=dict( required=False, - type='str'), - delete_type=dict( + elements='', + type='list'), + name=dict( required=False, type='str'), - user_data=dict( + vpc=dict( required=False, type='str'), primary_network_interface=dict( required=False, elements='', type='list'), - keys=dict( + resource_group=dict( required=False, - elements='', - type='list'), + type='str'), + action=dict( + required=False, + type='str'), + profile=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -298,7 +298,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 549daef20..0acfc8e3a 100644 --- a/plugins/modules/ibm_is_bare_metal_server_action.py +++ b/plugins/modules/ibm_is_bare_metal_server_action.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -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.41.1', + ibm_provider_version='1.42.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 598bd43d5..410f50b92 100644 --- a/plugins/modules/ibm_is_bare_metal_server_disk.py +++ b/plugins/modules/ibm_is_bare_metal_server_disk.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 e7f9613b4..7275c5557 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 52d1d0a0b..1b591ffcb 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 caabba3d9..60ad417d5 100644 --- a/plugins/modules/ibm_is_bare_metal_server_info.py +++ b/plugins/modules/ibm_is_bare_metal_server_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_bare_metal_server', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 25170432d..65493967a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5c87453cf..37e2b3ce4 100644 --- a/plugins/modules/ibm_is_bare_metal_server_network_interface.py +++ b/plugins/modules/ibm_is_bare_metal_server_network_interface.py @@ -18,42 +18,24 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - allowed_vlans: - description: - - Indicates what VLAN IDs (for VLAN type only) can use this physical (PCI type) interface. A given VLAN can only be in the allowed_vlans array for one PCI type adapter per bare metal server. - required: False - type: list - elements: int - hard_stop: + allow_ip_spoofing: description: - - Only used for PCI network interfaces, whether to hard/immediately stop server + - 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: True - security_groups: - description: - - Collection of security groups ids - required: False - type: list - elements: str - allow_interface_to_float: + enable_infrastructure_nat: description: - - Indicates if the interface can float to any other server within the same resource_group. The interface will float automatically if the network detects a GARP or RARP on another bare metal server in the resource group. Applies only to vlan type interfaces. + - 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 bare_metal_server: @@ -61,21 +43,39 @@ - (Required for new resource) Bare metal server identifier required: True type: str - allow_ip_spoofing: + allowed_vlans: 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. + - Indicates what VLAN IDs (for VLAN type only) can use this physical (PCI type) interface. A given VLAN can only be in the allowed_vlans array for one PCI type adapter per bare metal server. + 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: description: - The user-defined name for this network interface required: False type: str + security_groups: + description: + - Collection of security groups ids + required: False + type: list + elements: str subnet: description: - (Required for new resource) The id of the associated subnet required: True type: str + allow_interface_to_float: + description: + - Indicates if the interface can float to any other server within the same resource_group. The interface will float automatically if the network detects a GARP or RARP on another bare metal server in the resource group. Applies only to vlan type interfaces. + required: False + type: bool vlan: description: - Indicates the 802.1Q VLAN ID tag that must be used for all traffic on this interface @@ -133,16 +133,16 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'enable_infrastructure_nat', 'primary_ip', + 'allow_ip_spoofing', + 'enable_infrastructure_nat', + 'bare_metal_server', 'allowed_vlans', 'hard_stop', - 'security_groups', - 'allow_interface_to_float', - 'bare_metal_server', - 'allow_ip_spoofing', 'name', + 'security_groups', 'subnet', + 'allow_interface_to_float', 'vlan', ] @@ -167,39 +167,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( - enable_infrastructure_nat=dict( - required=False, - type='bool'), primary_ip=dict( required=False, elements='', type='list'), - allowed_vlans=dict( - required=False, - elements='', - type='list'), - hard_stop=dict( + allow_ip_spoofing=dict( required=False, type='bool'), - security_groups=dict( - required=False, - elements='', - type='list'), - allow_interface_to_float=dict( + enable_infrastructure_nat=dict( required=False, type='bool'), bare_metal_server=dict( required=False, type='str'), - allow_ip_spoofing=dict( + allowed_vlans=dict( + required=False, + elements='', + type='list'), + hard_stop=dict( required=False, type='bool'), name=dict( required=False, type='str'), + security_groups=dict( + required=False, + elements='', + type='list'), subnet=dict( required=False, type='str'), + allow_interface_to_float=dict( + required=False, + type='bool'), vlan=dict( required=False, type='int'), @@ -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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4ede44120..eab0c4e3e 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,15 +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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - The user-defined name for this network interface - required: False - type: str primary_ip: description: - title: IPv4, The IP address. @@ -38,32 +33,37 @@ - (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 - bare_metal_server: - description: - - (Required for new resource) Bare metal server identifier - required: True - type: str 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 + security_groups: + description: + - Collection of security groups ids + required: False + type: list + elements: str subnet: description: - (Required for new resource) The id of the associated subnet required: True type: str + 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 - security_groups: + name: description: - - Collection of security groups ids + - The user-defined name for this network interface required: False - type: list - elements: str + 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'), - ('bare_metal_server', 'str'), ('subnet', 'str'), + ('bare_metal_server', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'primary_ip', 'vlan', - 'bare_metal_server', 'enable_infrastructure_nat', + 'security_groups', 'subnet', + 'bare_metal_server', 'allow_ip_spoofing', - 'security_groups', + 'name', ] # Params for Data source @@ -141,9 +141,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'), primary_ip=dict( required=False, elements='', @@ -151,22 +148,25 @@ vlan=dict( required=False, type='int'), - bare_metal_server=dict( - required=False, - type='str'), enable_infrastructure_nat=dict( required=False, type='bool'), + security_groups=dict( + required=False, + elements='', + type='list'), subnet=dict( required=False, type='str'), + bare_metal_server=dict( + required=False, + type='str'), allow_ip_spoofing=dict( required=False, type='bool'), - security_groups=dict( + name=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_bare_metal_server_network_interface_allow_float', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 eb2ae9463..487a836db 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -97,15 +97,15 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('bare_metal_server', 'str'), ('network_interface', 'str'), ('floating_ip', 'str'), + ('bare_metal_server', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'bare_metal_server', 'network_interface', 'floating_ip', + 'bare_metal_server', ] 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 0aaeaa164..566488544 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,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_network_interface_floating_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - bare_metal_server: - description: - - The bare metal server identifier - required: True - type: str network_interface: description: - The network interface identifier of bare metal server @@ -36,6 +31,11 @@ - The floating ip identifier of the network interface associated with the bare metal server required: True type: str + bare_metal_server: + description: + - The bare metal server 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 = [ - ('bare_metal_server', 'str'), ('network_interface', 'str'), ('floating_ip', 'str'), + ('bare_metal_server', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'bare_metal_server', 'network_interface', 'floating_ip', + 'bare_metal_server', ] @@ -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( - bare_metal_server=dict( - required=True, - type='str'), network_interface=dict( required=True, type='str'), floating_ip=dict( required=True, type='str'), + bare_metal_server=dict( + required=True, + type='str'), generation=dict( type='int', required=False, @@ -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.41.1', + ibm_provider_version='1.42.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 1921a0541..6fdaa4ba5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 d1cc3e4fa..bf1553d18 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,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_bare_metal_server_network_interface' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -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.41.1', + ibm_provider_version='1.42.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 e7cc18c58..1d4692e67 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f8dd89f14..fbd30b907 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ab7939cc5..b613873eb 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 99564e6d4..1dc6530dc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4b24221c4..6fc1a41ad 100644 --- a/plugins/modules/ibm_is_dedicated_host.py +++ b/plugins/modules/ibm_is_dedicated_host.py @@ -18,14 +18,14 @@ - Create, update or destroy an IBM Cloud 'ibm_is_dedicated_host' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - profile: + resource_group: description: - - (Required for new resource) The Globally unique name of the dedicated host profile to use for this dedicated host. - required: True + - 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: @@ -33,10 +33,10 @@ required: False type: bool default: True - resource_group: + profile: 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 + - (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: @@ -100,9 +100,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'profile', - 'instance_placement_enabled', 'resource_group', + 'instance_placement_enabled', + 'profile', 'host_group', 'name', ] @@ -115,8 +115,8 @@ TL_ALL_PARAMETERS_DS = [ 'name', - 'host_group', 'resource_group', + 'host_group', ] TL_CONFLICTS_MAP = { @@ -126,13 +126,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( - profile=dict( + resource_group=dict( required=False, type='str'), instance_placement_enabled=dict( required=False, type='bool'), - resource_group=dict( + profile=dict( required=False, type='str'), host_group=dict( @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_dedicated_host', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 6c1676721..baebc7254 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - dedicated_host: + disk: description: - - The dedicated host identifier. + - The dedicated host disk identifier. required: True type: str - disk: + dedicated_host: description: - - The dedicated host disk identifier. + - The dedicated host identifier. required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('dedicated_host', 'str'), ('disk', 'str'), + ('dedicated_host', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'dedicated_host', 'disk', + 'dedicated_host', ] @@ -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( - dedicated_host=dict( + disk=dict( required=True, type='str'), - disk=dict( + dedicated_host=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.41.1', + ibm_provider_version='1.42.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 76526598f..960bfef25 100644 --- a/plugins/modules/ibm_is_dedicated_host_disk_management.py +++ b/plugins/modules/ibm_is_dedicated_host_disk_management.py @@ -18,21 +18,21 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + dedicated_host: + description: + - (Required for new resource) ID of the dedicated host for which disks has to be managed + required: True + type: str disks: description: - (Required for new resource) Disk information that has to be updated. required: True type: list elements: dict - dedicated_host: - description: - - (Required for new resource) ID of the dedicated host for which disks has to be managed - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -79,14 +79,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('disks', 'list'), ('dedicated_host', 'str'), + ('disks', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'disks', 'dedicated_host', + 'disks', ] # Params for Data source @@ -103,13 +103,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( + dedicated_host=dict( + required=False, + type='str'), disks=dict( required=False, elements='', type='list'), - dedicated_host=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -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.41.1', + ibm_provider_version='1.42.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 7c8c2216d..4d69676e3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c925e6d95..8d42d6fae 100644 --- a/plugins/modules/ibm_is_dedicated_host_group.py +++ b/plugins/modules/ibm_is_dedicated_host_group.py @@ -18,35 +18,35 @@ - Create, update or destroy an IBM Cloud 'ibm_is_dedicated_host_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + 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: 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 type: str - family: + class_: description: - - (Required for new resource) The dedicated host profile family for hosts in this group. + - (Required for new resource) The dedicated host profile class for hosts in this group. required: True type: str - name: + family: 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 + - (Required for new resource) The dedicated host profile family for hosts in this group. + required: True type: str zone: description: - (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 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -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_', ] # 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( - resource_group=dict( + name=dict( required=False, type='str'), - family=dict( + resource_group=dict( required=False, type='str'), - name=dict( + class_=dict( required=False, type='str'), - zone=dict( + family=dict( required=False, type='str'), - class_=dict( + zone=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 9d1275330..1d7cc2e99 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 b7b4fbfe9..7027f1670 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 1d0d52bfe..b1cd1179f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -26,16 +26,16 @@ - The unique name of this dedicated host required: True 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 + host_group: + description: + - The unique identifier of the dedicated host group this dedicated host belongs to + required: True + 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', - 'host_group', 'resource_group', + 'host_group', ] @@ -91,12 +91,12 @@ name=dict( required=True, type='str'), - host_group=dict( - required=True, - type='str'), resource_group=dict( required=False, type='str'), + host_group=dict( + required=True, + 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.41.1', + ibm_provider_version='1.42.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 1c95d9eae..081d45b4f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 dc3891035..c2454d559 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a2fed39ad..8f7ea0642 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3148c9ed9..96369f3e5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 36fb56107..797f66589 100644 --- a/plugins/modules/ibm_is_floating_ip.py +++ b/plugins/modules/ibm_is_floating_ip.py @@ -18,20 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_is_floating_ip' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resource_group: - description: - - Resource group info - required: False - type: str 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 @@ -99,8 +99,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group', 'name', + 'resource_group', 'tags', 'zone', 'target', @@ -124,10 +124,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_group=dict( + name=dict( required=False, type='str'), - name=dict( + resource_group=dict( required=False, type='str'), tags=dict( @@ -217,7 +217,7 @@ def run_module(): resource_type='ibm_is_floating_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 465f7596f..c2998d6c7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9e5c9534a..0da1e9243 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0aa2998e3..52715166e 100644 --- a/plugins/modules/ibm_is_flow_log.py +++ b/plugins/modules/ibm_is_flow_log.py @@ -18,25 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_is_flow_log' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - storage_bucket: + name: description: - - (Required for new resource) The Cloud Object Storage bucket name where the collected flows will be logged + - (Required for new resource) Flow Log Collector name required: True type: str - active: + resource_group: description: - - Indicates whether this collector is active + - The resource group of flow log required: False - type: bool - default: True - name: - description: - - (Required for new resource) Flow Log Collector name - required: True type: str tags: description: @@ -44,11 +38,17 @@ required: False type: list elements: str - resource_group: + storage_bucket: description: - - The resource group of flow log - required: False + - (Required for new resource) The Cloud Object Storage bucket name where the collected flows will be logged + required: True type: str + active: + description: + - Indicates whether this collector is active + required: False + type: bool + default: True 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 = [ - ('storage_bucket', 'str'), ('name', 'str'), + ('storage_bucket', 'str'), ('target', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'storage_bucket', - 'active', 'name', - 'tags', 'resource_group', + 'tags', + 'storage_bucket', + 'active', 'target', ] @@ -120,8 +120,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'identifier', 'name', + 'identifier', ] TL_CONFLICTS_MAP = { @@ -131,22 +131,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( - storage_bucket=dict( + name=dict( required=False, type='str'), - active=dict( - required=False, - type='bool'), - name=dict( + resource_group=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - resource_group=dict( + storage_bucket=dict( required=False, type='str'), + active=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 7d4fd7fa5..b59447ab5 100644 --- a/plugins/modules/ibm_is_flow_log_info.py +++ b/plugins/modules/ibm_is_flow_log_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_flow_log' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - identifier: + name: description: - - The flow log collector identifier. + - The unique user-defined name for this flow log collector. required: False type: str - name: + identifier: description: - - The unique user-defined name for this flow log collector. + - The flow log collector 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_flow_log', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 31b51ef3b..31a76ce8b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3e8211dd4..dbb9d5105 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 70018e519..3e2aeba31 100644 --- a/plugins/modules/ibm_is_ike_policy.py +++ b/plugins/modules/ibm_is_ike_policy.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_ike_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - ike_version: - description: - - IKE version - required: False - type: int name: description: - (Required for new resource) IKE name @@ -37,6 +32,11 @@ - (Required for new resource) Authentication algorithm type required: True type: str + ike_version: + description: + - IKE version + required: False + type: int encryption_algorithm: description: - (Required for new resource) Encryption alogorithm type @@ -112,9 +112,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'ike_version', 'name', 'authentication_algorithm', + 'ike_version', 'encryption_algorithm', 'dh_group', 'resource_group', @@ -137,15 +137,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( - ike_version=dict( - required=False, - type='int'), name=dict( required=False, type='str'), authentication_algorithm=dict( required=False, type='str'), + ike_version=dict( + required=False, + type='int'), encryption_algorithm=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 f04314f95..326f7cc9d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 7026bed74..44c8ca9b2 100644 --- a/plugins/modules/ibm_is_image.py +++ b/plugins/modules/ibm_is_image.py @@ -18,19 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_is_image' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: - description: - - Tags for the image - required: False - type: list - elements: str - href: + source_volume: description: - - Image Href value + - Image volume id required: False type: str encrypted_data_key: @@ -38,30 +32,36 @@ - A base64-encoded, encrypted representation of the key that was used to encrypt the data for this image required: False type: str - source_volume: - description: - - Image volume id - required: False - type: str resource_group: description: - The resource group for this image required: False type: str - name: + operating_system: description: - - (Required for new resource) Image name - required: True + - 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 required: False type: str - operating_system: + tags: description: - - Image Operating system + - Tags for the image required: False + type: list + elements: str + href: + description: + - Image Href value + required: False + type: str + name: + description: + - (Required for new resource) Image name + required: True type: str id: description: @@ -114,14 +114,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', - 'href', - 'encrypted_data_key', 'source_volume', + 'encrypted_data_key', 'resource_group', - 'name', - 'encryption_key', 'operating_system', + 'encryption_key', + 'tags', + 'href', + 'name', ] # Params for Data source @@ -130,8 +130,8 @@ TL_ALL_PARAMETERS_DS = [ 'name', - 'visibility', 'identifier', + 'visibility', ] 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( - tags=dict( - required=False, - elements='', - type='list'), - href=dict( + source_volume=dict( required=False, type='str'), encrypted_data_key=dict( required=False, type='str'), - source_volume=dict( - required=False, - type='str'), resource_group=dict( required=False, type='str'), - name=dict( + operating_system=dict( required=False, type='str'), encryption_key=dict( required=False, type='str'), - operating_system=dict( + tags=dict( + required=False, + elements='', + type='list'), + href=dict( + required=False, + type='str'), + name=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 57d01184f..83d0e4ce0 100644 --- a/plugins/modules/ibm_is_image_info.py +++ b/plugins/modules/ibm_is_image_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_image' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -26,14 +26,14 @@ - Image name required: False type: str - visibility: + identifier: description: - - Whether the image is publicly visible or private to the account + - Image id required: False type: str - identifier: + visibility: description: - - Image id + - Whether the image is publicly visible or private to the account required: False type: str generation: @@ -74,8 +74,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'visibility', 'identifier', + 'visibility', ] @@ -89,10 +89,10 @@ name=dict( required=False, type='str'), - visibility=dict( + identifier=dict( required=False, type='str'), - identifier=dict( + visibility=dict( required=False, type='str'), generation=dict( @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_is_image', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 6d984fa84..d67be2f3d 100644 --- a/plugins/modules/ibm_is_images_info.py +++ b/plugins/modules/ibm_is_images_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_is_images' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - visibility: - description: - - Whether the image is publicly visible or private to the account - required: False - type: str resource_group: description: - The id of the resource group @@ -36,6 +31,11 @@ - The name of the image required: False type: str + visibility: + description: + - Whether the image is publicly visible or private to the account + 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 = [ - 'visibility', 'resource_group', 'name', + 'visibility', ] @@ -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( - visibility=dict( - required=False, - type='str'), resource_group=dict( required=False, type='str'), name=dict( required=False, type='str'), + visibility=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -141,7 +141,7 @@ def run_module(): resource_type='ibm_is_images', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 852ad5088..b0df861d4 100644 --- a/plugins/modules/ibm_is_instance.py +++ b/plugins/modules/ibm_is_instance.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -32,46 +32,24 @@ - 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 - metadata_service_enabled: - description: - - Indicates whether the metadata service endpoint is available to the virtual server instance - required: False - type: bool - 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 - force_action: + name: description: - - If set to true, the action will be forced immediately, and all queued actions deleted. Ignored for the start action. - required: False - type: bool - default: False + - (Required for new resource) Instance name + required: True + type: str resource_group: description: - Instance resource group required: False type: str - vpc: - description: - - VPC id - required: False - type: str - instance_template: + metadata_service_enabled: description: - - Id of the instance template + - Indicates whether the metadata service endpoint is available to the virtual server instance required: False - type: str - placement_group: + type: bool + profile: description: - - Unique Identifier of the Placement Group for restricting the placement of the instance + - Profile info required: False type: str tags: @@ -86,7 +64,12 @@ required: False type: bool default: True - network_interfaces: + action: + description: + - Enables stopping of instance before deleting and waits till deletion is complete + required: False + type: str + boot_volume: description: - None required: False @@ -97,72 +80,89 @@ - Define timeout to force the instances to start/stop in minutes. required: False type: int - total_volume_bandwidth: + availability_policy_host_failure: description: - - The amount of bandwidth (in megabits per second) allocated exclusively to instance storage volumes + - The availability policy to use for this virtual server instance required: False - type: int - user_data: + type: str + instance_template: description: - - User data given for the instance + - Id of the instance template required: False type: str - boot_volume: + primary_network_interface: description: - - None + - Primary Network interface info required: False type: list elements: dict - volumes: + image: description: - - List of volumes + - image id + required: False + type: str + network_interfaces: + description: + - None required: False type: list - elements: str - auto_delete_volume: + elements: dict + user_data: description: - - Auto delete volume along with instance + - User data given for the instance required: False - type: bool + type: str zone: description: - Zone name required: False type: str - action: + default_trusted_profile_auto_link: description: - - Enables stopping of instance before deleting and waits till deletion is complete + - 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: str - name: + type: bool + total_volume_bandwidth: description: - - (Required for new resource) Instance name - required: True - type: str - profile: + - The amount of bandwidth (in megabits per second) allocated exclusively to instance storage volumes + required: False + type: int + keys: description: - - Profile info + - SSH key Ids for the instance + required: False + type: list + elements: str + force_action: + description: + - If set to true, the action will be forced immediately, and all queued actions deleted. Ignored for the start action. + required: False + type: bool + default: False + placement_group: + description: + - Unique Identifier of the Placement Group for restricting the placement of the instance required: False type: str - primary_network_interface: + volumes: description: - - Primary Network interface info + - List of volumes required: False type: list - elements: dict - availability_policy_host_failure: + elements: str + auto_delete_volume: description: - - The availability policy to use for this virtual server instance + - Auto delete volume along with instance required: False - type: str - dedicated_host: + type: bool + vpc: description: - - Unique Identifier of the Dedicated Host where the instance will be placed + - VPC id required: False type: str - image: + dedicated_host: description: - - image id + - Unique Identifier of the Dedicated Host where the instance will be placed required: False type: str id: @@ -218,31 +218,31 @@ TL_ALL_PARAMETERS = [ 'default_trusted_profile_target', 'dedicated_host_group', - 'keys', - 'metadata_service_enabled', - 'default_trusted_profile_auto_link', - 'force_action', + 'name', 'resource_group', - 'vpc', - 'instance_template', - 'placement_group', + 'metadata_service_enabled', + 'profile', 'tags', 'wait_before_delete', - 'network_interfaces', + 'action', + 'boot_volume', 'force_recovery_time', - 'total_volume_bandwidth', + 'availability_policy_host_failure', + 'instance_template', + 'primary_network_interface', + 'image', + 'network_interfaces', 'user_data', - 'boot_volume', + 'zone', + 'default_trusted_profile_auto_link', + 'total_volume_bandwidth', + 'keys', + 'force_action', + 'placement_group', 'volumes', 'auto_delete_volume', - 'zone', - 'action', - 'name', - 'profile', - 'primary_network_interface', - 'availability_policy_host_failure', + 'vpc', 'dedicated_host', - 'image', ] # Params for Data source @@ -251,17 +251,17 @@ ] TL_ALL_PARAMETERS_DS = [ - 'private_key', - 'name', 'passphrase', + 'name', + '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'], 'dedicated_host': ['dedicated_host_group', 'placement_group'], - 'image': ['boot_volume.0.snapshot'], } # define available arguments/parameters a user can pass to the module @@ -274,29 +274,16 @@ dedicated_host_group=dict( required=False, type='str'), - keys=dict( - required=False, - elements='', - type='list'), - metadata_service_enabled=dict( - required=False, - type='bool'), - default_trusted_profile_auto_link=dict( - required=False, - type='bool'), - force_action=dict( - required=False, - type='bool'), - resource_group=dict( + name=dict( required=False, type='str'), - vpc=dict( + resource_group=dict( required=False, type='str'), - instance_template=dict( + metadata_service_enabled=dict( required=False, - type='str'), - placement_group=dict( + type='bool'), + profile=dict( required=False, type='str'), tags=dict( @@ -306,53 +293,66 @@ wait_before_delete=dict( required=False, type='bool'), - network_interfaces=dict( + action=dict( + required=False, + type='str'), + boot_volume=dict( required=False, elements='', type='list'), force_recovery_time=dict( required=False, type='int'), - total_volume_bandwidth=dict( + availability_policy_host_failure=dict( required=False, - type='int'), - user_data=dict( + type='str'), + instance_template=dict( required=False, type='str'), - boot_volume=dict( + primary_network_interface=dict( required=False, elements='', type='list'), - volumes=dict( + image=dict( + required=False, + type='str'), + network_interfaces=dict( required=False, elements='', type='list'), - auto_delete_volume=dict( + user_data=dict( required=False, - type='bool'), + type='str'), zone=dict( required=False, type='str'), - action=dict( + default_trusted_profile_auto_link=dict( required=False, - type='str'), - name=dict( + type='bool'), + total_volume_bandwidth=dict( required=False, - type='str'), - profile=dict( + type='int'), + keys=dict( + required=False, + elements='', + type='list'), + force_action=dict( + required=False, + type='bool'), + placement_group=dict( required=False, type='str'), - primary_network_interface=dict( + volumes=dict( required=False, elements='', type='list'), - availability_policy_host_failure=dict( + auto_delete_volume=dict( required=False, - type='str'), - dedicated_host=dict( + type='bool'), + vpc=dict( required=False, type='str'), - image=dict( + dedicated_host=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 2f4bf663c..3c55511d1 100644 --- a/plugins/modules/ibm_is_instance_action.py +++ b/plugins/modules/ibm_is_instance_action.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_is_instance_action', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 ff8bd5b48..b91226689 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ea1c3e7d2..70db7cc91 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c6986442d..f98919e32 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3a867df26..fd88f2047 100644 --- a/plugins/modules/ibm_is_instance_group.py +++ b/plugins/modules/ibm_is_instance_group.py @@ -18,10 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + instance_count: + description: + - The number of instances in the instance group + required: False + type: int + default: 0 + resource_group: + description: + - Resource group ID + required: False + type: str + application_port: + description: + - Used by the instance group when scaling up instances to supply the port for the load balancer pool member. + required: False + type: int name: description: - (Required for new resource) The user-defined name for this instance group @@ -32,38 +48,22 @@ - (Required for new resource) instance template ID required: True type: str - load_balancer_pool: - description: - - load balancer pool ID - required: False - type: str - resource_group: - description: - - Resource group ID - required: False - type: str subnets: description: - (Required for new resource) list of subnet IDs required: True type: list elements: str - application_port: - description: - - Used by the instance group when scaling up instances to supply the port for the load balancer pool member. - required: False - type: int - instance_count: - description: - - The number of instances in the instance group - required: False - type: int - default: 0 load_balancer: description: - 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 @@ -123,14 +123,14 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'instance_count', + 'resource_group', + 'application_port', 'name', 'instance_template', - 'load_balancer_pool', - 'resource_group', 'subnets', - 'application_port', - 'instance_count', 'load_balancer', + 'load_balancer_pool', 'tags', ] @@ -150,31 +150,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( - name=dict( + instance_count=dict( required=False, - type='str'), - instance_template=dict( + type='int'), + resource_group=dict( required=False, type='str'), - load_balancer_pool=dict( + application_port=dict( + required=False, + type='int'), + name=dict( required=False, type='str'), - resource_group=dict( + instance_template=dict( required=False, type='str'), subnets=dict( required=False, elements='', type='list'), - application_port=dict( - required=False, - type='int'), - instance_count=dict( - required=False, - type='int'), load_balancer=dict( required=False, type='str'), + load_balancer_pool=dict( + required=False, + type='str'), tags=dict( required=False, elements='', @@ -256,7 +256,7 @@ def run_module(): resource_type='ibm_is_instance_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8f5b51e0f..009702e7c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0bf1a251e..49a14bcf4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -33,23 +33,12 @@ 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 - max_membership_count: - description: - - The maximum number of members in a managed instance group - required: False - type: int - min_membership_count: + cooldown: description: - - The minimum number of members in a managed instance group + - The duration of time in seconds to pause further scale actions after scaling has taken place required: False type: int - default: 1 + default: 300 enable_manager: description: - enable instance group manager @@ -61,12 +50,23 @@ - (Required for new resource) instance group ID required: True type: str - cooldown: + aggregation_window: description: - - The duration of time in seconds to pause further scale actions after scaling has taken place + - The time window in seconds to aggregate metrics prior to evaluation required: False type: int - default: 300 + 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 + required: False + type: int + default: 1 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -120,12 +120,12 @@ TL_ALL_PARAMETERS = [ 'name', 'manager_type', + 'cooldown', + 'enable_manager', + 'instance_group', 'aggregation_window', 'max_membership_count', 'min_membership_count', - 'enable_manager', - 'instance_group', - 'cooldown', ] # Params for Data source @@ -152,13 +152,7 @@ manager_type=dict( required=False, type='str'), - aggregation_window=dict( - required=False, - type='int'), - max_membership_count=dict( - required=False, - type='int'), - min_membership_count=dict( + cooldown=dict( required=False, type='int'), enable_manager=dict( @@ -167,7 +161,13 @@ instance_group=dict( required=False, type='str'), - cooldown=dict( + aggregation_window=dict( + required=False, + type='int'), + max_membership_count=dict( + required=False, + type='int'), + min_membership_count=dict( required=False, type='int'), id=dict( @@ -247,7 +247,7 @@ def run_module(): resource_type='ibm_is_instance_group_manager', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 9a8da4f5c..6a1fb8496 100644 --- a/plugins/modules/ibm_is_instance_group_manager_action.py +++ b/plugins/modules/ibm_is_instance_group_manager_action.py @@ -18,18 +18,18 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - run_at: + instance_group: description: - - The date and time the scheduled action will run. - required: False + - (Required for new resource) instance group ID + required: True type: str - max_membership_count: + membership_count: description: - - The maximum number of members in a managed instance group + - The number of members the instance group should have at the scheduled time. required: False type: int target_manager: @@ -37,37 +37,37 @@ - The unique identifier for this instance group manager of type autoscale. required: False 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 - membership_count: + min_membership_count: description: - - The number of members the instance group should have at the scheduled time. + - The minimum number of members in a managed instance group required: False type: int - name: + default: 1 + run_at: description: - - instance group manager action name + - The date and time the scheduled action will run. required: False type: str - min_membership_count: + name: description: - - The minimum number of members in a managed instance group + - instance group manager action name required: False - type: int - default: 1 - instance_group: + type: str + instance_group_manager: description: - - (Required for new resource) instance group ID + - (Required for new resource) Instance group manager ID of type scheduled required: True type: str + max_membership_count: + description: + - The maximum number of members in a managed instance group + required: False + type: int id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -114,76 +114,76 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_group_manager', 'str'), ('instance_group', 'str'), + ('instance_group_manager', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'run_at', - 'max_membership_count', + 'instance_group', + 'membership_count', 'target_manager', - 'instance_group_manager', 'cron_spec', - 'membership_count', - 'name', 'min_membership_count', - 'instance_group', + 'run_at', + 'name', + 'instance_group_manager', + 'max_membership_count', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('name', 'str'), - ('instance_group', 'str'), ('instance_group_manager', 'str'), + ('instance_group', 'str'), + ('name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'name', - 'instance_group', 'instance_group_manager', + 'instance_group', + 'name', ] TL_CONFLICTS_MAP = { - 'run_at': ['cron_spec'], - 'max_membership_count': ['membership_count'], + 'membership_count': ['target_manager', 'max_membership_count', 'min_membership_count'], 'target_manager': ['membership_count'], 'cron_spec': ['run_at'], - 'membership_count': ['target_manager', 'max_membership_count', 'min_membership_count'], 'min_membership_count': ['membership_count'], + 'run_at': ['cron_spec'], + 'max_membership_count': ['membership_count'], } # 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( - run_at=dict( + instance_group=dict( required=False, type='str'), - max_membership_count=dict( + membership_count=dict( required=False, type='int'), target_manager=dict( required=False, type='str'), - instance_group_manager=dict( - required=False, - type='str'), cron_spec=dict( required=False, type='str'), - membership_count=dict( + min_membership_count=dict( required=False, type='int'), - name=dict( + run_at=dict( required=False, type='str'), - min_membership_count=dict( + name=dict( required=False, - type='int'), - instance_group=dict( + type='str'), + instance_group_manager=dict( required=False, type='str'), + max_membership_count=dict( + required=False, + type='int'), id=dict( required=False, type='str'), @@ -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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 e5b42f4a8..f73c272e1 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + instance_group_manager: description: - - instance group manager action name + - Instance group manager ID of type scheduled required: True type: str instance_group: @@ -31,9 +31,9 @@ - instance group ID required: True type: str - instance_group_manager: + name: description: - - Instance group manager ID of type scheduled + - instance group manager action name required: True type: str generation: @@ -69,16 +69,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), - ('instance_group', 'str'), ('instance_group_manager', 'str'), + ('instance_group', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'instance_group', 'instance_group_manager', + 'instance_group', + 'name', ] @@ -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( - name=dict( + instance_group_manager=dict( required=True, type='str'), instance_group=dict( required=True, type='str'), - instance_group_manager=dict( + name=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.41.1', + ibm_provider_version='1.42.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 38d36b319..102748438 100644 --- a/plugins/modules/ibm_is_instance_group_manager_actions_info.py +++ b/plugins/modules/ibm_is_instance_group_manager_actions_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_manager_actions' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - instance_group_manager: + instance_group: description: - - Instance group manager ID + - instance group ID required: True type: str - instance_group: + instance_group_manager: description: - - instance group ID + - Instance group manager ID required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_group_manager', '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', + 'instance_group_manager', ] @@ -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_group_manager=dict( + instance_group=dict( required=True, type='str'), - instance_group=dict( + instance_group_manager=dict( required=True, type='str'), generation=dict( @@ -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.41.1', + ibm_provider_version='1.42.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 b4785de57..73e9f2f63 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4d1207633..f74f93c61 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 83afa34ba..29b124e5c 100644 --- a/plugins/modules/ibm_is_instance_group_manager_policy.py +++ b/plugins/modules/ibm_is_instance_group_manager_policy.py @@ -18,25 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - metric_type: - description: - - (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 name: description: - instance group manager policy name @@ -52,6 +37,21 @@ - (Required for new resource) Instance group manager ID required: True type: str + metric_type: + description: + - (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 = [ + ('instance_group', 'str'), + ('instance_group_manager', 'str'), ('metric_type', 'str'), ('metric_value', 'int'), ('policy_type', 'str'), - ('instance_group', 'str'), - ('instance_group_manager', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'metric_type', - '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,22 +135,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( - metric_type=dict( + name=dict( required=False, type='str'), - metric_value=dict( - required=False, - type='int'), - policy_type=dict( + instance_group=dict( required=False, type='str'), - name=dict( + instance_group_manager=dict( required=False, type='str'), - instance_group=dict( + metric_type=dict( required=False, type='str'), - instance_group_manager=dict( + metric_value=dict( + required=False, + type='int'), + policy_type=dict( required=False, type='str'), id=dict( @@ -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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 eaf9b19a8..2baae75ef 100644 --- a/plugins/modules/ibm_is_instance_group_manager_policy_info.py +++ b/plugins/modules/ibm_is_instance_group_manager_policy_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_group_manager_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - instance_group: - description: - - instance group ID - required: True - type: str instance_group_manager: description: - Instance group manager ID @@ -36,6 +31,11 @@ - 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,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( - instance_group=dict( - required=True, - type='str'), instance_group_manager=dict( required=True, type='str'), name=dict( required=True, type='str'), + instance_group=dict( + required=True, + type='str'), generation=dict( type='int', required=False, @@ -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.41.1', + ibm_provider_version='1.42.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 2d1b2adaf..1a8876c23 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 bd983f742..b1b0b5c32 100644 --- a/plugins/modules/ibm_is_instance_group_membership.py +++ b/plugins/modules/ibm_is_instance_group_membership.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_group_membership' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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. @@ -37,6 +32,11 @@ - 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. @@ -89,15 +89,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_group', 'str'), ('instance_group_membership', 'str'), + ('instance_group', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_group', 'instance_group_membership', 'name', + 'instance_group', 'action_delete', ] @@ -119,15 +119,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_group=dict( - required=False, - type='str'), instance_group_membership=dict( required=False, type='str'), name=dict( required=False, type='str'), + instance_group=dict( + required=False, + type='str'), action_delete=dict( required=False, type='bool'), @@ -208,7 +208,7 @@ def run_module(): resource_type='ibm_is_instance_group_membership', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 26630fc07..2d828142b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ef528a2f4..6bcce27d1 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3b41c4003..fbbb21f5a 100644 --- a/plugins/modules/ibm_is_instance_info.py +++ b/plugins/modules/ibm_is_instance_info.py @@ -17,13 +17,13 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - private_key: + passphrase: description: - - Instance Private Key file + - Passphrase for Instance Private Key file required: False type: str name: @@ -31,9 +31,9 @@ - Instance name required: True type: str - passphrase: + private_key: description: - - Passphrase for Instance Private Key file + - Instance Private Key file required: False type: str generation: @@ -74,9 +74,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'private_key', - 'name', 'passphrase', + 'name', + 'private_key', ] @@ -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( - private_key=dict( + passphrase=dict( required=False, type='str'), name=dict( required=True, type='str'), - passphrase=dict( + private_key=dict( required=False, type='str'), generation=dict( @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_is_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 a0241b9ec..86811e971 100644 --- a/plugins/modules/ibm_is_instance_network_interface.py +++ b/plugins/modules/ibm_is_instance_network_interface.py @@ -18,32 +18,27 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_network_interface' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 primary_ip: 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. required: False type: list elements: dict - instance: - description: - - (Required for new resource) The unique identifier of the instance. - required: True - type: str security_groups: description: - None required: False type: list elements: 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 floating_ip: description: - The ID of the floating IP to attach to this network interface @@ -60,6 +55,11 @@ required: False type: bool default: False + instance: + description: + - (Required for new resource) The unique identifier of the instance. + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,30 +107,30 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('name', 'str'), - ('instance', 'str'), ('subnet', 'str'), + ('instance', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'primary_ip', - 'instance', 'security_groups', + 'name', 'floating_ip', 'subnet', 'allow_ip_spoofing', + 'instance', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('instance_name', 'str'), ('network_interface_name', 'str'), + ('instance_name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance_name', 'network_interface_name', + 'instance_name', ] TL_CONFLICTS_MAP = { @@ -140,20 +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( - required=False, - type='str'), primary_ip=dict( required=False, elements='', type='list'), - instance=dict( - required=False, - type='str'), security_groups=dict( required=False, elements='', type='list'), + name=dict( + required=False, + type='str'), floating_ip=dict( required=False, type='str'), @@ -163,6 +160,9 @@ allow_ip_spoofing=dict( required=False, type='bool'), + instance=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 896a98030..0c3b24b94 100644 --- a/plugins/modules/ibm_is_instance_network_interface_info.py +++ b/plugins/modules/ibm_is_instance_network_interface_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_network_interface' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - instance_name: + network_interface_name: description: - - The instance name. + - The network interface name. required: True type: str - network_interface_name: + instance_name: description: - - The network interface name. + - The instance name. required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_name', 'str'), ('network_interface_name', 'str'), + ('instance_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_name', 'network_interface_name', + 'instance_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( - instance_name=dict( + network_interface_name=dict( required=True, type='str'), - network_interface_name=dict( + instance_name=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_network_interface', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 fffcb665c..bcfa67b5e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 044dd9e93..c6cceb664 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 056afdfc2..94e690dd7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a51997969..ce398f00a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 53ecc4820..c168a96d3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9cf063d35..4de711337 100644 --- a/plugins/modules/ibm_is_instance_template.py +++ b/plugins/modules/ibm_is_instance_template.py @@ -18,109 +18,104 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_template' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - dedicated_host_group: + vpc: description: - - Unique Identifier of the Dedicated Host Group where the instance will be placed - required: False + - (Required for new resource) VPC id + required: True type: str - volume_attachments: + default_trusted_profile_auto_link: description: - - None + - 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: list - elements: dict + type: bool primary_network_interface: description: - (Required for new resource) Primary Network interface info required: True type: list elements: dict - image: - description: - - (Required for new resource) image name - required: True - type: str - boot_volume: - description: - - None - required: False - type: list - elements: dict - availability_policy_host_failure: + metadata_service_enabled: description: - - The availability policy to use for this virtual server instance + - Indicates whether the metadata service endpoint is available to the virtual server instance required: False - type: str - zone: - description: - - (Required for new resource) Zone name - required: True - type: str + type: bool + default: False profile: description: - (Required for new resource) Profile info required: True type: str - keys: + total_volume_bandwidth: description: - - (Required for new resource) SSH key Ids for the instance template - required: True - type: list - elements: str + - The amount of bandwidth (in megabits per second) allocated exclusively to instance storage volumes + required: False + type: int dedicated_host: description: - Unique Identifier of the Dedicated Host where the instance will be placed required: False type: str - name: + placement_group: description: - - Instance Template name + - Unique Identifier of the Placement Group for restricting the placement of the instance required: False type: str - metadata_service_enabled: + volume_attachments: description: - - Indicates whether the metadata service endpoint is available to the virtual server instance + - None required: False - type: bool - default: False - vpc: + type: list + elements: dict + network_interfaces: description: - - (Required for new resource) VPC id + - None + required: False + type: list + elements: dict + image: + description: + - (Required for new resource) image name required: True type: str - placement_group: + name: description: - - Unique Identifier of the Placement Group for restricting the placement of the instance + - Instance Template name required: False type: str - network_interfaces: + boot_volume: description: - None required: False type: list elements: dict - default_trusted_profile_auto_link: + zone: 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 + - (Required for new resource) Zone name + required: True + type: str 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 - total_volume_bandwidth: + keys: description: - - The amount of bandwidth (in megabits per second) allocated exclusively to instance storage volumes + - (Required for new resource) SSH key Ids for the instance template + 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: int - user_data: + type: str + availability_policy_host_failure: description: - - User data given for the instance + - The availability policy to use for this virtual server instance required: False type: str resource_group: @@ -128,6 +123,11 @@ - Instance template resource group required: False type: str + user_data: + description: + - User data given for the instance + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource 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'), - ('profile', 'str'), ('keys', 'list'), - ('vpc', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'dedicated_host_group', - 'volume_attachments', + 'vpc', + 'default_trusted_profile_auto_link', 'primary_network_interface', - 'image', - 'boot_volume', - 'availability_policy_host_failure', - 'zone', + 'metadata_service_enabled', 'profile', - 'keys', + 'total_volume_bandwidth', 'dedicated_host', - 'name', - 'metadata_service_enabled', - 'vpc', 'placement_group', + 'volume_attachments', 'network_interfaces', - 'default_trusted_profile_auto_link', + 'image', + 'name', + 'boot_volume', + 'zone', 'default_trusted_profile_target', - 'total_volume_bandwidth', - 'user_data', + 'keys', + 'dedicated_host_group', + 'availability_policy_host_failure', 'resource_group', + 'user_data', ] # Params for Data source @@ -211,85 +211,85 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', 'identifier', + 'name', ] 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( - dedicated_host_group=dict( + vpc=dict( required=False, type='str'), - volume_attachments=dict( + default_trusted_profile_auto_link=dict( required=False, - elements='', - type='list'), + type='bool'), primary_network_interface=dict( required=False, elements='', type='list'), - image=dict( + metadata_service_enabled=dict( + required=False, + type='bool'), + profile=dict( required=False, type='str'), - boot_volume=dict( + total_volume_bandwidth=dict( required=False, - elements='', - type='list'), - availability_policy_host_failure=dict( + type='int'), + dedicated_host=dict( required=False, type='str'), - zone=dict( + placement_group=dict( required=False, type='str'), - profile=dict( + volume_attachments=dict( required=False, - type='str'), - keys=dict( + elements='', + type='list'), + network_interfaces=dict( required=False, elements='', type='list'), - dedicated_host=dict( + image=dict( required=False, type='str'), name=dict( required=False, type='str'), - metadata_service_enabled=dict( + boot_volume=dict( required=False, - type='bool'), - vpc=dict( + elements='', + type='list'), + zone=dict( required=False, type='str'), - placement_group=dict( + default_trusted_profile_target=dict( required=False, type='str'), - network_interfaces=dict( + keys=dict( required=False, elements='', type='list'), - default_trusted_profile_auto_link=dict( - required=False, - type='bool'), - default_trusted_profile_target=dict( + dedicated_host_group=dict( required=False, type='str'), - total_volume_bandwidth=dict( - required=False, - type='int'), - user_data=dict( + availability_policy_host_failure=dict( required=False, type='str'), resource_group=dict( required=False, type='str'), + user_data=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -367,7 +367,7 @@ def run_module(): resource_type='ibm_is_instance_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 2b333bf5b..3fcbbc365 100644 --- a/plugins/modules/ibm_is_instance_template_info.py +++ b/plugins/modules/ibm_is_instance_template_info.py @@ -17,16 +17,16 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_template' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + identifier: description: - None required: False type: str - identifier: + name: description: - None required: False @@ -68,8 +68,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'identifier', + '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( - name=dict( + identifier=dict( required=False, type='str'), - identifier=dict( + name=dict( required=False, type='str'), generation=dict( @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_instance_template', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 85d8af7d6..40a97c3a7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 71bc477de..903dcc995 100644 --- a/plugins/modules/ibm_is_instance_volume_attachment.py +++ b/plugins/modules/ibm_is_instance_volume_attachment.py @@ -18,35 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_is_instance_volume_attachment' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - volume_name: - description: - - The unique user-defined name for this volume - required: False - type: str - snapshot: - description: - - The snapshot of the volume to be attached - required: False - type: str - volume: - description: - - Instance id - required: False - type: str - profile: + delete_volume_on_instance_delete: description: - - The globally unique name for the volume profile to use for this volume. + - If set to true, when deleting the instance the volume will also be deleted. required: False - type: str - encryption_key: + type: bool + capacity: 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. + - 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: str + type: int instance: description: - (Required for new resource) Instance id @@ -57,27 +42,42 @@ - The user-defined name for this volume attachment. required: False type: str - delete_volume_on_instance_delete: - description: - - If set to true, when deleting the instance the volume will also be deleted. - required: False - type: bool delete_volume_on_attachment_delete: description: - 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 - 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 iops: description: - The maximum I/O operations per second (IOPS) for the volume. required: False type: int + profile: + description: + - The globally unique name for the volume profile to use for this volume. + required: False + type: str + encryption_key: + 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. + required: False + type: str + volume: + description: + - Instance id + required: False + type: str + volume_name: + description: + - The unique user-defined name for this volume + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -129,17 +129,17 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'volume_name', - 'snapshot', - 'volume', - 'profile', - 'encryption_key', + 'delete_volume_on_instance_delete', + 'capacity', 'instance', 'name', - 'delete_volume_on_instance_delete', 'delete_volume_on_attachment_delete', - 'capacity', + 'snapshot', 'iops', + 'profile', + 'encryption_key', + 'volume', + 'volume_name', ] # Params for Data source @@ -154,50 +154,50 @@ ] TL_CONFLICTS_MAP = { - 'snapshot': ['volume'], - 'volume': ['iops', 'volume_name', 'profile', 'capacity', 'snapshot'], - 'profile': ['volume'], 'capacity': ['volume'], + 'snapshot': ['volume'], 'iops': ['volume'], + 'profile': ['volume'], + 'volume': ['iops', 'volume_name', 'profile', 'capacity', 'snapshot'], } # 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( - volume_name=dict( + delete_volume_on_instance_delete=dict( + required=False, + type='bool'), + capacity=dict( + required=False, + type='int'), + instance=dict( required=False, type='str'), - snapshot=dict( + name=dict( required=False, type='str'), - volume=dict( + delete_volume_on_attachment_delete=dict( + required=False, + type='bool'), + snapshot=dict( required=False, type='str'), + iops=dict( + required=False, + type='int'), profile=dict( required=False, type='str'), encryption_key=dict( required=False, type='str'), - instance=dict( + volume=dict( required=False, type='str'), - name=dict( + volume_name=dict( required=False, type='str'), - delete_volume_on_instance_delete=dict( - required=False, - type='bool'), - delete_volume_on_attachment_delete=dict( - required=False, - type='bool'), - capacity=dict( - required=False, - type='int'), - iops=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 c9e1414ea..181736bbb 100644 --- a/plugins/modules/ibm_is_instance_volume_attachment_info.py +++ b/plugins/modules/ibm_is_instance_volume_attachment_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_instance_volume_attachment' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_instance_volume_attachment', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 3808eef4f..bda2b4c29 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 82ad0b54c..a0037b607 100644 --- a/plugins/modules/ibm_is_instances_info.py +++ b/plugins/modules/ibm_is_instances_info.py @@ -17,58 +17,58 @@ description: - Retrieve an IBM Cloud 'ibm_is_instances' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - placement_group_name: + instance_group: description: - - Name of the placement group to filter the instances attached to it + - Instance group ID to filter the instances attached to it required: False type: str - placement_group: + vpc_crn: description: - - ID of the placement group to filter the instances attached to it + - VPC CRN to filter the instances attached to it required: False type: str - vpc_name: + resource_group: description: - - Name of the vpc to filter the instances attached to it + - Instance resource group required: False type: str - vpc: + dedicated_host: description: - - VPC ID to filter the instances attached to it + - ID of the dedicated host to filter the instances attached to it required: False type: str - vpc_crn: + placement_group: description: - - VPC CRN to filter the instances attached to it + - ID of the placement group to filter the instances attached to it required: False type: str - resource_group: + instance_group_name: description: - - Instance resource group + - Instance group name to filter the instances attached to it required: False type: str - dedicated_host_name: + vpc_name: description: - - Name of the dedicated host to filter the instances attached to it + - Name of the vpc to filter the instances attached to it required: False type: str - dedicated_host: + vpc: description: - - ID of the dedicated host to filter the instances attached to it + - VPC ID to filter the instances attached to it required: False type: str - instance_group: + dedicated_host_name: description: - - Instance group ID to filter the instances attached to it + - Name of the dedicated host to filter the instances attached to it required: False type: str - instance_group_name: + placement_group_name: description: - - Instance group name to filter the instances attached to it + - Name of the placement group to filter the instances attached to it required: False type: str generation: @@ -108,63 +108,63 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'placement_group_name', - 'placement_group', - 'vpc_name', - 'vpc', + 'instance_group', 'vpc_crn', 'resource_group', - 'dedicated_host_name', 'dedicated_host', - 'instance_group', + 'placement_group', 'instance_group_name', + 'vpc_name', + 'vpc', + 'dedicated_host_name', + 'placement_group_name', ] TL_CONFLICTS_MAP = { - 'placement_group_name': ['placement_group'], + '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'], - 'vpc_crn': ['vpc_name', 'vpc', 'instance_group'], 'dedicated_host_name': ['dedicated_host'], - 'dedicated_host': ['dedicated_host_name'], - 'instance_group': ['vpc', 'vpc_crn', 'vpc_name', 'instance_group_name'], - 'instance_group_name': ['vpc', 'vpc_crn', 'vpc_name', 'instance_group'], + 'placement_group_name': ['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( - placement_group_name=dict( + instance_group=dict( required=False, type='str'), - placement_group=dict( + vpc_crn=dict( required=False, type='str'), - vpc_name=dict( + resource_group=dict( required=False, type='str'), - vpc=dict( + dedicated_host=dict( required=False, type='str'), - vpc_crn=dict( + placement_group=dict( required=False, type='str'), - resource_group=dict( + instance_group_name=dict( required=False, type='str'), - dedicated_host_name=dict( + vpc_name=dict( required=False, type='str'), - dedicated_host=dict( + vpc=dict( required=False, type='str'), - instance_group=dict( + dedicated_host_name=dict( required=False, type='str'), - instance_group_name=dict( + placement_group_name=dict( required=False, type='str'), generation=dict( @@ -213,7 +213,7 @@ def run_module(): resource_type='ibm_is_instances', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 8e901b9c8..f2c68c069 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 192da2848..c8c1a5d55 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -32,12 +32,11 @@ - (Required for new resource) Encryption algorithm required: True type: str - key_lifetime: + resource_group: description: - - IPSEC key lifetime + - Resource group info required: False - type: int - default: 3600 + type: str authentication_algorithm: description: - (Required for new resource) Authentication alorothm @@ -48,11 +47,12 @@ - (Required for new resource) PFS info required: True type: str - resource_group: + key_lifetime: description: - - Resource group info + - IPSEC key lifetime required: False - type: str + type: int + default: 3600 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -109,10 +109,10 @@ TL_ALL_PARAMETERS = [ 'name', 'encryption_algorithm', - 'key_lifetime', + 'resource_group', 'authentication_algorithm', 'pfs', - 'resource_group', + 'key_lifetime', ] # Params for Data source @@ -120,8 +120,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'ipsec_policy', 'name', + 'ipsec_policy', ] TL_CONFLICTS_MAP = { @@ -137,18 +137,18 @@ encryption_algorithm=dict( required=False, type='str'), - key_lifetime=dict( + resource_group=dict( required=False, - type='int'), + type='str'), authentication_algorithm=dict( required=False, type='str'), pfs=dict( required=False, type='str'), - resource_group=dict( + key_lifetime=dict( required=False, - type='str'), + type='int'), id=dict( required=False, type='str'), @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_is_ipsec_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5072e648e..f055b3b46 100644 --- a/plugins/modules/ibm_is_ipsec_policy_info.py +++ b/plugins/modules/ibm_is_ipsec_policy_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_ipsec_policy' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - ipsec_policy: + name: description: - - The IPsec policy identifier. + - The IPsec policy name. required: False type: str - name: + ipsec_policy: description: - - The IPsec policy name. + - The IPsec policy identifier. required: False type: str generation: @@ -68,8 +68,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'ipsec_policy', 'name', + 'ipsec_policy', ] @@ -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( - ipsec_policy=dict( + name=dict( required=False, type='str'), - name=dict( + ipsec_policy=dict( required=False, type='str'), generation=dict( @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_is_ipsec_policy', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 29382c30b..dbf0fbb85 100644 --- a/plugins/modules/ibm_is_lb.py +++ b/plugins/modules/ibm_is_lb.py @@ -18,61 +18,61 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - profile: + tags: description: - - The profile to use for this load balancer. + - None required: False - type: str + 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 + required: False + type: bool + default: False name: description: - (Required for new resource) Load Balancer name required: True type: str - type: - description: - - Load Balancer type - required: False - type: str - default: public subnets: description: - (Required for new resource) Load Balancer subnets list required: True type: list elements: str - logging: - description: - - Logging of Load Balancer - required: False - type: bool - default: False security_groups: description: - Load Balancer securitygroups list required: False type: list elements: str - tags: + resource_group: description: - None required: False - type: list - elements: str - resource_group: + type: str + profile: description: - - None + - The profile to use for this load balancer. + required: False + type: str + type: + description: + - Load Balancer type required: False type: str + default: public 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 = [ - 'profile', + 'tags', 'route_mode', + 'logging', 'name', - 'type', 'subnets', - 'logging', 'security_groups', - 'tags', 'resource_group', + 'profile', + 'type', ] # Params for Data source @@ -146,45 +146,45 @@ ] TL_CONFLICTS_MAP = { - 'profile': ['logging'], 'logging': ['profile'], 'security_groups': ['profile'], + 'profile': ['logging'], } # 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( - profile=dict( + tags=dict( required=False, - type='str'), + elements='', + type='list'), route_mode=dict( required=False, type='bool'), - name=dict( + logging=dict( required=False, - type='str'), - type=dict( + type='bool'), + name=dict( required=False, type='str'), subnets=dict( required=False, elements='', type='list'), - logging=dict( - required=False, - type='bool'), security_groups=dict( required=False, elements='', type='list'), - tags=dict( - required=False, - elements='', - type='list'), resource_group=dict( required=False, type='str'), + profile=dict( + required=False, + type='str'), + type=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 2f9074e78..2609520a8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ecd35fbdd..748538edf 100644 --- a/plugins/modules/ibm_is_lb_listener.py +++ b/plugins/modules/ibm_is_lb_listener.py @@ -18,30 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_listener' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - protocol: - description: - - (Required for new resource) Loadbalancer protocol - required: True - type: str - certificate_instance: - description: - - certificate instance for the Loadbalancer - required: False - type: str - accept_proxy_protocol: - description: - - Listener will forward proxy protocol - required: False - type: bool - https_redirect_uri: + port_min: description: - - Target URI where traffic will be redirected + - 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: str + type: int 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 @@ -52,11 +37,31 @@ - The HTTP status code to be returned in the redirect response required: False type: int + https_redirect_listener: + description: + - ID of the listener that will be set as http redirect target + required: False + type: str + protocol: + description: + - (Required for new resource) Loadbalancer protocol + required: True + type: str + certificate_instance: + description: + - certificate instance for the Loadbalancer + required: False + type: str connection_limit: description: - Connection limit for Loadbalancer required: False type: int + default_pool: + description: + - Loadbalancer default pool info + required: False + type: str lb: description: - (Required for new resource) Loadbalancer listener ID @@ -67,19 +72,14 @@ - Loadbalancer listener port required: False type: int - https_redirect_listener: - description: - - ID of the listener that will be set as http redirect target - required: False - type: str - port_min: + accept_proxy_protocol: 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. + - Listener will forward proxy protocol required: False - type: int - default_pool: + type: bool + https_redirect_uri: description: - - Loadbalancer default pool info + - Target URI where traffic will be redirected required: False type: str id: @@ -134,29 +134,29 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'protocol', - 'certificate_instance', - 'accept_proxy_protocol', - 'https_redirect_uri', + 'port_min', 'port_max', 'https_redirect_status_code', + 'https_redirect_listener', + 'protocol', + 'certificate_instance', 'connection_limit', + 'default_pool', 'lb', 'port', - 'https_redirect_listener', - 'port_min', - 'default_pool', + 'accept_proxy_protocol', + 'https_redirect_uri', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('lb', 'str'), ('listener_id', 'str'), + ('lb', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'lb', 'listener_id', + 'lb', ] TL_CONFLICTS_MAP = { @@ -166,40 +166,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( - protocol=dict( - required=False, - type='str'), - certificate_instance=dict( - required=False, - type='str'), - accept_proxy_protocol=dict( - required=False, - type='bool'), - https_redirect_uri=dict( + port_min=dict( required=False, - type='str'), + type='int'), port_max=dict( required=False, type='int'), https_redirect_status_code=dict( required=False, type='int'), + https_redirect_listener=dict( + required=False, + type='str'), + protocol=dict( + required=False, + type='str'), + certificate_instance=dict( + required=False, + type='str'), connection_limit=dict( required=False, type='int'), + default_pool=dict( + required=False, + type='str'), lb=dict( required=False, type='str'), port=dict( required=False, type='int'), - https_redirect_listener=dict( - required=False, - type='str'), - port_min=dict( + accept_proxy_protocol=dict( required=False, - type='int'), - default_pool=dict( + type='bool'), + https_redirect_uri=dict( required=False, type='str'), id=dict( @@ -279,7 +279,7 @@ def run_module(): resource_type='ibm_is_lb_listener', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 6e78068fa..8505b1c9b 100644 --- a/plugins/modules/ibm_is_lb_listener_info.py +++ b/plugins/modules/ibm_is_lb_listener_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - lb: + listener_id: description: - - The load balancer identifier. + - The listener identifier. required: True type: str - listener_id: + 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_id', 'str'), + ('lb', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'lb', 'listener_id', + '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_id=dict( required=True, type='str'), - listener_id=dict( + lb=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_lb_listener', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9a78e1e5f..d491f9545 100644 --- a/plugins/modules/ibm_is_lb_listener_policies_info.py +++ b/plugins/modules/ibm_is_lb_listener_policies_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_lb_listener_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4ca6f0fa4..357b8702b 100644 --- a/plugins/modules/ibm_is_lb_listener_policy.py +++ b/plugins/modules/ibm_is_lb_listener_policy.py @@ -18,71 +18,71 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_listener_policy' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - target_id: - description: - - Listener Policy Target ID - required: False - type: str - 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: + target_https_redirect_status_code: description: - - Target URI where traffic will be redirected + - The HTTP status code to be returned in the redirect response required: False - type: str + type: int target_https_redirect_listener: description: - ID of the listener that will be set as http redirect target required: False type: str + target_url: + description: + - Policy Target URL + required: False + type: str action: description: - (Required for new resource) Policy Action required: True type: str - target_https_redirect_status_code: + priority: description: - - The HTTP status code to be returned in the redirect response - required: False + - (Required for new resource) Listener Policy Priority + required: True type: int name: description: - Policy name required: False type: str - target_url: - description: - - Policy Target URL - required: False - type: str - priority: - description: - - (Required for new resource) Listener Policy Priority - required: True - type: int target_http_status_code: description: - Listener Policy target HTTPS Status code. required: False type: int - listener: + lb: description: - - (Required for new resource) Listener ID + - (Required for new resource) Load Balancer Listener Policy required: True type: str + target_https_redirect_uri: + description: + - Target URI where traffic will be redirected + required: False + type: str rules: description: - Policy Rules required: False type: list elements: dict + target_id: + description: + - Listener Policy Target ID + required: False + type: str 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 = [ - ('lb', 'str'), + ('listener', 'str'), ('action', 'str'), ('priority', 'int'), - ('listener', 'str'), + ('lb', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'target_id', - 'lb', - 'target_https_redirect_uri', - 'target_https_redirect_listener', - 'action', + 'listener', 'target_https_redirect_status_code', - 'name', + 'target_https_redirect_listener', 'target_url', + 'action', 'priority', + 'name', 'target_http_status_code', - 'listener', + 'lb', + 'target_https_redirect_uri', 'rules', + 'target_id', ] # 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( - target_id=dict( + listener=dict( required=False, type='str'), - lb=dict( + target_https_redirect_status_code=dict( required=False, - type='str'), - target_https_redirect_uri=dict( + type='int'), + target_https_redirect_listener=dict( required=False, type='str'), - target_https_redirect_listener=dict( + target_url=dict( required=False, type='str'), action=dict( required=False, type='str'), - target_https_redirect_status_code=dict( + priority=dict( required=False, type='int'), name=dict( required=False, type='str'), - target_url=dict( - required=False, - type='str'), - priority=dict( - required=False, - type='int'), target_http_status_code=dict( required=False, type='int'), - listener=dict( + lb=dict( + required=False, + type='str'), + target_https_redirect_uri=dict( required=False, type='str'), rules=dict( required=False, elements='', type='list'), + target_id=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 f800f9993..98b2e0afb 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e9848c4b8..20cb5718b 100644 --- a/plugins/modules/ibm_is_lb_listener_policy_rule.py +++ b/plugins/modules/ibm_is_lb_listener_policy_rule.py @@ -18,10 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + listener: + description: + - (Required for new resource) Listener ID. + required: True + type: str + condition: + description: + - (Required for new resource) Condition info of the rule. + required: True + type: str type: description: - (Required for new resource) Policy rule type. @@ -47,16 +57,6 @@ - (Required for new resource) policy rule value info required: True type: str - listener: - description: - - (Required for new resource) Listener ID. - required: True - type: str - condition: - description: - - (Required for new resource) Condition info of the rule. - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -103,38 +103,38 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('listener', 'str'), + ('condition', 'str'), ('type', 'str'), ('lb', 'str'), ('policy', 'str'), ('value', 'str'), - ('listener', 'str'), - ('condition', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'listener', + 'condition', 'type', 'field', 'lb', 'policy', 'value', - 'listener', - 'condition', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('listener', 'str'), - ('rule', 'str'), ('lb', 'str'), + ('listener', 'str'), ('policy', 'str'), + ('rule', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'listener', - 'rule', 'lb', + 'listener', 'policy', + 'rule', ] TL_CONFLICTS_MAP = { @@ -144,6 +144,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( + listener=dict( + required=False, + type='str'), + condition=dict( + required=False, + type='str'), type=dict( required=False, type='str'), @@ -159,12 +165,6 @@ value=dict( required=False, type='str'), - listener=dict( - required=False, - type='str'), - condition=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 11e29297c..a9d6a0684 100644 --- a/plugins/modules/ibm_is_lb_listener_policy_rule_info.py +++ b/plugins/modules/ibm_is_lb_listener_policy_rule_info.py @@ -17,28 +17,28 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener_policy_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - listener: + lb: description: - - The listener identifier. + - The load balancer identifier. required: True type: str - rule: + listener: description: - - The rule identifier. + - The listener identifier. required: True type: str - lb: + policy: description: - - The load balancer identifier. + - The policy identifier. required: True type: str - policy: + rule: description: - - The policy identifier. + - The rule identifier. required: True type: str generation: @@ -74,18 +74,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('listener', 'str'), - ('rule', 'str'), ('lb', 'str'), + ('listener', 'str'), ('policy', 'str'), + ('rule', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'listener', - 'rule', 'lb', + 'listener', 'policy', + 'rule', ] @@ -96,16 +96,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( - listener=dict( + lb=dict( required=True, type='str'), - rule=dict( + listener=dict( required=True, type='str'), - lb=dict( + policy=dict( required=True, type='str'), - policy=dict( + rule=dict( required=True, type='str'), generation=dict( @@ -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.41.1', + ibm_provider_version='1.42.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 f9d50d900..d8699c05b 100644 --- a/plugins/modules/ibm_is_lb_listener_policy_rules_info.py +++ b/plugins/modules/ibm_is_lb_listener_policy_rules_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_listener_policy_rules' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -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.41.1', + ibm_provider_version='1.42.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 ee6c4ce88..845ebf353 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 532f29a8d..376badf5a 100644 --- a/plugins/modules/ibm_is_lb_pool.py +++ b/plugins/modules/ibm_is_lb_pool.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - lb: + name: description: - - (Required for new resource) Load Balancer ID + - (Required for new resource) Load Balancer Pool name required: True type: str protocol: @@ -37,21 +37,36 @@ - Health monitor Port the LB Pool required: False type: int - session_persistence_type: + lb: description: - - Load Balancer Pool session persisence type. - required: False + - (Required for new resource) Load Balancer ID + required: True type: str - name: + health_type: description: - - (Required for new resource) Load Balancer Pool name + - (Required for new resource) Load Balancer health type required: True type: str + 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: description: - (Required for new resource) Load Balancer health retry count @@ -62,29 +77,14 @@ - (Required for new resource) Load Balancer health timeout interval required: True type: int - health_type: - description: - - (Required for new resource) Load Balancer health type - required: True - type: str - session_persistence_app_cookie_name: - description: - - Load Balancer Pool session persisence app cookie name. - required: False - type: str - health_delay: - description: - - (Required for new resource) Load Blancer health delay time period - required: True - type: int health_monitor_url: description: - Health monitor URL of LB Pool required: False type: str - proxy_protocol: + session_persistence_type: description: - - PROXY protocol setting for this pool + - Load Balancer Pool session persisence type. required: False type: str id: @@ -133,31 +133,31 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('lb', 'str'), - ('protocol', 'str'), ('name', 'str'), + ('protocol', 'str'), + ('lb', 'str'), + ('health_type', 'str'), ('algorithm', 'str'), + ('health_delay', 'int'), ('health_retries', 'int'), ('health_timeout', 'int'), - ('health_type', 'str'), - ('health_delay', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'lb', + 'name', 'protocol', 'health_monitor_port', - 'session_persistence_type', - 'name', - 'algorithm', - 'health_retries', - 'health_timeout', + 'lb', 'health_type', 'session_persistence_app_cookie_name', + 'algorithm', + 'proxy_protocol', 'health_delay', + 'health_retries', + 'health_timeout', 'health_monitor_url', - 'proxy_protocol', + 'session_persistence_type', ] # Params for Data source @@ -166,9 +166,9 @@ ] TL_ALL_PARAMETERS_DS = [ + 'name', 'lb', 'identifier', - 'name', ] TL_CONFLICTS_MAP = { @@ -178,7 +178,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( - lb=dict( + name=dict( required=False, type='str'), protocol=dict( @@ -187,34 +187,34 @@ health_monitor_port=dict( required=False, type='int'), - session_persistence_type=dict( + lb=dict( required=False, type='str'), - name=dict( + health_type=dict( required=False, type='str'), - algorithm=dict( + session_persistence_app_cookie_name=dict( required=False, type='str'), - health_retries=dict( - required=False, - type='int'), - health_timeout=dict( - required=False, - type='int'), - health_type=dict( + algorithm=dict( required=False, type='str'), - session_persistence_app_cookie_name=dict( + proxy_protocol=dict( required=False, type='str'), health_delay=dict( required=False, type='int'), + health_retries=dict( + required=False, + type='int'), + health_timeout=dict( + required=False, + type='int'), health_monitor_url=dict( required=False, type='str'), - proxy_protocol=dict( + session_persistence_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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 02fbdb33e..eef1da1b9 100644 --- a/plugins/modules/ibm_is_lb_pool_info.py +++ b/plugins/modules/ibm_is_lb_pool_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + name: + description: + - The user-defined name for this load balancer pool. + required: False + type: str lb: description: - The load balancer identifier. @@ -31,11 +36,6 @@ - The pool identifier. required: False type: str - name: - description: - - The user-defined name for this load balancer pool. - required: False - type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -74,9 +74,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', 'lb', 'identifier', - 'name', ] @@ -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( + name=dict( + required=False, + type='str'), lb=dict( required=True, type='str'), identifier=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), generation=dict( type='int', required=False, @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_is_lb_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 3bc0e1c39..530bb2aae 100644 --- a/plugins/modules/ibm_is_lb_pool_member.py +++ b/plugins/modules/ibm_is_lb_pool_member.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_lb_pool_member' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,24 +27,24 @@ - (Required for new resource) Loadblancer Poold ID required: True type: str - target_address: - description: - - Load balancer pool member target address - required: False - type: str lb: description: - (Required for new resource) Load balancer ID required: True type: str + target_id: + description: + - 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_id: + target_address: description: - - Load balancer pool member target id + - Load balancer pool member target address required: False type: str weight: @@ -106,10 +106,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'pool', - 'target_address', 'lb', - 'port', 'target_id', + 'port', + 'target_address', 'weight', ] @@ -136,16 +136,16 @@ pool=dict( required=False, type='str'), - target_address=dict( + lb=dict( required=False, type='str'), - lb=dict( + target_id=dict( required=False, type='str'), port=dict( required=False, type='int'), - target_id=dict( + target_address=dict( required=False, type='str'), weight=dict( @@ -228,7 +228,7 @@ def run_module(): resource_type='ibm_is_lb_pool_member', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 3129ab394..a1faab38d 100644 --- a/plugins/modules/ibm_is_lb_pool_member_info.py +++ b/plugins/modules/ibm_is_lb_pool_member_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_lb_pool_member' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_lb_pool_member', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 1cb69470e..9b1099230 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 235de94d6..1455ade1b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 60c718cb1..56f64ca49 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 81b761824..a3c40254a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 004a7fa8c..459e049dd 100644 --- a/plugins/modules/ibm_is_network_acl.py +++ b/plugins/modules/ibm_is_network_acl.py @@ -18,15 +18,26 @@ - Create, update or destroy an IBM Cloud 'ibm_is_network_acl' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + name: + description: + - (Required for new resource) Network ACL name + required: True + type: str resource_group: description: - Resource group ID for the network ACL required: False type: str + tags: + description: + - List of tags + required: False + type: list + elements: str rules: description: - None @@ -38,17 +49,6 @@ - Network ACL VPC name required: False type: str - tags: - description: - - List of tags - required: False - type: list - elements: str - name: - description: - - (Required for new resource) Network ACL name - 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 = [ + 'name', 'resource_group', + 'tags', 'rules', 'vpc', - 'tags', - 'name', ] # Params for Data source @@ -112,9 +112,9 @@ ] TL_ALL_PARAMETERS_DS = [ - 'vpc_name', 'network_acl', 'name', + 'vpc_name', ] TL_CONFLICTS_MAP = { @@ -124,21 +124,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( + name=dict( + required=False, + type='str'), resource_group=dict( required=False, type='str'), - rules=dict( + tags=dict( required=False, elements='', type='list'), - vpc=dict( - required=False, - type='str'), - tags=dict( + rules=dict( required=False, elements='', type='list'), - name=dict( + vpc=dict( required=False, type='str'), id=dict( @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_network_acl', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b0d468644..831b368ba 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - vpc_name: - description: - - The name of the vpc the network acl resides in. - required: False - type: str network_acl: description: - The network acl id. @@ -36,6 +31,11 @@ - The network acl name. required: False type: str + vpc_name: + description: + - The name of the vpc the network acl resides in. + 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 = [ - 'vpc_name', 'network_acl', 'name', + 'vpc_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( - vpc_name=dict( - required=False, - type='str'), network_acl=dict( required=False, type='str'), name=dict( required=False, type='str'), + vpc_name=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.41.1', + ibm_provider_version='1.42.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 57369da04..e3e1aff2a 100644 --- a/plugins/modules/ibm_is_network_acl_rule.py +++ b/plugins/modules/ibm_is_network_acl_rule.py @@ -18,24 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_is_network_acl_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - icmp: + before: description: - - None + - The rule that this rule is immediately before. If absent, this is the last rule. required: False - type: list - elements: dict - destination: + type: str + name: description: - - (Required for new resource) The destination CIDR block. The CIDR block 0.0.0.0/0 applies to all addresses. + - 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 - direction: + source: description: - - (Required for new resource) Direction of traffic to enforce, either inbound or outbound + - (Required for new resource) The source CIDR block. The CIDR block 0.0.0.0/0 applies to all addresses. required: True type: str tcp: @@ -44,37 +48,33 @@ required: False type: list elements: dict - network_acl: - description: - - (Required for new resource) Network ACL id - required: True - type: str - before: + udp: description: - - The rule that this rule is immediately before. If absent, this is the last rule. + - None required: False - type: str - action: + type: list + elements: dict + network_acl: description: - - (Required for new resource) Whether to allow or deny matching traffic + - (Required for new resource) Network ACL id required: True 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 - source: + destination: 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) The destination CIDR block. The CIDR block 0.0.0.0/0 applies to all addresses. required: True type: str - udp: + icmp: description: - None required: False type: list elements: dict + direction: + description: + - (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. @@ -121,81 +121,81 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('destination', 'str'), - ('direction', 'str'), - ('network_acl', 'str'), ('action', 'str'), ('source', 'str'), + ('network_acl', 'str'), + ('destination', 'str'), + ('direction', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'icmp', - 'destination', - 'direction', - 'tcp', - 'network_acl', 'before', - 'action', 'name', + 'action', 'source', + 'tcp', 'udp', + 'network_acl', + 'destination', + 'icmp', + 'direction', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('network_acl', 'str'), ('name', 'str'), + ('network_acl', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'network_acl', 'name', + 'network_acl', ] TL_CONFLICTS_MAP = { - 'icmp': ['tcp', 'udp'], 'tcp': ['icmp', 'udp'], 'udp': ['icmp', 'tcp'], + 'icmp': ['tcp', 'udp'], } # 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( - icmp=dict( + before=dict( required=False, - elements='', - type='list'), - destination=dict( + type='str'), + name=dict( required=False, type='str'), - direction=dict( + action=dict( + required=False, + type='str'), + source=dict( required=False, type='str'), tcp=dict( required=False, elements='', type='list'), - network_acl=dict( - required=False, - type='str'), - before=dict( - required=False, - type='str'), - action=dict( + udp=dict( required=False, - type='str'), - name=dict( + elements='', + type='list'), + network_acl=dict( required=False, type='str'), - source=dict( + destination=dict( required=False, type='str'), - udp=dict( + icmp=dict( required=False, elements='', type='list'), + direction=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 dc28357ee..7437bad47 100644 --- a/plugins/modules/ibm_is_network_acl_rule_info.py +++ b/plugins/modules/ibm_is_network_acl_rule_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_network_acl_rule' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - network_acl: + name: description: - - Network ACL id + - The user-defined name for this rule required: True type: str - name: + network_acl: description: - - The user-defined name for this rule + - Network ACL id required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('network_acl', 'str'), ('name', 'str'), + ('network_acl', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'network_acl', 'name', + 'network_acl', ] @@ -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( - network_acl=dict( + name=dict( required=True, type='str'), - name=dict( + network_acl=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_network_acl_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4b7763e9d..06c27ca3f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 7da7b2f7f..00907055e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0cde75935..c6bbc2167 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 90397ebab..807e0f59d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5b424504a..919a20410 100644 --- a/plugins/modules/ibm_is_placement_group.py +++ b/plugins/modules/ibm_is_placement_group.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_placement_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -32,9 +32,9 @@ - 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 - access_tags: + tags: description: - - List of access management tags + - List of tags required: False type: list elements: str @@ -43,9 +43,9 @@ - (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 - tags: + access_tags: description: - - List of tags + - List of access management tags required: False type: list elements: str @@ -103,9 +103,9 @@ TL_ALL_PARAMETERS = [ 'strategy', 'resource_group', - 'access_tags', - 'name', 'tags', + 'name', + 'access_tags', ] # Params for Data source @@ -130,14 +130,14 @@ resource_group=dict( required=False, type='str'), - access_tags=dict( + tags=dict( required=False, elements='', type='list'), name=dict( required=False, type='str'), - tags=dict( + access_tags=dict( required=False, elements='', type='list'), @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 29a1992e6..2d5cc4dbc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3db9b7619..82cee8eeb 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 dc0cc8f13..029fadc08 100644 --- a/plugins/modules/ibm_is_public_gateway.py +++ b/plugins/modules/ibm_is_public_gateway.py @@ -18,23 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_is_public_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) Name of the Public gateway instance - required: True - type: str - resource_group: + tags: description: - - Public gateway resource group info + - Service tags for the public gateway instance required: False - type: str - vpc: + type: list + elements: str + name: description: - - (Required for new resource) Public gateway VPC info + - (Required for new resource) Name of the Public gateway instance required: True type: str floating_ip: @@ -47,12 +43,16 @@ - (Required for new resource) Public gateway zone info required: True type: str - tags: + resource_group: description: - - Service tags for the public gateway instance + - Public gateway resource group info required: False - type: list - elements: str + type: str + vpc: + description: + - (Required for new resource) Public gateway VPC info + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -100,18 +100,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('name', 'str'), - ('vpc', 'str'), ('zone', 'str'), + ('vpc', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tags', 'name', - 'resource_group', - 'vpc', 'floating_ip', 'zone', - 'tags', + 'resource_group', + 'vpc', ] # Params for Data source @@ -120,8 +120,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'resource_group', 'name', + 'resource_group', ] TL_CONFLICTS_MAP = { @@ -131,13 +131,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( - name=dict( - required=False, - type='str'), - resource_group=dict( + tags=dict( required=False, - type='str'), - vpc=dict( + elements='', + type='list'), + name=dict( required=False, type='str'), floating_ip=dict( @@ -146,10 +144,12 @@ zone=dict( required=False, type='str'), - tags=dict( + resource_group=dict( required=False, - elements='', - type='list'), + type='str'), + vpc=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 9b7fcde19..7435fa395 100644 --- a/plugins/modules/ibm_is_public_gateway_info.py +++ b/plugins/modules/ibm_is_public_gateway_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_is_public_gateway' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resource_group: - description: - - Public gateway resource group info - required: False - type: str name: description: - Public gateway Name required: True type: str + resource_group: + description: + - Public gateway resource group info + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -69,8 +69,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group', 'name', + 'resource_group', ] @@ -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=dict( - required=False, - type='str'), name=dict( required=True, type='str'), + resource_group=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_public_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9d67351ee..531e3b0b6 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 8bff1ff71..477c860a3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0c1af043f..78264c4c2 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 df7c08219..7fdef75a0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,17 +27,17 @@ - Security group name required: False type: str - vpc: - description: - - (Required for new resource) Security group's resource group id - required: True - 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 + required: True + type: str resource_group: description: - Resource Group ID @@ -95,8 +95,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'name', - 'vpc', 'tags', + 'vpc', 'resource_group', ] @@ -119,13 +119,13 @@ name=dict( required=False, type='str'), - vpc=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'), @@ -206,7 +206,7 @@ def run_module(): resource_type='ibm_is_security_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 ac3b33d5f..55d16c75d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ed942bf39..292a0d209 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - 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 id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('network_interface', 'str'), ('security_group', 'str'), + ('network_interface', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'network_interface', 'security_group', + 'network_interface', ] # 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( - network_interface=dict( + security_group=dict( required=False, type='str'), - security_group=dict( + network_interface=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.41.1', + ibm_provider_version='1.42.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 7d2075b49..6ba1b61f4 100644 --- a/plugins/modules/ibm_is_security_group_rule.py +++ b/plugins/modules/ibm_is_security_group_rule.py @@ -18,49 +18,49 @@ - Create, update or destroy an IBM Cloud 'ibm_is_security_group_rule' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - remote: + direction: description: - - Security group id: an IP address, a CIDR block, or a single security group identifier - required: False + - (Required for new resource) Direction of traffic to enforce, either inbound or outbound + required: True type: str - icmp: + ip_version: description: - - protocol=icmp + - IP version: ipv4 required: False - type: list - elements: dict - udp: + type: str + default: ipv4 + remote: description: - - protocol=udp + - Security group id: an IP address, a CIDR block, or a single security group identifier required: False - type: list - elements: dict + type: str group: description: - (Required for new resource) Security group id required: True type: str - direction: - description: - - (Required for new resource) Direction of traffic to enforce, either inbound or outbound - required: True - type: str - ip_version: + icmp: description: - - IP version: ipv4 + - protocol=icmp required: False - type: str - default: ipv4 + type: list + elements: dict tcp: description: - protocol=tcp required: False type: list elements: dict + udp: + description: + - protocol=udp + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -107,63 +107,63 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('group', 'str'), ('direction', 'str'), + ('group', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'remote', - 'icmp', - 'udp', - 'group', 'direction', 'ip_version', + 'remote', + 'group', + 'icmp', 'tcp', + 'udp', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('security_group', 'str'), ('security_group_rule', 'str'), + ('security_group', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'security_group', 'security_group_rule', + 'security_group', ] TL_CONFLICTS_MAP = { 'icmp': ['tcp', 'udp'], - 'udp': ['tcp', 'icmp'], '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( required=False, type='str'), + group=dict( + required=False, + type='str'), icmp=dict( required=False, elements='', type='list'), - udp=dict( + tcp=dict( required=False, elements='', type='list'), - group=dict( - required=False, - type='str'), - direction=dict( - required=False, - type='str'), - ip_version=dict( - required=False, - type='str'), - tcp=dict( + udp=dict( required=False, elements='', type='list'), @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_is_security_group_rule', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 d6cc051c5..fad116092 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - security_group: + security_group_rule: description: - - The security group identifier. + - The rule identifier. required: True type: str - security_group_rule: + security_group: description: - - The rule identifier. + - The security group identifier. required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('security_group', 'str'), ('security_group_rule', 'str'), + ('security_group', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'security_group', 'security_group_rule', + 'security_group', ] @@ -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=dict( + security_group_rule=dict( required=True, type='str'), - security_group_rule=dict( + security_group=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.41.1', + ibm_provider_version='1.42.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 622dea0cc..a2fb5ded6 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f7de692c3..43f21471d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - security_group: + target: description: - - (Required for new resource) Security group id + - (Required for new resource) security group target identifier required: True type: str - target: + security_group: description: - - (Required for new resource) security group target identifier + - (Required for new resource) Security group id required: True type: str id: @@ -78,25 +78,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('security_group', 'str'), ('target', 'str'), + ('security_group', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'security_group', 'target', + 'security_group', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('name', 'str'), ('security_group', 'str'), + ('name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'name', 'security_group', + 'name', ] TL_CONFLICTS_MAP = { @@ -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( - security_group=dict( + target=dict( required=False, type='str'), - target=dict( + security_group=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 bcc674ed6..8730742b4 100644 --- a/plugins/modules/ibm_is_security_group_target_info.py +++ b/plugins/modules/ibm_is_security_group_target_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_group_target' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + security_group: description: - - Security group target name + - Security group id required: True type: str - security_group: + name: description: - - Security group id + - Security group target name required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('name', 'str'), ('security_group', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'security_group', + '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( + security_group=dict( required=True, type='str'), - security_group=dict( + name=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_security_group_target', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5ab1d843f..9138f72f0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f47d91955..03a2d51f0 100644 --- a/plugins/modules/ibm_is_security_groups_info.py +++ b/plugins/modules/ibm_is_security_groups_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_security_groups' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_is_security_groups', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9018529db..da76ee0c5 100644 --- a/plugins/modules/ibm_is_snapshot.py +++ b/plugins/modules/ibm_is_snapshot.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_snapshot' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resource_group: - description: - - Resource group info - required: False - type: str source_volume: description: - (Required for new resource) Snapshot source volume @@ -37,6 +32,11 @@ - Snapshot name required: False type: str + resource_group: + description: + - Resource group info + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -88,9 +88,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group', 'source_volume', 'name', + 'resource_group', ] # Params for Data source @@ -98,8 +98,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', 'identifier', + 'name', ] TL_CONFLICTS_MAP = { @@ -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( - resource_group=dict( - required=False, - type='str'), source_volume=dict( required=False, type='str'), name=dict( required=False, type='str'), + resource_group=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_is_snapshot', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5e2d29e3c..e9fc79887 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + identifier: description: - - Snapshot name + - Snapshot identifier required: False type: str - identifier: + name: description: - - Snapshot identifier + - Snapshot name required: False type: str generation: @@ -68,8 +68,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'identifier', + '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( - name=dict( + identifier=dict( required=False, type='str'), - identifier=dict( + name=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.41.1', + ibm_provider_version='1.42.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 838f19812..7c3055104 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 26d14705f..4b357eb13 100644 --- a/plugins/modules/ibm_is_ssh_key.py +++ b/plugins/modules/ibm_is_ssh_key.py @@ -18,24 +18,18 @@ - Create, update or destroy an IBM Cloud 'ibm_is_ssh_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: - description: - - List of tags for SSH key - required: False - type: list - elements: str - public_key: + name: description: - - (Required for new resource) SSH Public key data + - (Required for new resource) SSH Key name required: True type: str - name: + public_key: description: - - (Required for new resource) SSH Key name + - (Required for new resource) SSH Public key data required: True type: str resource_group: @@ -43,6 +37,12 @@ - Resource group ID required: False type: str + tags: + description: + - List of tags for SSH key + required: False + type: list + elements: 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 = [ - ('public_key', 'str'), ('name', 'str'), + ('public_key', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', - 'public_key', 'name', + 'public_key', 'resource_group', + 'tags', ] # Params for Data source @@ -107,8 +107,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'resource_group', 'name', + 'resource_group', ] TL_CONFLICTS_MAP = { @@ -118,19 +118,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( - tags=dict( - required=False, - elements='', - type='list'), - public_key=dict( + name=dict( required=False, type='str'), - name=dict( + public_key=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'), @@ -208,7 +208,7 @@ def run_module(): resource_type='ibm_is_ssh_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 68eb2457f..273149357 100644 --- a/plugins/modules/ibm_is_ssh_key_info.py +++ b/plugins/modules/ibm_is_ssh_key_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_is_ssh_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resource_group: - description: - - Resource group ID - required: False - type: str name: description: - The name of the ssh key required: True type: str + resource_group: + description: + - Resource group ID + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -69,8 +69,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group', 'name', + 'resource_group', ] @@ -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=dict( - required=False, - type='str'), name=dict( required=True, type='str'), + resource_group=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_ssh_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..e9ed49f11 --- /dev/null +++ b/plugins/modules/ibm_is_ssh_keys_info.py @@ -0,0 +1,133 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_is_ssh_keys_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/is_ssh_keys + +short_description: Retrieve IBM Cloud 'ibm_is_ssh_keys' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_is_ssh_keys' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + generation: + description: + - The generation of Virtual Private Cloud infrastructure + that you want to use. Supported values are 1 for VPC + generation 1, and 2 for VPC generation 2 infrastructure. + If this value is not specified, 2 is used by default. This + can also be provided via the environment variable + 'IC_GENERATION'. + default: 2 + required: False + type: int + 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 + 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 = [ +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ +] + + +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( + generation=dict( + type='int', + required=False, + fallback=(env_fallback, ['IC_GENERATION']), + default=2), + 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 + ) + + # VPC required arguments checks + if module.params['generation'] == 1: + missing_args = [] + if module.params['iaas_classic_username'] is None: + missing_args.append('iaas_classic_username') + if module.params['iaas_classic_api_key'] is None: + missing_args.append('iaas_classic_api_key') + if missing_args: + module.fail_json(msg=( + "VPC generation=1 missing required arguments: " + + ", ".join(missing_args))) + elif module.params['generation'] == 2: + if module.params['ibmcloud_api_key'] is None: + module.fail_json( + msg=("VPC generation=2 missing required argument: " + "ibmcloud_api_key")) + + result = ibmcloud_terraform( + resource_type='ibm_is_ssh_keys', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_is_subnet.py b/plugins/modules/ibm_is_subnet.py index 47377a411..aab4179e9 100644 --- a/plugins/modules/ibm_is_subnet.py +++ b/plugins/modules/ibm_is_subnet.py @@ -18,15 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_is_subnet' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resource_group: + total_ipv4_address_count: description: - - The resource group for this subnet + - The total number of IPv4 addresses in this subnet. required: False - type: str + type: int name: description: - (Required for new resource) Subnet name @@ -38,15 +38,9 @@ required: False type: list elements: str - access_tags: - description: - - List of access management tags - required: False - type: list - elements: str - network_acl: + ipv4_cidr_block: description: - - The network ACL for this subnet + - IPV4 subnet - CIDR block required: False type: str vpc: @@ -64,27 +58,33 @@ - routing table id that is associated with the subnet required: False type: str - public_gateway: + ip_version: description: - - Public Gateway of the subnet + - The IP version(s) to support for this subnet. required: False type: str - ipv4_cidr_block: + default: ipv4 + access_tags: description: - - IPV4 subnet - CIDR block + - List of access management tags + required: False + type: list + elements: str + network_acl: + description: + - The network ACL for this subnet required: False type: str - ip_version: + public_gateway: description: - - The IP version(s) to support for this subnet. + - Public Gateway of the subnet required: False type: str - default: ipv4 - total_ipv4_address_count: + resource_group: description: - - The total number of IPv4 addresses in this subnet. + - The resource group for this subnet required: False - type: int + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -138,18 +138,18 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'resource_group', + 'total_ipv4_address_count', 'name', 'tags', - 'access_tags', - 'network_acl', + 'ipv4_cidr_block', 'vpc', 'zone', 'routing_table', - 'public_gateway', - 'ipv4_cidr_block', 'ip_version', - 'total_ipv4_address_count', + 'access_tags', + 'network_acl', + 'public_gateway', + 'resource_group', ] # Params for Data source @@ -162,17 +162,17 @@ ] TL_CONFLICTS_MAP = { - 'ipv4_cidr_block': ['total_ipv4_address_count'], 'total_ipv4_address_count': ['ipv4_cidr_block'], + 'ipv4_cidr_block': ['total_ipv4_address_count'], } # 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=dict( + total_ipv4_address_count=dict( required=False, - type='str'), + type='int'), name=dict( required=False, type='str'), @@ -180,11 +180,7 @@ required=False, elements='', type='list'), - access_tags=dict( - required=False, - elements='', - type='list'), - network_acl=dict( + ipv4_cidr_block=dict( required=False, type='str'), vpc=dict( @@ -196,18 +192,22 @@ routing_table=dict( required=False, type='str'), - public_gateway=dict( + ip_version=dict( required=False, type='str'), - ipv4_cidr_block=dict( + access_tags=dict( + required=False, + elements='', + type='list'), + network_acl=dict( required=False, type='str'), - ip_version=dict( + public_gateway=dict( required=False, type='str'), - total_ipv4_address_count=dict( + resource_group=dict( required=False, - type='int'), + type='str'), id=dict( required=False, type='str'), @@ -285,7 +285,7 @@ def run_module(): resource_type='ibm_is_subnet', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 281c18252..fddb8f316 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 b66d4e1b4..7293c9bf6 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f6f93c884..9a802129b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - 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 id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('subnet', 'str'), ('public_gateway', 'str'), + ('subnet', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'subnet', 'public_gateway', + 'subnet', ] # 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( - subnet=dict( + public_gateway=dict( required=False, type='str'), - public_gateway=dict( + subnet=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.41.1', + ibm_provider_version='1.42.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 6cbf36b73..dcaef118c 100644 --- a/plugins/modules/ibm_is_subnet_reserved_ip.py +++ b/plugins/modules/ibm_is_subnet_reserved_ip.py @@ -18,15 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_is_subnet_reserved_ip' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - auto_delete: + address: description: - - If set to true, this reserved IP will be automatically deleted + - The address for this reserved IP. required: False - type: bool + 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. @@ -37,16 +42,11 @@ - (Required for new resource) The subnet identifier. required: True type: str - name: - description: - - The user-defined or system-provided name for this reserved IP. - required: False - type: str - address: + auto_delete: description: - - The address for this reserved IP. + - If set to true, this reserved IP will be automatically deleted required: False - type: str + type: bool id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -98,22 +98,22 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'auto_delete', + 'address', + 'name', 'target', 'subnet', - 'name', - 'address', + 'auto_delete', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('reserved_ip', 'str'), ('subnet', 'str'), + ('reserved_ip', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'reserved_ip', 'subnet', + 'reserved_ip', ] TL_CONFLICTS_MAP = { @@ -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( - auto_delete=dict( - required=False, - type='bool'), - target=dict( + address=dict( required=False, type='str'), - subnet=dict( + name=dict( required=False, type='str'), - name=dict( + target=dict( required=False, type='str'), - address=dict( + subnet=dict( required=False, type='str'), + auto_delete=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 781c64d74..e2ff8de28 100644 --- a/plugins/modules/ibm_is_subnet_reserved_ip_info.py +++ b/plugins/modules/ibm_is_subnet_reserved_ip_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_subnet_reserved_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - reserved_ip: + subnet: description: - - The reserved IP identifier. + - The subnet identifier. required: True type: str - subnet: + reserved_ip: description: - - The subnet identifier. + - The reserved IP identifier. required: True type: str generation: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('reserved_ip', 'str'), ('subnet', 'str'), + ('reserved_ip', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'reserved_ip', 'subnet', + 'reserved_ip', ] @@ -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( - reserved_ip=dict( + subnet=dict( required=True, type='str'), - subnet=dict( + reserved_ip=dict( required=True, type='str'), generation=dict( @@ -134,7 +134,7 @@ def run_module(): resource_type='ibm_is_subnet_reserved_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 7f496d8a8..8d77286d7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 344927fc5..ee6ed296e 100644 --- a/plugins/modules/ibm_is_subnet_routing_table_attachment.py +++ b/plugins/modules/ibm_is_subnet_routing_table_attachment.py @@ -18,18 +18,18 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - routing_table: + subnet: description: - - (Required for new resource) The unique identifier of routing table + - (Required for new resource) The subnet identifier required: True type: str - subnet: + routing_table: description: - - (Required for new resource) The subnet identifier + - (Required for new resource) The unique identifier of routing table required: True type: str id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('routing_table', 'str'), ('subnet', 'str'), + ('routing_table', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'routing_table', 'subnet', + 'routing_table', ] # 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( - routing_table=dict( + subnet=dict( required=False, type='str'), - subnet=dict( + routing_table=dict( required=False, type='str'), id=dict( @@ -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.41.1', + ibm_provider_version='1.42.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 64e7d3c01..be17ade44 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c17c457c3..0204a1beb 100644 --- a/plugins/modules/ibm_is_virtual_endpoint_gateway.py +++ b/plugins/modules/ibm_is_virtual_endpoint_gateway.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_is_virtual_endpoint_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 + required: True + type: str resource_group: description: - The resource group id @@ -33,28 +44,17 @@ required: False type: list elements: str - ips: - description: - - Endpoint gateway IPs - required: False - type: list - elements: dict vpc: description: - (Required for new resource) The VPC id required: True type: str - name: - description: - - (Required for new resource) Endpoint gateway name - required: True - type: str - tags: + ips: description: - - List of tags for VPE + - Endpoint gateway IPs required: False type: list - elements: str + elements: dict target: description: - (Required for new resource) Endpoint gateway target @@ -107,19 +107,19 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('vpc', 'str'), ('name', 'str'), + ('vpc', 'str'), ('target', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tags', + 'name', 'resource_group', 'security_groups', - 'ips', 'vpc', - 'name', - 'tags', + 'ips', 'target', ] @@ -139,6 +139,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( + tags=dict( + required=False, + elements='', + type='list'), + name=dict( + required=False, + type='str'), resource_group=dict( required=False, type='str'), @@ -146,17 +153,10 @@ required=False, elements='', type='list'), - ips=dict( - required=False, - elements='', - type='list'), vpc=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), - tags=dict( + ips=dict( required=False, elements='', type='list'), @@ -241,7 +241,7 @@ def run_module(): resource_type='ibm_is_virtual_endpoint_gateway', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 e7e1c19ee..ab88f10a9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3236c5550..1878e1a7b 100644 --- a/plugins/modules/ibm_is_virtual_endpoint_gateway_ip.py +++ b/plugins/modules/ibm_is_virtual_endpoint_gateway_ip.py @@ -18,18 +18,18 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - reserved_ip: + gateway: description: - - (Required for new resource) Endpoint gateway IP id + - (Required for new resource) Endpoint gateway ID required: True type: str - gateway: + reserved_ip: description: - - (Required for new resource) Endpoint gateway ID + - (Required for new resource) Endpoint gateway IP id required: True type: str id: @@ -78,14 +78,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('reserved_ip', 'str'), ('gateway', 'str'), + ('reserved_ip', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'reserved_ip', 'gateway', + 'reserved_ip', ] # 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( - reserved_ip=dict( + gateway=dict( required=False, type='str'), - gateway=dict( + reserved_ip=dict( required=False, type='str'), id=dict( @@ -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.41.1', + ibm_provider_version='1.42.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 415ad4685..a206e348d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 513e383ef..1eeeb0dc3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e1ac91715..2d383f5e9 100644 --- a/plugins/modules/ibm_is_volume.py +++ b/plugins/modules/ibm_is_volume.py @@ -18,18 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_is_volume' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - delete_all_snapshots: - description: - - Deletes all snapshots created from this volume - required: False - type: bool - zone: + profile: description: - - (Required for new resource) Zone name + - (Required for new resource) Volume profile name required: True type: str encryption_key: @@ -37,38 +32,43 @@ - Volume encryption key info required: False type: str - iops: + name: description: - - IOPS value for the Volume + - (Required for new resource) Volume name + required: True + type: str + capacity: + description: + - Volume capacity value required: False type: int + default: 100 resource_group: description: - Resource group name required: False type: str - tags: - description: - - Tags for the volume instance - required: False - type: list - elements: str - name: - description: - - (Required for new resource) Volume name - required: True - type: str - profile: + zone: description: - - (Required for new resource) Volume profile name + - (Required for new resource) Zone name required: True type: str - capacity: + iops: description: - - Volume capacity value + - IOPS value for the Volume required: False type: int - default: 100 + delete_all_snapshots: + description: + - Deletes all snapshots created from this volume + required: False + type: bool + tags: + description: + - Tags for the volume instance + required: False + type: list + elements: 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 = [ - ('zone', 'str'), - ('name', 'str'), ('profile', 'str'), + ('name', 'str'), + ('zone', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'delete_all_snapshots', - 'zone', + 'profile', 'encryption_key', - 'iops', - 'resource_group', - 'tags', 'name', - 'profile', 'capacity', + 'resource_group', + 'zone', + 'iops', + 'delete_all_snapshots', + 'tags', ] # Params for Data source @@ -139,8 +139,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'zone', 'name', + 'zone', ] TL_CONFLICTS_MAP = { @@ -150,34 +150,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( - delete_all_snapshots=dict( - required=False, - type='bool'), - zone=dict( + profile=dict( required=False, type='str'), encryption_key=dict( required=False, type='str'), - iops=dict( - required=False, - type='int'), - resource_group=dict( + name=dict( required=False, type='str'), - tags=dict( + capacity=dict( required=False, - elements='', - type='list'), - name=dict( + type='int'), + resource_group=dict( required=False, type='str'), - profile=dict( + zone=dict( required=False, type='str'), - capacity=dict( + iops=dict( required=False, type='int'), + delete_all_snapshots=dict( + required=False, + type='bool'), + tags=dict( + required=False, + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 6a787a5ae..bb0f4e0ef 100644 --- a/plugins/modules/ibm_is_volume_info.py +++ b/plugins/modules/ibm_is_volume_info.py @@ -17,20 +17,20 @@ description: - Retrieve an IBM Cloud 'ibm_is_volume' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - zone: - description: - - Zone name - required: False - type: str name: description: - Volume name required: True type: str + zone: + description: + - Zone name + required: False + type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -69,8 +69,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'zone', 'name', + 'zone', ] @@ -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( - zone=dict( - required=False, - type='str'), name=dict( required=True, type='str'), + zone=dict( + required=False, + type='str'), generation=dict( type='int', required=False, @@ -133,7 +133,7 @@ def run_module(): resource_type='ibm_is_volume', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9e5eb337a..701c5b90e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 fcab19b94..8b1ea4e8c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..ce7816d19 --- /dev/null +++ b/plugins/modules/ibm_is_volumes_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_is_volumes_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/is_volumes + +short_description: Retrieve IBM Cloud 'ibm_is_volumes' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_is_volumes' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + volume_name: + description: + - Volume name identifier. + required: False + type: str + zone_name: + description: + - Zone name identifier. + required: False + type: str + generation: + description: + - The generation of Virtual Private Cloud infrastructure + that you want to use. Supported values are 1 for VPC + generation 1, and 2 for VPC generation 2 infrastructure. + If this value is not specified, 2 is used by default. This + can also be provided via the environment variable + 'IC_GENERATION'. + default: 2 + required: False + type: int + 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 + 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 = [ +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'volume_name', + 'zone_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( + volume_name=dict( + required=False, + type='str'), + zone_name=dict( + required=False, + type='str'), + generation=dict( + type='int', + required=False, + fallback=(env_fallback, ['IC_GENERATION']), + default=2), + 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 + ) + + # VPC required arguments checks + if module.params['generation'] == 1: + missing_args = [] + if module.params['iaas_classic_username'] is None: + missing_args.append('iaas_classic_username') + if module.params['iaas_classic_api_key'] is None: + missing_args.append('iaas_classic_api_key') + if missing_args: + module.fail_json(msg=( + "VPC generation=1 missing required arguments: " + + ", ".join(missing_args))) + elif module.params['generation'] == 2: + if module.params['ibmcloud_api_key'] is None: + module.fail_json( + msg=("VPC generation=2 missing required argument: " + "ibmcloud_api_key")) + + result = ibmcloud_terraform( + resource_type='ibm_is_volumes', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_is_vpc.py b/plugins/modules/ibm_is_vpc.py index d8151ee33..5499cf3ea 100644 --- a/plugins/modules/ibm_is_vpc.py +++ b/plugins/modules/ibm_is_vpc.py @@ -18,53 +18,53 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: + address_prefix_management: description: - - List of tags + - Address Prefix management value required: False - type: list - elements: str + type: str + default: auto default_security_group_name: description: - Default security group name required: False type: str + default_routing_table_name: + description: + - 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 - name: - description: - - (Required for new resource) VPC name - required: True - type: str default_network_acl_name: description: - Default Network ACL name required: False type: str - resource_group: - description: - - Resource group info - required: False - type: str - default_routing_table_name: + tags: description: - - Default routing table name + - List of tags required: False - type: str - address_prefix_management: + type: list + elements: str + name: description: - - Address Prefix management value - required: False + - (Required for new resource) VPC name + required: True type: str - default: auto 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 = [ - 'tags', + 'address_prefix_management', 'default_security_group_name', + 'default_routing_table_name', + 'resource_group', 'classic_access', - 'name', 'default_network_acl_name', - 'resource_group', - 'default_routing_table_name', - 'address_prefix_management', + 'tags', + 'name', ] # Params for Data source @@ -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( - tags=dict( - required=False, - elements='', - type='list'), - default_security_group_name=dict( + address_prefix_management=dict( required=False, type='str'), - classic_access=dict( - required=False, - type='bool'), - name=dict( + default_security_group_name=dict( required=False, type='str'), - default_network_acl_name=dict( + default_routing_table_name=dict( required=False, type='str'), resource_group=dict( required=False, type='str'), - default_routing_table_name=dict( + classic_access=dict( + required=False, + type='bool'), + default_network_acl_name=dict( required=False, type='str'), - address_prefix_management=dict( + tags=dict( + required=False, + elements='', + type='list'), + name=dict( required=False, type='str'), id=dict( @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_is_vpc', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b0ecf133a..8075978a5 100644 --- a/plugins/modules/ibm_is_vpc_address_prefix.py +++ b/plugins/modules/ibm_is_vpc_address_prefix.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc_address_prefix' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -219,7 +219,7 @@ def run_module(): resource_type='ibm_is_vpc_address_prefix', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 07a479398..ed05543d9 100644 --- a/plugins/modules/ibm_is_vpc_address_prefix_info.py +++ b/plugins/modules/ibm_is_vpc_address_prefix_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_address_prefix' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -150,7 +150,7 @@ def run_module(): resource_type='ibm_is_vpc_address_prefix', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 f4c12b502..8aea8865d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 b06975336..d9bf1b5f7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 caf6c57c7..cd16fc024 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c8c843494..96bf47c24 100644 --- a/plugins/modules/ibm_is_vpc_route.py +++ b/plugins/modules/ibm_is_vpc_route.py @@ -18,33 +18,33 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + vpc: description: - - (Required for new resource) VPC route name + - (Required for new resource) VPC instance ID required: True type: str - zone: + next_hop: description: - - (Required for new resource) VPC route location + - (Required for new resource) VPC route next hop value required: True type: str - destination: + name: description: - - (Required for new resource) VPC route destination CIDR value + - (Required for new resource) VPC route name required: True type: str - vpc: + zone: description: - - (Required for new resource) VPC instance ID + - (Required for new resource) VPC route location required: True type: str - next_hop: + destination: description: - - (Required for new resource) VPC route next hop value + - (Required for new resource) VPC route destination CIDR value required: True type: str 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( - name=dict( + vpc=dict( required=False, type='str'), - zone=dict( + next_hop=dict( required=False, type='str'), - destination=dict( + name=dict( required=False, type='str'), - vpc=dict( + zone=dict( required=False, type='str'), - next_hop=dict( + destination=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.41.1', + ibm_provider_version='1.42.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 12397dae7..8745e7bec 100644 --- a/plugins/modules/ibm_is_vpc_routing_table.py +++ b/plugins/modules/ibm_is_vpc_routing_table.py @@ -18,21 +18,27 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpc_routing_table' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + vpc: + description: + - (Required for new resource) The VPC identifier. + required: True + type: str + route_direct_link_ingress: + description: + - If set to true, this routing table will be used to route traffic that originates from Direct Link to this VPC. + required: False + type: bool + default: False route_transit_gateway_ingress: description: - If set to true, this routing table will be used to route traffic that originates from Transit Gateway to this VPC. required: False type: bool default: False - vpc: - description: - - (Required for new resource) The VPC identifier. - required: True - type: str route_vpc_zone_ingress: description: - If set to true, this routing table will be used to route traffic that originates from subnets in other zones in this VPC. @@ -44,12 +50,6 @@ - The user-defined name for this routing table. required: False type: str - route_direct_link_ingress: - description: - - If set to true, this routing table will be used to route traffic that originates from Direct Link to this VPC. - required: False - type: bool - default: False id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -101,11 +101,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'route_transit_gateway_ingress', 'vpc', + 'route_direct_link_ingress', + 'route_transit_gateway_ingress', 'route_vpc_zone_ingress', 'name', - 'route_direct_link_ingress', ] # Params for Data source @@ -114,8 +114,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'routing_table', 'name', + 'routing_table', 'vpc', ] @@ -126,21 +126,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( - route_transit_gateway_ingress=dict( - required=False, - type='bool'), vpc=dict( required=False, type='str'), + route_direct_link_ingress=dict( + required=False, + type='bool'), + route_transit_gateway_ingress=dict( + required=False, + type='bool'), route_vpc_zone_ingress=dict( required=False, type='bool'), name=dict( required=False, type='str'), - route_direct_link_ingress=dict( - required=False, - type='bool'), id=dict( required=False, type='str'), @@ -218,7 +218,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b454b98f8..48fa3809d 100644 --- a/plugins/modules/ibm_is_vpc_routing_table_info.py +++ b/plugins/modules/ibm_is_vpc_routing_table_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_routing_table' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - routing_table: + name: description: - - The routing table identifier. + - The user-defined name for this routing table. required: False type: str - name: + routing_table: description: - - The user-defined name for this routing table. + - The routing table identifier. required: False type: str vpc: @@ -74,25 +74,25 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'routing_table', 'name', + 'routing_table', 'vpc', ] TL_CONFLICTS_MAP = { - 'routing_table': ['name'], 'name': ['routing_table'], + 'routing_table': ['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( - routing_table=dict( + name=dict( required=False, type='str'), - name=dict( + routing_table=dict( required=False, type='str'), vpc=dict( @@ -144,7 +144,7 @@ def run_module(): resource_type='ibm_is_vpc_routing_table', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 6f9c7a635..0cabe2bae 100644 --- a/plugins/modules/ibm_is_vpc_routing_table_route.py +++ b/plugins/modules/ibm_is_vpc_routing_table_route.py @@ -18,41 +18,41 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - destination: + action: description: - - (Required for new resource) The destination of the route. - required: True + - The action to perform with a packet matching the route. + required: False type: str - zone: + default: deliver + 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: + vpc: description: - - (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 for new resource) The VPC identifier. required: True type: str - routing_table: + destination: description: - - (Required for new resource) The routing table identifier. + - (Required for new resource) The destination of the route. required: True type: str - vpc: + zone: description: - - (Required for new resource) The VPC identifier. + - (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 - action: + next_hop: description: - - The action to perform with a packet matching the route. - required: False + - (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 - default: deliver name: description: - The user-defined name for this route. @@ -104,35 +104,35 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('routing_table', 'str'), + ('vpc', 'str'), ('destination', 'str'), ('zone', 'str'), ('next_hop', 'str'), - ('routing_table', 'str'), - ('vpc', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'action', + 'routing_table', + 'vpc', 'destination', 'zone', 'next_hop', - 'routing_table', - 'vpc', - 'action', 'name', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('routing_table', 'str'), ('vpc', 'str'), + ('routing_table', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'vpc', 'routing_table', 'route_id', 'name', - 'vpc', ] TL_CONFLICTS_MAP = { @@ -142,22 +142,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( - destination=dict( + action=dict( required=False, type='str'), - zone=dict( + routing_table=dict( required=False, type='str'), - next_hop=dict( + vpc=dict( required=False, type='str'), - routing_table=dict( + destination=dict( required=False, type='str'), - vpc=dict( + zone=dict( required=False, type='str'), - action=dict( + next_hop=dict( required=False, type='str'), name=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 29d462beb..4855dd645 100644 --- a/plugins/modules/ibm_is_vpc_routing_table_route_info.py +++ b/plugins/modules/ibm_is_vpc_routing_table_route_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpc_routing_table_route' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + vpc: + description: + - The VPC identifier. + required: True + type: str routing_table: description: - The routing table identifier. @@ -36,11 +41,6 @@ - The user-defined name for this route. required: False type: str - vpc: - description: - - The VPC identifier. - required: True - type: str generation: description: - The generation of Virtual Private Cloud infrastructure @@ -74,16 +74,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('routing_table', 'str'), ('vpc', 'str'), + ('routing_table', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'vpc', 'routing_table', 'route_id', 'name', - 'vpc', ] @@ -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( + vpc=dict( + required=True, + type='str'), routing_table=dict( required=True, type='str'), @@ -105,9 +108,6 @@ name=dict( required=False, type='str'), - vpc=dict( - required=True, - type='str'), generation=dict( type='int', required=False, @@ -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.41.1', + ibm_provider_version='1.42.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 0c24581b0..f8e86f3c3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0161982a3..313ea8247 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 72e1bb63a..d1c2c02f8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e67ca3627..d0e115b06 100644 --- a/plugins/modules/ibm_is_vpn_gateway.py +++ b/plugins/modules/ibm_is_vpn_gateway.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_is_vpn_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) VPN Gateway instance name - required: True - type: str subnet: description: - (Required for new resource) VPNGateway subnet info @@ -38,17 +33,22 @@ required: False type: list elements: str - mode: + name: description: - - mode in VPN gateway(route/policy) - required: False + - (Required for new resource) VPN Gateway instance name + required: True type: str - default: route resource_group: description: - The resource group for this VPN gateway required: False type: str + mode: + description: + - mode in VPN gateway(route/policy) + required: False + type: str + default: route 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'), ('subnet', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'subnet', 'tags', - 'mode', + 'name', 'resource_group', + 'mode', ] # Params for Data source @@ -113,8 +113,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'vpn_gateway', 'vpn_gateway_name', + 'vpn_gateway', ] TL_CONFLICTS_MAP = { @@ -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( - name=dict( - required=False, - type='str'), subnet=dict( required=False, type='str'), @@ -134,12 +131,15 @@ required=False, elements='', type='list'), - mode=dict( + name=dict( required=False, type='str'), resource_group=dict( required=False, type='str'), + mode=dict( + required=False, + type='str'), id=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 1455a971f..6fc789fa8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - peer_address: - description: - - (Required for new resource) VPN gateway connection peer address - required: True - type: str - admin_state_up: + interval: description: - - VPN gateway connection admin state + - Interval for dead peer detection interval required: False - type: bool - default: False - ipsec_policy: + type: int + default: 2 + name: description: - - IP security policy for vpn gateway connection - required: False + - (Required for new resource) VPN Gateway connection name + required: True type: str vpn_gateway: description: - (Required for new resource) VPN Gateway info required: True type: str - ike_policy: + local_cidrs: description: - - VPN gateway connection IKE Policy + - VPN gateway connection local CIDRs required: False - type: str + type: list + elements: str action: description: - Action detection for dead peer detection action required: False type: str default: restart - timeout: + ike_policy: description: - - Timeout for dead peer detection + - VPN gateway connection IKE Policy required: False - type: int - default: 10 - name: + 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 + peer_cidrs: + description: + - VPN gateway connection peer CIDRs + required: False + type: list + elements: str preshared_key: description: - (Required for new resource) vpn gateway required: True type: str - local_cidrs: + admin_state_up: description: - - VPN gateway connection local CIDRs + - VPN gateway connection admin state required: False - type: list - elements: str - peer_cidrs: + type: bool + default: False + timeout: description: - - VPN gateway connection peer CIDRs + - Timeout for dead peer detection required: False - type: list - elements: str - interval: + type: int + default: 10 + ipsec_policy: description: - - Interval for dead peer detection interval + - IP security policy for vpn gateway connection required: False - type: int - default: 2 + 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 = [ - ('peer_address', 'str'), - ('vpn_gateway', 'str'), ('name', 'str'), + ('vpn_gateway', 'str'), + ('peer_address', 'str'), ('preshared_key', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'peer_address', - 'admin_state_up', - 'ipsec_policy', - 'vpn_gateway', - 'ike_policy', - 'action', - 'timeout', + 'interval', 'name', - 'preshared_key', + 'vpn_gateway', 'local_cidrs', + 'action', + 'ike_policy', + 'peer_address', 'peer_cidrs', - 'interval', + 'preshared_key', + 'admin_state_up', + 'timeout', + 'ipsec_policy', ] # Params for Data source @@ -161,10 +161,10 @@ ] TL_ALL_PARAMETERS_DS = [ + 'vpn_gateway_connection', + 'vpn_gateway_connection_name', 'vpn_gateway', 'vpn_gateway_name', - 'vpn_gateway_connection_name', - 'vpn_gateway_connection', ] TL_CONFLICTS_MAP = { @@ -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( - peer_address=dict( - required=False, - type='str'), - admin_state_up=dict( + interval=dict( required=False, - type='bool'), - ipsec_policy=dict( + type='int'), + name=dict( required=False, type='str'), vpn_gateway=dict( required=False, type='str'), - ike_policy=dict( + local_cidrs=dict( required=False, - type='str'), + elements='', + type='list'), action=dict( required=False, type='str'), - timeout=dict( - required=False, - type='int'), - name=dict( + ike_policy=dict( required=False, type='str'), - preshared_key=dict( + peer_address=dict( required=False, type='str'), - local_cidrs=dict( - required=False, - elements='', - type='list'), peer_cidrs=dict( required=False, elements='', type='list'), - interval=dict( + preshared_key=dict( + required=False, + type='str'), + admin_state_up=dict( + required=False, + type='bool'), + 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 122697a46..e155f46dc 100644 --- a/plugins/modules/ibm_is_vpn_gateway_connection_info.py +++ b/plugins/modules/ibm_is_vpn_gateway_connection_info.py @@ -17,28 +17,28 @@ description: - Retrieve an IBM Cloud 'ibm_is_vpn_gateway_connection' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - vpn_gateway: + vpn_gateway_connection: description: - - The VPN gateway identifier. + - The VPN gateway connection identifier. required: False type: str - vpn_gateway_name: + vpn_gateway_connection_name: description: - - The VPN gateway name. + - The VPN gateway connection name. 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_connection: + vpn_gateway_name: description: - - The VPN gateway connection identifier. + - The VPN gateway name. required: False type: str generation: @@ -78,10 +78,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'vpn_gateway_connection', + 'vpn_gateway_connection_name', 'vpn_gateway', 'vpn_gateway_name', - 'vpn_gateway_connection_name', - 'vpn_gateway_connection', ] @@ -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( - vpn_gateway=dict( + vpn_gateway_connection=dict( required=False, type='str'), - vpn_gateway_name=dict( + vpn_gateway_connection_name=dict( required=False, type='str'), - vpn_gateway_connection_name=dict( + vpn_gateway=dict( required=False, type='str'), - vpn_gateway_connection=dict( + vpn_gateway_name=dict( required=False, type='str'), generation=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.41.1', + ibm_provider_version='1.42.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 a255b280f..9db1e6cc1 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4bee6f637..013cba3fa 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - vpn_gateway: + vpn_gateway_name: description: - - The VPN gateway identifier. + - The VPN gateway name. required: False type: str - vpn_gateway_name: + vpn_gateway: description: - - The VPN gateway name. + - The VPN gateway identifier. required: False type: str generation: @@ -68,8 +68,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'vpn_gateway', 'vpn_gateway_name', + 'vpn_gateway', ] @@ -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=dict( + vpn_gateway_name=dict( required=False, type='str'), - vpn_gateway_name=dict( + vpn_gateway=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.41.1', + ibm_provider_version='1.42.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 1f0b9e982..07cc1280b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 273475c1c..f667e0963 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 29d38b6c0..108defd9f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9739c81d5..6a5b1a4cf 100644 --- a/plugins/modules/ibm_kms_key.py +++ b/plugins/modules/ibm_kms_key.py @@ -18,63 +18,63 @@ - Create, update or destroy an IBM Cloud 'ibm_kms_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - instance_id: + encrypted_nonce: description: - - (Required for new resource) Key protect or hpcs instance GUID or CRN - required: True + - Only for imported root key + required: False type: str - standard_key: + iv_value: description: - - Standard key type + - Only for imported root key required: False - type: bool - default: False - payload: + type: str + expiration_date: description: - - None + - 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 - key_name: + instance_id: description: - - (Required for new resource) Key name + - (Required for new resource) Key protect or hpcs instance GUID or CRN required: True type: str - iv_value: - description: - - Only for imported root key - required: False - type: str force_delete: description: - set to true to force delete the key required: False type: bool default: False - key_ring_id: + endpoint_type: description: - - Key Ring for the Key + - public or private required: False type: str - default: default - expiration_date: + payload: 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 + - None required: False type: str - endpoint_type: + standard_key: description: - - public or private + - Standard key type required: False - type: str - encrypted_nonce: + type: bool + default: False + key_ring_id: description: - - Only for imported root key + - Key Ring for the Key required: False type: str + default: default + key_name: + description: + - (Required for new resource) Key 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 = [ - 'instance_id', - 'standard_key', - 'payload', - 'key_name', + 'encrypted_nonce', 'iv_value', - 'force_delete', - 'key_ring_id', 'expiration_date', + 'instance_id', + 'force_delete', 'endpoint_type', - 'encrypted_nonce', + 'payload', + 'standard_key', + 'key_ring_id', + 'key_name', ] # Params for Data source @@ -145,12 +145,12 @@ ] TL_ALL_PARAMETERS_DS = [ - 'key_name', - 'alias', - 'endpoint_type', 'instance_id', 'limit', 'key_id', + 'key_name', + 'alias', + 'endpoint_type', ] TL_CONFLICTS_MAP = { @@ -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( - instance_id=dict( + encrypted_nonce=dict( required=False, type='str'), - standard_key=dict( - required=False, - type='bool'), - payload=dict( + iv_value=dict( required=False, type='str'), - key_name=dict( + expiration_date=dict( required=False, type='str'), - iv_value=dict( + instance_id=dict( required=False, type='str'), force_delete=dict( required=False, type='bool'), - key_ring_id=dict( + endpoint_type=dict( required=False, type='str'), - expiration_date=dict( + payload=dict( required=False, type='str'), - endpoint_type=dict( + standard_key=dict( + required=False, + type='bool'), + key_ring_id=dict( required=False, type='str'), - encrypted_nonce=dict( + key_name=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 40095cb71..f2829833b 100644 --- a/plugins/modules/ibm_kms_key_alias.py +++ b/plugins/modules/ibm_kms_key_alias.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -34,8 +34,13 @@ type: str key_id: description: - - (Required for new resource) Key ID - required: True + - Key ID + required: False + type: str + existing_alias: + description: + - Existing Alias of the Key + required: False type: str endpoint_type: description: @@ -90,7 +95,6 @@ TL_REQUIRED_PARAMETERS = [ ('instance_id', 'str'), ('alias', 'str'), - ('key_id', 'str'), ] # All top level parameter keys supported by Terraform module @@ -98,6 +102,7 @@ 'instance_id', 'alias', 'key_id', + 'existing_alias', 'endpoint_type', ] @@ -124,6 +129,9 @@ key_id=dict( required=False, type='str'), + existing_alias=dict( + required=False, + type='str'), endpoint_type=dict( required=False, type='str'), @@ -192,7 +200,7 @@ def run_module(): resource_type='ibm_kms_key_alias', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 5b376d020..cfbd86742 100644 --- a/plugins/modules/ibm_kms_key_info.py +++ b/plugins/modules/ibm_kms_key_info.py @@ -17,10 +17,25 @@ description: - Retrieve an IBM Cloud 'ibm_kms_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + instance_id: + description: + - Key protect or hpcs instance GUID + required: True + type: str + limit: + description: + - Limit till the keys to be fetched + required: False + type: int + key_id: + description: + - None + required: False + type: str key_name: description: - The name of the key to be fetched @@ -37,21 +52,6 @@ required: False type: str default: public - instance_id: - description: - - Key protect or hpcs instance GUID - required: True - type: str - limit: - description: - - Limit till the keys to be fetched - required: False - type: int - key_id: - description: - - None - required: False - type: str iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -90,12 +90,12 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'key_name', - 'alias', - 'endpoint_type', 'instance_id', 'limit', 'key_id', + 'key_name', + 'alias', + 'endpoint_type', ] @@ -106,15 +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( - key_name=dict( - required=False, - type='str'), - alias=dict( - required=False, - type='str'), - endpoint_type=dict( - required=False, - type='str'), instance_id=dict( required=True, type='str'), @@ -124,6 +115,15 @@ key_id=dict( required=False, type='str'), + key_name=dict( + required=False, + type='str'), + alias=dict( + required=False, + type='str'), + endpoint_type=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -158,7 +158,7 @@ def run_module(): resource_type='ibm_kms_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4fd915e46..19454b6c7 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -29,21 +29,26 @@ type: str key_id: description: - - (Required for new resource) Key ID - required: True + - Key ID + required: False type: str - endpoint_type: + alias: description: - - public or private + - None required: False type: str - default: public 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 + required: False + type: str + default: public dual_auth_delete: description: - Data associated with the dual authorization delete policy. @@ -97,29 +102,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('instance_id', 'str'), - ('key_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'instance_id', 'key_id', - 'endpoint_type', + 'alias', 'rotation', + 'endpoint_type', 'dual_auth_delete', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ ('instance_id', 'str'), - ('key_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'instance_id', - 'endpoint_type', 'key_id', + 'alias', 'policies', + 'instance_id', + 'endpoint_type', ] TL_CONFLICTS_MAP = { @@ -135,13 +140,16 @@ key_id=dict( required=False, type='str'), - endpoint_type=dict( + alias=dict( required=False, type='str'), rotation=dict( required=False, elements='', type='list'), + endpoint_type=dict( + required=False, + type='str'), dual_auth_delete=dict( required=False, elements='', @@ -211,7 +219,7 @@ def run_module(): resource_type='ibm_kms_key_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -220,7 +228,7 @@ def run_module(): resource_type='ibm_kms_key_policies', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d1ac6e559..5245dce5a 100644 --- a/plugins/modules/ibm_kms_key_policies_info.py +++ b/plugins/modules/ibm_kms_key_policies_info.py @@ -17,25 +17,19 @@ description: - Retrieve an IBM Cloud 'ibm_kms_key_policies' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - instance_id: - description: - - Key protect or hpcs instance GUID - required: True - type: str - endpoint_type: + key_id: description: - - public or private + - Key ID of the Key required: False type: str - default: public - key_id: + alias: description: - - Key ID of the Key - required: True + - Alias of the Key + required: False type: str policies: description: @@ -43,6 +37,17 @@ required: False type: list elements: dict + instance_id: + description: + - Key protect or hpcs instance GUID + required: True + type: str + endpoint_type: + description: + - public or private + required: False + type: str + default: public iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -77,15 +82,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('instance_id', 'str'), - ('key_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_id', - 'endpoint_type', 'key_id', + 'alias', 'policies', + 'instance_id', + 'endpoint_type', ] @@ -96,19 +101,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( - instance_id=dict( - required=True, - type='str'), - endpoint_type=dict( + key_id=dict( required=False, type='str'), - key_id=dict( - required=True, + alias=dict( + required=False, type='str'), policies=dict( required=False, elements='', type='list'), + instance_id=dict( + required=True, + type='str'), + endpoint_type=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -143,7 +151,7 @@ def run_module(): resource_type='ibm_kms_key_policies', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 b77570eb0..d23ed3ac8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 73653e444..44567bf65 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 445d3397c..d7a56b069 100644 --- a/plugins/modules/ibm_kms_keys_info.py +++ b/plugins/modules/ibm_kms_keys_info.py @@ -17,21 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_kms_keys' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - key_id: - description: - - None - required: False - type: str - endpoint_type: - description: - - public or private - required: False - type: str - default: public instance_id: description: - Key protect or hpcs instance GUID @@ -52,6 +41,17 @@ - The name of the key to be fetched required: False type: str + key_id: + description: + - None + required: False + type: str + endpoint_type: + description: + - public or private + required: False + type: str + default: public iaas_classic_username: description: - (Required when generation = 1) The IBM Cloud Classic @@ -90,31 +90,25 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'key_id', - 'endpoint_type', 'instance_id', 'key_name', 'limit', 'alias', + 'key_id', + 'endpoint_type', ] TL_CONFLICTS_MAP = { - 'key_id': ['alias', 'key_name'], 'key_name': ['alias', 'key_id'], 'alias': ['key_name', 'key_id'], + 'key_id': ['alias', 'key_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( - key_id=dict( - required=False, - type='str'), - endpoint_type=dict( - required=False, - type='str'), instance_id=dict( required=True, type='str'), @@ -127,6 +121,12 @@ alias=dict( required=False, type='str'), + key_id=dict( + required=False, + type='str'), + endpoint_type=dict( + required=False, + type='str'), iaas_classic_username=dict( type='str', no_log=True, @@ -161,7 +161,7 @@ def run_module(): resource_type='ibm_kms_keys', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 ec38a4a98..d1210e76b 100644 --- a/plugins/modules/ibm_kp_key.py +++ b/plugins/modules/ibm_kp_key.py @@ -18,29 +18,23 @@ - Create, update or destroy an IBM Cloud 'ibm_kp_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - force_delete: - description: - - set to true to force delete the key - required: False - type: bool - default: False - encrypted_nonce: + key_name: description: - - Only for imported root key - required: False + - (Required for new resource) Key name + required: True type: str payload: description: - None required: False type: str - key_name: + key_protect_id: description: - - (Required for new resource) Key name + - (Required for new resource) Key protect instance ID required: True type: str standard_key: @@ -49,15 +43,21 @@ required: False type: bool default: False + force_delete: + description: + - set to true to force delete the key + required: False + type: bool + default: False iv_value: description: - Only for imported root key 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 id: description: @@ -111,13 +111,13 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'force_delete', - 'encrypted_nonce', - 'payload', 'key_name', + 'payload', + 'key_protect_id', 'standard_key', + 'force_delete', 'iv_value', - 'key_protect_id', + 'encrypted_nonce', ] # Params for Data source @@ -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( - force_delete=dict( - required=False, - type='bool'), - encrypted_nonce=dict( + key_name=dict( required=False, type='str'), payload=dict( required=False, type='str'), - key_name=dict( + key_protect_id=dict( required=False, type='str'), standard_key=dict( required=False, type='bool'), + force_delete=dict( + required=False, + type='bool'), iv_value=dict( required=False, type='str'), - key_protect_id=dict( + encrypted_nonce=dict( required=False, type='str'), id=dict( @@ -223,7 +223,7 @@ def run_module(): resource_type='ibm_kp_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 50fa6d9b3..3ec8faac3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 71fb3dfd3..46977edfb 100644 --- a/plugins/modules/ibm_lb.py +++ b/plugins/modules/ibm_lb.py @@ -18,31 +18,36 @@ - Create, update or destroy an IBM Cloud 'ibm_lb' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: - description: - - Tags associated with resource - required: False - type: list - elements: str datacenter: description: - (Required for new resource) Datacenter name info required: True type: str - ha_enabled: + security_certificate_id: description: - - true if High availability is enabled + - Security certificate ID + required: False + type: int + ssl_offload: + description: + - boolean value true if SSL offload is enabled required: False type: bool default: False - security_certificate_id: + tags: description: - - Security certificate ID + - Tags associated with resource required: False + type: list + elements: str + connections: + description: + - (Required for new resource) Connections value + required: True type: int dedicated: description: @@ -50,17 +55,12 @@ required: False type: bool default: False - ssl_offload: + ha_enabled: description: - - boolean value true if SSL offload is enabled + - true if High availability is enabled required: False type: bool default: False - connections: - description: - - (Required for new resource) Connections value - required: True - type: int 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 = [ - 'tags', 'datacenter', - 'ha_enabled', 'security_certificate_id', - 'dedicated', 'ssl_offload', + 'tags', 'connections', + 'dedicated', + 'ha_enabled', ] # Params for Data source @@ -136,28 +136,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'), datacenter=dict( required=False, type='str'), - ha_enabled=dict( - required=False, - type='bool'), security_certificate_id=dict( required=False, type='int'), - dedicated=dict( - required=False, - type='bool'), ssl_offload=dict( required=False, type='bool'), + tags=dict( + required=False, + elements='', + type='list'), connections=dict( required=False, type='int'), + dedicated=dict( + required=False, + type='bool'), + ha_enabled=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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 53a463d51..360a59cc5 100644 --- a/plugins/modules/ibm_lb_service.py +++ b/plugins/modules/ibm_lb_service.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_service' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -224,7 +224,7 @@ def run_module(): resource_type='ibm_lb_service', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 df1ce85f4..b0f11e383 100644 --- a/plugins/modules/ibm_lb_service_group.py +++ b/plugins/modules/ibm_lb_service_group.py @@ -18,46 +18,46 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: - description: - - List of tags - required: False - type: list - elements: str - timeout: + load_balancer_id: description: - - Timeout value - required: False + - (Required for new resource) Loadbalancer ID + required: True type: int - routing_method: + port: description: - - (Required for new resource) Routing method + - (Required for new resource) Port number required: True - type: str + type: int routing_type: description: - (Required for new resource) Routing type required: True type: str - load_balancer_id: + timeout: description: - - (Required for new resource) Loadbalancer ID - required: True + - Timeout value + required: False type: int + tags: + description: + - List of tags + required: False + type: list + elements: str allocation: description: - (Required for new resource) Allocation type required: True type: int - port: + routing_method: description: - - (Required for new resource) Port number + - (Required for new resource) Routing method required: True - type: int + 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 = [ - ('routing_method', 'str'), - ('routing_type', 'str'), ('load_balancer_id', 'int'), - ('allocation', 'int'), ('port', 'int'), + ('routing_type', 'str'), + ('allocation', 'int'), + ('routing_method', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', - 'timeout', - 'routing_method', - 'routing_type', 'load_balancer_id', - 'allocation', 'port', + 'routing_type', + 'timeout', + 'tags', + 'allocation', + 'routing_method', ] # Params for Data source @@ -136,28 +136,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'), - timeout=dict( + load_balancer_id=dict( required=False, type='int'), - routing_method=dict( + port=dict( required=False, - type='str'), + type='int'), routing_type=dict( required=False, type='str'), - load_balancer_id=dict( + timeout=dict( required=False, type='int'), + tags=dict( + required=False, + elements='', + type='list'), allocation=dict( required=False, type='int'), - port=dict( + routing_method=dict( required=False, - type='int'), + type='str'), 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.41.1', + ibm_provider_version='1.42.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 755d3189f..93cd2583e 100644 --- a/plugins/modules/ibm_lb_vpx.py +++ b/plugins/modules/ibm_lb_vpx.py @@ -18,46 +18,36 @@ - Create, update or destroy an IBM Cloud 'ibm_lb_vpx' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 + tags: + description: + - List of the tags + required: False + type: list + elements: str plan: description: - (Required for new resource) Plan info required: True type: str - ip_count: - description: - - (Required for new resource) IP address count - required: True - type: int public_subnet: description: - Public subnet required: False type: str - private_subnet: + datacenter: description: - - Private subnet - required: False + - (Required for new resource) Datacenter name + required: True type: str - tags: - description: - - List of the tags - required: False - type: list - elements: str speed: description: - (Required for new resource) Speed value @@ -73,6 +63,16 @@ - Private VLAN id required: False type: int + ip_count: + description: + - (Required for new resource) IP address count + 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 = [ - ('datacenter', 'str'), ('plan', 'str'), - ('ip_count', 'int'), + ('datacenter', 'str'), ('speed', 'int'), ('version', 'str'), + ('ip_count', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'datacenter', 'public_vlan_id', + 'tags', 'plan', - 'ip_count', 'public_subnet', - 'private_subnet', - 'tags', + 'datacenter', 'speed', 'version', 'private_vlan_id', + 'ip_count', + 'private_subnet', ] # Params for Data source @@ -154,28 +154,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( - required=False, - type='str'), public_vlan_id=dict( required=False, type='int'), + tags=dict( + required=False, + elements='', + type='list'), plan=dict( required=False, type='str'), - ip_count=dict( - required=False, - type='int'), public_subnet=dict( required=False, type='str'), - private_subnet=dict( + datacenter=dict( required=False, type='str'), - tags=dict( - required=False, - elements='', - type='list'), speed=dict( required=False, type='int'), @@ -185,6 +179,12 @@ private_vlan_id=dict( required=False, type='int'), + ip_count=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.41.1', + ibm_provider_version='1.42.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 b31c7eac2..753b00d29 100644 --- a/plugins/modules/ibm_lb_vpx_ha.py +++ b/plugins/modules/ibm_lb_vpx_ha.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -193,7 +193,7 @@ def run_module(): resource_type='ibm_lb_vpx_ha', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 de96c7e0b..12176ce8e 100644 --- a/plugins/modules/ibm_lb_vpx_service.py +++ b/plugins/modules/ibm_lb_vpx_service.py @@ -18,25 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - destination_ip_address: + name: description: - - (Required for new resource) Destination IP Address + - (Required for new resource) name required: True type: str - weight: - description: - - (Required for new resource) Weight value - required: True - type: int - connection_limit: + destination_ip_address: description: - - (Required for new resource) Number of connections limit + - (Required for new resource) Destination IP Address required: True - type: int + type: str health_check: description: - (Required for new resource) Health check info @@ -53,16 +48,21 @@ - (Required for new resource) VIP id required: True type: str - name: - description: - - (Required for new resource) name - required: True - type: str destination_port: description: - (Required for new resource) Destination Port number required: True type: int + weight: + description: + - (Required for new resource) Weight value + required: True + type: int + connection_limit: + description: + - (Required for new resource) Number of connections limit + required: True + type: int tags: description: - list of tags associated with the resource @@ -115,25 +115,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('name', 'str'), ('destination_ip_address', 'str'), - ('weight', 'int'), - ('connection_limit', 'int'), ('health_check', 'str'), ('vip_id', 'str'), - ('name', 'str'), ('destination_port', 'int'), + ('weight', 'int'), + ('connection_limit', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', 'destination_ip_address', - 'weight', - 'connection_limit', 'health_check', 'usip', 'vip_id', - 'name', 'destination_port', + 'weight', + 'connection_limit', 'tags', ] @@ -151,15 +151,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( - destination_ip_address=dict( + name=dict( required=False, type='str'), - weight=dict( - required=False, - type='int'), - connection_limit=dict( + destination_ip_address=dict( required=False, - type='int'), + type='str'), health_check=dict( required=False, type='str'), @@ -169,12 +166,15 @@ vip_id=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), destination_port=dict( required=False, type='int'), + weight=dict( + required=False, + type='int'), + connection_limit=dict( + required=False, + type='int'), tags=dict( required=False, elements='', @@ -244,7 +244,7 @@ def run_module(): resource_type='ibm_lb_vpx_service', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d4dc5e2ce..459cd9af1 100644 --- a/plugins/modules/ibm_lb_vpx_vip.py +++ b/plugins/modules/ibm_lb_vpx_vip.py @@ -18,25 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - nad_controller_id: + source_port: description: - - (Required for new resource) NAD controller ID + - (Required for new resource) Source Port number required: True type: int - security_certificate_id: - description: - - security certificate ID - required: False - type: int - 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: int persistence: description: - Persistance value @@ -47,16 +42,6 @@ - (Required for new resource) Name required: True type: str - source_port: - description: - - (Required for new resource) Source Port number - required: True - type: int - type: - description: - - (Required for new resource) Type - required: True - type: str virtual_ip_address: description: - (Required for new resource) Virtual IP address @@ -68,6 +53,21 @@ required: False type: list elements: str + load_balancing_method: + description: + - (Required for new resource) Load balancing method + required: True + type: str + type: + description: + - (Required for new resource) Type + required: True + type: str + security_certificate_id: + description: + - security certificate ID + required: False + type: int 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 = [ + ('source_port', 'int'), ('nad_controller_id', 'int'), - ('load_balancing_method', 'str'), ('name', 'str'), - ('source_port', 'int'), - ('type', 'str'), ('virtual_ip_address', 'str'), + ('load_balancing_method', 'str'), + ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'source_port', 'nad_controller_id', - 'security_certificate_id', - 'load_balancing_method', 'persistence', 'name', - 'source_port', - 'type', 'virtual_ip_address', 'tags', + 'load_balancing_method', + 'type', + 'security_certificate_id', ] # Params for Data source @@ -149,27 +149,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( - nad_controller_id=dict( + source_port=dict( required=False, type='int'), - security_certificate_id=dict( + nad_controller_id=dict( required=False, type='int'), - load_balancing_method=dict( - required=False, - type='str'), persistence=dict( required=False, type='str'), name=dict( required=False, type='str'), - source_port=dict( - required=False, - type='int'), - type=dict( - required=False, - type='str'), virtual_ip_address=dict( required=False, type='str'), @@ -177,6 +168,15 @@ required=False, elements='', type='list'), + load_balancing_method=dict( + required=False, + type='str'), + type=dict( + required=False, + type='str'), + security_certificate_id=dict( + required=False, + type='int'), 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.41.1', + ibm_provider_version='1.42.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 c599fb2f1..aba53cb63 100644 --- a/plugins/modules/ibm_lbaas.py +++ b/plugins/modules/ibm_lbaas.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_lbaas' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - type: - description: - - Specifies if a load balancer is public or private - required: False - type: str - default: PUBLIC use_system_public_ip_pool: description: - "in public loadbalancer - Public IP address allocation done by system public IP pool or public subnet." @@ -39,12 +33,12 @@ required: False type: list elements: str - protocols: + subnets: description: - - Protocols to be assigned to this load balancer. - required: False + - (Required for new resource) The subnet where this Load Balancer will be provisioned. + required: True type: list - elements: dict + elements: int name: description: - (Required for new resource) The load balancer's name. @@ -55,18 +49,24 @@ - Description of a load balancer. required: False type: str + type: + description: + - Specifies if a load balancer is public or private + required: False + type: str + default: PUBLIC wait_time_minutes: description: - None required: False type: int default: 90 - subnets: + protocols: description: - - (Required for new resource) The subnet where this Load Balancer will be provisioned. - required: True + - Protocols to be assigned to this load balancer. + required: False type: list - elements: int + elements: dict 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 = [ - ('name', 'str'), ('subnets', 'list'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'type', 'use_system_public_ip_pool', 'ssl_ciphers', - 'protocols', + 'subnets', 'name', 'description', + 'type', 'wait_time_minutes', - 'subnets', + 'protocols', ] # Params for Data source @@ -145,9 +145,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( - type=dict( - required=False, - type='str'), use_system_public_ip_pool=dict( required=False, type='bool'), @@ -155,7 +152,7 @@ required=False, elements='', type='list'), - protocols=dict( + subnets=dict( required=False, elements='', type='list'), @@ -165,10 +162,13 @@ description=dict( required=False, type='str'), + type=dict( + required=False, + type='str'), wait_time_minutes=dict( required=False, type='int'), - subnets=dict( + protocols=dict( required=False, elements='', type='list'), @@ -237,7 +237,7 @@ def run_module(): resource_type='ibm_lbaas', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 34c188d21..ed19e21c9 100644 --- a/plugins/modules/ibm_lbaas_health_monitor.py +++ b/plugins/modules/ibm_lbaas_health_monitor.py @@ -18,21 +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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - url_path: - description: - - URL Path - required: False - type: str - default: / - monitor_id: - description: - - (Required for new resource) Monitor ID - required: True - type: str lbaas_id: description: - (Required for new resource) LBAAS id @@ -66,6 +55,17 @@ required: False type: int default: 2 + url_path: + description: + - URL Path + required: False + type: str + default: / + monitor_id: + description: + - (Required for new resource) Monitor ID + 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 = [ - ('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 = [ - 'url_path', - 'monitor_id', 'lbaas_id', 'protocol', 'port', 'interval', 'max_retries', 'timeout', + 'url_path', + 'monitor_id', ] # Params for Data source @@ -144,12 +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( - url_path=dict( - required=False, - type='str'), - monitor_id=dict( - required=False, - type='str'), lbaas_id=dict( required=False, type='str'), @@ -168,6 +162,12 @@ timeout=dict( required=False, type='int'), + url_path=dict( + required=False, + type='str'), + monitor_id=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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 3668dee05..040517ed5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 cd818257e..9132ee151 100644 --- a/plugins/modules/ibm_lbaas_server_instance_attachment.py +++ b/plugins/modules/ibm_lbaas_server_instance_attachment.py @@ -18,15 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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. @@ -37,6 +32,11 @@ - (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 = [ - ('private_ip_address', 'str'), ('lbaas_id', 'str'), + ('private_ip_address', '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.41.1', + ibm_provider_version='1.42.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 1a1086f92..7b716c9ea 100644 --- a/plugins/modules/ibm_multi_vlan_firewall.py +++ b/plugins/modules/ibm_multi_vlan_firewall.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,9 +27,9 @@ - (Required for new resource) Datacenter name required: True type: str - name: + pod: description: - - (Required for new resource) name + - (Required for new resource) POD name required: True type: str firewall_type: @@ -37,17 +37,17 @@ - (Required for new resource) Firewall type required: True type: str - pod: - description: - - (Required for new resource) POD 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. @@ -95,18 +95,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('datacenter', 'str'), - ('name', 'str'), - ('firewall_type', 'str'), ('pod', 'str'), + ('firewall_type', 'str'), + ('name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'datacenter', - 'name', - 'firewall_type', 'pod', + 'firewall_type', 'addon_configuration', + 'name', ] # Params for Data source @@ -126,19 +126,19 @@ datacenter=dict( required=False, type='str'), - name=dict( + pod=dict( required=False, type='str'), firewall_type=dict( required=False, type='str'), - pod=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.41.1', + ibm_provider_version='1.42.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 4f3e4f1fb..920feb2b4 100644 --- a/plugins/modules/ibm_network_gateway.py +++ b/plugins/modules/ibm_network_gateway.py @@ -18,32 +18,32 @@ - Create, update or destroy an IBM Cloud 'ibm_network_gateway' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - post_install_script_uri: - description: - - None - required: False - type: str members: description: - (Required for new resource) The hardware members of this network Gateway required: True type: list elements: dict - name: - description: - - (Required for new resource) The name of the gateway - required: True - type: str ssh_key_ids: description: - None required: False type: list elements: int + post_install_script_uri: + description: + - None + required: False + type: str + name: + description: + - (Required for new resource) The name of the gateway + required: True + type: str 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 = [ - 'post_install_script_uri', 'members', - 'name', 'ssh_key_ids', + 'post_install_script_uri', + 'name', ] # Params for Data source @@ -116,20 +116,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( - post_install_script_uri=dict( - required=False, - type='str'), members=dict( required=False, elements='', type='list'), - name=dict( - required=False, - type='str'), ssh_key_ids=dict( required=False, elements='', type='list'), + post_install_script_uri=dict( + required=False, + type='str'), + name=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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 1f94c68cc..41f0ab0c2 100644 --- a/plugins/modules/ibm_network_gateway_vlan_association.py +++ b/plugins/modules/ibm_network_gateway_vlan_association.py @@ -18,10 +18,15 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + gateway_id: + description: + - (Required for new resource) Gateway instance ID + required: True + type: int network_vlan_id: description: - (Required for new resource) The Identifier of the VLAN to be associated @@ -33,11 +38,6 @@ required: False type: bool default: True - gateway_id: - description: - - (Required for new resource) Gateway instance ID - required: True - type: int 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 = [ - ('network_vlan_id', 'int'), ('gateway_id', 'int'), + ('network_vlan_id', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'gateway_id', 'network_vlan_id', 'bypass', - 'gateway_id', ] # 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( + gateway_id=dict( + required=False, + type='int'), network_vlan_id=dict( required=False, type='int'), bypass=dict( required=False, type='bool'), - gateway_id=dict( - required=False, - type='int'), id=dict( required=False, type='str'), @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_network_gateway_vlan_association', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 70b08f3e0..edbd1be35 100644 --- a/plugins/modules/ibm_network_interface_sg_attachment.py +++ b/plugins/modules/ibm_network_interface_sg_attachment.py @@ -18,10 +18,15 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + security_group_id: + description: + - (Required for new resource) Security group ID + required: True + type: int network_interface_id: description: - (Required for new resource) Network interface ID @@ -33,11 +38,6 @@ required: False type: bool default: True - 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. @@ -84,15 +84,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('network_interface_id', 'int'), ('security_group_id', 'int'), + ('network_interface_id', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'security_group_id', 'network_interface_id', 'soft_reboot', - 'security_group_id', ] # 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( + security_group_id=dict( + required=False, + type='int'), network_interface_id=dict( required=False, type='int'), soft_reboot=dict( required=False, type='bool'), - security_group_id=dict( - required=False, - type='int'), id=dict( required=False, type='str'), @@ -183,7 +183,7 @@ def run_module(): resource_type='ibm_network_interface_sg_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 78d83f4aa..37c4bdfde 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4866769dd..663f0c338 100644 --- a/plugins/modules/ibm_network_vlan.py +++ b/plugins/modules/ibm_network_vlan.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_network_vlan' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 + required: True + type: str type: description: - (Required for new resource) VLAN type @@ -37,17 +48,6 @@ - router host name required: False type: str - datacenter: - description: - - (Required for new resource) Datacenter name - required: True - 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. @@ -94,17 +94,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('type', 'str'), ('datacenter', 'str'), + ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'tags', + 'datacenter', 'type', 'name', 'router_hostname', - 'datacenter', - 'tags', ] # Params for Data source @@ -112,9 +112,9 @@ ] TL_ALL_PARAMETERS_DS = [ + 'router_hostname', 'name', 'number', - 'router_hostname', ] TL_CONFLICTS_MAP = { @@ -124,6 +124,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( + tags=dict( + required=False, + elements='', + type='list'), + datacenter=dict( + required=False, + type='str'), type=dict( required=False, type='str'), @@ -133,13 +140,6 @@ router_hostname=dict( required=False, type='str'), - datacenter=dict( - required=False, - type='str'), - tags=dict( - required=False, - elements='', - type='list'), id=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4d23f6182..1781d2f73 100644 --- a/plugins/modules/ibm_network_vlan_info.py +++ b/plugins/modules/ibm_network_vlan_info.py @@ -17,25 +17,25 @@ description: - Retrieve an IBM Cloud 'ibm_network_vlan' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: + router_hostname: description: - None required: False type: str - number: + name: description: - None required: False - type: int - router_hostname: + type: str + number: description: - None required: False - type: str + type: int 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.41.1', + ibm_provider_version='1.42.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 60bc83d19..f66468053 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 76d8e8f44..caca93546 100644 --- a/plugins/modules/ibm_ob_logging.py +++ b/plugins/modules/ibm_ob_logging.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_ob_logging' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - logdna_ingestion_key: - description: - - LogDNA ingestion key - required: False - type: str cluster: description: - (Required for new resource) Name or ID of the cluster to be used. @@ -37,6 +32,11 @@ - (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: description: - Add this option to connect to your LogDNA service instance through the private service endpoint @@ -94,9 +94,9 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'logdna_ingestion_key', 'cluster', 'instance_id', + 'logdna_ingestion_key', 'private_endpoint', ] @@ -114,15 +114,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( - logdna_ingestion_key=dict( - required=False, - type='str'), cluster=dict( required=False, type='str'), instance_id=dict( required=False, type='str'), + logdna_ingestion_key=dict( + required=False, + type='str'), private_endpoint=dict( required=False, type='bool'), @@ -191,7 +191,7 @@ def run_module(): resource_type='ibm_ob_logging', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 21ba7c6d8..606482f3a 100644 --- a/plugins/modules/ibm_ob_monitoring.py +++ b/plugins/modules/ibm_ob_monitoring.py @@ -18,13 +18,13 @@ - Create, update or destroy an IBM Cloud 'ibm_ob_monitoring' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 sysdig_access_key: @@ -37,9 +37,9 @@ - Add this option to connect to your Sysdig service instance through the private service endpoint required: False type: bool - instance_id: + cluster: description: - - (Required for new resource) ID of the Sysdig service instance to latch + - (Required for new resource) Name or ID of the cluster to be used. required: True type: str id: @@ -88,16 +88,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cluster', 'str'), ('instance_id', 'str'), + ('cluster', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cluster', + 'instance_id', 'sysdig_access_key', 'private_endpoint', - 'instance_id', + 'cluster', ] # Params for Data source @@ -114,7 +114,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( + instance_id=dict( required=False, type='str'), sysdig_access_key=dict( @@ -123,7 +123,7 @@ private_endpoint=dict( required=False, type='bool'), - instance_id=dict( + cluster=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.41.1', + ibm_provider_version='1.42.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 bde925d5f..062d47847 100644 --- a/plugins/modules/ibm_object_storage_account.py +++ b/plugins/modules/ibm_object_storage_account.py @@ -18,21 +18,21 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: + local_note: description: - None required: False - type: list - elements: str - local_note: + type: str + tags: description: - None required: False - type: str + type: list + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,8 +83,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'local_note', + 'tags', ] # Params for Data source @@ -101,13 +101,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( + local_note=dict( + required=False, + type='str'), tags=dict( required=False, elements='', type='list'), - local_note=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -173,7 +173,7 @@ def run_module(): resource_type='ibm_object_storage_account', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 f7a78ef91..f40811310 100644 --- a/plugins/modules/ibm_org.py +++ b/plugins/modules/ibm_org.py @@ -18,10 +18,22 @@ - Create, update or destroy an IBM Cloud 'ibm_org' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -50,18 +62,6 @@ 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,6 +138,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( + users=dict( + required=False, + elements='', + type='list'), + tags=dict( + required=False, + elements='', + type='list'), name=dict( required=False, type='str'), @@ -156,14 +164,6 @@ 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8d400bd8f..6169cad4b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f416336c5..a52de5422 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f09683f00..aad5c9346 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,11 +27,17 @@ - (Required for new resource) Instance Name of the Power VM required: True type: str - pi_capture_cloud_storage_access_key: + pi_capture_name: description: - - Name of Cloud Storage Access Key - required: False + - (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: description: - Name of the Cloud Storage Secret Key @@ -47,27 +53,21 @@ - (Required for new resource) Cloud Instance ID - This is the service_instance_id. 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_destination: description: - (Required for new resource) Destination for the deployable image required: True type: str - pi_capture_volume_ids: - description: - - List of Data volume IDs - required: False - type: list - elements: str pi_capture_cloud_storage_region: description: - List of Regions to use required: False type: str + pi_capture_cloud_storage_access_key: + description: + - Name of Cloud Storage Access Key + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -111,22 +111,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('pi_instance_name', 'str'), - ('pi_cloud_instance_id', 'str'), ('pi_capture_name', 'str'), + ('pi_cloud_instance_id', 'str'), ('pi_capture_destination', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'pi_instance_name', - 'pi_capture_cloud_storage_access_key', + 'pi_capture_name', + 'pi_capture_volume_ids', 'pi_capture_cloud_storage_secret_key', 'pi_capture_storage_image_path', 'pi_cloud_instance_id', - 'pi_capture_name', 'pi_capture_destination', - 'pi_capture_volume_ids', 'pi_capture_cloud_storage_region', + 'pi_capture_cloud_storage_access_key', ] # Params for Data source @@ -146,9 +146,13 @@ pi_instance_name=dict( required=False, type='str'), - pi_capture_cloud_storage_access_key=dict( + 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( required=False, type='str'), @@ -158,19 +162,15 @@ pi_cloud_instance_id=dict( required=False, type='str'), - pi_capture_name=dict( - required=False, - type='str'), pi_capture_destination=dict( required=False, type='str'), - pi_capture_volume_ids=dict( - required=False, - elements='', - type='list'), pi_capture_cloud_storage_region=dict( required=False, type='str'), + pi_capture_cloud_storage_access_key=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_pi_capture', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 468d49ef3..f21fc908d 100644 --- a/plugins/modules/ibm_pi_catalog_images_info.py +++ b/plugins/modules/ibm_pi_catalog_images_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_pi_catalog_images' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - vtl: - description: - - None - required: False - type: bool pi_cloud_instance_id: description: - None @@ -36,6 +31,11 @@ - 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.41.1', + ibm_provider_version='1.42.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 e9da44b67..111b4b486 100644 --- a/plugins/modules/ibm_pi_cloud_connection.py +++ b/plugins/modules/ibm_pi_cloud_connection.py @@ -18,71 +18,77 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_cloud_connection' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_cloud_connection_name: + pi_cloud_connection_speed: description: - - (Required for new resource) Name of the cloud connection + - (Required for new resource) Speed of the cloud connection (speed in megabits per second) required: True - type: str - pi_cloud_connection_networks: - description: - - Set of Networks to attach to this cloud connection - required: False - type: list - elements: str - pi_cloud_connection_gre_cidr: + type: int + pi_cloud_connection_classic_enabled: description: - - GRE network in CIDR notation + - Enable classic endpoint destination required: False - type: str + type: bool + default: False pi_cloud_connection_vpc_enabled: description: - Enable VPC for this cloud connection required: False type: bool default: False - pi_cloud_connection_global_routing: + pi_cloud_connection_vpc_crns: description: - - Enable global routing for this cloud connection + - Set of VPCs to attach to this cloud connection required: False - type: bool - default: False - pi_cloud_connection_gre_destination_address: + type: list + elements: str + pi_cloud_connection_transit_enabled: description: - - GRE destination IP address + - Enable transit gateway for this cloud connection required: False - type: str - pi_cloud_instance_id: + type: bool + default: False + pi_cloud_connection_name: description: - - (Required for new resource) PI cloud instance ID + - (Required for new resource) Name of the cloud connection 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_metered: description: - Enable metered for this cloud connection required: False type: bool default: False - pi_cloud_connection_classic_enabled: + pi_cloud_connection_networks: description: - - Enable classic endpoint destination + - Set of Networks to attach to this cloud connection + required: False + type: list + elements: str + pi_cloud_connection_gre_cidr: + description: + - GRE network in CIDR notation + required: False + type: str + pi_cloud_instance_id: + description: + - (Required for new resource) PI cloud instance ID + required: True + type: str + pi_cloud_connection_global_routing: + description: + - Enable global routing for this cloud connection required: False type: bool default: False - pi_cloud_connection_vpc_crns: + pi_cloud_connection_gre_destination_address: description: - - Set of VPCs to attach to this cloud connection + - GRE destination IP address required: False - type: list - elements: str + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -125,35 +131,36 @@ # 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_classic_enabled', + '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_connection_vpc_enabled', + 'pi_cloud_instance_id', 'pi_cloud_connection_global_routing', 'pi_cloud_connection_gre_destination_address', - 'pi_cloud_instance_id', - 'pi_cloud_connection_speed', - 'pi_cloud_connection_metered', - 'pi_cloud_connection_classic_enabled', - 'pi_cloud_connection_vpc_crns', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('pi_cloud_instance_id', 'str'), ('pi_cloud_connection_name', 'str'), + ('pi_cloud_instance_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'pi_cloud_instance_id', 'pi_cloud_connection_name', + 'pi_cloud_instance_id', ] TL_CONFLICTS_MAP = { @@ -163,41 +170,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( - pi_cloud_connection_name=dict( + pi_cloud_connection_speed=dict( required=False, - type='str'), - pi_cloud_connection_networks=dict( + type='int'), + pi_cloud_connection_classic_enabled=dict( + required=False, + type='bool'), + pi_cloud_connection_vpc_enabled=dict( + required=False, + type='bool'), + pi_cloud_connection_vpc_crns=dict( required=False, elements='', type='list'), - pi_cloud_connection_gre_cidr=dict( + pi_cloud_connection_transit_enabled=dict( + required=False, + type='bool'), + pi_cloud_connection_name=dict( required=False, type='str'), - pi_cloud_connection_vpc_enabled=dict( + pi_cloud_connection_metered=dict( required=False, type='bool'), - pi_cloud_connection_global_routing=dict( + pi_cloud_connection_networks=dict( required=False, - type='bool'), - pi_cloud_connection_gre_destination_address=dict( + elements='', + type='list'), + pi_cloud_connection_gre_cidr=dict( required=False, type='str'), pi_cloud_instance_id=dict( required=False, type='str'), - pi_cloud_connection_speed=dict( - required=False, - type='int'), - pi_cloud_connection_metered=dict( - required=False, - type='bool'), - pi_cloud_connection_classic_enabled=dict( + pi_cloud_connection_global_routing=dict( required=False, type='bool'), - pi_cloud_connection_vpc_crns=dict( + pi_cloud_connection_gre_destination_address=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -256,7 +266,7 @@ def run_module(): resource_type='ibm_pi_cloud_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -265,7 +275,7 @@ def run_module(): resource_type='ibm_pi_cloud_connection', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 470db31b4..3ca39616c 100644 --- a/plugins/modules/ibm_pi_cloud_connection_info.py +++ b/plugins/modules/ibm_pi_cloud_connection_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_pi_cloud_connection' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_cloud_instance_id: + pi_cloud_connection_name: description: - - None + - Cloud Connection Name to be used required: True type: str - pi_cloud_connection_name: + pi_cloud_instance_id: description: - - Cloud Connection Name to be used + - 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_cloud_connection_name', 'str'), + ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_instance_id', 'pi_cloud_connection_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_cloud_connection_name=dict( required=True, type='str'), - pi_cloud_connection_name=dict( + pi_cloud_instance_id=dict( required=True, type='str'), zone=dict( @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_cloud_connection', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 35a001f1b..f115d0f82 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 f06fcaea3..e183bfeee 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 d352e991d..23ece47a5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 176e5ac1c..3659d0413 100644 --- a/plugins/modules/ibm_pi_console_language.py +++ b/plugins/modules/ibm_pi_console_language.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -172,7 +172,7 @@ def run_module(): resource_type='ibm_pi_console_language', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 211a2f365..778697a80 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 80f282ffa..ae5d03f52 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 a38add337..db78b94bc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 80e240c38..cac50b3d5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a320c64cc..135e712db 100644 --- a/plugins/modules/ibm_pi_ike_policy.py +++ b/plugins/modules/ibm_pi_ike_policy.py @@ -18,31 +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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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_cloud_instance_id: + pi_policy_dh_group: description: - - (Required for new resource) PI cloud instance ID + - (Required for new resource) DH group of the IKE Policy required: True - type: str + type: int pi_policy_name: description: - (Required for new resource) Name of the IKE Policy required: True type: str - pi_policy_dh_group: - description: - - (Required for new resource) DH group of the IKE Policy - required: True - type: int pi_policy_encryption: description: - (Required for new resource) Encryption of the IKE Policy @@ -58,9 +58,9 @@ - (Required for new resource) Version of the IKE Policy required: True type: int - pi_policy_preshared_key: + pi_cloud_instance_id: description: - - (Required for new resource) Preshared key used in this IKE Policy (length of preshared key must be even) + - (Required for new resource) PI cloud instance ID required: True type: str id: @@ -105,25 +105,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), - ('pi_policy_name', 'str'), + ('pi_policy_preshared_key', 'str'), ('pi_policy_dh_group', 'int'), + ('pi_policy_name', 'str'), ('pi_policy_encryption', 'str'), ('pi_policy_key_lifetime', 'int'), ('pi_policy_version', 'int'), - ('pi_policy_preshared_key', 'str'), + ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'pi_policy_preshared_key', 'pi_policy_authentication', - 'pi_cloud_instance_id', - 'pi_policy_name', 'pi_policy_dh_group', + 'pi_policy_name', 'pi_policy_encryption', 'pi_policy_key_lifetime', 'pi_policy_version', - 'pi_policy_preshared_key', + 'pi_cloud_instance_id', ] # Params for Data source @@ -140,18 +140,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( - pi_policy_authentication=dict( - required=False, - type='str'), - pi_cloud_instance_id=dict( + pi_policy_preshared_key=dict( required=False, type='str'), - pi_policy_name=dict( + pi_policy_authentication=dict( required=False, type='str'), pi_policy_dh_group=dict( required=False, type='int'), + pi_policy_name=dict( + required=False, + type='str'), pi_policy_encryption=dict( required=False, type='str'), @@ -161,7 +161,7 @@ pi_policy_version=dict( required=False, type='int'), - pi_policy_preshared_key=dict( + pi_cloud_instance_id=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.41.1', + ibm_provider_version='1.42.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 100cf371f..2c456494d 100644 --- a/plugins/modules/ibm_pi_image.py +++ b/plugins/modules/ibm_pi_image.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_image' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,61 +27,66 @@ - Instance image id required: False type: str - pi_image_storage_type: + pi_image_access_key: description: - - Type of storage + - Cloud Object Storage access key; required for buckets with private access required: False type: str - pi_image_storage_pool: + pi_image_bucket_region: 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 region required: False type: str - pi_affinity_policy: + pi_image_storage_type: 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 + - Type of storage required: False type: str - pi_anti_affinity_volumes: + pi_affinity_volume: description: - - List of volumes to base storage anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided + - Volume (ID or Name) to base storage affinity policy against; required if requesting affinity and pi_affinity_instance is not provided required: False - type: list - elements: str - pi_cloud_instance_id: + type: str + pi_image_name: description: - - (Required for new resource) PI cloud instance ID + - (Required for new resource) Image name required: True type: str + pi_image_bucket_access: + description: + - Indicates if the bucket has public or private access + required: False + type: str + default: public pi_image_bucket_file_name: description: - Cloud Object Storage image filename 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_bucket_region: + pi_affinity_policy: description: - - Cloud Object Storage region + - 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_image_bucket_name: + pi_affinity_instance: description: - - Cloud Object Storage bucket name; bucket-name[/optional/folder] + - 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_image_bucket_access: + pi_anti_affinity_instances: description: - - Indicates if the bucket has public or private 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: str - default: public - pi_image_name: + type: list + elements: str + pi_cloud_instance_id: description: - - (Required for new resource) Image name + - (Required for new resource) PI cloud instance ID required: True type: str pi_image_secret_key: @@ -89,20 +94,15 @@ - Cloud Object Storage secret key; required for buckets with private access required: False type: str - 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_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_image_access_key: + pi_image_bucket_name: description: - - Cloud Object Storage access key; required for buckets with private access + - Cloud Object Storage bucket name; bucket-name[/optional/folder] required: False type: str id: @@ -147,28 +147,28 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), ('pi_image_name', 'str'), + ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'pi_image_id', + 'pi_image_access_key', + 'pi_image_bucket_region', 'pi_image_storage_type', - 'pi_image_storage_pool', - 'pi_affinity_policy', - 'pi_anti_affinity_volumes', - 'pi_cloud_instance_id', - 'pi_image_bucket_file_name', 'pi_affinity_volume', - 'pi_image_bucket_region', - 'pi_image_bucket_name', - 'pi_image_bucket_access', 'pi_image_name', - 'pi_image_secret_key', + 'pi_image_bucket_access', + 'pi_image_bucket_file_name', + 'pi_image_storage_pool', + 'pi_affinity_policy', 'pi_affinity_instance', 'pi_anti_affinity_instances', - 'pi_image_access_key', + 'pi_cloud_instance_id', + 'pi_image_secret_key', + 'pi_anti_affinity_volumes', + 'pi_image_bucket_name', ] # Params for Data source @@ -184,14 +184,14 @@ TL_CONFLICTS_MAP = { 'pi_image_id': ['pi_image_bucket_name'], - 'pi_anti_affinity_volumes': ['pi_anti_affinity_instances'], - 'pi_image_bucket_file_name': ['pi_image_id'], - 'pi_affinity_volume': ['pi_affinity_instance'], 'pi_image_bucket_region': ['pi_image_id'], - 'pi_image_bucket_name': ['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_anti_affinity_volumes': ['pi_anti_affinity_instances'], + 'pi_image_bucket_name': ['pi_image_id'], } # define available arguments/parameters a user can pass to the module @@ -201,51 +201,51 @@ pi_image_id=dict( required=False, type='str'), - pi_image_storage_type=dict( + pi_image_access_key=dict( required=False, type='str'), - pi_image_storage_pool=dict( + pi_image_bucket_region=dict( required=False, type='str'), - pi_affinity_policy=dict( + pi_image_storage_type=dict( required=False, type='str'), - pi_anti_affinity_volumes=dict( - required=False, - elements='', - type='list'), - pi_cloud_instance_id=dict( + pi_affinity_volume=dict( required=False, type='str'), - pi_image_bucket_file_name=dict( + pi_image_name=dict( required=False, type='str'), - pi_affinity_volume=dict( + pi_image_bucket_access=dict( required=False, type='str'), - pi_image_bucket_region=dict( + pi_image_bucket_file_name=dict( required=False, type='str'), - pi_image_bucket_name=dict( + pi_image_storage_pool=dict( required=False, type='str'), - pi_image_bucket_access=dict( + pi_affinity_policy=dict( required=False, type='str'), - pi_image_name=dict( + pi_affinity_instance=dict( required=False, type='str'), - pi_image_secret_key=dict( + pi_anti_affinity_instances=dict( + required=False, + elements='', + type='list'), + pi_cloud_instance_id=dict( required=False, type='str'), - pi_affinity_instance=dict( + pi_image_secret_key=dict( required=False, type='str'), - pi_anti_affinity_instances=dict( + pi_anti_affinity_volumes=dict( required=False, elements='', type='list'), - pi_image_access_key=dict( + pi_image_bucket_name=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 113be8cb1..59bc66c70 100644 --- a/plugins/modules/ibm_pi_image_export.py +++ b/plugins/modules/ibm_pi_image_export.py @@ -18,10 +18,15 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + pi_cloud_instance_id: + description: + - (Required for new resource) PI cloud instance ID + required: True + type: str pi_image_id: description: - (Required for new resource) Instance image id @@ -47,11 +52,6 @@ - (Required for new resource) Cloud Object Storage region 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. @@ -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'), ] # 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', ] # Params for Data source @@ -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( + pi_cloud_instance_id=dict( + required=False, + type='str'), pi_image_id=dict( required=False, type='str'), @@ -141,9 +144,6 @@ pi_image_bucket_region=dict( required=False, type='str'), - pi_cloud_instance_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -202,7 +202,7 @@ def run_module(): resource_type='ibm_pi_image_export', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 51db3a962..4d79f474d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 52f72966b..ce5d0add2 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3849445ff..5f0b34619 100644 --- a/plugins/modules/ibm_pi_instance.py +++ b/plugins/modules/ibm_pi_instance.py @@ -18,25 +18,19 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_license_repository_capacity: + pi_affinity_instance: description: - - The VTL license repository capacity TB value + - 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: int - pi_volume_ids: + type: str + pi_proc_type: description: - - List of PI volumes + - Instance processor type required: False - type: list - elements: str - pi_image_id: - description: - - (Required for new resource) PI instance image id - required: True type: str pi_replicants: description: @@ -44,144 +38,155 @@ required: False type: int default: 1 - pi_migratable: + pi_virtual_cores_assigned: description: - - set to true to enable migration of the PI instance + - Virtual Cores Assigned to the PVMInstance required: False - type: bool - pi_storage_pool_affinity: + type: int + pi_instance_name: description: - - Indicates if all volumes attached to the server must reside in the same storage pool + - (Required for new resource) PI Instance name + required: True + type: str + pi_replication_policy: + description: + - Replication policy for the PI Instance required: False - type: bool - default: True + type: str + default: none pi_storage_type: description: - Storage type for server deployment required: False type: str - pi_affinity_policy: + pi_storage_connection: 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 + - Storage Connectivity Group for server deployment required: False type: str - pi_affinity_volume: + pi_placement_group_id: description: - - Volume (ID or Name) to base storage affinity policy against; required if requesting affinity and pi_affinity_instance is not provided + - Placement group ID required: False type: str - pi_storage_pool: + pi_processors: description: - - Storage Pool for server deployment; if provided then pi_affinity_policy and pi_storage_type will be ignored + - Processors count required: False - type: str - pi_placement_group_id: + type: float + pi_affinity_volume: description: - - Placement group ID + - 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_replication_policy: + pi_anti_affinity_volumes: description: - - Replication policy for the PI Instance + - 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: str - default: none - pi_pin_policy: + type: list + elements: str + pi_key_pair_name: description: - - Pin Policy of the instance + - SSH key name required: False type: str - default: none pi_anti_affinity_instances: description: - 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: + pi_storage_pool_affinity: description: - - SSH key name + - Indicates if all volumes attached to the server must reside in the same storage pool required: False - type: str - pi_sys_type: + type: bool + default: True + pi_sap_deployment_type: description: - - PI Instance system type + - Custom SAP Deployment Type Information required: False type: str - pi_anti_affinity_volumes: + pi_volume_ids: 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 PI volumes required: False type: list elements: str - pi_network: + pi_user_data: description: - - (Required for new resource) List of one or more networks to attach to the instance - required: True - type: list - elements: dict - pi_processors: + - Base64 encoded data to be passed in for invoking a cloud init script + required: False + type: str + pi_storage_pool: description: - - Processors count + - Storage Pool for server deployment; if provided then pi_affinity_policy and pi_storage_type will be ignored required: False - type: float + type: str pi_health_status: description: - Allow the user to set the status of the lpar so that they can connect to it faster required: False type: str default: OK - pi_replication_scheme: + pi_migratable: description: - - Replication scheme + - set to true to enable migration of the PI instance required: False - type: str - default: suffix - pi_user_data: + type: bool + pi_image_id: description: - - Base64 encoded data to be passed in for invoking a cloud init script - required: False + - (Required for new resource) PI instance image id + required: True type: str - pi_affinity_instance: + pi_sys_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 + - PI Instance system type required: False type: str - pi_sap_profile_id: + pi_pin_policy: description: - - SAP Profile ID for the amount of cores and memory + - Pin Policy of the instance required: False type: str - pi_storage_connection: + default: none + pi_license_repository_capacity: description: - - Storage Connectivity Group for server deployment + - The VTL license repository capacity TB value required: False - type: str - pi_instance_name: + type: int + pi_affinity_policy: description: - - (Required for new resource) PI Instance name - required: True + - 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_memory: description: - Memory size required: False type: float - pi_virtual_cores_assigned: + pi_sap_profile_id: description: - - Virtual Cores Assigned to the PVMInstance + - SAP Profile ID for the amount of cores and memory required: False - type: int + type: str 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. @@ -224,44 +229,45 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_image_id', 'str'), - ('pi_network', 'list'), ('pi_instance_name', 'str'), + ('pi_image_id', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_network', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_license_repository_capacity', - 'pi_volume_ids', - 'pi_image_id', + 'pi_affinity_instance', + 'pi_proc_type', 'pi_replicants', - 'pi_migratable', - 'pi_storage_pool_affinity', + 'pi_virtual_cores_assigned', + 'pi_instance_name', + 'pi_replication_policy', 'pi_storage_type', - 'pi_affinity_policy', - 'pi_affinity_volume', - 'pi_storage_pool', + 'pi_storage_connection', 'pi_placement_group_id', - 'pi_replication_policy', - 'pi_pin_policy', - 'pi_anti_affinity_instances', - 'pi_proc_type', - 'pi_key_pair_name', - 'pi_sys_type', - 'pi_anti_affinity_volumes', - 'pi_network', 'pi_processors', - 'pi_health_status', - 'pi_replication_scheme', + 'pi_affinity_volume', + 'pi_anti_affinity_volumes', + 'pi_key_pair_name', + 'pi_anti_affinity_instances', + 'pi_storage_pool_affinity', + 'pi_sap_deployment_type', + 'pi_volume_ids', 'pi_user_data', - 'pi_affinity_instance', - 'pi_sap_profile_id', - 'pi_storage_connection', - 'pi_instance_name', + 'pi_storage_pool', + 'pi_health_status', + 'pi_migratable', + 'pi_image_id', + 'pi_sys_type', + 'pi_pin_policy', + 'pi_license_repository_capacity', + 'pi_affinity_policy', 'pi_memory', - 'pi_virtual_cores_assigned', + 'pi_sap_profile_id', 'pi_cloud_instance_id', + 'pi_network', + 'pi_replication_scheme', ] # Params for Data source @@ -276,114 +282,117 @@ ] TL_CONFLICTS_MAP = { - 'pi_affinity_volume': ['pi_affinity_instance'], - 'pi_anti_affinity_instances': ['pi_anti_affinity_volumes'], + 'pi_affinity_instance': ['pi_affinity_volume'], 'pi_proc_type': ['pi_sap_profile_id'], - 'pi_anti_affinity_volumes': ['pi_anti_affinity_instances'], 'pi_processors': ['pi_sap_profile_id'], - 'pi_affinity_instance': ['pi_affinity_volume'], - 'pi_sap_profile_id': ['pi_processors', 'pi_memory', 'pi_proc_type'], + 'pi_affinity_volume': ['pi_affinity_instance'], + 'pi_anti_affinity_volumes': ['pi_anti_affinity_instances'], + 'pi_anti_affinity_instances': ['pi_anti_affinity_volumes'], 'pi_memory': ['pi_sap_profile_id'], + 'pi_sap_profile_id': ['pi_processors', 'pi_memory', 'pi_proc_type'], } # 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_license_repository_capacity=dict( - required=False, - type='int'), - pi_volume_ids=dict( + pi_affinity_instance=dict( required=False, - elements='', - type='list'), - pi_image_id=dict( + type='str'), + pi_proc_type=dict( required=False, type='str'), pi_replicants=dict( required=False, type='int'), - pi_migratable=dict( - required=False, - type='bool'), - pi_storage_pool_affinity=dict( + pi_virtual_cores_assigned=dict( required=False, - type='bool'), - pi_storage_type=dict( + type='int'), + pi_instance_name=dict( required=False, type='str'), - pi_affinity_policy=dict( + pi_replication_policy=dict( required=False, type='str'), - pi_affinity_volume=dict( + pi_storage_type=dict( required=False, type='str'), - pi_storage_pool=dict( + pi_storage_connection=dict( required=False, type='str'), pi_placement_group_id=dict( required=False, type='str'), - pi_replication_policy=dict( + pi_processors=dict( required=False, - type='str'), - pi_pin_policy=dict( + type='float'), + pi_affinity_volume=dict( required=False, type='str'), - pi_anti_affinity_instances=dict( + pi_anti_affinity_volumes=dict( required=False, elements='', type='list'), - pi_proc_type=dict( - required=False, - type='str'), pi_key_pair_name=dict( required=False, type='str'), - pi_sys_type=dict( - required=False, - type='str'), - pi_anti_affinity_volumes=dict( + pi_anti_affinity_instances=dict( required=False, elements='', type='list'), - pi_network=dict( + pi_storage_pool_affinity=dict( + required=False, + type='bool'), + pi_sap_deployment_type=dict( + required=False, + type='str'), + pi_volume_ids=dict( required=False, elements='', type='list'), - pi_processors=dict( - required=False, - type='float'), - pi_health_status=dict( + pi_user_data=dict( required=False, type='str'), - pi_replication_scheme=dict( + pi_storage_pool=dict( required=False, type='str'), - pi_user_data=dict( + pi_health_status=dict( required=False, type='str'), - pi_affinity_instance=dict( + pi_migratable=dict( + required=False, + type='bool'), + pi_image_id=dict( required=False, type='str'), - pi_sap_profile_id=dict( + pi_sys_type=dict( required=False, type='str'), - pi_storage_connection=dict( + pi_pin_policy=dict( required=False, type='str'), - pi_instance_name=dict( + pi_license_repository_capacity=dict( + required=False, + type='int'), + pi_affinity_policy=dict( required=False, type='str'), pi_memory=dict( required=False, type='float'), - pi_virtual_cores_assigned=dict( + pi_sap_profile_id=dict( required=False, - type='int'), + type='str'), pi_cloud_instance_id=dict( required=False, type='str'), + pi_network=dict( + required=False, + elements='', + type='list'), + pi_replication_scheme=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -442,7 +451,7 @@ def run_module(): resource_type='ibm_pi_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS_DS, tl_all_params=TL_ALL_PARAMETERS_DS) @@ -451,7 +460,7 @@ def run_module(): resource_type='ibm_pi_instance', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 3f89084fd..601d03079 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 462d47613..57869b18d 100644 --- a/plugins/modules/ibm_pi_instance_ip_info.py +++ b/plugins/modules/ibm_pi_instance_ip_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_pi_instance_ip' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_network_name: + pi_instance_name: description: - - None + - Server Name to be used for pvminstances required: True type: str - pi_instance_name: + pi_network_name: description: - - Server Name to be used for pvminstances + - None required: True type: str pi_cloud_instance_id: @@ -65,15 +65,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_network_name', 'str'), ('pi_instance_name', 'str'), + ('pi_network_name', 'str'), ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_network_name', 'pi_instance_name', + 'pi_network_name', 'pi_cloud_instance_id', ] @@ -85,10 +85,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_instance_name=dict( required=True, type='str'), - pi_instance_name=dict( + pi_network_name=dict( required=True, type='str'), pi_cloud_instance_id=dict( @@ -121,7 +121,7 @@ def run_module(): resource_type='ibm_pi_instance_ip', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d1d0a1854..a593f303e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0268b345a..0c4ce27c0 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 6642295f5..bb6b198df 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 302a8dead..3907ab211 100644 --- a/plugins/modules/ibm_pi_ipsec_policy.py +++ b/plugins/modules/ibm_pi_ipsec_policy.py @@ -18,10 +18,25 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -43,21 +58,6 @@ 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_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'), + ('pi_policy_encryption', 'str'), + ('pi_policy_key_lifetime', 'int'), + ('pi_policy_pfs', 'bool'), ] # 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,6 +133,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_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'), @@ -145,15 +154,6 @@ 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.41.1', + ibm_provider_version='1.42.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 6c4d42732..41a2ec7fb 100644 --- a/plugins/modules/ibm_pi_key.py +++ b/plugins/modules/ibm_pi_key.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -37,6 +32,11 @@ - (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_key_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_key_name', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'pi_key_name', 'pi_cloud_instance_id', + 'pi_key_name', ] TL_CONFLICTS_MAP = { @@ -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( - pi_key_name=dict( - required=False, - type='str'), pi_ssh_key=dict( required=False, type='str'), pi_cloud_instance_id=dict( required=False, type='str'), + pi_key_name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_pi_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8b11e05e5..bb37b6f3e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_key_name: + pi_cloud_instance_id: description: - - SSHKey Name to be used for pvminstances + - None required: True type: str - pi_cloud_instance_id: + pi_key_name: description: - - None + - SSHKey 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_key_name', '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_cloud_instance_id', + 'pi_key_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_key_name=dict( + pi_cloud_instance_id=dict( required=True, type='str'), - pi_cloud_instance_id=dict( + pi_key_name=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.41.1', + ibm_provider_version='1.42.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 270429846..8d658bf4e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ac181349c..66c0fc819 100644 --- a/plugins/modules/ibm_pi_network.py +++ b/plugins/modules/ibm_pi_network.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_network' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + pi_network_name: + description: + - (Required for new resource) PI network name + required: True + type: str pi_cloud_instance_id: description: - (Required for new resource) PI cloud instance ID @@ -32,17 +37,6 @@ - (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 - pi_dns: - description: - - List of PI network DNS name - required: False - type: list - elements: str pi_cidr: description: - PI network CIDR @@ -64,6 +58,12 @@ required: False type: list elements: dict + pi_dns: + description: + - List of PI network DNS name + required: False + type: list + elements: 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_network_name', - 'pi_dns', 'pi_cidr', 'pi_gateway', 'pi_network_jumbo', 'pi_ipaddress_range', + 'pi_dns', ] # Params for Data source @@ -141,19 +141,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_instance_id=dict( + pi_network_name=dict( required=False, type='str'), - pi_network_type=dict( + pi_cloud_instance_id=dict( required=False, type='str'), - pi_network_name=dict( + pi_network_type=dict( required=False, type='str'), - pi_dns=dict( - required=False, - elements='', - type='list'), pi_cidr=dict( required=False, type='str'), @@ -167,6 +163,10 @@ required=False, elements='', type='list'), + pi_dns=dict( + required=False, + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 d0e2722a7..f8f2b7555 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9d9e88ed5..bb1945f41 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -184,7 +184,7 @@ def run_module(): resource_type='ibm_pi_network_port', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 88720e8fe..3b6fc9c2d 100644 --- a/plugins/modules/ibm_pi_network_port_attach.py +++ b/plugins/modules/ibm_pi_network_port_attach.py @@ -18,23 +18,18 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_cloud_instance_id: - description: - - (Required for new resource) - required: True - type: str - pi_instance_name: + pi_network_port_ipaddress: description: - - (Required for new resource) Instance name to attach the network port to - required: True + - None + required: False 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 pi_network_port_description: @@ -43,11 +38,16 @@ required: False type: str default: Port Created via Terraform - port_id: + pi_cloud_instance_id: description: - (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 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -90,19 +90,18 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('pi_instance_id', 'str'), ('pi_cloud_instance_id', 'str'), - ('pi_instance_name', 'str'), ('pi_network_name', 'str'), - ('port_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_instance_name', 'pi_network_name', - 'pi_network_port_description', - 'port_id', ] # Params for Data source @@ -119,19 +118,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( - pi_cloud_instance_id=dict( + pi_network_port_ipaddress=dict( required=False, type='str'), - pi_instance_name=dict( + pi_instance_id=dict( required=False, type='str'), - pi_network_name=dict( + pi_network_port_description=dict( required=False, type='str'), - pi_network_port_description=dict( + pi_cloud_instance_id=dict( required=False, type='str'), - port_id=dict( + pi_network_name=dict( required=False, type='str'), id=dict( @@ -192,7 +191,7 @@ def run_module(): resource_type='ibm_pi_network_port_attach', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 1c6d8a56f..bb1c11643 100644 --- a/plugins/modules/ibm_pi_network_port_info.py +++ b/plugins/modules/ibm_pi_network_port_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_pi_network_port' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_network_port', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 551dc567e..d6b0ea913 100644 --- a/plugins/modules/ibm_pi_operations.py +++ b/plugins/modules/ibm_pi_operations.py @@ -18,10 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_operations' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + pi_cloud_instance_id: + description: + - (Required for new resource) PI Cloud instnce id + required: True + type: str pi_instance_name: description: - (Required for new resource) PI instance Operation server name @@ -32,11 +37,6 @@ - (Required for new resource) PI instance operation type required: True type: str - pi_cloud_instance_id: - description: - - (Required for new resource) PI Cloud instnce 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_operation', '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_operation', - '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_operation=dict( + pi_instance_name=dict( required=False, type='str'), - pi_cloud_instance_id=dict( + pi_operation=dict( required=False, type='str'), id=dict( @@ -172,7 +172,7 @@ def run_module(): resource_type='ibm_pi_operations', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9533ed472..dd09b1950 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -93,13 +93,13 @@ # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('pi_cloud_instance_id', 'str'), ('pi_placement_group_name', 'str'), + ('pi_cloud_instance_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'pi_cloud_instance_id', 'pi_placement_group_name', + 'pi_cloud_instance_id', ] TL_CONFLICTS_MAP = { @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_pi_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 a7b0e39b4..3b3dfefd3 100644 --- a/plugins/modules/ibm_pi_placement_group_info.py +++ b/plugins/modules/ibm_pi_placement_group_info.py @@ -17,16 +17,16 @@ description: - Retrieve an IBM Cloud 'ibm_pi_placement_group' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_cloud_instance_id: + pi_placement_group_name: description: - None required: True type: str - pi_placement_group_name: + pi_cloud_instance_id: description: - None required: True @@ -60,14 +60,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), ('pi_placement_group_name', 'str'), + ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_instance_id', 'pi_placement_group_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_placement_group_name=dict( required=True, type='str'), - pi_placement_group_name=dict( + pi_cloud_instance_id=dict( required=True, type='str'), zone=dict( @@ -111,7 +111,7 @@ def run_module(): resource_type='ibm_pi_placement_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 63296f531..b38456a18 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9e60baa3b..f7907e24e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3abe7c921..d8d878cf1 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 72107e931..d9f9a5adc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a8ec3f14b..657362b04 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c16c3770e..045207bfc 100644 --- a/plugins/modules/ibm_pi_snapshot.py +++ b/plugins/modules/ibm_pi_snapshot.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_snapshot' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_snap_shot_name: - description: - - (Required for new resource) Unique name of the snapshot - required: True - type: str pi_volume_ids: description: - List of PI volumes @@ -43,6 +38,11 @@ - Description of the PVM instance snapshot required: False type: str + pi_snap_shot_name: + description: + - (Required for new resource) Unique name of the snapshot + required: True + type: str pi_instance_name: description: - (Required for new resource) Instance name / id of the pvm @@ -90,17 +90,17 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_snap_shot_name', 'str'), ('pi_cloud_instance_id', 'str'), + ('pi_snap_shot_name', 'str'), ('pi_instance_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_snap_shot_name', 'pi_volume_ids', 'pi_cloud_instance_id', 'pi_description', + 'pi_snap_shot_name', 'pi_instance_name', ] @@ -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( - pi_snap_shot_name=dict( - required=False, - type='str'), pi_volume_ids=dict( required=False, elements='', @@ -131,6 +128,9 @@ pi_description=dict( required=False, type='str'), + pi_snap_shot_name=dict( + required=False, + type='str'), pi_instance_name=dict( required=False, type='str'), @@ -192,7 +192,7 @@ def run_module(): resource_type='ibm_pi_snapshot', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 f07ba94eb..a5ef57f7e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 817027ac4..a8284860d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5582c450f..7eb01cb53 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_cloud_instance_id: + pi_storage_type: description: - - None + - Storage type name required: True type: str - pi_storage_type: + pi_cloud_instance_id: description: - - Storage type name + - 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_storage_type', 'str'), + ('pi_cloud_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_instance_id', 'pi_storage_type', + '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_storage_type=dict( required=True, type='str'), - pi_storage_type=dict( + pi_cloud_instance_id=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.41.1', + ibm_provider_version='1.42.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 04f720b3d..88a0548f1 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 new file mode 100644 index 000000000..9315fda90 --- /dev/null +++ b/plugins/modules/ibm_pi_system_pools_info.py @@ -0,0 +1,120 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: ibm_pi_system_pools_info +for_more_info: refer - https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/pi_system_pools + +short_description: Retrieve IBM Cloud 'ibm_pi_system_pools' resource + +version_added: "2.8" + +description: + - Retrieve an IBM Cloud 'ibm_pi_system_pools' resource +requirements: + - IBM-Cloud terraform-provider-ibm v1.42.0 + - Terraform v0.12.20 + +options: + pi_cloud_instance_id: + description: + - None + required: True + type: str + zone: + description: + - Denotes which IBM Cloud zone to connect to in multizone + environment. This can also be provided via the environment + variable 'IC_ZONE'. + required: False + type: str + 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 + 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 = [ + ('pi_cloud_instance_id', 'str'), +] + +# All top level parameter keys supported by Terraform module +TL_ALL_PARAMETERS = [ + 'pi_cloud_instance_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( + pi_cloud_instance_id=dict( + required=True, + type='str'), + zone=dict( + type='str', + fallback=(env_fallback, ['IC_ZONE'])), + 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_pi_system_pools', + tf_type='data', + parameters=module.params, + ibm_provider_version='1.42.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_pi_tenant_info.py b/plugins/modules/ibm_pi_tenant_info.py index 2c075bc4f..b19f35f37 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 7366038ae..1f1ac87db 100644 --- a/plugins/modules/ibm_pi_volume.py +++ b/plugins/modules/ibm_pi_volume.py @@ -18,25 +18,25 @@ - Create, update or destroy an IBM Cloud 'ibm_pi_volume' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_affinity_policy: - 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 - type: str pi_cloud_instance_id: description: - (Required for new resource) Cloud Instance ID - This is the service_instance_id. required: True type: str - pi_volume_name: + pi_affinity_policy: description: - - (Required for new resource) Volume Name to create - required: True + - 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_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 @@ -47,35 +47,35 @@ - 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_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 - pi_volume_type: + pi_affinity_volume: description: - - Type of Disk, required if pi_affinity_policy and pi_volume_pool not provided, otherwise ignored + - 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_volume_shareable: + pi_volume_name: description: - - Flag to indicate if the volume can be shared across multiple instances? + - (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: bool - pi_affinity_volume: + type: str + pi_affinity_instance: description: - - Volume (ID or Name) to base volume affinity policy against; required if requesting affinity and pi_affinity_instance is not provided + - 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_volumes: + pi_anti_affinity_instances: description: - - List of volumes to base volume anti-affinity policy against; required if requesting anti-affinity and pi_anti_affinity_instances is not provided + - 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 @@ -122,23 +122,23 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('pi_cloud_instance_id', 'str'), - ('pi_volume_name', 'str'), ('pi_volume_size', 'float'), + ('pi_volume_name', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_affinity_policy', 'pi_cloud_instance_id', - 'pi_volume_name', + 'pi_affinity_policy', + 'pi_volume_shareable', 'pi_volume_size', 'pi_volume_pool', + 'pi_anti_affinity_volumes', + 'pi_affinity_volume', + 'pi_volume_name', + 'pi_volume_type', 'pi_affinity_instance', 'pi_anti_affinity_instances', - 'pi_volume_type', - 'pi_volume_shareable', - 'pi_affinity_volume', - '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_volume': ['pi_affinity_instance'], - '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_policy=dict( - required=False, - type='str'), pi_cloud_instance_id=dict( required=False, type='str'), - pi_volume_name=dict( + pi_affinity_policy=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_affinity_instance=dict( - required=False, - type='str'), - pi_anti_affinity_instances=dict( + pi_anti_affinity_volumes=dict( required=False, elements='', type='list'), - pi_volume_type=dict( + pi_affinity_volume=dict( required=False, type='str'), - pi_volume_shareable=dict( + pi_volume_name=dict( required=False, - type='bool'), - pi_affinity_volume=dict( + type='str'), + pi_volume_type=dict( required=False, type='str'), - pi_anti_affinity_volumes=dict( + pi_affinity_instance=dict( + required=False, + type='str'), + pi_anti_affinity_instances=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 32549a76b..f5e7eb391 100644 --- a/plugins/modules/ibm_pi_volume_attach.py +++ b/plugins/modules/ibm_pi_volume_attach.py @@ -18,15 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - pi_instance_id: - description: - - (Required for new resource) PI Instance Id - required: True - type: str pi_cloud_instance_id: description: - (Required for new resource) Cloud Instance ID - This is the service_instance_id. @@ -37,6 +32,11 @@ - (Required for new resource) Id of the volume to attach. Note these volumes should have been created required: True type: str + pi_instance_id: + description: + - (Required for new resource) PI 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_instance_id', 'str'), ('pi_cloud_instance_id', 'str'), ('pi_volume_id', 'str'), + ('pi_instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_instance_id', 'pi_cloud_instance_id', 'pi_volume_id', + 'pi_instance_id', ] # Params for Data source @@ -105,15 +105,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_instance_id=dict( - required=False, - type='str'), pi_cloud_instance_id=dict( required=False, type='str'), pi_volume_id=dict( required=False, type='str'), + pi_instance_id=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -172,7 +172,7 @@ def run_module(): resource_type='ibm_pi_volume_attach', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 27077f9dd..4a9e26abc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 e1b3a4594..1106cc867 100644 --- a/plugins/modules/ibm_pi_vpn_connection.py +++ b/plugins/modules/ibm_pi_vpn_connection.py @@ -18,28 +18,30 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - pi_ike_policy_id: + type: list + elements: str + pi_peer_subnets: description: - - (Required for new resource) Unique identifier of IKE Policy selected for this VPN Connection + - (Required for new resource) Set of CIDR of peer subnets required: True - type: str - pi_peer_gateway_address: + type: list + elements: str + pi_vpn_connection_name: description: - - (Required for new resource) Peer Gateway address + - (Required for new resource) Name of the VPN Connection required: True type: str - pi_vpn_connection_name: + pi_ike_policy_id: description: - - (Required for new resource) Name of the VPN Connection + - (Required for new resource) Unique identifier of IKE Policy selected for this VPN Connection required: True type: str pi_ipsec_policy_id: @@ -52,18 +54,16 @@ - (Required for new resource) Mode used by this VPN Connection, either 'policy' or 'route' required: True type: str - pi_networks: + pi_cloud_instance_id: description: - - (Required for new resource) Set of network IDs to attach to this VPN connection + - (Required for new resource) PI cloud instance ID required: True - type: list - elements: str - pi_peer_subnets: + type: str + pi_peer_gateway_address: description: - - (Required for new resource) Set of CIDR of peer subnets + - (Required for new resource) Peer Gateway address required: True - type: list - elements: str + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -106,26 +106,26 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('pi_cloud_instance_id', 'str'), - ('pi_ike_policy_id', 'str'), - ('pi_peer_gateway_address', 'str'), + ('pi_networks', 'list'), + ('pi_peer_subnets', 'list'), ('pi_vpn_connection_name', 'str'), + ('pi_ike_policy_id', 'str'), ('pi_ipsec_policy_id', 'str'), ('pi_vpn_connection_mode', 'str'), - ('pi_networks', 'list'), - ('pi_peer_subnets', 'list'), + ('pi_cloud_instance_id', 'str'), + ('pi_peer_gateway_address', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'pi_cloud_instance_id', - 'pi_ike_policy_id', - 'pi_peer_gateway_address', + 'pi_networks', + 'pi_peer_subnets', 'pi_vpn_connection_name', + 'pi_ike_policy_id', 'pi_ipsec_policy_id', 'pi_vpn_connection_mode', - 'pi_networks', - 'pi_peer_subnets', + 'pi_cloud_instance_id', + 'pi_peer_gateway_address', ] # Params for Data source @@ -142,16 +142,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( - pi_cloud_instance_id=dict( + pi_networks=dict( required=False, - type='str'), - pi_ike_policy_id=dict( + elements='', + type='list'), + pi_peer_subnets=dict( required=False, - type='str'), - pi_peer_gateway_address=dict( + elements='', + type='list'), + pi_vpn_connection_name=dict( required=False, type='str'), - pi_vpn_connection_name=dict( + pi_ike_policy_id=dict( required=False, type='str'), pi_ipsec_policy_id=dict( @@ -160,14 +162,12 @@ pi_vpn_connection_mode=dict( required=False, type='str'), - pi_networks=dict( + pi_cloud_instance_id=dict( required=False, - elements='', - type='list'), - pi_peer_subnets=dict( + type='str'), + pi_peer_gateway_address=dict( required=False, - elements='', - type='list'), + type='str'), id=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.41.1', + ibm_provider_version='1.42.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 c5b4338de..4c4d536fa 100644 --- a/plugins/modules/ibm_pn_application_chrome.py +++ b/plugins/modules/ibm_pn_application_chrome.py @@ -18,15 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_pn_application_chrome' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - guid: - description: - - (Required for new resource) Unique guid of the push notification instance. - required: True - type: str server_key: description: - (Required for new resource) A server key that gives the push service an authorized access to Google services that is used for Chrome Web Push. @@ -37,6 +32,11 @@ - (Required for new resource) The URL of the WebSite / WebApp that should be permitted to subscribe to WebPush. required: True type: str + guid: + description: + - (Required for new resource) Unique guid of the push notification instance. + 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 = [ - ('guid', 'str'), ('server_key', 'str'), ('web_site_url', 'str'), + ('guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'guid', 'server_key', 'web_site_url', + 'guid', ] # Params for Data source @@ -111,15 +111,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( - guid=dict( - required=False, - type='str'), server_key=dict( required=False, type='str'), web_site_url=dict( required=False, type='str'), + guid=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -185,7 +185,7 @@ def run_module(): resource_type='ibm_pn_application_chrome', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 96eb140ba..51a84336b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 2dbb19340..43625fb23 100644 --- a/plugins/modules/ibm_resource_group.py +++ b/plugins/modules/ibm_resource_group.py @@ -18,21 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - name: - description: - - (Required for new resource) The name of the resource group - required: True - type: str tags: description: - None required: False type: list elements: str + name: + description: + - (Required for new resource) The name of the resource group + required: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -84,8 +84,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', 'tags', + 'name', ] # Params for Data source @@ -104,13 +104,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( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), + name=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_resource_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 22c95110c..76617f671 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 226d353e4..3d494744f 100644 --- a/plugins/modules/ibm_resource_instance.py +++ b/plugins/modules/ibm_resource_instance.py @@ -18,26 +18,36 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - parameters: + name: description: - - Arbitrary parameters to pass. Must be a JSON object + - (Required for new resource) A name for the resource instance + required: True + type: str + tags: + description: + - None required: False - type: dict + type: list + elements: str service_endpoints: description: - Types of the service endpoints. Possible values are 'public', 'private', 'public-and-private'. required: False type: str - tags: + plan: description: - - None + - (Required for new resource) The plan type of the service + required: True + type: str + parameters: + description: + - Arbitrary parameters to pass. Must be a JSON object required: False - type: list - elements: str + type: dict location: description: - (Required for new resource) The location where the instance available @@ -48,21 +58,11 @@ - The resource group id required: False type: str - name: - description: - - (Required for new resource) A name for the resource instance - required: True - type: str parameters_json: description: - Arbitrary parameters to pass in Json string format required: False type: str - plan: - description: - - (Required for new resource) The plan type of the service - required: True - type: str service: description: - (Required for new resource) The name of the service offering like cloud-object-storage, kms etc @@ -114,22 +114,22 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('location', 'str'), ('name', 'str'), ('plan', 'str'), + ('location', 'str'), ('service', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'parameters', - 'service_endpoints', + 'name', 'tags', + 'service_endpoints', + 'plan', + 'parameters', 'location', 'resource_group_id', - 'name', 'parameters_json', - 'plan', 'service', ] @@ -139,10 +139,10 @@ ] TL_ALL_PARAMETERS_DS = [ - 'location', - 'name', - 'service', 'resource_group_id', + 'service', + 'name', + 'location', ] TL_CONFLICTS_MAP = { @@ -154,29 +154,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( - parameters=dict( - required=False, - type='dict'), - service_endpoints=dict( + name=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - location=dict( + service_endpoints=dict( required=False, type='str'), - resource_group_id=dict( + plan=dict( required=False, type='str'), - name=dict( + parameters=dict( + required=False, + type='dict'), + location=dict( required=False, type='str'), - parameters_json=dict( + resource_group_id=dict( required=False, type='str'), - plan=dict( + parameters_json=dict( required=False, type='str'), service=dict( @@ -247,7 +247,7 @@ def run_module(): resource_type='ibm_resource_instance', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5c411ab54..6fca7c3f6 100644 --- a/plugins/modules/ibm_resource_instance_info.py +++ b/plugins/modules/ibm_resource_instance_info.py @@ -17,28 +17,28 @@ description: - Retrieve an IBM Cloud 'ibm_resource_instance' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - location: + resource_group_id: description: - - The location or the environment in which instance exists + - 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 service: description: - The service type of the instance required: False type: str - resource_group_id: + name: description: - - The id of the resource group in which the instance is present + - 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 iaas_classic_username: @@ -79,10 +79,10 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'location', - 'name', - 'service', 'resource_group_id', + 'service', + 'name', + 'location', ] @@ -93,16 +93,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( - location=dict( + resource_group_id=dict( required=False, type='str'), - name=dict( - required=True, - type='str'), service=dict( required=False, type='str'), - resource_group_id=dict( + name=dict( + required=True, + type='str'), + location=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.41.1', + ibm_provider_version='1.42.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 8bc289c7b..0b0ee7f38 100644 --- a/plugins/modules/ibm_resource_key.py +++ b/plugins/modules/ibm_resource_key.py @@ -18,10 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + resource_alias_id: + description: + - 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 tags: description: - None @@ -38,21 +48,11 @@ - The id of the resource instance for which to create resource key required: False type: str - resource_alias_id: - description: - - The id of the resource alias for which to create resource key - required: False - type: str name: description: - (Required for new resource) The name of the resource key required: True 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', 'role', 'resource_instance_id', - 'resource_alias_id', 'name', - 'parameters', ] # Params for Data source @@ -118,21 +118,27 @@ ] TL_ALL_PARAMETERS_DS = [ - 'name', 'resource_instance_id', 'resource_alias_id', 'most_recent', + 'name', ] TL_CONFLICTS_MAP = { - 'resource_instance_id': ['resource_alias_id'], 'resource_alias_id': ['resource_instance_id'], + 'resource_instance_id': ['resource_alias_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( + required=False, + type='str'), + parameters=dict( + required=False, + type='dict'), tags=dict( required=False, elements='', @@ -143,15 +149,9 @@ resource_instance_id=dict( required=False, type='str'), - resource_alias_id=dict( - required=False, - type='str'), name=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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b08605375..842836c2f 100644 --- a/plugins/modules/ibm_resource_key_info.py +++ b/plugins/modules/ibm_resource_key_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_resource_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -42,6 +37,11 @@ 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,9 +96,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=True, - type='str'), resource_instance_id=dict( required=False, type='str'), @@ -108,6 +105,9 @@ 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.41.1', + ibm_provider_version='1.42.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 0e1e897f1..bb54195e4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 fdf3a96cd..caec20803 100644 --- a/plugins/modules/ibm_resource_tag.py +++ b/plugins/modules/ibm_resource_tag.py @@ -18,20 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_resource_tag' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - resource_type: - description: - - Resource type on which the tags should be attached - required: False - type: str - tag_type: - description: - - Type of the tag. Only allowed values are: user, or service or access (default value : user) - required: False - type: str resource_id: description: - (Required for new resource) CRN of the resource on which the tags should be attached @@ -43,6 +33,16 @@ required: False type: list elements: str + resource_type: + description: + - Resource type on which the tags should be attached + required: False + type: str + tag_type: + description: + - Type of the tag. Only allowed values are: user, or service or access (default value : user) + required: False + 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 = [ - 'resource_type', - 'tag_type', 'resource_id', 'tags', + 'resource_type', + 'tag_type', ] # Params for Data source @@ -105,9 +105,9 @@ ] TL_ALL_PARAMETERS_DS = [ + 'resource_id', 'resource_type', 'tag_type', - 'resource_id', ] TL_CONFLICTS_MAP = { @@ -117,12 +117,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_type=dict( - required=False, - type='str'), - tag_type=dict( - required=False, - type='str'), resource_id=dict( required=False, type='str'), @@ -130,6 +124,12 @@ required=False, elements='', type='list'), + resource_type=dict( + required=False, + type='str'), + tag_type=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -195,7 +195,7 @@ def run_module(): resource_type='ibm_resource_tag', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 898d0876e..e833c834a 100644 --- a/plugins/modules/ibm_resource_tag_info.py +++ b/plugins/modules/ibm_resource_tag_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_resource_tag' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + resource_id: + description: + - CRN of the resource on which the tags should be attached + required: False + type: str resource_type: description: - Resource type on which the tags should be fetched @@ -32,11 +37,6 @@ required: False type: str default: user - resource_id: - description: - - CRN of the resource on which the tags should be attached - required: False - 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 = [ + 'resource_id', 'resource_type', 'tag_type', - 'resource_id', ] @@ -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_type=dict( + resource_id=dict( required=False, type='str'), - tag_type=dict( + resource_type=dict( required=False, type='str'), - resource_id=dict( + tag_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.41.1', + ibm_provider_version='1.42.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 05eb29ee8..e56ff6e05 100644 --- a/plugins/modules/ibm_satellite_attach_host_script_info.py +++ b/plugins/modules/ibm_satellite_attach_host_script_info.py @@ -17,10 +17,21 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_attach_host_script' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + labels: + description: + - List of labels for the attach host + required: False + type: list + elements: str + host_provider: + description: + - None + required: False + type: str script_dir: description: - The directory where the satellite attach host script to be downloaded. Default is home directory @@ -36,17 +47,6 @@ - A unique name for the new Satellite location required: True type: str - labels: - description: - - List of labels for the attach host - required: False - type: list - elements: str - host_provider: - description: - - None - 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 = [ + 'labels', + 'host_provider', 'script_dir', 'custom_script', 'location', - 'labels', - 'host_provider', ] @@ -100,6 +100,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( + labels=dict( + required=False, + elements='', + type='list'), + host_provider=dict( + required=False, + type='str'), script_dir=dict( required=False, type='str'), @@ -109,13 +116,6 @@ location=dict( required=True, type='str'), - labels=dict( - required=False, - elements='', - type='list'), - host_provider=dict( - required=False, - 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.41.1', + ibm_provider_version='1.42.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 0fe37d256..2453da1c5 100644 --- a/plugins/modules/ibm_satellite_cluster.py +++ b/plugins/modules/ibm_satellite_cluster.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_cluster' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -28,40 +28,30 @@ required: False type: bool default: True - crn_token: - description: - - The IBM Cloud Identity and Access Management (IAM) service CRN token for the service that creates the cluster. - required: False - type: str tags: description: - List of tags for the resources required: False type: list elements: str - kube_version: - description: - - The OpenShift Container Platform version - required: False - type: str - patch_version: + name: description: - - Kubernetes patch version - required: False + - (Required for new resource) The unique name for the new IBM Cloud Satellite cluster + required: True type: str - worker_count: + enable_config_admin: description: - - The number of worker nodes per zone in the default worker pool. Required when '--host-label' is specified. (default: 0) + - Grant cluster admin access to Satellite Config to manage Kubernetes resources. required: False - type: int - service_subnet: + type: bool + pod_subnet: description: - - User provided value for service subnet + - User provided value for the pod subnet required: False type: str - resource_group_id: + kube_version: description: - - ID of the resource group. + - The OpenShift Container Platform version required: False type: str default_worker_pool_labels: @@ -70,31 +60,15 @@ required: False type: dict elements: str - zones: - description: - - Zone info for worker pool - required: False - type: list - elements: dict - pull_secret: - description: - - The RedHat pull secret to create the OpenShift cluster - required: False - type: str - pod_subnet: + crn_token: description: - - User provided value for the pod subnet + - The IBM Cloud Identity and Access Management (IAM) service CRN token for the service that creates the cluster. required: False type: str - enable_config_admin: + service_subnet: description: - - Grant cluster admin access to Satellite Config to manage Kubernetes resources. + - User provided value for service subnet required: False - type: bool - name: - description: - - (Required for new resource) The unique name for the new IBM Cloud Satellite cluster - required: True type: str disable_public_service_endpoint: description: @@ -107,11 +81,37 @@ - (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: + description: + - The RedHat pull secret to create the OpenShift cluster + required: False + type: str 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 + worker_count: + description: + - The number of worker nodes per zone in the default worker pool. Required when '--host-label' is specified. (default: 0) + required: False + type: int + resource_group_id: + description: + - ID of the resource group. + required: False + type: str host_labels: description: - Labels that describe a Satellite host for default workerpool @@ -171,22 +171,22 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'wait_for_worker_update', - 'crn_token', 'tags', + 'name', + 'enable_config_admin', + 'pod_subnet', 'kube_version', - 'patch_version', - 'worker_count', - 'service_subnet', - 'resource_group_id', 'default_worker_pool_labels', - 'zones', - 'pull_secret', - 'pod_subnet', - 'enable_config_admin', - 'name', + 'crn_token', + 'service_subnet', 'disable_public_service_endpoint', 'location', + 'patch_version', + 'zones', + 'pull_secret', 'retry_patch_version', + 'worker_count', + 'resource_group_id', 'host_labels', ] @@ -196,8 +196,8 @@ ] TL_ALL_PARAMETERS_DS = [ - 'resource_group_id', 'name', + 'resource_group_id', ] TL_CONFLICTS_MAP = { @@ -210,57 +210,57 @@ wait_for_worker_update=dict( required=False, type='bool'), - crn_token=dict( - required=False, - type='str'), tags=dict( required=False, elements='', type='list'), - kube_version=dict( - required=False, - type='str'), - patch_version=dict( + name=dict( required=False, type='str'), - worker_count=dict( + enable_config_admin=dict( required=False, - type='int'), - service_subnet=dict( + type='bool'), + pod_subnet=dict( required=False, type='str'), - resource_group_id=dict( + kube_version=dict( required=False, type='str'), default_worker_pool_labels=dict( required=False, elements='', type='dict'), - zones=dict( - required=False, - elements='', - type='list'), - pull_secret=dict( + crn_token=dict( required=False, type='str'), - pod_subnet=dict( + service_subnet=dict( required=False, type='str'), - enable_config_admin=dict( + disable_public_service_endpoint=dict( required=False, type='bool'), - name=dict( + location=dict( required=False, type='str'), - disable_public_service_endpoint=dict( + patch_version=dict( required=False, - type='bool'), - location=dict( + type='str'), + zones=dict( + required=False, + elements='', + type='list'), + pull_secret=dict( required=False, type='str'), retry_patch_version=dict( required=False, type='int'), + worker_count=dict( + required=False, + type='int'), + resource_group_id=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 87ea68f49..b5b4633ae 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 + resource_group_id: + description: + - ID of the resource group. + 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_satellite_cluster', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 8ac1b995b..d4e6f00e7 100644 --- a/plugins/modules/ibm_satellite_cluster_worker_pool.py +++ b/plugins/modules/ibm_satellite_cluster_worker_pool.py @@ -18,46 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_cluster_worker_pool' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - worker_pool_labels: - description: - - Labels on all the workers in the worker pool - required: False - type: dict - elements: 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 isolation: description: - None required: False type: str - entitlement: - description: - - None - required: False - type: str worker_count: description: - Specify the desired number of workers per zone in this worker pool @@ -80,6 +54,32 @@ - 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: + 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 + entitlement: + description: + - None + required: False + type: str + worker_pool_labels: + description: + - Labels on all the workers in the worker pool + required: False + type: dict + elements: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -132,29 +132,29 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'flavor', 'disk_encryption', - 'worker_pool_labels', - 'name', - 'cluster', 'isolation', - 'entitlement', 'worker_count', 'zones', 'host_labels', 'resource_group_id', + 'name', + 'cluster', + 'flavor', + 'entitlement', + 'worker_pool_labels', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('cluster', 'str'), ('name', 'str'), + ('cluster', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'cluster', 'resource_group_id', 'name', + 'cluster', 'region', ] @@ -165,28 +165,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( - flavor=dict( - required=False, - type='str'), disk_encryption=dict( required=False, type='bool'), - worker_pool_labels=dict( - required=False, - elements='', - type='dict'), - name=dict( - required=False, - type='str'), - cluster=dict( - required=False, - type='str'), isolation=dict( required=False, type='str'), - entitlement=dict( - required=False, - type='str'), worker_count=dict( required=False, type='int'), @@ -201,6 +185,22 @@ resource_group_id=dict( required=False, type='str'), + name=dict( + required=False, + type='str'), + cluster=dict( + required=False, + type='str'), + flavor=dict( + required=False, + type='str'), + entitlement=dict( + required=False, + type='str'), + worker_pool_labels=dict( + required=False, + elements='', + type='dict'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 5d47af6f5..35e595288 100644 --- a/plugins/modules/ibm_satellite_cluster_worker_pool_info.py +++ b/plugins/modules/ibm_satellite_cluster_worker_pool_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_cluster_worker_pool' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cluster: - description: - - Cluster name - required: True - type: str resource_group_id: description: - ID of the resource group @@ -36,6 +31,11 @@ - worker pool name required: True type: str + cluster: + description: + - Cluster name + required: True + type: str region: description: - Name of the region @@ -74,15 +74,15 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('cluster', 'str'), ('name', 'str'), + ('cluster', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cluster', 'resource_group_id', 'name', + 'cluster', 'region', ] @@ -94,15 +94,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=dict( - required=True, - type='str'), resource_group_id=dict( required=False, type='str'), name=dict( required=True, type='str'), + cluster=dict( + required=True, + type='str'), region=dict( required=False, type='str'), @@ -140,7 +140,7 @@ def run_module(): resource_type='ibm_satellite_cluster_worker_pool', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 2083f166d..53466a74b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 946be9797..0d9894439 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 82bbd50d8..1c0c9809d 100644 --- a/plugins/modules/ibm_satellite_endpoint.py +++ b/plugins/modules/ibm_satellite_endpoint.py @@ -18,39 +18,29 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_endpoint' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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: + display_name: 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 + - (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: + server_port: description: - - (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 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: str - sni: + type: int + client_mutual_auth: description: - - The server name indicator (SNI) which used to connect to the server endpoint. Only useful if server side requires SNI. + - Whether enable mutual auth in the client application side, when client_protocol is 'tls' or 'https', this field is required. required: False - type: str - client_protocol: - description: - - (Required for new resource) The protocol in the client application side. - required: True - type: str - reject_unauth: + type: bool + default: False + server_mutual_auth: description: - - Whether reject any connection to the server application which is not authorized with the list of supplied CAs in the fields certs.server_cert. + - Whether enable mutual auth in the server application side, when client_protocol is 'tls', this field is required. required: False type: bool default: False @@ -69,33 +59,43 @@ - (Required for new resource) The Location ID. required: True type: str - server_port: + connection_type: 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 for new resource) The type of the endpoint. required: True - type: int - display_name: + type: str + server_host: 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 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 - certs: + server_protocol: description: - - The certs. + - 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: list - elements: dict - connection_type: + type: str + client_protocol: description: - - (Required for new resource) The type of the endpoint. + - (Required for new resource) The protocol in the client application side. required: True type: str - server_mutual_auth: + sni: description: - - Whether enable mutual auth in the server application side, when client_protocol is 'tls', this field is required. + - The server name indicator (SNI) which used to connect to the server endpoint. Only useful if server side requires SNI. + required: False + type: str + reject_unauth: + description: + - Whether reject any connection to the server application which is not authorized with the list of supplied CAs in the fields certs.server_cert. required: False type: bool default: False + certs: + description: + - The certs. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -142,41 +142,41 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('server_host', 'str'), - ('client_protocol', 'str'), - ('location', 'str'), - ('server_port', 'int'), ('display_name', 'str'), + ('server_port', 'int'), + ('location', 'str'), ('connection_type', 'str'), + ('server_host', 'str'), + ('client_protocol', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'display_name', + 'server_port', 'client_mutual_auth', - 'server_protocol', - 'server_host', - 'sni', - 'client_protocol', - 'reject_unauth', + 'server_mutual_auth', 'timeout', 'created_by', 'location', - 'server_port', - 'display_name', - 'certs', 'connection_type', - 'server_mutual_auth', + 'server_host', + 'server_protocol', + 'client_protocol', + 'sni', + 'reject_unauth', + 'certs', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('endpoint_id', 'str'), ('location', 'str'), + ('endpoint_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ - 'endpoint_id', 'location', + 'endpoint_id', ] TL_CONFLICTS_MAP = { @@ -186,22 +186,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( - client_mutual_auth=dict( - required=False, - type='bool'), - server_protocol=dict( - required=False, - type='str'), - server_host=dict( + display_name=dict( required=False, type='str'), - sni=dict( + server_port=dict( required=False, - type='str'), - client_protocol=dict( + type='int'), + client_mutual_auth=dict( required=False, - type='str'), - reject_unauth=dict( + type='bool'), + server_mutual_auth=dict( required=False, type='bool'), timeout=dict( @@ -213,22 +207,28 @@ location=dict( required=False, type='str'), - server_port=dict( + connection_type=dict( required=False, - type='int'), - display_name=dict( + type='str'), + server_host=dict( required=False, type='str'), - certs=dict( + server_protocol=dict( required=False, - elements='', - type='list'), - connection_type=dict( + type='str'), + client_protocol=dict( required=False, type='str'), - server_mutual_auth=dict( + sni=dict( + required=False, + type='str'), + reject_unauth=dict( required=False, type='bool'), + certs=dict( + required=False, + elements='', + type='list'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 06f9a0be2..1bb69f8c5 100644 --- a/plugins/modules/ibm_satellite_endpoint_info.py +++ b/plugins/modules/ibm_satellite_endpoint_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_satellite_endpoint' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - endpoint_id: + location: description: - - The Endpoint ID. + - The Location ID. required: True type: str - location: + endpoint_id: description: - - The Location ID. + - The Endpoint ID. required: True type: str iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('endpoint_id', 'str'), ('location', 'str'), + ('endpoint_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'endpoint_id', 'location', + 'endpoint_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( - endpoint_id=dict( + location=dict( required=True, type='str'), - location=dict( + endpoint_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_satellite_endpoint', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 0754b1229..88a3b9bbf 100644 --- a/plugins/modules/ibm_satellite_host.py +++ b/plugins/modules/ibm_satellite_host.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_host' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,6 +27,16 @@ - The name or ID of a Satellite location or cluster to assign the host to required: False type: str + wait_till: + description: + - Wait until location is normal + required: False + type: str + location: + description: + - (Required for new resource) The name or ID of the Satellite location + required: True + type: str host_id: description: - (Required for new resource) The specific host ID to assign to a Satellite location or cluster @@ -53,16 +63,6 @@ - Host Provider required: False type: str - location: - description: - - (Required for new resource) The name or ID of the Satellite location - required: True - type: str - wait_till: - description: - - Wait until location is normal - required: False - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -109,20 +109,20 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('host_id', 'str'), ('location', 'str'), + ('host_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'cluster', + 'wait_till', + 'location', 'host_id', 'labels', 'zone', 'worker_pool', 'host_provider', - 'location', - 'wait_till', ] # Params for Data source @@ -142,6 +142,12 @@ cluster=dict( required=False, type='str'), + wait_till=dict( + required=False, + type='str'), + location=dict( + required=False, + type='str'), host_id=dict( required=False, type='str'), @@ -158,12 +164,6 @@ host_provider=dict( required=False, type='str'), - location=dict( - required=False, - type='str'), - wait_till=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -229,7 +229,7 @@ def run_module(): resource_type='ibm_satellite_host', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 46184c24a..960543e7c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 8ea0c6da4..f010d6204 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 6cbe9f4b3..4c0a137c5 100644 --- a/plugins/modules/ibm_satellite_location.py +++ b/plugins/modules/ibm_satellite_location.py @@ -18,22 +18,31 @@ - Create, update or destroy an IBM Cloud 'ibm_satellite_location' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - cos_config: + managed_from: description: - - COSBucket - IBM Cloud Object Storage bucket configuration details + - (Required for new resource) The IBM Cloud metro from which the Satellite location is managed + required: True + type: str + zones: + description: + - The names of at least three high availability zones to use for the location required: False type: list - elements: dict - cos_credentials: + elements: str + location: description: - - COSAuthorization - IBM Cloud Object Storage authorization keys + - (Required for new resource) A unique name for the new Satellite location + required: True + type: str + description: + description: + - A description of the new Satellite location required: False - type: list - elements: dict + type: str logging_account_id: description: - The account ID for IBM Log Analysis with LogDNA log forwarding @@ -44,33 +53,24 @@ - ID of the resource group. required: False type: str - location: - description: - - (Required for new resource) A unique name for the new Satellite location - required: True - type: str - description: + cos_config: description: - - A description of the new Satellite location + - COSBucket - IBM Cloud Object Storage bucket configuration details required: False - type: str - zones: + type: list + elements: dict + cos_credentials: description: - - The names of at least three high availability zones to use for the location + - COSAuthorization - IBM Cloud Object Storage authorization keys required: False type: list - elements: str + elements: dict tags: description: - List of tags associated with resource instance required: False type: list elements: str - managed_from: - description: - - (Required for new resource) The IBM Cloud metro from which the Satellite location is managed - required: True - type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -117,21 +117,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('location', 'str'), ('managed_from', 'str'), + ('location', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'cos_config', - 'cos_credentials', - 'logging_account_id', - 'resource_group_id', + 'managed_from', + 'zones', 'location', 'description', - 'zones', + 'logging_account_id', + 'resource_group_id', + 'cos_config', + 'cos_credentials', 'tags', - 'managed_from', ] # Params for Data source @@ -150,37 +150,37 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - cos_config=dict( + managed_from=dict( required=False, - elements='', - type='list'), - cos_credentials=dict( + type='str'), + zones=dict( required=False, elements='', type='list'), - logging_account_id=dict( + location=dict( required=False, type='str'), - resource_group_id=dict( + description=dict( required=False, type='str'), - location=dict( + logging_account_id=dict( required=False, type='str'), - description=dict( + resource_group_id=dict( required=False, type='str'), - zones=dict( + cos_config=dict( required=False, elements='', type='list'), - tags=dict( + cos_credentials=dict( required=False, elements='', type='list'), - managed_from=dict( + tags=dict( required=False, - type='str'), + elements='', + type='list'), id=dict( required=False, type='str'), @@ -246,7 +246,7 @@ def run_module(): resource_type='ibm_satellite_location', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4757264f5..19adfcd8a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 bbe520287..e2d1084d3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 dd32f7674..779f13b2b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 0fc277985..dc630041b 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 8d0144e68..9fd2413b4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 59bb7d662..020886e28 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ea27634ba..56e9ac1dc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c4a030727..bbe0d3276 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 fd6ae88d8..f80bf498d 100644 --- a/plugins/modules/ibm_scc_posture_collector.py +++ b/plugins/modules/ibm_scc_posture_collector.py @@ -18,15 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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. @@ -53,6 +48,11 @@ - 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 = [ - 'is_ubi_image', 'name', 'is_public', 'managed_by', 'description', 'passphrase', + 'is_ubi_image', ] # Params for Data source @@ -128,9 +128,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( - is_ubi_image=dict( - required=False, - type='bool'), name=dict( required=False, type='str'), @@ -146,6 +143,9 @@ 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.41.1', + ibm_provider_version='1.42.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 2526bfebb..0bf03f1e7 100644 --- a/plugins/modules/ibm_scc_posture_credential.py +++ b/plugins/modules/ibm_scc_posture_credential.py @@ -18,21 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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. @@ -59,6 +48,17 @@ 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 = [ - ('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 = [ - 'group', - 'purpose', 'enabled', 'type', 'name', 'description', 'display_fields', + 'group', + 'purpose', ] # Params for Data source @@ -139,13 +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( - group=dict( - required=False, - elements='', - type='list'), - purpose=dict( - required=False, - type='str'), enabled=dict( required=False, type='bool'), @@ -162,6 +155,13 @@ 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.41.1', + ibm_provider_version='1.42.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 453dfafa5..bd45d00f9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 18453d8cc..1a3900ce6 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 ea2507739..b57645116 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - 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 iaas_classic_username: @@ -64,14 +64,14 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('profile_type', 'str'), ('profile_id', 'str'), + ('profile_type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'profile_type', 'profile_id', + 'profile_type', ] @@ -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_type=dict( + profile_id=dict( required=True, type='str'), - profile_id=dict( + profile_type=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.41.1', + ibm_provider_version='1.42.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 6010b4df8..a943540b9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 327be31e9..ee130ccc8 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 df1eafb82..ff8280124 100644 --- a/plugins/modules/ibm_scc_posture_scan_summary_info.py +++ b/plugins/modules/ibm_scc_posture_scan_summary_info.py @@ -17,18 +17,18 @@ description: - Retrieve an IBM Cloud 'ibm_scc_posture_scan_summary' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - profile_id: + scan_id: description: - - The profile ID. This can be obtained from the Security and Compliance Center UI by clicking on the profile name. The URL contains the ID. + - Your Scan ID. required: True type: str - scan_id: + profile_id: description: - - Your Scan ID. + - The profile ID. This can be obtained from the Security and Compliance Center UI by clicking on the profile name. The URL contains the ID. 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'), ('scan_id', 'str'), + ('profile_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'profile_id', 'scan_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( + scan_id=dict( required=True, type='str'), - scan_id=dict( + profile_id=dict( required=True, type='str'), iaas_classic_username=dict( @@ -122,7 +122,7 @@ def run_module(): resource_type='ibm_scc_posture_scan_summary', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 ea4310ad4..dce6d17b0 100644 --- a/plugins/modules/ibm_scc_posture_scope.py +++ b/plugins/modules/ibm_scc_posture_scope.py @@ -18,10 +18,20 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + name: + description: + - (Required for new resource) A unique name for your scope. + required: True + type: str + description: + description: + - (Required for new resource) A detailed description of the scope. + required: True + type: str collector_ids: description: - (Required for new resource) The unique IDs of the collectors that are attached to the scope. @@ -38,16 +48,6 @@ - (Required for new resource) The environment that the scope is targeted to. required: True type: str - name: - description: - - (Required for new resource) A unique name for your scope. - required: True - type: str - description: - description: - - (Required for new resource) A detailed description of the scope. - 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 = [ + ('name', 'str'), + ('description', 'str'), ('collector_ids', 'list'), ('credential_id', 'str'), ('credential_type', 'str'), - ('name', 'str'), - ('description', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'name', + 'description', 'collector_ids', 'credential_id', 'credential_type', - 'name', - 'description', ] # Params for Data source @@ -124,6 +124,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=False, + type='str'), + description=dict( + required=False, + type='str'), collector_ids=dict( required=False, elements='', @@ -134,12 +140,6 @@ credential_type=dict( required=False, type='str'), - name=dict( - required=False, - type='str'), - description=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -205,7 +205,7 @@ def run_module(): resource_type='ibm_scc_posture_scope', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 d9c1419ba..2c624f7ae 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 9bdcec47f..47282f805 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 4722515ca..a1b983559 100644 --- a/plugins/modules/ibm_scc_rule.py +++ b/plugins/modules/ibm_scc_rule.py @@ -18,24 +18,35 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_rule' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + description: + description: + - (Required for new resource) An extended description of your rule. + required: True + type: str enforcement_actions: 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. required: False type: list elements: dict - name: + required_config: description: - - (Required for new resource) A human-readable alias to assign to your rule. + - (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. + required: True + type: list + elements: dict + account_id: + description: + - (Required for new resource) Your IBM Cloud account ID. required: True type: str - description: + name: description: - - (Required for new resource) An extended description of your rule. + - (Required for new resource) A human-readable alias to assign to your rule. required: True type: str labels: @@ -44,23 +55,12 @@ required: False type: list 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. - required: True - type: list - 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 - account_id: - description: - - (Required for new resource) Your IBM Cloud account ID. - 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 = [ - ('name', 'str'), ('description', 'str'), ('required_config', 'list'), - ('target', 'list'), ('account_id', 'str'), + ('name', 'str'), + ('target', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'description', 'enforcement_actions', + 'required_config', + 'account_id', 'name', - 'description', 'labels', - 'required_config', 'target', - 'account_id', ] # Params for Data source @@ -139,31 +139,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'), enforcement_actions=dict( required=False, elements='', type='list'), - name=dict( + required_config=dict( + required=False, + elements='', + type='list'), + account_id=dict( required=False, type='str'), - description=dict( + name=dict( required=False, type='str'), labels=dict( required=False, elements='', type='list'), - required_config=dict( - required=False, - elements='', - type='list'), target=dict( required=False, elements='', type='list'), - account_id=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.41.1', + ibm_provider_version='1.42.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 5c2d55454..e1f3c0196 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + account_id: + description: + - (Required for new resource) Your IBM Cloud account ID. + required: True + type: str included_scope: description: - (Required for new resource) The extent at which the rule can be attached across your accounts. @@ -39,11 +44,6 @@ - (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. - 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 = [ + ('account_id', 'str'), ('included_scope', 'list'), ('rule_id', 'str'), - ('account_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'account_id', 'included_scope', 'excluded_scopes', 'rule_id', - 'account_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( + account_id=dict( + required=False, + type='str'), included_scope=dict( required=False, elements='', @@ -128,9 +131,6 @@ rule_id=dict( required=False, type='str'), - account_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.41.1', + ibm_provider_version='1.42.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 f8ef8ac3e..87b8e67d2 100644 --- a/plugins/modules/ibm_scc_si_note.py +++ b/plugins/modules/ibm_scc_si_note.py @@ -18,21 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_si_note' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - kind: - 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: True - type: str - card: - description: - - Card provides details about a card kind of note. - required: False - type: list - elements: dict account_id: description: - None @@ -43,23 +32,6 @@ - (Required for new resource) A more detailed description of your note. required: True type: str - note_id: - description: - - (Required for new resource) The ID of the note. - required: True - type: str - related_url: - description: - - None - required: False - type: list - elements: dict - shared: - description: - - True if this note can be shared by multiple accounts. - required: False - type: bool - default: True finding: description: - FindingType provides details about a finding note. @@ -72,7 +44,12 @@ required: False type: list elements: dict - section: + kind: + 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: True + type: str + card: description: - Card provides details about a card kind of note. required: False @@ -83,17 +60,40 @@ - (Required for new resource) A one sentence description of your note. required: True type: str - reported_by: + note_id: description: - - (Required for new resource) The entity reporting a note. + - (Required for new resource) The ID of the note. required: True + type: str + related_url: + description: + - None + 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: description: - (Required for new resource) Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. required: True type: str + reported_by: + description: + - (Required for new resource) The entity reporting a note. + required: True + type: list + elements: dict + section: + description: + - Card provides details about a card kind of note. + required: False + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -140,29 +140,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('kind', 'str'), ('long_description', 'str'), - ('note_id', 'str'), + ('kind', 'str'), ('short_description', 'str'), - ('reported_by', 'list'), + ('note_id', 'str'), ('provider_id', 'str'), + ('reported_by', 'list'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'kind', - 'card', 'account_id', 'long_description', - 'note_id', - 'related_url', - 'shared', 'finding', 'kpi', - 'section', + 'kind', + 'card', 'short_description', - 'reported_by', + 'note_id', + 'related_url', + 'shared', 'provider_id', + 'reported_by', + 'section', ] # Params for Data source @@ -184,17 +184,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( - kind=dict( + account_id=dict( required=False, type='str'), - card=dict( + long_description=dict( + required=False, + type='str'), + finding=dict( required=False, elements='', type='list'), - account_id=dict( + kpi=dict( + required=False, + elements='', + type='list'), + kind=dict( required=False, type='str'), - long_description=dict( + card=dict( + required=False, + elements='', + type='list'), + short_description=dict( required=False, type='str'), note_id=dict( @@ -207,11 +218,10 @@ shared=dict( required=False, type='bool'), - finding=dict( + provider_id=dict( required=False, - elements='', - type='list'), - kpi=dict( + type='str'), + reported_by=dict( required=False, elements='', type='list'), @@ -219,16 +229,6 @@ required=False, elements='', type='list'), - short_description=dict( - required=False, - type='str'), - reported_by=dict( - required=False, - elements='', - type='list'), - provider_id=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -294,7 +294,7 @@ def run_module(): resource_type='ibm_scc_si_note', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b4746fa57..cdffa45c6 100644 --- a/plugins/modules/ibm_scc_si_note_info.py +++ b/plugins/modules/ibm_scc_si_note_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_note' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -131,7 +131,7 @@ def run_module(): resource_type='ibm_scc_si_note', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 1a34aa9b0..50e701d12 100644 --- a/plugins/modules/ibm_scc_si_notes_info.py +++ b/plugins/modules/ibm_scc_si_notes_info.py @@ -17,7 +17,7 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_notes' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -139,7 +139,7 @@ def run_module(): resource_type='ibm_scc_si_notes', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 8683e0b50..634daf76f 100644 --- a/plugins/modules/ibm_scc_si_occurrence.py +++ b/plugins/modules/ibm_scc_si_occurrence.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_si_occurrence' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -28,6 +28,12 @@ required: False type: list elements: dict + finding: + description: + - Finding provides details about a finding occurrence. + required: False + type: list + elements: dict account_id: description: - None @@ -38,11 +44,6 @@ - (Required for new resource) Part of the parent. This field contains the provider ID. For example: providers/{provider_id}. required: True type: str - note_name: - 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. - required: True - type: str occurrence_id: description: - (Required for new resource) The id of the occurrence. @@ -64,23 +65,22 @@ required: False type: list elements: dict - kind: - 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: True - type: str - finding: - description: - - Finding provides details about a finding occurrence. - required: False - type: list - elements: dict replace_if_exists: description: - When set to true, an existing occurrence is replaced rather than duplicated. required: False type: bool default: False + note_name: + 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. + required: True + type: str + kind: + 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: True + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -128,36 +128,36 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ ('provider_id', 'str'), - ('note_name', 'str'), ('occurrence_id', 'str'), + ('note_name', 'str'), ('kind', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'context', + 'finding', 'account_id', 'provider_id', - 'note_name', 'occurrence_id', 'resource_url', 'remediation', 'kpi', - 'kind', - 'finding', 'replace_if_exists', + 'note_name', + 'kind', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ - ('provider_id', 'str'), ('occurrence_id', 'str'), + ('provider_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'occurrence_id', 'account_id', 'provider_id', - 'occurrence_id', ] TL_CONFLICTS_MAP = { @@ -171,15 +171,16 @@ required=False, elements='', type='list'), + finding=dict( + required=False, + elements='', + type='list'), account_id=dict( required=False, type='str'), provider_id=dict( required=False, type='str'), - note_name=dict( - required=False, - type='str'), occurrence_id=dict( required=False, type='str'), @@ -193,16 +194,15 @@ required=False, elements='', type='list'), - kind=dict( - required=False, - type='str'), - finding=dict( - required=False, - elements='', - type='list'), replace_if_exists=dict( required=False, type='bool'), + note_name=dict( + required=False, + type='str'), + kind=dict( + required=False, + type='str'), id=dict( required=False, type='str'), @@ -268,7 +268,7 @@ def run_module(): resource_type='ibm_scc_si_occurrence', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 7e3e83381..9f429fc4f 100644 --- a/plugins/modules/ibm_scc_si_occurrence_info.py +++ b/plugins/modules/ibm_scc_si_occurrence_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_scc_si_occurrence' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + occurrence_id: + description: + - Second part of occurrence `name`: providers/{provider_id}/occurrences/{occurrence_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 - occurrence_id: - description: - - Second part of occurrence `name`: providers/{provider_id}/occurrences/{occurrence_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'), ('occurrence_id', 'str'), + ('provider_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'occurrence_id', 'account_id', 'provider_id', - 'occurrence_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( + occurrence_id=dict( + required=True, + type='str'), account_id=dict( required=False, type='str'), provider_id=dict( required=True, type='str'), - occurrence_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_occurrence', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 9d24fa4cc..6dd2ffcd4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 5a365cdfa..9ab4112a4 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 301f2b8cb..ce857102a 100644 --- a/plugins/modules/ibm_scc_template.py +++ b/plugins/modules/ibm_scc_template.py @@ -18,10 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_scc_template' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + customized_defaults: + description: + - (Required for new resource) A list of default property values to apply to your template. + required: True + type: list + elements: dict + account_id: + description: + - (Required for new resource) Your IBM Cloud account ID. + required: True + type: str name: description: - (Required for new resource) A human-readablse alias to assign to your template. @@ -38,17 +49,6 @@ required: True type: list elements: dict - customized_defaults: - description: - - (Required for new resource) A list of default property values to apply to your template. - required: True - type: list - elements: dict - account_id: - description: - - (Required for new resource) Your IBM Cloud account ID. - required: True - type: str 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 = [ + ('customized_defaults', 'list'), + ('account_id', 'str'), ('name', 'str'), ('description', 'str'), ('target', 'list'), - ('customized_defaults', 'list'), - ('account_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'customized_defaults', + 'account_id', 'name', 'description', 'target', - 'customized_defaults', - 'account_id', ] # Params for Data source @@ -125,6 +125,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( + customized_defaults=dict( + required=False, + elements='', + type='list'), + account_id=dict( + required=False, + type='str'), name=dict( required=False, type='str'), @@ -135,13 +142,6 @@ required=False, elements='', type='list'), - customized_defaults=dict( - required=False, - elements='', - type='list'), - account_id=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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 9df9e2b90..069ef2a0b 100644 --- a/plugins/modules/ibm_scc_template_attachment.py +++ b/plugins/modules/ibm_scc_template_attachment.py @@ -18,7 +18,7 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -196,7 +196,7 @@ def run_module(): resource_type='ibm_scc_template_attachment', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4c5e71e63..4cbfc7c78 100644 --- a/plugins/modules/ibm_schematics_action.py +++ b/plugins/modules/ibm_schematics_action.py @@ -18,29 +18,28 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_action' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - command_parameter: + description: description: - - Schematics job command parameter (playbook-name). + - Action description. required: False type: str - sys_lock: + resource_group: description: - - System lock status. + - Resource-group name for an action. By default, action is created in default resource group. required: False - type: list - elements: dict - x_github_token: + type: str + command_parameter: description: - - The personal access token to authenticate with your private GitHub or GitLab repository and access your Terraform template. + - Schematics job command parameter (playbook-name). required: False type: str - settings: + credentials: description: - - Environment variables for the Action. + - credentials of the Action. required: False type: list elements: dict @@ -49,89 +48,90 @@ - (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 - 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 - bastion: + type: str + inventory: description: - - Describes a bastion resource. + - Target inventory record ID, used by the action or ansible playbook. + required: False + type: str + bastion_credential: + description: + - User editable variable data & system generated reference to value. required: False type: list elements: dict - action_inputs: + action_outputs: description: - - Input variables for the Action. + - Output variables for the Action. required: False type: list elements: dict - description: + location: description: - - Action 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 - bastion_credential: - description: - - User editable variable data & system generated reference to value. - 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: + action_inputs: description: - - Action tags. + - Input variables for the Action. required: False type: list - elements: str - source_type: + elements: dict + settings: description: - - Type of source for the Template. + - Environment variables for the Action. required: False - type: str - source_readme_url: + type: list + elements: dict + x_github_token: description: - - URL of the `README` file, for the source URL. + - The personal access token to authenticate with your private GitHub or GitLab repository and access your Terraform template. required: False type: str - source: + sys_lock: description: - - Source of templates, playbooks, or controls. + - System lock status. required: False type: list elements: dict - credentials: + tags: description: - - credentials of the Action. + - Action tags. required: False type: list - elements: dict - action_outputs: + elements: str + user_state: description: - - Output variables for the Action. + - User defined status of the Schematics object. required: False type: list elements: dict - location: + source: 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. + - Source of templates, playbooks, or controls. required: False - type: str - resource_group: + type: list + elements: dict + source_type: description: - - Resource-group name for an action. By default, action is created in default resource group. + - Type of source for the Template. required: False type: str - inventory: + bastion: description: - - Target inventory record ID, used by the action or ansible playbook. + - Describes a bastion resource. required: False - type: str + type: list + elements: dict id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -183,26 +183,26 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'description', + 'resource_group', 'command_parameter', - 'sys_lock', - 'x_github_token', - 'settings', + 'credentials', 'name', - 'user_state', - 'bastion', - 'action_inputs', - 'description', + 'source_readme_url', + 'inventory', 'bastion_credential', + 'action_outputs', + 'location', 'targets_ini', + 'action_inputs', + 'settings', + 'x_github_token', + 'sys_lock', 'tags', - 'source_type', - 'source_readme_url', + 'user_state', 'source', - 'credentials', - 'action_outputs', - 'location', - 'resource_group', - 'inventory', + 'source_type', + 'bastion', ] # Params for Data source @@ -221,76 +221,76 @@ 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_parameter=dict( + description=dict( required=False, type='str'), - sys_lock=dict( + resource_group=dict( required=False, - elements='', - type='list'), - x_github_token=dict( + type='str'), + command_parameter=dict( required=False, type='str'), - settings=dict( + credentials=dict( required=False, elements='', type='list'), name=dict( required=False, type='str'), - user_state=dict( + source_readme_url=dict( required=False, - elements='', - type='list'), - bastion=dict( + type='str'), + inventory=dict( + required=False, + type='str'), + bastion_credential=dict( required=False, elements='', type='list'), - action_inputs=dict( + action_outputs=dict( required=False, elements='', type='list'), - description=dict( + location=dict( required=False, type='str'), - bastion_credential=dict( - required=False, - elements='', - type='list'), targets_ini=dict( required=False, type='str'), - tags=dict( + action_inputs=dict( required=False, elements='', type='list'), - source_type=dict( + settings=dict( required=False, - type='str'), - source_readme_url=dict( + elements='', + type='list'), + x_github_token=dict( required=False, type='str'), - source=dict( + sys_lock=dict( required=False, elements='', type='list'), - credentials=dict( + tags=dict( required=False, elements='', type='list'), - action_outputs=dict( + user_state=dict( required=False, elements='', type='list'), - location=dict( + source=dict( required=False, - type='str'), - resource_group=dict( + elements='', + type='list'), + source_type=dict( required=False, type='str'), - inventory=dict( + bastion=dict( required=False, - type='str'), + elements='', + type='list'), id=dict( required=False, type='str'), @@ -356,7 +356,7 @@ def run_module(): resource_type='ibm_schematics_action', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 6384724f8..21e6342a3 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 81fb593f0..4d2a825c5 100644 --- a/plugins/modules/ibm_schematics_inventory.py +++ b/plugins/modules/ibm_schematics_inventory.py @@ -18,41 +18,41 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_inventory' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: + inventories_ini: description: - - The description of your Inventory definition. The description can be up to 2048 characters long in size. + - Input inventory of host and host group for the playbook, in the `.ini` file format. required: False type: str - resource_group: + resource_queries: description: - - Resource-group name for the Inventory definition. By default, Inventory definition will be created in Default Resource Group. + - Input resource query definitions that is used to dynamically generate the inventory of host and host group for the playbook. required: False - type: str - name: + type: list + elements: str + location: 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. + - 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 - location: + description: 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. + - The description of your Inventory definition. The description can be up to 2048 characters long in size. required: False type: str - inventories_ini: + resource_group: description: - - Input inventory of host and host group for the playbook, in the `.ini` file format. + - Resource-group name for the Inventory definition. By default, Inventory definition will be created in Default Resource Group. required: False type: str - resource_queries: + name: description: - - Input resource query definitions that is used to dynamically generate the inventory of host and host group for the playbook. + - 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: list - elements: str + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource 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', 'name', - 'location', - 'inventories_ini', - 'resource_queries', ] # Params for Data source @@ -127,25 +127,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( + inventories_ini=dict( required=False, type='str'), - resource_group=dict( + resource_queries=dict( required=False, - type='str'), - name=dict( + elements='', + type='list'), + location=dict( required=False, type='str'), - location=dict( + description=dict( required=False, type='str'), - inventories_ini=dict( + resource_group=dict( required=False, type='str'), - resource_queries=dict( + name=dict( required=False, - elements='', - type='list'), + type='str'), id=dict( required=False, type='str'), @@ -211,7 +211,7 @@ def run_module(): resource_type='ibm_schematics_inventory', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 66b370096..a90bf32dc 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 89be623b3..41d7a196a 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - command_object_id: + command_name: description: - - (Required for new resource) Job command object id (workspace-id, action-id). + - (Required for new resource) Schematics job command name. required: True type: str job_env_settings: @@ -33,26 +33,42 @@ required: False type: list elements: dict - command_name: + command_options: description: - - (Required for new resource) Schematics job command name. - required: True + - Command line options for the command. + 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 - job_inputs: + log_summary: description: - - Job inputs used by Action or Workspace. + - Job log summary record. required: False type: list elements: dict + command_object_id: + description: + - (Required for new resource) Job command object id (workspace-id, action-id). + required: True + type: str + command_parameter: + description: + - Schematics job command parameter (playbook-name). + required: False + type: str tags: description: - User defined tags, while running the job. required: False type: list elements: str - bastion: + data: description: - - Describes a bastion resource. + - Job data. required: False type: list elements: dict @@ -61,34 +77,18 @@ - (Required for new resource) Name of the Schematics automation resource. required: True type: str - command_options: - description: - - Command line options for the command. - required: False - type: list - elements: str - data: + job_inputs: description: - - Job data. + - Job inputs used by Action or Workspace. required: False type: list elements: dict - log_summary: + bastion: description: - - Job log summary record. + - Describes a bastion resource. required: False type: list elements: dict - command_parameter: - description: - - Schematics job command parameter (playbook-name). - 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 id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -135,25 +135,25 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('command_object_id', 'str'), ('command_name', 'str'), + ('command_object_id', 'str'), ('command_object', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'command_object_id', - 'job_env_settings', 'command_name', - 'job_inputs', - 'tags', - 'bastion', - 'command_object', + 'job_env_settings', 'command_options', - 'data', + 'location', 'log_summary', + 'command_object_id', 'command_parameter', - 'location', + 'tags', + 'data', + 'command_object', + 'job_inputs', + 'bastion', ] # Params for Data source @@ -172,49 +172,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( - command_object_id=dict( + command_name=dict( required=False, type='str'), job_env_settings=dict( required=False, elements='', type='list'), - command_name=dict( + command_options=dict( + required=False, + elements='', + type='list'), + location=dict( required=False, type='str'), - job_inputs=dict( + log_summary=dict( required=False, elements='', type='list'), + command_object_id=dict( + required=False, + type='str'), + command_parameter=dict( + required=False, + type='str'), tags=dict( required=False, elements='', type='list'), - bastion=dict( + data=dict( required=False, elements='', type='list'), command_object=dict( required=False, type='str'), - command_options=dict( - required=False, - elements='', - type='list'), - data=dict( + job_inputs=dict( required=False, elements='', type='list'), - log_summary=dict( + bastion=dict( required=False, elements='', type='list'), - command_parameter=dict( - required=False, - type='str'), - location=dict( - required=False, - type='str'), id=dict( required=False, type='str'), @@ -280,7 +280,7 @@ def run_module(): resource_type='ibm_schematics_job', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 9d6403b36..beb591ac9 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 326898c51..1e047ccc7 100644 --- a/plugins/modules/ibm_schematics_output_info.py +++ b/plugins/modules/ibm_schematics_output_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_output' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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. @@ -36,6 +31,11 @@ - 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.41.1', + ibm_provider_version='1.42.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 8fece633a..e541d232e 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 23e2309e1..fdf73ce80 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 351209ff3..28a60ec1f 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 7969e6ced..2fcaeacd0 100644 --- a/plugins/modules/ibm_schematics_workspace.py +++ b/plugins/modules/ibm_schematics_workspace.py @@ -18,167 +18,167 @@ - Create, update or destroy an IBM Cloud 'ibm_schematics_workspace' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: + frozen_at: description: - - The description of the workspace. + - The timestamp when the workspace was frozen. required: False type: str - resource_group: + location: description: - - The ID of the resource group where you want to provision the workspace. + - 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 - template_env_settings: + x_github_token: description: - - A list of environment variables that you want to apply during the execution of a bash script or Terraform job. This field must be provided as a list of key-value pairs, for example, **TF_LOG=debug**. Each entry will be a map with one entry where `key is the environment variable name and value is value`. You can define environment variables for IBM Cloud catalog offerings that are provisioned by using a bash script. See [example to use special environment variable](https://cloud.ibm.com/docs/schematics?topic=schematics-set-parallelism#parallelism-example) that are supported by Schematics. + - 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: + description: + - List of values metadata. required: False type: list elements: dict - locked: + template_git_release: description: - - If set to true, the workspace is locked and disabled for changes. + - The repository release. required: False - type: bool - applied_shareddata_ids: + type: str + 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 - tags: + elements: dict + 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 - frozen_by: - description: - - The user ID that froze the workspace. - required: False - type: str - x_github_token: + elements: dict + template_uninstall_script_name: description: - - The personal access token to authenticate with your private GitHub or GitLab repository and access your Terraform template. + - Uninstall script name. required: False type: str - shared_data: + 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 + 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 template_init_state_file: 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 `. required: False type: str - template_values: + template_git_url: 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. + - The source URL. required: False type: str - frozen_at: + description: description: - - The timestamp when the workspace was frozen. + - The description of the workspace. required: False type: str - template_git_repo_url: + template_env_settings: description: - - The repository URL. + - A list of environment variables that you want to apply during the execution of a bash script or Terraform job. This field must be provided as a list of key-value pairs, for example, **TF_LOG=debug**. Each entry will be a map with one entry where `key is the environment variable name and value is value`. You can define environment variables for IBM Cloud catalog offerings that are provisioned by using a bash script. See [example to use special environment variable](https://cloud.ibm.com/docs/schematics?topic=schematics-set-parallelism#parallelism-example) that are supported by Schematics. required: False - type: str - name: + type: list + elements: dict + template_values: 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 + - 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_branch: + template_ref: description: - - The repository branch. + - Workspace template ref. required: False type: str - template_git_release: + template_git_has_uploadedgitrepotar: description: - - The repository release. + - Has uploaded git repo tar required: False - type: str - template_git_repo_sha_value: + type: bool + locked_time: description: - - The repository SHA value. + - The timestamp when the workspace was locked. required: False type: str - template_git_url: + frozen: description: - - The source URL. + - If set to true, the workspace is frozen and changes to the workspace are disabled. required: False - type: str - catalog_ref: + type: bool + frozen_by: description: - - Information about the software template that you chose from the IBM Cloud catalog. This information is returned for IBM Cloud catalog offerings only. + - The user ID that froze the workspace. required: False - type: list - elements: dict - template_type: + type: str + template_git_branch: 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 + - The repository branch. + required: False type: str - template_values_metadata: + template_git_repo_sha_value: description: - - List of values metadata. + - The repository SHA value. required: False - type: list - elements: dict - template_inputs: + type: str + applied_shareddata_ids: description: - - VariablesRequest -. + - List of applied shared dataset ID. required: False type: list - elements: dict - locked_time: + elements: str + name: description: - - The timestamp when the workspace was locked. - required: False + - (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 - location: + resource_group: 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. + - The ID of the resource group where you want to provision the workspace. required: False type: str + tags: + description: + - A list of tags that are associated with the workspace. + required: False + type: list + elements: str template_git_folder: description: - The subfolder in your GitHub or GitLab repository where your Terraform template is stored. required: False type: str - template_uninstall_script_name: + template_type: description: - - Uninstall script name. - 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 - template_git_has_uploadedgitrepotar: - description: - - Has uploaded git repo tar - required: False - type: bool - template_ref: + template_git_repo_url: description: - - Workspace template ref. + - The repository URL. required: False type: str - frozen: + locked: description: - - If set to true, the workspace is frozen and changes to the workspace are disabled. + - If set to true, the workspace is locked and disabled for changes. required: False type: bool - 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 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 = [ - 'description', - 'resource_group', - 'template_env_settings', - 'locked', - 'applied_shareddata_ids', - 'tags', - 'frozen_by', + 'frozen_at', + 'location', 'x_github_token', + 'template_values_metadata', + 'template_git_release', + 'catalog_ref', 'shared_data', + 'template_uninstall_script_name', + 'template_inputs', + 'locked_by', 'template_init_state_file', + 'template_git_url', + 'description', + 'template_env_settings', 'template_values', - 'frozen_at', - 'template_git_repo_url', - 'name', + 'template_ref', + 'template_git_has_uploadedgitrepotar', + 'locked_time', + 'frozen', + 'frozen_by', 'template_git_branch', - 'template_git_release', 'template_git_repo_sha_value', - 'template_git_url', - 'catalog_ref', - 'template_type', - 'template_values_metadata', - 'template_inputs', - 'locked_time', - 'location', + 'applied_shareddata_ids', + 'name', + 'resource_group', + 'tags', 'template_git_folder', - 'template_uninstall_script_name', - 'template_git_has_uploadedgitrepotar', - 'template_ref', - 'frozen', - 'locked_by', + 'template_type', + 'template_git_repo_url', + 'locked', ] # Params for Data source @@ -269,9 +269,9 @@ ] TL_ALL_PARAMETERS_DS = [ - 'template_git_has_uploadedgitrepotar', - 'workspace_id', 'template_values_metadata', + 'workspace_id', + 'template_git_has_uploadedgitrepotar', ] TL_CONFLICTS_MAP = { @@ -281,103 +281,103 @@ 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( + frozen_at=dict( required=False, type='str'), - resource_group=dict( + location=dict( required=False, type='str'), - template_env_settings=dict( + x_github_token=dict( + required=False, + type='str'), + template_values_metadata=dict( required=False, elements='', type='list'), - locked=dict( + template_git_release=dict( required=False, - type='bool'), - applied_shareddata_ids=dict( + type='str'), + catalog_ref=dict( required=False, elements='', type='list'), - tags=dict( + shared_data=dict( required=False, elements='', type='list'), - frozen_by=dict( - required=False, - type='str'), - x_github_token=dict( + template_uninstall_script_name=dict( required=False, type='str'), - shared_data=dict( + template_inputs=dict( required=False, elements='', type='list'), + locked_by=dict( + required=False, + type='str'), template_init_state_file=dict( required=False, type='str'), - template_values=dict( + template_git_url=dict( required=False, type='str'), - frozen_at=dict( + description=dict( required=False, type='str'), - template_git_repo_url=dict( + template_env_settings=dict( + required=False, + elements='', + type='list'), + template_values=dict( required=False, type='str'), - name=dict( + template_ref=dict( required=False, type='str'), - template_git_branch=dict( + template_git_has_uploadedgitrepotar=dict( + required=False, + type='bool'), + locked_time=dict( required=False, type='str'), - template_git_release=dict( + frozen=dict( + required=False, + type='bool'), + frozen_by=dict( required=False, type='str'), - template_git_repo_sha_value=dict( + template_git_branch=dict( required=False, type='str'), - template_git_url=dict( + template_git_repo_sha_value=dict( required=False, type='str'), - catalog_ref=dict( + applied_shareddata_ids=dict( required=False, elements='', type='list'), - template_type=dict( + name=dict( required=False, type='str'), - template_values_metadata=dict( + resource_group=dict( required=False, - elements='', - type='list'), - template_inputs=dict( + type='str'), + tags=dict( required=False, elements='', type='list'), - locked_time=dict( - required=False, - type='str'), - location=dict( - required=False, - type='str'), template_git_folder=dict( required=False, type='str'), - template_uninstall_script_name=dict( + template_type=dict( required=False, type='str'), - template_git_has_uploadedgitrepotar=dict( - required=False, - type='bool'), - template_ref=dict( + template_git_repo_url=dict( required=False, type='str'), - frozen=dict( + locked=dict( required=False, type='bool'), - locked_by=dict( - required=False, - type='str'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b9b99734d..9f50d6e0f 100644 --- a/plugins/modules/ibm_schematics_workspace_info.py +++ b/plugins/modules/ibm_schematics_workspace_info.py @@ -17,26 +17,26 @@ description: - Retrieve an IBM Cloud 'ibm_schematics_workspace' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - template_git_has_uploadedgitrepotar: + template_values_metadata: description: - - Has uploaded Git repository tar. + - A list of input variables that are associated with the workspace. required: False - type: bool + 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_values_metadata: + template_git_has_uploadedgitrepotar: description: - - A list of input variables that are associated with the workspace. + - Has uploaded Git repository tar. required: False - type: list - elements: dict + 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 = [ - 'template_git_has_uploadedgitrepotar', - 'workspace_id', 'template_values_metadata', + 'workspace_id', + 'template_git_has_uploadedgitrepotar', ] @@ -88,16 +88,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( - template_git_has_uploadedgitrepotar=dict( + template_values_metadata=dict( required=False, - type='bool'), + elements='', + type='list'), workspace_id=dict( required=True, type='str'), - template_values_metadata=dict( + template_git_has_uploadedgitrepotar=dict( required=False, - elements='', - type='list'), + type='bool'), iaas_classic_username=dict( type='str', no_log=True, @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_schematics_workspace', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 2d271b570..5e1010c04 100644 --- a/plugins/modules/ibm_secrets_manager_secret_info.py +++ b/plugins/modules/ibm_secrets_manager_secret_info.py @@ -17,15 +17,10 @@ description: - Retrieve an IBM Cloud 'ibm_secrets_manager_secret' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - instance_id: - description: - - Secrets Manager instance GUID - required: True - type: str secret_type: description: - The secret type. Supported options include: arbitrary, iam_credentials, username_password. @@ -36,6 +31,11 @@ - The v4 UUID that uniquely identifies the secret. required: True type: str + instance_id: + description: + - Secrets Manager instance GUID + required: True + type: str endpoint_type: description: - Endpoint Type. 'public' or 'private' @@ -75,16 +75,16 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('instance_id', 'str'), ('secret_type', 'str'), ('secret_id', 'str'), + ('instance_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'instance_id', 'secret_type', 'secret_id', + 'instance_id', 'endpoint_type', ] @@ -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( - instance_id=dict( - required=True, - type='str'), secret_type=dict( required=True, type='str'), secret_id=dict( required=True, type='str'), + instance_id=dict( + required=True, + type='str'), endpoint_type=dict( required=False, type='str'), @@ -142,7 +142,7 @@ def run_module(): resource_type='ibm_secrets_manager_secret', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 a6c0af397..1690ad587 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 063b8bbd4..42beddd33 100644 --- a/plugins/modules/ibm_security_group.py +++ b/plugins/modules/ibm_security_group.py @@ -18,20 +18,20 @@ - Create, update or destroy an IBM Cloud 'ibm_security_group' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - description: - description: - - Security group description - required: False - type: str name: description: - (Required for new resource) Security group name required: True type: str + description: + description: + - Security group description + required: False + type: str id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -83,8 +83,8 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'description', 'name', + 'description', ] # Params for Data source @@ -105,10 +105,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( - description=dict( + name=dict( required=False, type='str'), - name=dict( + description=dict( required=False, type='str'), id=dict( @@ -176,7 +176,7 @@ def run_module(): resource_type='ibm_security_group', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 40361adfd..cc704f50d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 198229b74..01ad06367 100644 --- a/plugins/modules/ibm_security_group_rule.py +++ b/plugins/modules/ibm_security_group_rule.py @@ -18,15 +18,10 @@ - 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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 @@ -63,6 +58,11 @@ - 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,13 +109,12 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('security_group_id', 'int'), ('direction', 'str'), + ('security_group_id', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'security_group_id', 'direction', 'ether_type', 'port_range_min', @@ -123,6 +122,7 @@ 'remote_group_id', 'remote_ip', 'protocol', + 'security_group_id', ] # Params for Data source @@ -141,9 +141,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( - security_group_id=dict( - required=False, - type='int'), direction=dict( required=False, type='str'), @@ -165,6 +162,9 @@ 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.41.1', + ibm_provider_version='1.42.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 b2e5ac7a0..06c45493a 100644 --- a/plugins/modules/ibm_service_instance.py +++ b/plugins/modules/ibm_service_instance.py @@ -18,21 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_service_instance' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - plan: + tags: description: - - (Required for new resource) The plan type of the service + - 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 - wait_time_minutes: - description: - - Define timeout to wait for the service instances to succeeded/deleted etc. - required: False - type: int - default: 10 service: description: - (Required for new resource) The name of the service offering like speech_to_text, text_to_speech etc @@ -43,22 +43,22 @@ - Arbitrary parameters to pass along to the service broker. Must be a JSON object required: False type: dict - name: + plan: description: - - (Required for new resource) A name for the service instance + - (Required for new resource) The plan type of the service required: True type: str - space_guid: + wait_time_minutes: description: - - (Required for new resource) The guid of the space in which the instance will be created + - Define timeout to wait for the service instances to succeeded/deleted etc. + required: False + type: int + default: 10 + name: + description: + - (Required for new resource) A name for the service instance required: True 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,21 +105,21 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('plan', 'str'), + ('space_guid', 'str'), ('service', 'str'), + ('plan', 'str'), ('name', 'str'), - ('space_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'plan', - 'wait_time_minutes', + 'tags', + 'space_guid', 'service', 'parameters', + 'plan', + 'wait_time_minutes', 'name', - 'space_guid', - 'tags', ] # 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( - plan=dict( + tags=dict( required=False, - type='str'), - wait_time_minutes=dict( + elements='', + type='list'), + space_guid=dict( required=False, - type='int'), + type='str'), service=dict( required=False, type='str'), parameters=dict( required=False, type='dict'), - name=dict( + plan=dict( required=False, type='str'), - space_guid=dict( + wait_time_minutes=dict( required=False, - type='str'), - tags=dict( + type='int'), + name=dict( required=False, - elements='', - type='list'), + 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 76be557bb..9f47dd816 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 fc2f10d51..95a83c65a 100644 --- a/plugins/modules/ibm_service_key.py +++ b/plugins/modules/ibm_service_key.py @@ -18,20 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_service_key' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - service_instance_guid: - description: - - (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 tags: description: - None @@ -43,6 +33,16 @@ - (Required for new resource) The name of the service key required: True type: str + service_instance_guid: + description: + - (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. @@ -89,29 +89,29 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('service_instance_guid', 'str'), ('name', 'str'), + ('service_instance_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'service_instance_guid', - 'parameters', 'tags', 'name', + 'service_instance_guid', + 'parameters', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ + ('space_guid', 'str'), ('name', 'str'), ('service_instance_name', 'str'), - ('space_guid', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'space_guid', 'name', 'service_instance_name', - 'space_guid', ] TL_CONFLICTS_MAP = { @@ -121,12 +121,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( - service_instance_guid=dict( - required=False, - type='str'), - parameters=dict( - required=False, - type='dict'), tags=dict( required=False, elements='', @@ -134,6 +128,12 @@ name=dict( required=False, type='str'), + 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 b49cd18a9..7e4274c50 100644 --- a/plugins/modules/ibm_service_key_info.py +++ b/plugins/modules/ibm_service_key_info.py @@ -17,10 +17,15 @@ description: - Retrieve an IBM Cloud 'ibm_service_key' resource requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + space_guid: + description: + - The guid of the space in which the service instance is present + required: True + type: str name: description: - The name of the service key @@ -31,11 +36,6 @@ - Service instance name for example, speech_to_text required: True type: str - space_guid: - description: - - The guid of the space in which the service instance is present - 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 = [ + ('space_guid', 'str'), ('name', 'str'), ('service_instance_name', 'str'), - ('space_guid', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'space_guid', 'name', 'service_instance_name', - 'space_guid', ] @@ -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( - name=dict( + space_guid=dict( required=True, type='str'), - service_instance_name=dict( + name=dict( required=True, type='str'), - space_guid=dict( + service_instance_name=dict( required=True, type='str'), iaas_classic_username=dict( @@ -132,7 +132,7 @@ def run_module(): resource_type='ibm_service_key', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 4cf0d2941..adba77634 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 3477bfa78..7bd73d17a 100644 --- a/plugins/modules/ibm_space.py +++ b/plugins/modules/ibm_space.py @@ -18,16 +18,10 @@ - Create, update or destroy an IBM Cloud 'ibm_space' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - tags: - description: - - None - required: False - type: list - elements: str name: description: - (Required for new resource) The name for the space @@ -61,6 +55,12 @@ - The name of the Space Quota Definition 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. @@ -113,13 +113,13 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'tags', 'name', 'org', 'auditors', 'managers', 'developers', 'space_quota', + 'tags', ] # Params for Data source @@ -140,10 +140,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'), @@ -165,6 +161,10 @@ space_quota=dict( required=False, type='str'), + tags=dict( + required=False, + elements='', + type='list'), id=dict( required=False, type='str'), @@ -230,7 +230,7 @@ def run_module(): resource_type='ibm_space', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 1e41f1ffd..f9c6a2350 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 8d0ca8208..dd2766400 100644 --- a/plugins/modules/ibm_ssl_certificate.py +++ b/plugins/modules/ibm_ssl_certificate.py @@ -18,33 +18,17 @@ - Create, update or destroy an IBM Cloud 'ibm_ssl_certificate' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - ssl_type: - description: - - (Required for new resource) ssl type - required: True - type: str - certificate_signing_request: - description: - - (Required for new resource) certificate signing request info - required: True - type: str - administrative_contact_same_as_technical_flag: - description: - - Administrative contact same as technical flag - required: False - type: bool - default: False billing_address_same_as_organization_flag: description: - billing address same as organization flag required: False type: bool default: False - billing_contact: + administrative_contact: description: - None required: False @@ -55,48 +39,44 @@ - (Required for new resource) Server count required: True type: int - validity_months: - description: - - (Required for new resource) vslidity of the ssl certificate in month - required: True - type: int - organization_information: - description: - - (Required for new resource) Organization information - required: True - type: list - elements: dict - administrative_contact: - description: - - None - required: False - type: list - elements: dict renewal_flag: description: - Renewal flag required: False type: bool default: True - order_approver_email_address: + technical_contact_same_as_org_address_flag: description: - - (Required for new resource) Email address of the approver - required: True - type: str + - Technical contact same as org address flag + required: False + type: bool + default: False billing_contact_same_as_technical_flag: description: - billing contact required: False type: bool default: False - server_type: + order_approver_email_address: description: - - (Required for new resource) server type + - (Required for new resource) Email address of the approver required: True type: str - technical_contact_same_as_org_address_flag: + technical_contact: description: - - Technical contact same as org address flag + - (Required for new resource) Technical contact info + required: True + type: list + elements: dict + billing_contact: + description: + - None + 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 @@ -106,12 +86,32 @@ required: False type: bool default: False - technical_contact: + organization_information: description: - - (Required for new resource) Technical contact info + - (Required for new resource) Organization information required: True type: list elements: dict + server_type: + description: + - (Required for new resource) server type + required: True + type: str + validity_months: + description: + - (Required for new resource) vslidity of the ssl certificate in month + required: True + type: int + ssl_type: + description: + - (Required for new resource) ssl type + required: True + type: str + certificate_signing_request: + description: + - (Required for new resource) certificate signing request info + required: True + type: str 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 = [ - ('ssl_type', 'str'), - ('certificate_signing_request', 'str'), ('server_count', 'int'), - ('validity_months', 'int'), - ('organization_information', 'list'), ('order_approver_email_address', 'str'), - ('server_type', 'str'), ('technical_contact', 'list'), + ('organization_information', 'list'), + ('server_type', 'str'), + ('validity_months', 'int'), + ('ssl_type', 'str'), + ('certificate_signing_request', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'ssl_type', - 'certificate_signing_request', - 'administrative_contact_same_as_technical_flag', 'billing_address_same_as_organization_flag', - 'billing_contact', - 'server_count', - 'validity_months', - 'organization_information', 'administrative_contact', + 'server_count', 'renewal_flag', - 'order_approver_email_address', - 'billing_contact_same_as_technical_flag', - 'server_type', 'technical_contact_same_as_org_address_flag', - 'administrative_address_same_as_organization_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', + 'validity_months', + 'ssl_type', + 'certificate_signing_request', ] # Params for Data source @@ -202,58 +202,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( - ssl_type=dict( - required=False, - type='str'), - certificate_signing_request=dict( - required=False, - type='str'), - administrative_contact_same_as_technical_flag=dict( - required=False, - type='bool'), billing_address_same_as_organization_flag=dict( required=False, type='bool'), - billing_contact=dict( + administrative_contact=dict( required=False, elements='', type='list'), server_count=dict( required=False, type='int'), - validity_months=dict( - required=False, - type='int'), - organization_information=dict( - required=False, - elements='', - type='list'), - administrative_contact=dict( - required=False, - elements='', - type='list'), renewal_flag=dict( required=False, type='bool'), - order_approver_email_address=dict( + technical_contact_same_as_org_address_flag=dict( required=False, - type='str'), + type='bool'), billing_contact_same_as_technical_flag=dict( required=False, type='bool'), - server_type=dict( + order_approver_email_address=dict( required=False, type='str'), - technical_contact_same_as_org_address_flag=dict( + technical_contact=dict( + required=False, + elements='', + type='list'), + billing_contact=dict( + 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'), - technical_contact=dict( + organization_information=dict( required=False, elements='', type='list'), + server_type=dict( + required=False, + type='str'), + validity_months=dict( + required=False, + type='int'), + ssl_type=dict( + required=False, + type='str'), + certificate_signing_request=dict( + required=False, + type='str'), 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.41.1', + ibm_provider_version='1.42.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 800810c2a..74bc42b9a 100644 --- a/plugins/modules/ibm_storage_block.py +++ b/plugins/modules/ibm_storage_block.py @@ -18,75 +18,75 @@ - Create, update or destroy an IBM Cloud 'ibm_storage_block' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - capacity: - description: - - (Required for new resource) Storage block size - required: True - type: int - iops: - description: - - (Required for new resource) IOPS value required - required: True - type: float - type: - description: - - (Required for new resource) Storage block type - required: True - type: str - notes: + allowed_virtual_guest_ids: description: - - Additional note info + - List of allowed virtual guest IDs required: False - type: str + type: list + elements: int allowed_hardware_ids: description: - List of allowe hardware IDs required: False type: list elements: int + allowed_ip_addresses: + description: + - Allowed IP addresses + required: False + type: list + elements: str + tags: + description: + - List of tags associated with the resource + required: False + type: list + elements: str hourly_billing: description: - Billing done hourly, if set to true required: False type: bool default: False - snapshot_capacity: + capacity: description: - - Snapshot capacity in GB - required: False + - (Required for new resource) Storage block size + required: True type: int - os_format_type: + iops: description: - - (Required for new resource) OS formatr type + - (Required for new resource) IOPS value required required: True - type: str - allowed_virtual_guest_ids: + type: float + snapshot_capacity: description: - - List of allowed virtual guest IDs + - Snapshot capacity in GB required: False - type: list - elements: int - allowed_ip_addresses: + type: int + notes: description: - - Allowed IP addresses + - Additional note info required: False - type: list - elements: str + type: str datacenter: description: - (Required for new resource) Datacenter name required: True type: str - tags: + os_format_type: description: - - List of tags associated with the resource - required: False - type: list - elements: str + - (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. @@ -135,25 +135,25 @@ TL_REQUIRED_PARAMETERS = [ ('capacity', 'int'), ('iops', 'float'), - ('type', 'str'), - ('os_format_type', 'str'), ('datacenter', 'str'), + ('os_format_type', 'str'), + ('type', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'capacity', - 'iops', - 'type', - 'notes', + 'allowed_virtual_guest_ids', 'allowed_hardware_ids', + 'allowed_ip_addresses', + 'tags', 'hourly_billing', + 'capacity', + 'iops', 'snapshot_capacity', - 'os_format_type', - 'allowed_virtual_guest_ids', - 'allowed_ip_addresses', + 'notes', 'datacenter', - 'tags', + 'os_format_type', + 'type', ] # Params for Data source @@ -170,46 +170,46 @@ from ansible_collections.ibm.cloudcollection.plugins.module_utils.ibmcloud import Terraform, ibmcloud_terraform from ansible.module_utils.basic import env_fallback module_args = dict( - capacity=dict( - required=False, - type='int'), - iops=dict( + allowed_virtual_guest_ids=dict( required=False, - type='float'), - type=dict( + elements='', + type='list'), + allowed_hardware_ids=dict( required=False, - type='str'), - notes=dict( + elements='', + type='list'), + allowed_ip_addresses=dict( required=False, - type='str'), - allowed_hardware_ids=dict( + elements='', + type='list'), + tags=dict( required=False, elements='', type='list'), hourly_billing=dict( required=False, type='bool'), - snapshot_capacity=dict( + capacity=dict( required=False, type='int'), - os_format_type=dict( + iops=dict( required=False, - type='str'), - allowed_virtual_guest_ids=dict( + type='float'), + snapshot_capacity=dict( required=False, - elements='', - type='list'), - allowed_ip_addresses=dict( + type='int'), + notes=dict( required=False, - elements='', - type='list'), + type='str'), datacenter=dict( required=False, type='str'), - tags=dict( + os_format_type=dict( required=False, - elements='', - type='list'), + 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.41.1', + ibm_provider_version='1.42.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 478499b09..d68eccdf1 100644 --- a/plugins/modules/ibm_storage_evault.py +++ b/plugins/modules/ibm_storage_evault.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_storage_evault' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -204,7 +204,7 @@ def run_module(): resource_type='ibm_storage_evault', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 99dd21ec1..0ff144ade 100644 --- a/plugins/modules/ibm_storage_file.py +++ b/plugins/modules/ibm_storage_file.py @@ -18,43 +18,33 @@ - Create, update or destroy an IBM Cloud 'ibm_storage_file' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - snapshot_capacity: - description: - - Snapshot capacity - required: False - type: int - allowed_virtual_guest_ids: - description: - - Virtual guest ID - required: False - type: list - elements: int - allowed_hardware_ids: + allowed_ip_addresses: description: - - Hardaware ID + - Allowed range of IP addresses required: False type: list - elements: int + elements: str snapshot_schedule: description: - None required: False type: list elements: dict - capacity: + datacenter: description: - - (Required for new resource) Storage capacity + - (Required for new resource) Datacenter name required: True - type: int - iops: + type: str + allowed_hardware_ids: description: - - (Required for new resource) iops rate - required: True - type: float + - Hardaware ID + required: False + type: list + elements: int allowed_subnets: description: - Allowed network subnets @@ -67,18 +57,27 @@ required: False type: list elements: str - hourly_billing: + allowed_virtual_guest_ids: description: - - Hourly based billing type + - Virtual guest ID required: False - type: bool - default: False - allowed_ip_addresses: + type: list + elements: int + capacity: description: - - Allowed range of IP addresses + - (Required for new resource) Storage capacity + required: True + type: int + iops: + description: + - (Required for new resource) iops rate + required: True + type: float + snapshot_capacity: + description: + - Snapshot capacity required: False - type: list - elements: str + type: int notes: description: - Notes @@ -89,11 +88,12 @@ - (Required for new resource) Storage type required: True type: str - datacenter: + hourly_billing: description: - - (Required for new resource) Datacenter name - required: True - type: str + - Hourly based billing type + required: False + type: bool + default: False id: description: - (Required when updating or destroying existing resource) IBM Cloud Resource ID. @@ -140,27 +140,27 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('datacenter', 'str'), ('capacity', 'int'), ('iops', 'float'), ('type', 'str'), - ('datacenter', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'snapshot_capacity', - 'allowed_virtual_guest_ids', - 'allowed_hardware_ids', + 'allowed_ip_addresses', 'snapshot_schedule', - 'capacity', - 'iops', + 'datacenter', + 'allowed_hardware_ids', 'allowed_subnets', 'tags', - 'hourly_billing', - 'allowed_ip_addresses', + 'allowed_virtual_guest_ids', + 'capacity', + 'iops', + 'snapshot_capacity', 'notes', 'type', - 'datacenter', + 'hourly_billing', ] # Params for Data source @@ -177,14 +177,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( - snapshot_capacity=dict( - required=False, - type='int'), - allowed_virtual_guest_ids=dict( - required=False, - elements='', - type='list'), - allowed_hardware_ids=dict( + allowed_ip_addresses=dict( required=False, elements='', type='list'), @@ -192,12 +185,13 @@ required=False, elements='', type='list'), - capacity=dict( + datacenter=dict( required=False, - type='int'), - iops=dict( + type='str'), + allowed_hardware_ids=dict( required=False, - type='float'), + elements='', + type='list'), allowed_subnets=dict( required=False, elements='', @@ -206,22 +200,28 @@ required=False, elements='', type='list'), - hourly_billing=dict( - required=False, - type='bool'), - allowed_ip_addresses=dict( + allowed_virtual_guest_ids=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'), - datacenter=dict( + hourly_billing=dict( required=False, - type='str'), + type='bool'), id=dict( required=False, type='str'), @@ -287,7 +287,7 @@ def run_module(): resource_type='ibm_storage_file', tf_type='resource', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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 e41db799f..29760f633 100644 --- a/plugins/modules/ibm_subnet.py +++ b/plugins/modules/ibm_subnet.py @@ -18,7 +18,7 @@ - Create, update or destroy an IBM Cloud 'ibm_subnet' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: @@ -27,10 +27,21 @@ - VLAN ID for the subnet required: False type: int - notes: + endpoint_ip: description: - - Notes + - endpoint IP + required: False + type: str + private: + description: + - private subnet required: False + type: bool + default: False + type: + description: + - (Required for new resource) subnet type + required: True type: str ip_version: description: @@ -43,9 +54,9 @@ - (Required for new resource) number of ip addresses in the subnet required: True type: int - endpoint_ip: + notes: description: - - endpoint IP + - Notes required: False type: str tags: @@ -54,17 +65,6 @@ required: False type: list elements: str - private: - description: - - private subnet - required: False - type: bool - default: False - type: - description: - - (Required for new resource) subnet type - 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 = [ - ('capacity', 'int'), ('type', 'str'), + ('capacity', 'int'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ 'vlan_id', - 'notes', - 'ip_version', - 'capacity', 'endpoint_ip', - 'tags', 'private', 'type', + 'ip_version', + 'capacity', + 'notes', + 'tags', ] # Params for Data source @@ -146,7 +146,13 @@ vlan_id=dict( required=False, type='int'), - notes=dict( + endpoint_ip=dict( + required=False, + type='str'), + private=dict( + required=False, + type='bool'), + type=dict( required=False, type='str'), ip_version=dict( @@ -155,19 +161,13 @@ capacity=dict( required=False, type='int'), - endpoint_ip=dict( + notes=dict( required=False, type='str'), tags=dict( required=False, elements='', type='list'), - private=dict( - required=False, - type='bool'), - type=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.41.1', + ibm_provider_version='1.42.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 1126d1136..a100b0f92 100644 --- a/plugins/modules/ibm_tg_connection.py +++ b/plugins/modules/ibm_tg_connection.py @@ -18,25 +18,15 @@ - Create, update or destroy an IBM Cloud 'ibm_tg_connection' resource - This module does not support idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - 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 - local_tunnel_ip: + network_type: description: - - The local tunnel IP address. This field only applies to network type 'gre_tunnel' connections. - required: False + - (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 - remote_bgp_asn: - description: - - The remote network BGP ASN. This field only applies to network type 'gre_tunnel' connections. - required: False - type: int 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'. @@ -52,14 +42,14 @@ - The local gateway IP address. This field only applies to network type 'gre_tunnel' connections. required: False type: str - gateway: + remote_bgp_asn: description: - - (Required for new resource) The Transit Gateway identifier - required: True - type: str - base_connection_id: + - The remote network BGP ASN. This field only applies to network type 'gre_tunnel' connections. + required: False + type: int + zone: description: - - The ID of a network_type 'classic' connection a tunnel is configured over. This field only applies to network type 'gre_tunnel' connections. + - Location of GRE tunnel. This field only applies to network type 'gre_tunnel' connections. required: False type: str remote_gateway_ip: @@ -67,19 +57,29 @@ - The remote gateway IP address. This field only applies to network type 'gre_tunnel' connections. required: False type: str - network_type: + remote_tunnel_ip: description: - - (Required for new resource) Defines what type of network is connected via this connection. Allowable values (classic,directlink,vpc,gre_tunnel) + - The remote tunnel IP address. This field only applies to network type 'gre_tunnel' connections. + required: False + type: str + gateway: + description: + - (Required for new resource) The Transit Gateway identifier required: True type: str - remote_tunnel_ip: + name: description: - - The remote tunnel IP address. This field only applies to network type 'gre_tunnel' connections. + - 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 - zone: + base_connection_id: description: - - Location of GRE tunnel. This field only applies to network type 'gre_tunnel' connections. + - 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 + local_tunnel_ip: + description: + - The local tunnel IP address. This field only applies to network type 'gre_tunnel' connections. required: False type: str id: @@ -128,24 +128,24 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ - ('gateway', 'str'), ('network_type', 'str'), + ('gateway', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'name', - 'local_tunnel_ip', - 'remote_bgp_asn', + 'network_type', 'network_id', 'network_account_id', 'local_gateway_ip', - 'gateway', - 'base_connection_id', + 'remote_bgp_asn', + 'zone', 'remote_gateway_ip', - 'network_type', 'remote_tunnel_ip', - 'zone', + 'gateway', + 'name', + 'base_connection_id', + 'local_tunnel_ip', ] # Params for Data source @@ -162,15 +162,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'), - local_tunnel_ip=dict( + network_type=dict( required=False, type='str'), - remote_bgp_asn=dict( - required=False, - type='int'), network_id=dict( required=False, type='str'), @@ -180,22 +174,28 @@ local_gateway_ip=dict( required=False, type='str'), - gateway=dict( + remote_bgp_asn=dict( required=False, - type='str'), - base_connection_id=dict( + type='int'), + zone=dict( required=False, type='str'), remote_gateway_ip=dict( required=False, type='str'), - network_type=dict( + remote_tunnel_ip=dict( required=False, type='str'), - remote_tunnel_ip=dict( + gateway=dict( required=False, type='str'), - zone=dict( + name=dict( + required=False, + type='str'), + base_connection_id=dict( + required=False, + type='str'), + local_tunnel_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.41.1', + ibm_provider_version='1.42.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 045013fb0..3d3e59d1d 100644 --- a/plugins/modules/ibm_tg_connection_prefix_filter.py +++ b/plugins/modules/ibm_tg_connection_prefix_filter.py @@ -18,43 +18,43 @@ - Create, update or destroy an IBM Cloud 'ibm_tg_connection_prefix_filter' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - before: + connection_id: description: - - Identifier of prefix filter that handles ordering - required: False + - (Required for new resource) The Transit Gateway Connection identifier + required: True type: str - le: - description: - - IP Prefix LE - required: False - type: int action: description: - (Required for new resource) Whether to permit or deny the prefix filter required: True type: str - ge: + before: description: - - IP Prefix GE + - Identifier of prefix filter that handles ordering required: False - type: int - prefix: - description: - - (Required for new resource) IP Prefix - required: True type: str gateway: description: - (Required for new resource) The Transit Gateway identifier required: True type: str - connection_id: + ge: description: - - (Required for new resource) The Transit Gateway Connection identifier + - IP Prefix GE + required: False + type: int + le: + description: + - IP Prefix LE + required: False + type: int + prefix: + description: + - (Required for new resource) IP Prefix required: True type: str id: @@ -103,34 +103,34 @@ # Top level parameter keys required by Terraform module TL_REQUIRED_PARAMETERS = [ + ('connection_id', 'str'), ('action', 'str'), - ('prefix', 'str'), ('gateway', 'str'), - ('connection_id', 'str'), + ('prefix', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'before', - 'le', + 'connection_id', 'action', + 'before', + 'gateway', 'ge', + 'le', 'prefix', - 'gateway', - 'connection_id', ] # Params for Data source TL_REQUIRED_PARAMETERS_DS = [ + ('filter_id', 'str'), ('gateway', 'str'), ('connection_id', 'str'), - ('filter_id', 'str'), ] TL_ALL_PARAMETERS_DS = [ + 'filter_id', 'gateway', 'connection_id', - 'filter_id', ] TL_CONFLICTS_MAP = { @@ -140,25 +140,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( - before=dict( + connection_id=dict( required=False, type='str'), - le=dict( - required=False, - type='int'), action=dict( required=False, type='str'), - ge=dict( - required=False, - type='int'), - prefix=dict( + before=dict( required=False, type='str'), gateway=dict( required=False, type='str'), - connection_id=dict( + ge=dict( + required=False, + type='int'), + le=dict( + required=False, + type='int'), + prefix=dict( required=False, type='str'), id=dict( @@ -226,7 +226,7 @@ def run_module(): resource_type='ibm_tg_connection_prefix_filter', tf_type='data', parameters=module.params, - ibm_provider_version='1.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 aac019c07..74d384cd5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: + filter_id: + description: + - The Transit Gateway Connection Prefix Filter identifier + required: True + type: str gateway: description: - The Transit Gateway identifier @@ -31,11 +36,6 @@ - The Transit Gateway Connection identifier required: True type: str - filter_id: - description: - - The Transit Gateway Connection Prefix Filter 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 = [ + ('filter_id', 'str'), ('gateway', 'str'), ('connection_id', 'str'), - ('filter_id', 'str'), ] # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ + 'filter_id', 'gateway', 'connection_id', - 'filter_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( - gateway=dict( + filter_id=dict( required=True, type='str'), - connection_id=dict( + gateway=dict( required=True, type='str'), - filter_id=dict( + connection_id=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.41.1', + ibm_provider_version='1.42.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 14b9a04df..fa007a350 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 267d5b7fe..a8cc052f8 100644 --- a/plugins/modules/ibm_tg_gateway.py +++ b/plugins/modules/ibm_tg_gateway.py @@ -18,27 +18,21 @@ - Create, update or destroy an IBM Cloud 'ibm_tg_gateway' resource - This module supports idempotency requirements: - - IBM-Cloud terraform-provider-ibm v1.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.0 - Terraform v0.12.20 options: - global_: + name: description: - - Allow global routing for a Transit Gateway. If unspecified, the default value is false - required: False - type: bool - default: False + - (Required for new resource) Name Transit Gateway Services + required: True + type: str tags: description: - Tags for the transit gateway instance required: False type: list elements: str - name: - description: - - (Required for new resource) Name Transit Gateway Services - required: True - type: str resource_group: description: - None @@ -49,6 +43,12 @@ - (Required for new resource) Location of 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. @@ -101,11 +101,11 @@ # All top level parameter keys supported by Terraform module TL_ALL_PARAMETERS = [ - 'global_', - 'tags', 'name', + 'tags', 'resource_group', 'location', + 'global_', ] # 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( - global_=dict( + name=dict( required=False, - type='bool'), + type='str'), tags=dict( required=False, elements='', type='list'), - name=dict( - required=False, - type='str'), resource_group=dict( required=False, type='str'), location=dict( required=False, type='str'), + global_=dict( + required=False, + type='bool'), 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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 4246c577d..969841a14 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 795a65093..2ebe6d660 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a3c8f6eec..da33d259c 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 a920355ad..6fe2c8dae 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 165ef0fc9..fedebbb8d 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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.41.1', + ibm_provider_version='1.42.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 fe07ca296..6cb5354d5 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.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 c5b8de8a4..b109e23cb 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.41.1 + - IBM-Cloud terraform-provider-ibm v1.42.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.41.1', + ibm_provider_version='1.42.0', tl_required_params=TL_REQUIRED_PARAMETERS, tl_all_params=TL_ALL_PARAMETERS)