diff --git a/plugins/modules/gcp_compute_backend_service.py b/plugins/modules/gcp_compute_backend_service.py index 8c2552d..49e7a88 100644 --- a/plugins/modules/gcp_compute_backend_service.py +++ b/plugins/modules/gcp_compute_backend_service.py @@ -229,10 +229,6 @@ options: description: - OAuth2 Client Secret for IAP. required: false - oauth2_client_secret_sha256: - description: - - OAuth2 Client Secret SHA-256 for IAP. - required: false load_balancing_scheme: description: - Indicates whether the backend service will be used with internal or external @@ -657,15 +653,7 @@ def main(): description=dict(type='str'), enable_cdn=dict(type='bool'), health_checks=dict(type='list', elements='str'), - iap=dict( - type='dict', - options=dict( - enabled=dict(type='bool'), - oauth2_client_id=dict(type='str'), - oauth2_client_secret=dict(type='str'), - oauth2_client_secret_sha256=dict(type='str'), - ), - ), + iap=dict(type='dict', options=dict(enabled=dict(type='bool'), oauth2_client_id=dict(type='str'), oauth2_client_secret=dict(type='str'))), load_balancing_scheme=dict(type='str', choices=['INTERNAL', 'EXTERNAL']), name=dict(type='str'), port_name=dict(type='str'), diff --git a/plugins/modules/gcp_compute_disk.py b/plugins/modules/gcp_compute_disk.py index 271db2c..ec8543e 100644 --- a/plugins/modules/gcp_compute_disk.py +++ b/plugins/modules/gcp_compute_disk.py @@ -124,11 +124,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false kms_key_name: description: - The name of the encryption key that is stored in Google Cloud KMS. @@ -150,11 +145,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false kms_key_name: description: - The name of the encryption key that is stored in Google Cloud KMS. @@ -183,11 +173,6 @@ options: description: - The name of the encryption key that is stored in Google Cloud KMS. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false extends_documentation_fragment: gcp notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/disks)' @@ -436,10 +421,10 @@ def main(): type=dict(type='str'), source_image=dict(type='str'), zone=dict(required=True, type='str'), - source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'), kms_key_name=dict(type='str'))), - disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'), kms_key_name=dict(type='str'))), + source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))), + disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))), source_snapshot=dict(), - source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'), sha256=dict(type='str'))), + source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))), ) ) diff --git a/plugins/modules/gcp_compute_image.py b/plugins/modules/gcp_compute_image.py index 5ecbf7b..f27231e 100644 --- a/plugins/modules/gcp_compute_image.py +++ b/plugins/modules/gcp_compute_image.py @@ -106,11 +106,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false labels: description: - Labels to apply to this Image. @@ -173,11 +168,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false source_disk_id: description: - The ID value of the disk used to create this image. This value may be used to @@ -453,7 +443,7 @@ def main(): 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']))), - image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=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'), @@ -462,7 +452,7 @@ def main(): options=dict(container_type=dict(type='str', choices=['TAR']), sha1_checksum=dict(type='str'), source=dict(required=True, type='str')), ), source_disk=dict(), - source_disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'))), + 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']), ) diff --git a/plugins/modules/gcp_compute_instance.py b/plugins/modules/gcp_compute_instance.py index 21bf960..1687eb9 100644 --- a/plugins/modules/gcp_compute_instance.py +++ b/plugins/modules/gcp_compute_instance.py @@ -98,11 +98,6 @@ options: - Specifies an RFC 4648 base64 encoded, RSA-wrapped 2048-bit customer-supplied encryption key to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false index: description: - Assigns a zero-based index to this disk, where 0 is reserved for the boot @@ -156,11 +151,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied - encryption key that protects this resource. - required: false interface: description: - Specifies the disk interface to use for attaching this disk, which is either @@ -302,11 +292,6 @@ options: from which to allocate the IP CIDR range for this alias IP range. If left unspecified, the primary range of the subnetwork will be used. required: false - name: - description: - - The name of the network interface, generated by the server. For network - devices, these are eth0, eth1, etc . - required: false network: description: - Specifies the title of an existing network. When creating an instance, if @@ -902,7 +887,7 @@ def main(): auto_delete=dict(type='bool'), boot=dict(type='bool'), device_name=dict(type='str'), - disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), rsa_encrypted_key=dict(type='str'), sha256=dict(type='str'))), + disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), rsa_encrypted_key=dict(type='str'))), index=dict(type='int'), initialize_params=dict( type='dict', @@ -911,7 +896,7 @@ def main(): disk_size_gb=dict(type='int'), disk_type=dict(type='str'), source_image=dict(type='str', aliases=['image', 'image_family']), - source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'))), + source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), ), ), interface=dict(type='str', choices=['SCSI', 'NVME']), @@ -936,7 +921,6 @@ def main(): options=dict(name=dict(required=True, type='str'), nat_ip=dict(), type=dict(required=True, type='str', choices=['ONE_TO_ONE_NAT'])), ), alias_ip_ranges=dict(type='list', elements='dict', options=dict(ip_cidr_range=dict(type='str'), subnetwork_range_name=dict(type='str'))), - name=dict(type='str'), network=dict(), network_ip=dict(type='str'), subnetwork=dict(), diff --git a/plugins/modules/gcp_compute_instance_template.py b/plugins/modules/gcp_compute_instance_template.py index ee90ace..eebdfa5 100644 --- a/plugins/modules/gcp_compute_instance_template.py +++ b/plugins/modules/gcp_compute_instance_template.py @@ -123,11 +123,6 @@ options: - Specifies an RFC 4648 base64 encoded, RSA-wrapped 2048-bit customer-supplied encryption key to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied - encryption key that protects this resource. - required: false index: description: - Assigns a zero-based index to this disk, where 0 is reserved for the @@ -179,11 +174,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied - encryption key that protects this resource. - required: false interface: description: - Specifies the disk interface to use for attaching this disk, which is @@ -315,11 +305,6 @@ options: range. If left unspecified, the primary range of the subnetwork will be used. required: false - name: - description: - - The name of the network interface, generated by the server. For network - devices, these are eth0, eth1, etc . - required: false network: description: - Specifies the title of an existing network. When creating an instance, @@ -878,9 +863,7 @@ def main(): auto_delete=dict(type='bool'), boot=dict(type='bool'), device_name=dict(type='str'), - disk_encryption_key=dict( - type='dict', options=dict(raw_key=dict(type='str'), rsa_encrypted_key=dict(type='str'), sha256=dict(type='str')) - ), + disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), rsa_encrypted_key=dict(type='str'))), index=dict(type='int'), initialize_params=dict( type='dict', @@ -889,7 +872,7 @@ def main(): disk_size_gb=dict(type='int'), disk_type=dict(type='str'), source_image=dict(type='str'), - source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'))), + source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), ), ), interface=dict(type='str', choices=['SCSI', 'NVME']), @@ -916,7 +899,6 @@ def main(): alias_ip_ranges=dict( type='list', elements='dict', options=dict(ip_cidr_range=dict(type='str'), subnetwork_range_name=dict(type='str')) ), - name=dict(type='str'), network=dict(), network_ip=dict(type='str'), subnetwork=dict(), diff --git a/plugins/modules/gcp_compute_region_disk.py b/plugins/modules/gcp_compute_region_disk.py index 627ce87..416e85b 100644 --- a/plugins/modules/gcp_compute_region_disk.py +++ b/plugins/modules/gcp_compute_region_disk.py @@ -118,11 +118,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false source_snapshot: description: - The source snapshot used to create this disk. You can provide this as a partial @@ -143,11 +138,6 @@ options: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource. required: false - sha256: - description: - - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption - key that protects this resource. - required: false extends_documentation_fragment: gcp notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/beta/regionDisks)' @@ -345,9 +335,9 @@ def main(): replica_zones=dict(required=True, type='list', elements='str'), type=dict(type='str'), region=dict(required=True, type='str'), - disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'))), + disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), source_snapshot=dict(), - source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'))), + source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))), ) ) diff --git a/plugins/modules/gcp_container_cluster.py b/plugins/modules/gcp_container_cluster.py index 6564d7a..3f0edf6 100644 --- a/plugins/modules/gcp_container_cluster.py +++ b/plugins/modules/gcp_container_cluster.py @@ -170,20 +170,6 @@ options: Because the master endpoint is open to the Internet, you should create a strong password. required: false - cluster_ca_certificate: - description: - - Base64-encoded public certificate that is the root of trust for the cluster. - required: false - client_certificate: - description: - - Base64-encoded public certificate used by clients to authenticate to the - cluster endpoint. - required: false - client_key: - description: - - Base64-encoded private key used by clients to authenticate to the cluster - endpoint. - required: false logging_service: description: - 'The logging service the cluster should use to write logs. Currently available @@ -672,16 +658,7 @@ def main(): preemptible=dict(type='bool'), ), ), - master_auth=dict( - type='dict', - options=dict( - username=dict(type='str'), - password=dict(type='str'), - cluster_ca_certificate=dict(type='str'), - client_certificate=dict(type='str'), - client_key=dict(type='str'), - ), - ), + 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']), network=dict(type='str'), diff --git a/plugins/modules/gcp_container_node_pool.py b/plugins/modules/gcp_container_node_pool.py index e0cf122..d7416aa 100644 --- a/plugins/modules/gcp_container_node_pool.py +++ b/plugins/modules/gcp_container_node_pool.py @@ -188,17 +188,7 @@ options: description: - Specifies the Auto Upgrade knobs for the node pool. required: false - suboptions: - auto_upgrade_start_time: - description: - - This field is set when upgrades are about to commence with the approximate - start time for the upgrades, in RFC3339 text format. - required: false - description: - description: - - This field is set when upgrades are about to commence with the description - of the upgrade. - required: false + suboptions: {} cluster: description: - The cluster this node pool belongs to. @@ -464,12 +454,7 @@ def main(): initial_node_count=dict(required=True, type='int'), autoscaling=dict(type='dict', options=dict(enabled=dict(type='bool'), min_node_count=dict(type='int'), max_node_count=dict(type='int'))), management=dict( - type='dict', - options=dict( - auto_upgrade=dict(type='bool'), - auto_repair=dict(type='bool'), - upgrade_options=dict(type='dict', options=dict(auto_upgrade_start_time=dict(type='str'), description=dict(type='str'))), - ), + type='dict', options=dict(auto_upgrade=dict(type='bool'), auto_repair=dict(type='bool'), upgrade_options=dict(type='dict', options=dict())) ), cluster=dict(required=True), location=dict(required=True, type='str', aliases=['region', 'zone']), diff --git a/plugins/modules/gcp_sql_instance.py b/plugins/modules/gcp_sql_instance.py index f1fd075..9301b4f 100644 --- a/plugins/modules/gcp_sql_instance.py +++ b/plugins/modules/gcp_sql_instance.py @@ -82,13 +82,6 @@ options: to Second Generation instances. required: false suboptions: - available: - description: - - The availability status of the failover replica. A false status indicates - that the failover replica is out of sync. The master can only failover to - the failover replica when the status is true. - required: false - type: bool name: description: - The name of the failover replica. If specified at instance creation, a failover @@ -286,13 +279,6 @@ options: description: - Define the backup start time in UTC (HH:MM) . required: false - settings_version: - description: - - The version of instance settings. This is a required field for update method - to make sure concurrent updates are handled properly. During update, use - the most recent settingsVersion value for this instance and do not try to - update this value. - required: false extends_documentation_fragment: gcp ''' @@ -624,7 +610,7 @@ def main(): backend_type=dict(type='str', choices=['FIRST_GEN', 'SECOND_GEN', 'EXTERNAL']), connection_name=dict(type='str'), database_version=dict(type='str', choices=['MYSQL_5_5', 'MYSQL_5_6', 'MYSQL_5_7', 'POSTGRES_9_6']), - failover_replica=dict(type='dict', options=dict(available=dict(type='bool'), name=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']), ipv6_address=dict(type='str'), master_instance_name=dict(type='str'), @@ -672,7 +658,6 @@ def main(): backup_configuration=dict( type='dict', options=dict(enabled=dict(type='bool'), binary_log_enabled=dict(type='bool'), start_time=dict(type='str')) ), - settings_version=dict(type='int'), ), ), ) diff --git a/plugins/modules/gcp_storage_bucket.py b/plugins/modules/gcp_storage_bucket.py index 0da5659..2e73866 100644 --- a/plugins/modules/gcp_storage_bucket.py +++ b/plugins/modules/gcp_storage_bucket.py @@ -65,14 +65,6 @@ options: string Alternatively, you can add `register: name-of-resource` to a gcp_storage_bucket task and then set this bucket field to "{{ name-of-resource }}"' required: true - domain: - description: - - The domain associated with the entity. - required: false - email: - description: - - The email address associated with the entity. - required: false entity: description: - 'The entity holding the permission, in one of the following forms: user-userId @@ -87,10 +79,6 @@ options: description: - The ID for the entity. required: false - id: - description: - - The ID of the access-control entry. - required: false project_team: description: - The project team associated with the entity. @@ -156,14 +144,6 @@ options: string Alternatively, you can add `register: name-of-resource` to a gcp_storage_bucket task and then set this bucket field to "{{ name-of-resource }}"' required: true - domain: - description: - - The domain associated with the entity. - required: false - email: - description: - - The email address associated with the entity. - required: false entity: description: - 'The entity holding the permission, in one of the following forms: * user-{{userId}} @@ -172,39 +152,10 @@ options: (such as "domain-example.com") * project-team-{{projectId}} * allUsers * allAuthenticatedUsers .' required: true - entity_id: - description: - - The ID for the entity. - required: false - generation: - description: - - The content generation of the object, if applied to an object. - required: false - id: - description: - - The ID of the access-control entry. - required: false object: description: - The name of the object, if applied to an object. required: false - project_team: - description: - - The project team associated with the entity. - required: false - suboptions: - project_number: - description: - - The project team associated with the entity. - required: false - team: - description: - - The team. - required: false - choices: - - editors - - owners - - viewers role: description: - The access permission for the entity. @@ -313,10 +264,6 @@ options: description: - The entity, in the form project-owner-projectId. required: false - entity_id: - description: - - The ID for the entity. - required: false storage_class: description: - The bucket's default storage class, used whenever no storageClass is specified @@ -794,11 +741,8 @@ def main(): elements='dict', options=dict( bucket=dict(required=True), - domain=dict(type='str'), - email=dict(type='str'), entity=dict(required=True, type='str'), entity_id=dict(type='str'), - id=dict(type='str'), project_team=dict( type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str', choices=['editors', 'owners', 'viewers'])) ), @@ -820,16 +764,8 @@ def main(): elements='dict', options=dict( bucket=dict(required=True), - domain=dict(type='str'), - email=dict(type='str'), entity=dict(required=True, type='str'), - entity_id=dict(type='str'), - generation=dict(type='int'), - id=dict(type='str'), object=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(required=True, type='str', choices=['OWNER', 'READER']), ), ), @@ -861,7 +797,7 @@ def main(): logging=dict(type='dict', options=dict(log_bucket=dict(type='str'), log_object_prefix=dict(type='str'))), metageneration=dict(type='int'), name=dict(type='str'), - owner=dict(type='dict', options=dict(entity=dict(type='str'), entity_id=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']), 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'))),