From b1795cda836eecf202c22a878843ece5fdf852fb Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 21 May 2019 14:44:46 -0700 Subject: [PATCH] remove client side validation on enums (#256) Signed-off-by: Modular Magician --- plugins/modules/gcp_bigquery_dataset.py | 2 +- plugins/modules/gcp_bigquery_table.py | 24 +++++++++---------- plugins/modules/gcp_compute_address.py | 4 ++-- .../modules/gcp_compute_backend_service.py | 8 +++---- plugins/modules/gcp_compute_firewall.py | 2 +- .../modules/gcp_compute_forwarding_rule.py | 8 +++---- plugins/modules/gcp_compute_global_address.py | 4 ++-- .../gcp_compute_global_forwarding_rule.py | 6 ++--- plugins/modules/gcp_compute_health_check.py | 10 ++++---- plugins/modules/gcp_compute_image.py | 9 +++---- plugins/modules/gcp_compute_instance.py | 12 ++++------ .../modules/gcp_compute_instance_template.py | 12 ++++------ .../gcp_compute_interconnect_attachment.py | 2 +- plugins/modules/gcp_compute_network.py | 2 +- plugins/modules/gcp_compute_router.py | 2 +- plugins/modules/gcp_compute_ssl_policy.py | 4 ++-- .../modules/gcp_compute_target_https_proxy.py | 2 +- plugins/modules/gcp_compute_target_pool.py | 2 +- .../modules/gcp_compute_target_ssl_proxy.py | 2 +- .../modules/gcp_compute_target_tcp_proxy.py | 2 +- plugins/modules/gcp_container_cluster.py | 4 ++-- plugins/modules/gcp_dns_managed_zone.py | 2 +- .../modules/gcp_dns_resource_record_set.py | 2 +- plugins/modules/gcp_iam_role.py | 2 +- .../modules/gcp_iam_service_account_key.py | 4 ++-- plugins/modules/gcp_redis_instance.py | 2 +- plugins/modules/gcp_sql_instance.py | 8 +++---- plugins/modules/gcp_storage_bucket.py | 18 +++++--------- .../gcp_storage_bucket_access_control.py | 4 ++-- plugins/modules/gcp_storage_object.py | 2 +- 30 files changed, 76 insertions(+), 91 deletions(-) diff --git a/plugins/modules/gcp_bigquery_dataset.py b/plugins/modules/gcp_bigquery_dataset.py index 96763d7..40d1d11 100644 --- a/plugins/modules/gcp_bigquery_dataset.py +++ b/plugins/modules/gcp_bigquery_dataset.py @@ -311,7 +311,7 @@ def main(): options=dict( domain=dict(type='str'), group_by_email=dict(type='str'), - role=dict(type='str', choices=['READER', 'WRITER', 'OWNER']), + role=dict(type='str'), special_group=dict(type='str'), user_by_email=dict(type='str'), view=dict( diff --git a/plugins/modules/gcp_bigquery_table.py b/plugins/modules/gcp_bigquery_table.py index 69c90c8..6aaa07e 100644 --- a/plugins/modules/gcp_bigquery_table.py +++ b/plugins/modules/gcp_bigquery_table.py @@ -917,7 +917,7 @@ def main(): ), ), ), - time_partitioning=dict(type='dict', options=dict(expiration_ms=dict(type='int'), type=dict(type='str', choices=['DAY']))), + time_partitioning=dict(type='dict', options=dict(expiration_ms=dict(type='int'), type=dict(type='str'))), schema=dict( type='dict', options=dict( @@ -927,9 +927,9 @@ def main(): options=dict( description=dict(type='str'), fields=dict(type='list', elements='str'), - mode=dict(type='str', choices=['NULLABLE', 'REQUIRED', 'REPEATED']), + mode=dict(type='str'), name=dict(type='str'), - type=dict(type='str', choices=['STRING', 'BYTES', 'INTEGER', 'FLOAT', 'TIMESTAMP', 'DATE', 'TIME', 'DATETIME', 'RECORD']), + type=dict(type='str'), ), ) ), @@ -940,10 +940,10 @@ def main(): type='dict', options=dict( autodetect=dict(type='bool'), - compression=dict(type='str', choices=['GZIP', 'NONE']), + compression=dict(type='str'), ignore_unknown_values=dict(type='bool'), max_bad_records=dict(default=0, type='int'), - source_format=dict(type='str', choices=['CSV', 'GOOGLE_SHEETS', 'NEWLINE_DELIMITED_JSON', 'AVRO', 'DATASTORE_BACKUP', 'BIGTABLE']), + source_format=dict(type='str'), source_uris=dict(type='list', elements='str'), schema=dict( type='dict', @@ -954,9 +954,9 @@ def main(): options=dict( description=dict(type='str'), fields=dict(type='list', elements='str'), - mode=dict(type='str', choices=['NULLABLE', 'REQUIRED', 'REPEATED']), + mode=dict(type='str'), name=dict(type='str'), - type=dict(type='str', choices=['STRING', 'BYTES', 'INTEGER', 'FLOAT', 'TIMESTAMP', 'DATE', 'TIME', 'DATETIME', 'RECORD']), + type=dict(type='str'), ), ) ), @@ -967,7 +967,7 @@ def main(): options=dict( allow_jagged_rows=dict(type='bool'), allow_quoted_newlines=dict(type='bool'), - encoding=dict(type='str', choices=['UTF-8', 'ISO-8859-1']), + encoding=dict(type='str'), field_delimiter=dict(type='str'), quote=dict(type='str'), skip_leading_rows=dict(default=0, type='int'), @@ -986,17 +986,17 @@ def main(): type='list', elements='dict', options=dict( - encoding=dict(type='str', choices=['TEXT', 'BINARY']), + encoding=dict(type='str'), field_name=dict(type='str'), only_read_latest=dict(type='bool'), qualifier_string=dict(required=True, type='str'), - type=dict(type='str', choices=['BYTES', 'STRING', 'INTEGER', 'FLOAT', 'BOOLEAN']), + type=dict(type='str'), ), ), - encoding=dict(type='str', choices=['TEXT', 'BINARY']), + encoding=dict(type='str'), family_id=dict(type='str'), only_read_latest=dict(type='bool'), - type=dict(type='str', choices=['BYTES', 'STRING', 'INTEGER', 'FLOAT', 'BOOLEAN']), + type=dict(type='str'), ), ), ), diff --git a/plugins/modules/gcp_compute_address.py b/plugins/modules/gcp_compute_address.py index 9a05e01..bf3a451 100644 --- a/plugins/modules/gcp_compute_address.py +++ b/plugins/modules/gcp_compute_address.py @@ -216,10 +216,10 @@ def main(): argument_spec=dict( state=dict(default='present', choices=['present', 'absent'], type='str'), address=dict(type='str'), - address_type=dict(default='EXTERNAL', type='str', choices=['INTERNAL', 'EXTERNAL']), + address_type=dict(default='EXTERNAL', type='str'), description=dict(type='str'), name=dict(required=True, type='str'), - network_tier=dict(type='str', choices=['PREMIUM', 'STANDARD']), + network_tier=dict(type='str'), subnetwork=dict(type='dict'), region=dict(required=True, type='str'), ) diff --git a/plugins/modules/gcp_compute_backend_service.py b/plugins/modules/gcp_compute_backend_service.py index 72f5f94..ebc0c35 100644 --- a/plugins/modules/gcp_compute_backend_service.py +++ b/plugins/modules/gcp_compute_backend_service.py @@ -636,7 +636,7 @@ def main(): type='list', elements='dict', options=dict( - balancing_mode=dict(default='UTILIZATION', type='str', choices=['UTILIZATION', 'RATE', 'CONNECTION']), + balancing_mode=dict(default='UTILIZATION', type='str'), capacity_scaler=dict(default=1.0, type='str'), description=dict(type='str'), group=dict(type='str'), @@ -671,12 +671,12 @@ def main(): type='dict', options=dict(enabled=dict(type='bool'), oauth2_client_id=dict(required=True, type='str'), oauth2_client_secret=dict(required=True, type='str')), ), - load_balancing_scheme=dict(default='EXTERNAL', type='str', choices=['EXTERNAL']), + load_balancing_scheme=dict(default='EXTERNAL', type='str'), name=dict(required=True, type='str'), port_name=dict(type='str'), - protocol=dict(type='str', choices=['HTTP', 'HTTPS', 'HTTP2', 'TCP', 'SSL']), + protocol=dict(type='str'), security_policy=dict(type='str'), - session_affinity=dict(type='str', choices=['NONE', 'CLIENT_IP', 'GENERATED_COOKIE']), + session_affinity=dict(type='str'), timeout_sec=dict(type='int', aliases=['timeout_seconds']), ) ) diff --git a/plugins/modules/gcp_compute_firewall.py b/plugins/modules/gcp_compute_firewall.py index 082d697..1ebcc72 100644 --- a/plugins/modules/gcp_compute_firewall.py +++ b/plugins/modules/gcp_compute_firewall.py @@ -431,7 +431,7 @@ def main(): denied=dict(type='list', elements='dict', options=dict(ip_protocol=dict(required=True, type='str'), ports=dict(type='list', elements='str'))), description=dict(type='str'), destination_ranges=dict(type='list', elements='str'), - direction=dict(type='str', choices=['INGRESS', 'EGRESS']), + direction=dict(type='str'), disabled=dict(type='bool'), name=dict(required=True, type='str'), network=dict(default=dict(selfLink='global/networks/default'), type='dict'), diff --git a/plugins/modules/gcp_compute_forwarding_rule.py b/plugins/modules/gcp_compute_forwarding_rule.py index 1798ddf..41a0259 100644 --- a/plugins/modules/gcp_compute_forwarding_rule.py +++ b/plugins/modules/gcp_compute_forwarding_rule.py @@ -448,10 +448,10 @@ def main(): state=dict(default='present', choices=['present', 'absent'], type='str'), description=dict(type='str'), ip_address=dict(type='str'), - ip_protocol=dict(type='str', choices=['TCP', 'UDP', 'ESP', 'AH', 'SCTP', 'ICMP']), + ip_protocol=dict(type='str'), backend_service=dict(type='dict'), - ip_version=dict(type='str', choices=['IPV4', 'IPV6']), - load_balancing_scheme=dict(type='str', choices=['INTERNAL', 'EXTERNAL']), + ip_version=dict(type='str'), + load_balancing_scheme=dict(type='str'), name=dict(required=True, type='str'), network=dict(type='dict'), port_range=dict(type='str'), @@ -459,7 +459,7 @@ def main(): subnetwork=dict(type='dict'), target=dict(type='dict'), all_ports=dict(type='bool'), - network_tier=dict(type='str', choices=['PREMIUM', 'STANDARD']), + network_tier=dict(type='str'), service_label=dict(type='str'), region=dict(required=True, type='str'), ) diff --git a/plugins/modules/gcp_compute_global_address.py b/plugins/modules/gcp_compute_global_address.py index fff05fb..7a19f6f 100644 --- a/plugins/modules/gcp_compute_global_address.py +++ b/plugins/modules/gcp_compute_global_address.py @@ -175,8 +175,8 @@ def main(): address=dict(type='str'), description=dict(type='str'), name=dict(required=True, type='str'), - ip_version=dict(type='str', choices=['IPV4', 'IPV6']), - address_type=dict(default='EXTERNAL', type='str', choices=['EXTERNAL', 'INTERNAL']), + ip_version=dict(type='str'), + address_type=dict(default='EXTERNAL', type='str'), ) ) diff --git a/plugins/modules/gcp_compute_global_forwarding_rule.py b/plugins/modules/gcp_compute_global_forwarding_rule.py index 5c38823..1c09e65 100644 --- a/plugins/modules/gcp_compute_global_forwarding_rule.py +++ b/plugins/modules/gcp_compute_global_forwarding_rule.py @@ -356,9 +356,9 @@ def main(): state=dict(default='present', choices=['present', 'absent'], type='str'), description=dict(type='str'), ip_address=dict(type='str'), - ip_protocol=dict(type='str', choices=['TCP', 'UDP', 'ESP', 'AH', 'SCTP', 'ICMP']), - ip_version=dict(type='str', choices=['IPV4', 'IPV6']), - load_balancing_scheme=dict(type='str', choices=['INTERNAL_SELF_MANAGED', 'EXTERNAL']), + ip_protocol=dict(type='str'), + ip_version=dict(type='str'), + load_balancing_scheme=dict(type='str'), name=dict(required=True, type='str'), network=dict(type='dict'), port_range=dict(type='str'), diff --git a/plugins/modules/gcp_compute_health_check.py b/plugins/modules/gcp_compute_health_check.py index 1ecf29a..e5dba3d 100644 --- a/plugins/modules/gcp_compute_health_check.py +++ b/plugins/modules/gcp_compute_health_check.py @@ -535,7 +535,7 @@ def main(): name=dict(required=True, type='str'), timeout_sec=dict(default=5, type='int', aliases=['timeout_seconds']), unhealthy_threshold=dict(default=2, type='int'), - type=dict(type='str', choices=['TCP', 'SSL', 'HTTP', 'HTTPS']), + type=dict(type='str'), http_health_check=dict( type='dict', options=dict( @@ -544,7 +544,7 @@ def main(): response=dict(type='str'), port=dict(type='int'), port_name=dict(type='str'), - proxy_header=dict(default='NONE', type='str', choices=['NONE', 'PROXY_V1']), + proxy_header=dict(default='NONE', type='str'), ), ), https_health_check=dict( @@ -555,7 +555,7 @@ def main(): response=dict(type='str'), port=dict(type='int'), port_name=dict(type='str'), - proxy_header=dict(default='NONE', type='str', choices=['NONE', 'PROXY_V1']), + proxy_header=dict(default='NONE', type='str'), ), ), tcp_health_check=dict( @@ -565,7 +565,7 @@ def main(): response=dict(type='str'), port=dict(type='int'), port_name=dict(type='str'), - proxy_header=dict(default='NONE', type='str', choices=['NONE', 'PROXY_V1']), + proxy_header=dict(default='NONE', type='str'), ), ), ssl_health_check=dict( @@ -575,7 +575,7 @@ def main(): response=dict(type='str'), port=dict(type='int'), port_name=dict(type='str'), - proxy_header=dict(default='NONE', type='str', choices=['NONE', 'PROXY_V1']), + proxy_header=dict(default='NONE', type='str'), ), ), ), diff --git a/plugins/modules/gcp_compute_image.py b/plugins/modules/gcp_compute_image.py index f8db6b4..7bf7402 100644 --- a/plugins/modules/gcp_compute_image.py +++ b/plugins/modules/gcp_compute_image.py @@ -443,19 +443,16 @@ def main(): description=dict(type='str'), disk_size_gb=dict(type='int'), family=dict(type='str'), - guest_os_features=dict(type='list', elements='dict', options=dict(type=dict(type='str', choices=['VIRTIO_SCSI_MULTIQUEUE']))), + guest_os_features=dict(type='list', elements='dict', options=dict(type=dict(type='str'))), image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), labels=dict(type='dict'), licenses=dict(type='list', elements='str'), name=dict(required=True, type='str'), - raw_disk=dict( - type='dict', - options=dict(container_type=dict(type='str', choices=['TAR']), sha1_checksum=dict(type='str'), source=dict(required=True, type='str')), - ), + raw_disk=dict(type='dict', options=dict(container_type=dict(type='str'), sha1_checksum=dict(type='str'), source=dict(required=True, type='str'))), source_disk=dict(type='dict'), source_disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), source_disk_id=dict(type='str'), - source_type=dict(type='str', choices=['RAW']), + source_type=dict(type='str'), ) ) diff --git a/plugins/modules/gcp_compute_instance.py b/plugins/modules/gcp_compute_instance.py index 6e85b03..918a12b 100644 --- a/plugins/modules/gcp_compute_instance.py +++ b/plugins/modules/gcp_compute_instance.py @@ -902,10 +902,10 @@ def main(): source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), ), ), - interface=dict(type='str', choices=['SCSI', 'NVME']), - mode=dict(type='str', choices=['READ_WRITE', 'READ_ONLY']), + interface=dict(type='str'), + mode=dict(type='str'), source=dict(type='dict'), - type=dict(type='str', choices=['SCRATCH', 'PERSISTENT']), + type=dict(type='str'), ), ), guest_accelerators=dict(type='list', elements='dict', options=dict(accelerator_count=dict(type='int'), accelerator_type=dict(type='str'))), @@ -921,9 +921,7 @@ def main(): access_configs=dict( type='list', elements='dict', - options=dict( - name=dict(required=True, type='str'), nat_ip=dict(type='dict'), type=dict(required=True, type='str', choices=['ONE_TO_ONE_NAT']) - ), + options=dict(name=dict(required=True, type='str'), nat_ip=dict(type='dict'), type=dict(required=True, type='str')), ), alias_ip_ranges=dict(type='list', elements='dict', options=dict(ip_cidr_range=dict(type='str'), subnetwork_range_name=dict(type='str'))), network=dict(type='dict'), @@ -935,7 +933,7 @@ def main(): type='dict', options=dict(automatic_restart=dict(type='bool'), on_host_maintenance=dict(type='str'), preemptible=dict(type='bool')) ), service_accounts=dict(type='list', elements='dict', options=dict(email=dict(type='str'), scopes=dict(type='list', elements='str'))), - status=dict(type='str', choices=['PROVISIONING', 'STAGING', 'RUNNING', 'STOPPING', 'SUSPENDING', 'SUSPENDED', 'TERMINATED']), + status=dict(type='str'), tags=dict(type='dict', options=dict(fingerprint=dict(type='str'), items=dict(type='list', elements='str'))), zone=dict(required=True, type='str'), ) diff --git a/plugins/modules/gcp_compute_instance_template.py b/plugins/modules/gcp_compute_instance_template.py index 71b7ab3..d6b5d38 100644 --- a/plugins/modules/gcp_compute_instance_template.py +++ b/plugins/modules/gcp_compute_instance_template.py @@ -875,10 +875,10 @@ def main(): source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), ), ), - interface=dict(type='str', choices=['SCSI', 'NVME']), - mode=dict(type='str', choices=['READ_WRITE', 'READ_ONLY']), + interface=dict(type='str'), + mode=dict(type='str'), source=dict(type='dict'), - type=dict(type='str', choices=['SCRATCH', 'PERSISTENT']), + type=dict(type='str'), ), ), machine_type=dict(required=True, type='str'), @@ -892,11 +892,7 @@ def main(): access_configs=dict( type='list', elements='dict', - options=dict( - name=dict(required=True, type='str'), - nat_ip=dict(type='dict'), - type=dict(required=True, type='str', choices=['ONE_TO_ONE_NAT']), - ), + options=dict(name=dict(required=True, type='str'), nat_ip=dict(type='dict'), type=dict(required=True, type='str')), ), alias_ip_ranges=dict( type='list', elements='dict', options=dict(ip_cidr_range=dict(type='str'), subnetwork_range_name=dict(type='str')) diff --git a/plugins/modules/gcp_compute_interconnect_attachment.py b/plugins/modules/gcp_compute_interconnect_attachment.py index 4c7d698..18deb73 100644 --- a/plugins/modules/gcp_compute_interconnect_attachment.py +++ b/plugins/modules/gcp_compute_interconnect_attachment.py @@ -284,7 +284,7 @@ def main(): interconnect=dict(type='str'), description=dict(type='str'), edge_availability_domain=dict(type='str'), - type=dict(type='str', choices=['DEDICATED', 'PARTNER', 'PARTNER_PROVIDER']), + type=dict(type='str'), router=dict(required=True, type='dict'), name=dict(required=True, type='str'), candidate_subnets=dict(type='list', elements='str'), diff --git a/plugins/modules/gcp_compute_network.py b/plugins/modules/gcp_compute_network.py index 0d893b8..fe89fec 100644 --- a/plugins/modules/gcp_compute_network.py +++ b/plugins/modules/gcp_compute_network.py @@ -213,7 +213,7 @@ def main(): ipv4_range=dict(type='str'), name=dict(required=True, type='str'), auto_create_subnetworks=dict(type='bool'), - routing_config=dict(type='dict', options=dict(routing_mode=dict(required=True, type='str', choices=['REGIONAL', 'GLOBAL']))), + routing_config=dict(type='dict', options=dict(routing_mode=dict(required=True, type='str'))), ), mutually_exclusive=[['auto_create_subnetworks', 'ipv4_range']], ) diff --git a/plugins/modules/gcp_compute_router.py b/plugins/modules/gcp_compute_router.py index d15a4b1..b9c1573 100644 --- a/plugins/modules/gcp_compute_router.py +++ b/plugins/modules/gcp_compute_router.py @@ -264,7 +264,7 @@ def main(): type='dict', options=dict( asn=dict(required=True, type='int'), - advertise_mode=dict(default='DEFAULT', type='str', choices=['DEFAULT', 'CUSTOM']), + advertise_mode=dict(default='DEFAULT', type='str'), advertised_groups=dict(type='list', elements='str'), advertised_ip_ranges=dict(type='list', elements='dict', options=dict(range=dict(type='str'), description=dict(type='str'))), ), diff --git a/plugins/modules/gcp_compute_ssl_policy.py b/plugins/modules/gcp_compute_ssl_policy.py index 3ae8d0f..4bab5d1 100644 --- a/plugins/modules/gcp_compute_ssl_policy.py +++ b/plugins/modules/gcp_compute_ssl_policy.py @@ -209,8 +209,8 @@ def main(): state=dict(default='present', choices=['present', 'absent'], type='str'), description=dict(type='str'), name=dict(required=True, type='str'), - profile=dict(type='str', choices=['COMPATIBLE', 'MODERN', 'RESTRICTED', 'CUSTOM']), - min_tls_version=dict(type='str', choices=['TLS_1_0', 'TLS_1_1', 'TLS_1_2']), + profile=dict(type='str'), + min_tls_version=dict(type='str'), custom_features=dict(type='list', elements='str'), ) ) diff --git a/plugins/modules/gcp_compute_target_https_proxy.py b/plugins/modules/gcp_compute_target_https_proxy.py index e32c47c..0bd0433 100644 --- a/plugins/modules/gcp_compute_target_https_proxy.py +++ b/plugins/modules/gcp_compute_target_https_proxy.py @@ -266,7 +266,7 @@ def main(): state=dict(default='present', choices=['present', 'absent'], type='str'), description=dict(type='str'), name=dict(required=True, type='str'), - quic_override=dict(type='str', choices=['NONE', 'ENABLE', 'DISABLE']), + quic_override=dict(type='str'), ssl_certificates=dict(required=True, type='list', elements='dict'), ssl_policy=dict(type='dict'), url_map=dict(required=True, type='dict'), diff --git a/plugins/modules/gcp_compute_target_pool.py b/plugins/modules/gcp_compute_target_pool.py index 4d9e693..e08683e 100644 --- a/plugins/modules/gcp_compute_target_pool.py +++ b/plugins/modules/gcp_compute_target_pool.py @@ -256,7 +256,7 @@ def main(): health_check=dict(type='dict'), instances=dict(type='list', elements='dict'), name=dict(required=True, type='str'), - session_affinity=dict(type='str', choices=['NONE', 'CLIENT_IP', 'CLIENT_IP_PROTO']), + session_affinity=dict(type='str'), region=dict(required=True, type='str'), ) ) diff --git a/plugins/modules/gcp_compute_target_ssl_proxy.py b/plugins/modules/gcp_compute_target_ssl_proxy.py index 108d271..75aec6c 100644 --- a/plugins/modules/gcp_compute_target_ssl_proxy.py +++ b/plugins/modules/gcp_compute_target_ssl_proxy.py @@ -251,7 +251,7 @@ def main(): state=dict(default='present', choices=['present', 'absent'], type='str'), description=dict(type='str'), name=dict(required=True, type='str'), - proxy_header=dict(type='str', choices=['NONE', 'PROXY_V1']), + proxy_header=dict(type='str'), service=dict(required=True, type='dict'), ssl_certificates=dict(required=True, type='list', elements='dict'), ssl_policy=dict(type='dict'), diff --git a/plugins/modules/gcp_compute_target_tcp_proxy.py b/plugins/modules/gcp_compute_target_tcp_proxy.py index 06acbc3..5b3d8d2 100644 --- a/plugins/modules/gcp_compute_target_tcp_proxy.py +++ b/plugins/modules/gcp_compute_target_tcp_proxy.py @@ -197,7 +197,7 @@ def main(): state=dict(default='present', choices=['present', 'absent'], type='str'), description=dict(type='str'), name=dict(required=True, type='str'), - proxy_header=dict(type='str', choices=['NONE', 'PROXY_V1']), + proxy_header=dict(type='str'), service=dict(required=True, type='dict'), ) ) diff --git a/plugins/modules/gcp_container_cluster.py b/plugins/modules/gcp_container_cluster.py index aca85eb..feaabe9 100644 --- a/plugins/modules/gcp_container_cluster.py +++ b/plugins/modules/gcp_container_cluster.py @@ -651,8 +651,8 @@ def main(): ), ), master_auth=dict(type='dict', options=dict(username=dict(type='str'), password=dict(type='str'))), - logging_service=dict(type='str', choices=['logging.googleapis.com', 'none']), - monitoring_service=dict(type='str', choices=['monitoring.googleapis.com', 'none']), + logging_service=dict(type='str'), + monitoring_service=dict(type='str'), network=dict(type='str'), private_cluster_config=dict( type='dict', diff --git a/plugins/modules/gcp_dns_managed_zone.py b/plugins/modules/gcp_dns_managed_zone.py index 5a54812..536bca8 100644 --- a/plugins/modules/gcp_dns_managed_zone.py +++ b/plugins/modules/gcp_dns_managed_zone.py @@ -219,7 +219,7 @@ def main(): name=dict(required=True, type='str'), name_server_set=dict(type='str'), labels=dict(type='dict'), - visibility=dict(default='public', type='str', choices=['private', 'public']), + visibility=dict(default='public', type='str'), private_visibility_config=dict(type='dict', options=dict(networks=dict(type='list', elements='dict', options=dict(network_url=dict(type='str'))))), ) ) diff --git a/plugins/modules/gcp_dns_resource_record_set.py b/plugins/modules/gcp_dns_resource_record_set.py index 6acd195..82cab65 100644 --- a/plugins/modules/gcp_dns_resource_record_set.py +++ b/plugins/modules/gcp_dns_resource_record_set.py @@ -170,7 +170,7 @@ def main(): argument_spec=dict( state=dict(default='present', choices=['present', 'absent'], type='str'), name=dict(required=True, type='str'), - type=dict(required=True, type='str', choices=['A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NAPTR', 'NS', 'PTR', 'SOA', 'SPF', 'SRV', 'TLSA', 'TXT']), + type=dict(required=True, type='str'), ttl=dict(type='int'), target=dict(type='list', elements='str'), managed_zone=dict(required=True, type='dict'), diff --git a/plugins/modules/gcp_iam_role.py b/plugins/modules/gcp_iam_role.py index a9e8a85..e4f642b 100644 --- a/plugins/modules/gcp_iam_role.py +++ b/plugins/modules/gcp_iam_role.py @@ -149,7 +149,7 @@ def main(): title=dict(type='str'), description=dict(type='str'), included_permissions=dict(type='list', elements='str'), - stage=dict(type='str', choices=['ALPHA', 'BETA', 'GA', 'DEPRECATED', 'DISABLED', 'EAP']), + stage=dict(type='str'), ) ) diff --git a/plugins/modules/gcp_iam_service_account_key.py b/plugins/modules/gcp_iam_service_account_key.py index a994c23..fa51fd3 100644 --- a/plugins/modules/gcp_iam_service_account_key.py +++ b/plugins/modules/gcp_iam_service_account_key.py @@ -175,8 +175,8 @@ def main(): module = GcpModule( argument_spec=dict( state=dict(default='present', choices=['present', 'absent'], type='str'), - private_key_type=dict(type='str', choices=['TYPE_UNSPECIFIED', 'TYPE_PKCS12_FILE', 'TYPE_GOOGLE_CREDENTIALS_FILE']), - key_algorithm=dict(type='str', choices=['KEY_ALG_UNSPECIFIED', 'KEY_ALG_RSA_1024', 'KEY_ALG_RSA_2048']), + private_key_type=dict(type='str'), + key_algorithm=dict(type='str'), service_account=dict(type='dict'), path=dict(type='path'), ) diff --git a/plugins/modules/gcp_redis_instance.py b/plugins/modules/gcp_redis_instance.py index c561793..16e2a7f 100644 --- a/plugins/modules/gcp_redis_instance.py +++ b/plugins/modules/gcp_redis_instance.py @@ -280,7 +280,7 @@ def main(): memory_size_gb=dict(required=True, type='int'), redis_version=dict(type='str'), reserved_ip_range=dict(type='str'), - tier=dict(default='BASIC', type='str', choices=['BASIC', 'STANDARD_HA']), + tier=dict(default='BASIC', type='str'), region=dict(required=True, type='str'), ) ) diff --git a/plugins/modules/gcp_sql_instance.py b/plugins/modules/gcp_sql_instance.py index 9cfa57d..11e529e 100644 --- a/plugins/modules/gcp_sql_instance.py +++ b/plugins/modules/gcp_sql_instance.py @@ -607,11 +607,11 @@ def main(): module = GcpModule( argument_spec=dict( state=dict(default='present', choices=['present', 'absent'], type='str'), - backend_type=dict(type='str', choices=['FIRST_GEN', 'SECOND_GEN', 'EXTERNAL']), + backend_type=dict(type='str'), connection_name=dict(type='str'), - database_version=dict(type='str', choices=['MYSQL_5_5', 'MYSQL_5_6', 'MYSQL_5_7', 'POSTGRES_9_6']), + database_version=dict(type='str'), failover_replica=dict(type='dict', options=dict(name=dict(type='str'))), - instance_type=dict(type='str', choices=['CLOUD_SQL_INSTANCE', 'ON_PREMISES_INSTANCE', 'READ_REPLICA_INSTANCE']), + instance_type=dict(type='str'), ipv6_address=dict(type='str'), master_instance_name=dict(type='str'), max_disk_size=dict(type='int'), @@ -654,7 +654,7 @@ def main(): ), ), tier=dict(type='str'), - availability_type=dict(type='str', choices=['ZONAL', 'REGIONAL']), + availability_type=dict(type='str'), backup_configuration=dict( type='dict', options=dict(enabled=dict(type='bool'), binary_log_enabled=dict(type='bool'), start_time=dict(type='str')) ), diff --git a/plugins/modules/gcp_storage_bucket.py b/plugins/modules/gcp_storage_bucket.py index e33cbed..1d6d379 100644 --- a/plugins/modules/gcp_storage_bucket.py +++ b/plugins/modules/gcp_storage_bucket.py @@ -745,10 +745,8 @@ def main(): bucket=dict(required=True, type='dict'), entity=dict(required=True, type='str'), entity_id=dict(type='str'), - project_team=dict( - type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str', choices=['editors', 'owners', 'viewers'])) - ), - role=dict(type='str', choices=['OWNER', 'READER', 'WRITER']), + project_team=dict(type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str'))), + role=dict(type='str'), ), ), cors=dict( @@ -768,7 +766,7 @@ def main(): bucket=dict(required=True, type='dict'), entity=dict(required=True, type='str'), object=dict(type='str'), - role=dict(required=True, type='str', choices=['OWNER', 'READER']), + role=dict(required=True, type='str'), ), ), lifecycle=dict( @@ -778,9 +776,7 @@ def main(): type='list', elements='dict', options=dict( - action=dict( - type='dict', options=dict(storage_class=dict(type='str'), type=dict(type='str', choices=['Delete', 'SetStorageClass'])) - ), + action=dict(type='dict', options=dict(storage_class=dict(type='str'), type=dict(type='str'))), condition=dict( type='dict', options=dict( @@ -800,13 +796,11 @@ def main(): metageneration=dict(type='int'), name=dict(type='str'), owner=dict(type='dict', options=dict(entity=dict(type='str'))), - storage_class=dict(type='str', choices=['MULTI_REGIONAL', 'REGIONAL', 'STANDARD', 'NEARLINE', 'COLDLINE', 'DURABLE_REDUCED_AVAILABILITY']), + storage_class=dict(type='str'), versioning=dict(type='dict', options=dict(enabled=dict(type='bool'))), website=dict(type='dict', options=dict(main_page_suffix=dict(type='str'), not_found_page=dict(type='str'))), project=dict(type='str'), - predefined_default_object_acl=dict( - type='str', choices=['authenticatedRead', 'bucketOwnerFullControl', 'bucketOwnerRead', 'private', 'projectPrivate', 'publicRead'] - ), + predefined_default_object_acl=dict(type='str'), ) ) diff --git a/plugins/modules/gcp_storage_bucket_access_control.py b/plugins/modules/gcp_storage_bucket_access_control.py index 49c9dc7..fe7e909 100644 --- a/plugins/modules/gcp_storage_bucket_access_control.py +++ b/plugins/modules/gcp_storage_bucket_access_control.py @@ -207,8 +207,8 @@ def main(): bucket=dict(required=True, type='dict'), entity=dict(required=True, type='str'), entity_id=dict(type='str'), - project_team=dict(type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str', choices=['editors', 'owners', 'viewers']))), - role=dict(type='str', choices=['OWNER', 'READER', 'WRITER']), + project_team=dict(type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str'))), + role=dict(type='str'), ) ) diff --git a/plugins/modules/gcp_storage_object.py b/plugins/modules/gcp_storage_object.py index 756b201..cd5b918 100644 --- a/plugins/modules/gcp_storage_object.py +++ b/plugins/modules/gcp_storage_object.py @@ -140,7 +140,7 @@ def main(): module = GcpModule( argument_spec=dict( state=dict(default='present', choices=['present', 'absent'], type='str'), - action=dict(type='str', choices=['download', 'upload']), + action=dict(type='str'), overwrite=dict(type='bool'), src=dict(type='path'), dest=dict(type='path'),