From 8264deeb9caf0993c33b357e4c359e5d1c6c1cbc Mon Sep 17 00:00:00 2001 From: Chris Stephens Date: Wed, 24 Oct 2018 19:05:06 +0000 Subject: [PATCH] Empty commit with no code changes --- .../modules/gcp_compute_backend_service.py | 42 ++--- plugins/modules/gcp_compute_health_check.py | 4 +- plugins/modules/gcp_compute_image.py | 3 - plugins/modules/gcp_compute_instance.py | 121 ++++++------ plugins/modules/gcp_compute_instance_group.py | 2 +- .../gcp_compute_instance_group_manager.py | 11 +- .../modules/gcp_compute_instance_template.py | 177 ++++++++---------- .../gcp_compute_interconnect_attachment.py | 4 +- plugins/modules/gcp_compute_network.py | 8 +- plugins/modules/gcp_compute_region_disk.py | 8 +- plugins/modules/gcp_compute_router.py | 28 ++- plugins/modules/gcp_compute_subnetwork.py | 8 +- plugins/modules/gcp_compute_url_map.py | 32 ++-- plugins/modules/gcp_container_cluster.py | 73 ++------ plugins/modules/gcp_container_node_pool.py | 24 +-- plugins/modules/gcp_pubsub_subscription.py | 14 +- plugins/modules/gcp_sql_instance.py | 62 +++--- plugins/modules/gcp_storage_bucket.py | 73 +++++--- .../gcp_storage_bucket_access_control.py | 4 +- 19 files changed, 310 insertions(+), 388 deletions(-) diff --git a/plugins/modules/gcp_compute_backend_service.py b/plugins/modules/gcp_compute_backend_service.py index 62922ae..ea23acd 100644 --- a/plugins/modules/gcp_compute_backend_service.py +++ b/plugins/modules/gcp_compute_backend_service.py @@ -907,19 +907,17 @@ class BackendServiceBackendsArray(object): ) def _response_from_item(self, item): - return remove_nones_from_dict( - { - u'balancingMode': item.get(u'balancingMode'), - u'capacityScaler': item.get(u'capacityScaler'), - u'description': item.get(u'description'), - u'group': item.get(u'group'), - u'maxConnections': item.get(u'maxConnections'), - u'maxConnectionsPerInstance': item.get(u'maxConnectionsPerInstance'), - u'maxRate': item.get(u'maxRate'), - u'maxRatePerInstance': item.get(u'maxRatePerInstance'), - u'maxUtilization': item.get(u'maxUtilization'), - } - ) + return remove_nones_from_dict({ + u'balancingMode': item.get(u'balancingMode'), + u'capacityScaler': item.get(u'capacityScaler'), + u'description': item.get(u'description'), + u'group': item.get(u'group'), + u'maxConnections': item.get(u'maxConnections'), + u'maxConnectionsPerInstance': item.get(u'maxConnectionsPerInstance'), + u'maxRate': item.get(u'maxRate'), + u'maxRatePerInstance': item.get(u'maxRatePerInstance'), + u'maxUtilization': item.get(u'maxUtilization') + }) class BackendServiceCdnpolicy(object): @@ -931,20 +929,14 @@ class BackendServiceCdnpolicy(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'cacheKeyPolicy': BackendServiceCachekeypolicy(self.request.get('cache_key_policy', {}), self.module).to_request(), - u'signedUrlCacheMaxAgeSec': self.request.get('signed_url_cache_max_age_sec'), - } - ) + return remove_nones_from_dict({ + u'cacheKeyPolicy': BackendServiceCachekeypolicy(self.request.get('cache_key_policy', {}), self.module).to_request() + }) def from_response(self): - return remove_nones_from_dict( - { - u'cacheKeyPolicy': BackendServiceCachekeypolicy(self.request.get(u'cacheKeyPolicy', {}), self.module).from_response(), - u'signedUrlCacheMaxAgeSec': self.request.get(u'signedUrlCacheMaxAgeSec'), - } - ) + return remove_nones_from_dict({ + u'cacheKeyPolicy': BackendServiceCachekeypolicy(self.request.get(u'cacheKeyPolicy', {}), self.module).from_response() + }) class BackendServiceCachekeypolicy(object): diff --git a/plugins/modules/gcp_compute_health_check.py b/plugins/modules/gcp_compute_health_check.py index 98ee871..dd80bbe 100644 --- a/plugins/modules/gcp_compute_health_check.py +++ b/plugins/modules/gcp_compute_health_check.py @@ -600,7 +600,7 @@ def resource_to_request(module): u'httpHealthCheck': HealthCheckHttphealthcheck(module.params.get('http_health_check', {}), module).to_request(), u'httpsHealthCheck': HealthCheckHttpshealthcheck(module.params.get('https_health_check', {}), module).to_request(), u'tcpHealthCheck': HealthCheckTcphealthcheck(module.params.get('tcp_health_check', {}), module).to_request(), - u'sslHealthCheck': HealthCheckSslhealthcheck(module.params.get('ssl_health_check', {}), module).to_request(), + u'sslHealthCheck': HealthCheckSslhealthcheck(module.params.get('ssl_health_check', {}), module).to_request() } return_vals = {} for k, v in request.items(): @@ -678,7 +678,7 @@ def response_to_hash(module, response): u'httpHealthCheck': HealthCheckHttphealthcheck(response.get(u'httpHealthCheck', {}), module).from_response(), u'httpsHealthCheck': HealthCheckHttpshealthcheck(response.get(u'httpsHealthCheck', {}), module).from_response(), u'tcpHealthCheck': HealthCheckTcphealthcheck(response.get(u'tcpHealthCheck', {}), module).from_response(), - u'sslHealthCheck': HealthCheckSslhealthcheck(response.get(u'sslHealthCheck', {}), module).from_response(), + u'sslHealthCheck': HealthCheckSslhealthcheck(response.get(u'sslHealthCheck', {}), module).from_response() } diff --git a/plugins/modules/gcp_compute_image.py b/plugins/modules/gcp_compute_image.py index 91e2ce5..914214a 100644 --- a/plugins/modules/gcp_compute_image.py +++ b/plugins/modules/gcp_compute_image.py @@ -518,7 +518,6 @@ def resource_to_request(module): u'family': module.params.get('family'), u'guestOsFeatures': ImageGuestosfeaturesArray(module.params.get('guest_os_features', []), module).to_request(), u'imageEncryptionKey': ImageImageencryptionkey(module.params.get('image_encryption_key', {}), module).to_request(), - u'labels': module.params.get('labels'), u'licenses': module.params.get('licenses'), u'name': module.params.get('name'), u'rawDisk': ImageRawdisk(module.params.get('raw_disk', {}), module).to_request(), @@ -600,8 +599,6 @@ def response_to_hash(module, response): u'guestOsFeatures': ImageGuestosfeaturesArray(response.get(u'guestOsFeatures', []), module).from_response(), u'id': response.get(u'id'), u'imageEncryptionKey': ImageImageencryptionkey(response.get(u'imageEncryptionKey', {}), module).from_response(), - u'labels': response.get(u'labels'), - u'labelFingerprint': response.get(u'labelFingerprint'), u'licenses': response.get(u'licenses'), u'name': response.get(u'name'), u'rawDisk': ImageRawdisk(response.get(u'rawDisk', {}), module).from_response(), diff --git a/plugins/modules/gcp_compute_instance.py b/plugins/modules/gcp_compute_instance.py index 7d50e96..587cc18 100644 --- a/plugins/modules/gcp_compute_instance.py +++ b/plugins/modules/gcp_compute_instance.py @@ -1016,8 +1016,7 @@ def resource_to_request(module): u'networkInterfaces': InstanceNetworkinterfacesArray(module.params.get('network_interfaces', []), module).to_request(), u'scheduling': InstanceScheduling(module.params.get('scheduling', {}), module).to_request(), u'serviceAccounts': InstanceServiceaccountsArray(module.params.get('service_accounts', []), module).to_request(), - u'status': module.params.get('status'), - u'tags': InstanceTags(module.params.get('tags', {}), module).to_request(), + u'tags': InstanceTags(module.params.get('tags', {}), module).to_request() } request = encode_request(request, module) return_vals = {} @@ -1259,36 +1258,32 @@ class InstanceDisksArray(object): return items def _request_for_item(self, item): - return remove_nones_from_dict( - { - u'autoDelete': item.get('auto_delete'), - u'boot': item.get('boot'), - u'deviceName': item.get('device_name'), - u'diskEncryptionKey': InstanceDiskencryptionkey(item.get('disk_encryption_key', {}), self.module).to_request(), - u'index': item.get('index'), - u'initializeParams': InstanceInitializeparams(item.get('initialize_params', {}), self.module).to_request(), - u'interface': item.get('interface'), - u'mode': item.get('mode'), - u'source': replace_resource_dict(item.get(u'source', {}), 'selfLink'), - u'type': item.get('type'), - } - ) + return remove_nones_from_dict({ + u'autoDelete': item.get('auto_delete'), + u'boot': item.get('boot'), + u'deviceName': item.get('device_name'), + u'diskEncryptionKey': InstanceDiskencryptionkey(item.get('disk_encryption_key', {}), self.module).to_request(), + u'index': item.get('index'), + u'initializeParams': InstanceInitializeparams(item.get('initialize_params', {}), self.module).to_request(), + u'interface': item.get('interface'), + u'mode': item.get('mode'), + u'source': replace_resource_dict(item.get(u'source', {}), 'selfLink'), + u'type': item.get('type') + }) def _response_from_item(self, item): - return remove_nones_from_dict( - { - u'autoDelete': item.get(u'autoDelete'), - u'boot': item.get(u'boot'), - u'deviceName': item.get(u'deviceName'), - u'diskEncryptionKey': InstanceDiskencryptionkey(item.get(u'diskEncryptionKey', {}), self.module).from_response(), - u'index': item.get(u'index'), - u'initializeParams': InstanceInitializeparams(self.module.params.get('initialize_params', {}), self.module).to_request(), - u'interface': item.get(u'interface'), - u'mode': item.get(u'mode'), - u'source': item.get(u'source'), - u'type': item.get(u'type'), - } - ) + return remove_nones_from_dict({ + u'autoDelete': item.get(u'autoDelete'), + u'boot': item.get(u'boot'), + u'deviceName': item.get(u'deviceName'), + u'diskEncryptionKey': InstanceDiskencryptionkey(item.get(u'diskEncryptionKey', {}), self.module).from_response(), + u'index': item.get(u'index'), + u'initializeParams': InstanceInitializeparams(self.module.params.get('initialize_params', {}), self.module).to_request(), + u'interface': item.get(u'interface'), + u'mode': item.get(u'mode'), + u'source': item.get(u'source'), + u'type': item.get(u'type') + }) class InstanceDiskencryptionkey(object): @@ -1315,26 +1310,22 @@ class InstanceInitializeparams(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'diskName': self.request.get('disk_name'), - u'diskSizeGb': self.request.get('disk_size_gb'), - u'diskType': disk_type_selflink(self.request.get('disk_type'), self.module.params), - u'sourceImage': self.request.get('source_image'), - u'sourceImageEncryptionKey': InstanceSourceimageencryptionkey(self.request.get('source_image_encryption_key', {}), self.module).to_request(), - } - ) + return remove_nones_from_dict({ + u'diskName': self.request.get('disk_name'), + u'diskSizeGb': self.request.get('disk_size_gb'), + u'diskType': disk_type_selflink(self.request.get('disk_type'), self.module.params), + u'sourceImage': self.request.get('source_image'), + u'sourceImageEncryptionKey': InstanceSourceimageencryptionkey(self.request.get('source_image_encryption_key', {}), self.module).to_request() + }) def from_response(self): - return remove_nones_from_dict( - { - u'diskName': self.request.get(u'diskName'), - u'diskSizeGb': self.request.get(u'diskSizeGb'), - u'diskType': self.request.get(u'diskType'), - u'sourceImage': self.request.get(u'sourceImage'), - u'sourceImageEncryptionKey': InstanceSourceimageencryptionkey(self.request.get(u'sourceImageEncryptionKey', {}), self.module).from_response(), - } - ) + return remove_nones_from_dict({ + u'diskName': self.request.get(u'diskName'), + u'diskSizeGb': self.request.get(u'diskSizeGb'), + u'diskType': self.request.get(u'diskType'), + u'sourceImage': self.request.get(u'sourceImage'), + u'sourceImageEncryptionKey': InstanceSourceimageencryptionkey(self.request.get(u'sourceImageEncryptionKey', {}), self.module).from_response() + }) class InstanceSourceimageencryptionkey(object): @@ -1400,26 +1391,24 @@ class InstanceNetworkinterfacesArray(object): return items def _request_for_item(self, item): - return remove_nones_from_dict( - { - u'accessConfigs': InstanceAccessconfigsArray(item.get('access_configs', []), self.module).to_request(), - u'aliasIpRanges': InstanceAliasiprangesArray(item.get('alias_ip_ranges', []), self.module).to_request(), - u'network': replace_resource_dict(item.get(u'network', {}), 'selfLink'), - u'networkIP': item.get('network_ip'), - u'subnetwork': replace_resource_dict(item.get(u'subnetwork', {}), 'selfLink'), - } - ) + return remove_nones_from_dict({ + u'accessConfigs': InstanceAccessconfigsArray(item.get('access_configs', []), self.module).to_request(), + u'aliasIpRanges': InstanceAliasiprangesArray(item.get('alias_ip_ranges', []), self.module).to_request(), + u'name': item.get('name'), + u'network': replace_resource_dict(item.get(u'network', {}), 'selfLink'), + u'networkIP': item.get('network_ip'), + u'subnetwork': replace_resource_dict(item.get(u'subnetwork', {}), 'selfLink') + }) def _response_from_item(self, item): - return remove_nones_from_dict( - { - u'accessConfigs': InstanceAccessconfigsArray(item.get(u'accessConfigs', []), self.module).from_response(), - u'aliasIpRanges': InstanceAliasiprangesArray(item.get(u'aliasIpRanges', []), self.module).from_response(), - u'network': item.get(u'network'), - u'networkIP': item.get(u'networkIP'), - u'subnetwork': item.get(u'subnetwork'), - } - ) + return remove_nones_from_dict({ + u'accessConfigs': InstanceAccessconfigsArray(item.get(u'accessConfigs', []), self.module).from_response(), + u'aliasIpRanges': InstanceAliasiprangesArray(item.get(u'aliasIpRanges', []), self.module).from_response(), + u'name': item.get(u'name'), + u'network': item.get(u'network'), + u'networkIP': item.get(u'networkIP'), + u'subnetwork': item.get(u'subnetwork') + }) class InstanceAccessconfigsArray(object): diff --git a/plugins/modules/gcp_compute_instance_group.py b/plugins/modules/gcp_compute_instance_group.py index fed89e4..dac82ee 100644 --- a/plugins/modules/gcp_compute_instance_group.py +++ b/plugins/modules/gcp_compute_instance_group.py @@ -487,7 +487,7 @@ class InstanceLogic(object): return request -class InstanceGroupNamedPortsArray(object): +class InstanceGroupNamedportsArray(object): def __init__(self, request, module): self.module = module if request: diff --git a/plugins/modules/gcp_compute_instance_group_manager.py b/plugins/modules/gcp_compute_instance_group_manager.py index 744b95c..fee921c 100644 --- a/plugins/modules/gcp_compute_instance_group_manager.py +++ b/plugins/modules/gcp_compute_instance_group_manager.py @@ -540,7 +540,16 @@ class InstanceGroupManagerCurrentactions(object): return remove_nones_from_dict({}) def from_response(self): - return remove_nones_from_dict({}) + return remove_nones_from_dict({ + u'abandoning': self.request.get(u'abandoning'), + u'creating': self.request.get(u'creating'), + u'creatingWithoutRetries': self.request.get(u'creatingWithoutRetries'), + u'deleting': self.request.get(u'deleting'), + u'none': self.request.get(u'none'), + u'recreating': self.request.get(u'recreating'), + u'refreshing': self.request.get(u'refreshing'), + u'restarting': self.request.get(u'restarting') + }) class InstanceGroupManagerNamedportsArray(object): diff --git a/plugins/modules/gcp_compute_instance_template.py b/plugins/modules/gcp_compute_instance_template.py index cd0b437..38ab66d 100644 --- a/plugins/modules/gcp_compute_instance_template.py +++ b/plugins/modules/gcp_compute_instance_template.py @@ -1149,38 +1149,32 @@ class InstanceTemplateProperties(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'canIpForward': self.request.get('can_ip_forward'), - u'description': self.request.get('description'), - u'disks': InstanceTemplateDisksArray(self.request.get('disks', []), self.module).to_request(), - u'machineType': self.request.get('machine_type'), - u'minCpuPlatform': self.request.get('min_cpu_platform'), - u'metadata': self.request.get('metadata'), - u'guestAccelerators': InstanceTemplateGuestacceleratorsArray(self.request.get('guest_accelerators', []), self.module).to_request(), - u'networkInterfaces': InstanceTemplateNetworkinterfacesArray(self.request.get('network_interfaces', []), self.module).to_request(), - u'scheduling': InstanceTemplateScheduling(self.request.get('scheduling', {}), self.module).to_request(), - u'serviceAccounts': InstanceTemplateServiceaccountsArray(self.request.get('service_accounts', []), self.module).to_request(), - u'tags': InstanceTemplateTags(self.request.get('tags', {}), self.module).to_request(), - } - ) + return remove_nones_from_dict({ + u'canIpForward': self.request.get('can_ip_forward'), + u'description': self.request.get('description'), + u'disks': InstanceTemplateDisksArray(self.request.get('disks', []), self.module).to_request(), + u'machineType': self.request.get('machine_type'), + u'metadata': self.request.get('metadata'), + u'guestAccelerators': InstanceTemplateGuestacceleratorsArray(self.request.get('guest_accelerators', []), self.module).to_request(), + u'networkInterfaces': InstanceTemplateNetworkinterfacesArray(self.request.get('network_interfaces', []), self.module).to_request(), + u'scheduling': InstanceTemplateScheduling(self.request.get('scheduling', {}), self.module).to_request(), + u'serviceAccounts': InstanceTemplateServiceaccountsArray(self.request.get('service_accounts', []), self.module).to_request(), + u'tags': InstanceTemplateTags(self.request.get('tags', {}), self.module).to_request() + }) def from_response(self): - return remove_nones_from_dict( - { - u'canIpForward': self.request.get(u'canIpForward'), - u'description': self.request.get(u'description'), - u'disks': InstanceTemplateDisksArray(self.request.get(u'disks', []), self.module).from_response(), - u'machineType': self.request.get(u'machineType'), - u'minCpuPlatform': self.request.get(u'minCpuPlatform'), - u'metadata': self.request.get(u'metadata'), - u'guestAccelerators': InstanceTemplateGuestacceleratorsArray(self.request.get(u'guestAccelerators', []), self.module).from_response(), - u'networkInterfaces': InstanceTemplateNetworkinterfacesArray(self.request.get(u'networkInterfaces', []), self.module).from_response(), - u'scheduling': InstanceTemplateScheduling(self.request.get(u'scheduling', {}), self.module).from_response(), - u'serviceAccounts': InstanceTemplateServiceaccountsArray(self.request.get(u'serviceAccounts', []), self.module).from_response(), - u'tags': InstanceTemplateTags(self.request.get(u'tags', {}), self.module).from_response(), - } - ) + return remove_nones_from_dict({ + u'canIpForward': self.request.get(u'canIpForward'), + u'description': self.request.get(u'description'), + u'disks': InstanceTemplateDisksArray(self.request.get(u'disks', []), self.module).from_response(), + u'machineType': self.request.get(u'machineType'), + u'metadata': self.request.get(u'metadata'), + u'guestAccelerators': InstanceTemplateGuestacceleratorsArray(self.request.get(u'guestAccelerators', []), self.module).from_response(), + u'networkInterfaces': InstanceTemplateNetworkinterfacesArray(self.request.get(u'networkInterfaces', []), self.module).from_response(), + u'scheduling': InstanceTemplateScheduling(self.request.get(u'scheduling', {}), self.module).from_response(), + u'serviceAccounts': InstanceTemplateServiceaccountsArray(self.request.get(u'serviceAccounts', []), self.module).from_response(), + u'tags': InstanceTemplateTags(self.request.get(u'tags', {}), self.module).from_response() + }) class InstanceTemplateDisksArray(object): @@ -1204,36 +1198,32 @@ class InstanceTemplateDisksArray(object): return items def _request_for_item(self, item): - return remove_nones_from_dict( - { - u'autoDelete': item.get('auto_delete'), - u'boot': item.get('boot'), - u'deviceName': item.get('device_name'), - u'diskEncryptionKey': InstanceTemplateDiskencryptionkey(item.get('disk_encryption_key', {}), self.module).to_request(), - u'index': item.get('index'), - u'initializeParams': InstanceTemplateInitializeparams(item.get('initialize_params', {}), self.module).to_request(), - u'interface': item.get('interface'), - u'mode': item.get('mode'), - u'source': replace_resource_dict(item.get(u'source', {}), 'name'), - u'type': item.get('type'), - } - ) + return remove_nones_from_dict({ + u'autoDelete': item.get('auto_delete'), + u'boot': item.get('boot'), + u'deviceName': item.get('device_name'), + u'diskEncryptionKey': InstanceTemplateDiskencryptionkey(item.get('disk_encryption_key', {}), self.module).to_request(), + u'index': item.get('index'), + u'initializeParams': InstanceTemplateInitializeparams(item.get('initialize_params', {}), self.module).to_request(), + u'interface': item.get('interface'), + u'mode': item.get('mode'), + u'source': replace_resource_dict(item.get(u'source', {}), 'name'), + u'type': item.get('type') + }) def _response_from_item(self, item): - return remove_nones_from_dict( - { - u'autoDelete': item.get(u'autoDelete'), - u'boot': item.get(u'boot'), - u'deviceName': item.get(u'deviceName'), - u'diskEncryptionKey': InstanceTemplateDiskencryptionkey(item.get(u'diskEncryptionKey', {}), self.module).from_response(), - u'index': item.get(u'index'), - u'initializeParams': InstanceTemplateInitializeparams(self.module.params.get('initialize_params', {}), self.module).to_request(), - u'interface': item.get(u'interface'), - u'mode': item.get(u'mode'), - u'source': item.get(u'source'), - u'type': item.get(u'type'), - } - ) + return remove_nones_from_dict({ + u'autoDelete': item.get(u'autoDelete'), + u'boot': item.get(u'boot'), + u'deviceName': item.get(u'deviceName'), + u'diskEncryptionKey': InstanceTemplateDiskencryptionkey(item.get(u'diskEncryptionKey', {}), self.module).from_response(), + u'index': item.get(u'index'), + u'initializeParams': InstanceTemplateInitializeparams(self.module.params.get('initialize_params', {}), self.module).to_request(), + u'interface': item.get(u'interface'), + u'mode': item.get(u'mode'), + u'source': item.get(u'source'), + u'type': item.get(u'type') + }) class InstanceTemplateDiskencryptionkey(object): @@ -1260,30 +1250,23 @@ class InstanceTemplateInitializeparams(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'diskName': self.request.get('disk_name'), - u'diskSizeGb': self.request.get('disk_size_gb'), - u'diskType': disk_type_selflink(self.request.get('disk_type'), self.module.params), - u'sourceImage': self.request.get('source_image'), - u'sourceImageEncryptionKey': InstanceTemplateSourceimageencryptionkey( - self.request.get('source_image_encryption_key', {}), self.module - ).to_request(), - } - ) + return remove_nones_from_dict({ + u'diskName': self.request.get('disk_name'), + u'diskSizeGb': self.request.get('disk_size_gb'), + u'diskType': disk_type_selflink(self.request.get('disk_type'), self.module.params), + u'sourceImage': self.request.get('source_image'), + u'sourceImageEncryptionKey': InstanceTemplateSourceimageencryptionkey(self.request.get('source_image_encryption_key', {}), self.module).to_request() + }) def from_response(self): - return remove_nones_from_dict( - { - u'diskName': self.request.get(u'diskName'), - u'diskSizeGb': self.request.get(u'diskSizeGb'), - u'diskType': self.request.get(u'diskType'), - u'sourceImage': self.request.get(u'sourceImage'), - u'sourceImageEncryptionKey': InstanceTemplateSourceimageencryptionkey( - self.request.get(u'sourceImageEncryptionKey', {}), self.module - ).from_response(), - } - ) + return remove_nones_from_dict({ + u'diskName': self.request.get(u'diskName'), + u'diskSizeGb': self.request.get(u'diskSizeGb'), + u'diskType': self.request.get(u'diskType'), + u'sourceImage': self.request.get(u'sourceImage'), + u'sourceImageEncryptionKey': + InstanceTemplateSourceimageencryptionkey(self.request.get(u'sourceImageEncryptionKey', {}), self.module).from_response() + }) class InstanceTemplateSourceimageencryptionkey(object): @@ -1349,26 +1332,24 @@ class InstanceTemplateNetworkinterfacesArray(object): return items def _request_for_item(self, item): - return remove_nones_from_dict( - { - u'accessConfigs': InstanceTemplateAccessconfigsArray(item.get('access_configs', []), self.module).to_request(), - u'aliasIpRanges': InstanceTemplateAliasiprangesArray(item.get('alias_ip_ranges', []), self.module).to_request(), - u'network': replace_resource_dict(item.get(u'network', {}), 'selfLink'), - u'networkIP': item.get('network_ip'), - u'subnetwork': replace_resource_dict(item.get(u'subnetwork', {}), 'selfLink'), - } - ) + return remove_nones_from_dict({ + u'accessConfigs': InstanceTemplateAccessconfigsArray(item.get('access_configs', []), self.module).to_request(), + u'aliasIpRanges': InstanceTemplateAliasiprangesArray(item.get('alias_ip_ranges', []), self.module).to_request(), + u'name': item.get('name'), + u'network': replace_resource_dict(item.get(u'network', {}), 'selfLink'), + u'networkIP': item.get('network_ip'), + u'subnetwork': replace_resource_dict(item.get(u'subnetwork', {}), 'selfLink') + }) def _response_from_item(self, item): - return remove_nones_from_dict( - { - u'accessConfigs': InstanceTemplateAccessconfigsArray(item.get(u'accessConfigs', []), self.module).from_response(), - u'aliasIpRanges': InstanceTemplateAliasiprangesArray(item.get(u'aliasIpRanges', []), self.module).from_response(), - u'network': item.get(u'network'), - u'networkIP': item.get(u'networkIP'), - u'subnetwork': item.get(u'subnetwork'), - } - ) + return remove_nones_from_dict({ + u'accessConfigs': InstanceTemplateAccessconfigsArray(item.get(u'accessConfigs', []), self.module).from_response(), + u'aliasIpRanges': InstanceTemplateAliasiprangesArray(item.get(u'aliasIpRanges', []), self.module).from_response(), + u'name': item.get(u'name'), + u'network': item.get(u'network'), + u'networkIP': item.get(u'networkIP'), + u'subnetwork': item.get(u'subnetwork') + }) class InstanceTemplateAccessconfigsArray(object): diff --git a/plugins/modules/gcp_compute_interconnect_attachment.py b/plugins/modules/gcp_compute_interconnect_attachment.py index b11a094..d9e91f4 100644 --- a/plugins/modules/gcp_compute_interconnect_attachment.py +++ b/plugins/modules/gcp_compute_interconnect_attachment.py @@ -327,7 +327,7 @@ def response_to_hash(module, response): u'customerRouterIpAddress': response.get(u'customerRouterIpAddress'), u'interconnect': response.get(u'interconnect'), u'description': response.get(u'description'), - u'privateInterconnectInfo': InterconnectAttachmentPrivateInterconnectInfo(response.get(u'privateInterconnectInfo', {}), module).from_response(), + u'privateInterconnectInfo': InterconnectAttachmentPrivateinterconnectinfo(response.get(u'privateInterconnectInfo', {}), module).from_response(), u'googleReferenceId': response.get(u'googleReferenceId'), u'router': response.get(u'router'), u'creationTimestamp': response.get(u'creationTimestamp'), @@ -382,7 +382,7 @@ def raise_if_errors(response, err_path, module): module.fail_json(msg=errors) -class InterconnectAttachmentPrivateInterconnectInfo(object): +class InterconnectAttachmentPrivateinterconnectinfo(object): def __init__(self, request, module): self.module = module if request: diff --git a/plugins/modules/gcp_compute_network.py b/plugins/modules/gcp_compute_network.py index 1736a5e..04792dd 100644 --- a/plugins/modules/gcp_compute_network.py +++ b/plugins/modules/gcp_compute_network.py @@ -277,7 +277,7 @@ def routing_config_update(module, request, response): "projects/{project}/regions/{region}/subnetworks/{name}" ]).format(**module.params), { - u'routingConfig': NetworkRoutingConfigArray(module.params.get('routing_config', []), module).to_request() + u'routingConfig': NetworkRoutingconfigArray(module.params.get('routing_config', []), module).to_request() } ) @@ -294,7 +294,7 @@ def resource_to_request(module): u'IPv4Range': module.params.get('ipv4_range'), u'name': module.params.get('name'), u'autoCreateSubnetworks': module.params.get('auto_create_subnetworks'), - u'routingConfig': NetworkRoutingConfigArray(module.params.get('routing_config', []), module).to_request() + u'routingConfig': NetworkRoutingconfigArray(module.params.get('routing_config', []), module).to_request() } return_vals = {} for k, v in request.items(): @@ -368,7 +368,7 @@ def response_to_hash(module, response): u'subnetworks': response.get(u'subnetworks'), u'autoCreateSubnetworks': module.params.get('auto_create_subnetworks'), u'creationTimestamp': response.get(u'creationTimestamp'), - u'routingConfig': NetworkRoutingConfigArray(response.get(u'routingConfig', []), module).from_response() + u'routingConfig': NetworkRoutingconfigArray(response.get(u'routingConfig', []), module).from_response() } @@ -407,7 +407,7 @@ def raise_if_errors(response, err_path, module): module.fail_json(msg=errors) -class NetworkRoutingConfigArray(object): +class NetworkRoutingconfigArray(object): def __init__(self, request, module): self.module = module if request: diff --git a/plugins/modules/gcp_compute_region_disk.py b/plugins/modules/gcp_compute_region_disk.py index efa4603..7847fb2 100644 --- a/plugins/modules/gcp_compute_region_disk.py +++ b/plugins/modules/gcp_compute_region_disk.py @@ -443,8 +443,8 @@ def delete(module, link, kind): def resource_to_request(module): request = { u'kind': 'compute#disk', - u'diskEncryptionKey': RegionDiskDiskEncryptionKey(module.params.get('disk_encryption_key', {}), module).to_request(), - u'sourceSnapshotEncryptionKey': RegionDiskSourceSnapshotEncryptionKey(module.params.get('source_snapshot_encryption_key', {}), module).to_request(), + u'diskEncryptionKey': RegionDiskDiskencryptionkey(module.params.get('disk_encryption_key', {}), module).to_request(), + u'sourceSnapshotEncryptionKey': RegionDiskSourcesnapshotencryptionkey(module.params.get('source_snapshot_encryption_key', {}), module).to_request(), u'description': module.params.get('description'), u'labels': module.params.get('labels'), u'licenses': module.params.get('licenses'), @@ -588,7 +588,7 @@ def raise_if_errors(response, err_path, module): module.fail_json(msg=errors) -class RegionDiskDiskEncryptionKey(object): +class RegionDiskDiskencryptionkey(object): def __init__(self, request, module): self.module = module if request: @@ -609,7 +609,7 @@ class RegionDiskDiskEncryptionKey(object): }) -class RegionDiskSourceSnapshotEncryptionKey(object): +class RegionDiskSourcesnapshotencryptionkey(object): def __init__(self, request, module): self.module = module if request: diff --git a/plugins/modules/gcp_compute_router.py b/plugins/modules/gcp_compute_router.py index 5c75882..e88b6b8 100644 --- a/plugins/modules/gcp_compute_router.py +++ b/plugins/modules/gcp_compute_router.py @@ -445,24 +445,20 @@ class RouterBgp(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'asn': self.request.get('asn'), - u'advertiseMode': self.request.get('advertise_mode'), - u'advertisedGroups': self.request.get('advertised_groups'), - u'advertisedIpRanges': RouterAdvertisediprangesArray(self.request.get('advertised_ip_ranges', []), self.module).to_request(), - } - ) + return remove_nones_from_dict({ + u'asn': self.request.get('asn'), + u'advertiseMode': self.request.get('advertise_mode'), + u'advertisedGroups': self.request.get('advertised_groups'), + u'advertisedIpRanges': RouterAdvertisediprangesArray(self.request.get('advertised_ip_ranges', []), self.module).to_request() + }) def from_response(self): - return remove_nones_from_dict( - { - u'asn': self.request.get(u'asn'), - u'advertiseMode': self.request.get(u'advertiseMode'), - u'advertisedGroups': self.request.get(u'advertisedGroups'), - u'advertisedIpRanges': RouterAdvertisediprangesArray(self.request.get(u'advertisedIpRanges', []), self.module).from_response(), - } - ) + return remove_nones_from_dict({ + u'asn': self.request.get(u'asn'), + u'advertiseMode': self.request.get(u'advertiseMode'), + u'advertisedGroups': self.request.get(u'advertisedGroups'), + u'advertisedIpRanges': RouterAdvertisediprangesArray(self.request.get(u'advertisedIpRanges', []), self.module).from_response() + }) class RouterAdvertisediprangesArray(object): diff --git a/plugins/modules/gcp_compute_subnetwork.py b/plugins/modules/gcp_compute_subnetwork.py index a8f7b56..6e4b242 100644 --- a/plugins/modules/gcp_compute_subnetwork.py +++ b/plugins/modules/gcp_compute_subnetwork.py @@ -362,7 +362,7 @@ def enable_flow_logs_update(module, request, response): { u'enableFlowLogs': module.params.get('enable_flow_logs'), u'fingerprint': response.get('fingerprint'), - u'secondaryIpRanges': SubnetworkSecondaryIpRangesArray(module.params.get('secondary_ip_ranges', []), module).to_request() + u'secondaryIpRanges': SubnetworkSecondaryiprangesArray(module.params.get('secondary_ip_ranges', []), module).to_request() } ) @@ -393,7 +393,7 @@ def resource_to_request(module): u'name': module.params.get('name'), u'network': replace_resource_dict(module.params.get(u'network', {}), 'selfLink'), u'enableFlowLogs': module.params.get('enable_flow_logs'), - u'secondaryIpRanges': SubnetworkSecondaryIpRangesArray(module.params.get('secondary_ip_ranges', []), module).to_request(), + u'secondaryIpRanges': SubnetworkSecondaryiprangesArray(module.params.get('secondary_ip_ranges', []), module).to_request(), u'privateIpGoogleAccess': module.params.get('private_ip_google_access'), u'region': module.params.get('region'), } @@ -470,7 +470,7 @@ def response_to_hash(module, response): u'network': replace_resource_dict(module.params.get(u'network', {}), 'selfLink'), u'enableFlowLogs': response.get(u'enableFlowLogs'), u'fingerprint': response.get(u'fingerprint'), - u'secondaryIpRanges': SubnetworkSecondaryIpRangesArray(response.get(u'secondaryIpRanges', []), module).from_response(), + u'secondaryIpRanges': SubnetworkSecondaryiprangesArray(response.get(u'secondaryIpRanges', []), module).from_response(), u'privateIpGoogleAccess': response.get(u'privateIpGoogleAccess'), u'region': module.params.get('region'), } @@ -511,7 +511,7 @@ def raise_if_errors(response, err_path, module): module.fail_json(msg=errors) -class SubnetworkSecondaryIpRangesArray(object): +class SubnetworkSecondaryiprangesArray(object): def __init__(self, request, module): self.module = module if request: diff --git a/plugins/modules/gcp_compute_url_map.py b/plugins/modules/gcp_compute_url_map.py index 774d3c1..31ec2f9 100644 --- a/plugins/modules/gcp_compute_url_map.py +++ b/plugins/modules/gcp_compute_url_map.py @@ -450,7 +450,7 @@ def resource_to_request(module): u'hostRules': UrlMapHostrulesArray(module.params.get('host_rules', []), module).to_request(), u'name': module.params.get('name'), u'pathMatchers': UrlMapPathmatchersArray(module.params.get('path_matchers', []), module).to_request(), - u'tests': UrlMapTestsArray(module.params.get('tests', []), module).to_request(), + u'tests': UrlMapTestsArray(module.params.get('tests', []), module).to_request() } return_vals = {} for k, v in request.items(): @@ -523,7 +523,7 @@ def response_to_hash(module, response): u'id': response.get(u'id'), u'fingerprint': response.get(u'fingerprint'), u'name': module.params.get('name'), - u'pathMatchers': UrlMapPathMatchersArray(response.get(u'pathMatchers', []), module).from_response(), + u'pathMatchers': UrlMapPathmatchersArray(response.get(u'pathMatchers', []), module).from_response(), u'tests': UrlMapTestsArray(response.get(u'tests', []), module).from_response() } @@ -611,24 +611,20 @@ class UrlMapPathmatchersArray(object): return items def _request_for_item(self, item): - return remove_nones_from_dict( - { - u'defaultService': replace_resource_dict(item.get(u'default_service', {}), 'selfLink'), - u'description': item.get('description'), - u'name': item.get('name'), - u'pathRules': UrlMapPathrulesArray(item.get('path_rules', []), self.module).to_request(), - } - ) + return remove_nones_from_dict({ + u'defaultService': replace_resource_dict(item.get(u'default_service', {}), 'selfLink'), + u'description': item.get('description'), + u'name': item.get('name'), + u'pathRules': UrlMapPathrulesArray(item.get('path_rules', []), self.module).to_request() + }) def _response_from_item(self, item): - return remove_nones_from_dict( - { - u'defaultService': item.get(u'defaultService'), - u'description': item.get(u'description'), - u'name': item.get(u'name'), - u'pathRules': UrlMapPathrulesArray(item.get(u'pathRules', []), self.module).from_response(), - } - ) + return remove_nones_from_dict({ + u'defaultService': item.get(u'defaultService'), + u'description': item.get(u'description'), + u'name': item.get(u'name'), + u'pathRules': UrlMapPathrulesArray(item.get(u'pathRules', []), self.module).from_response() + }) class UrlMapPathrulesArray(object): diff --git a/plugins/modules/gcp_container_cluster.py b/plugins/modules/gcp_container_cluster.py index 582defb..82b958c 100644 --- a/plugins/modules/gcp_container_cluster.py +++ b/plugins/modules/gcp_container_cluster.py @@ -859,20 +859,18 @@ class ClusterNodeconfig(object): ) def from_response(self): - return remove_nones_from_dict( - { - u'machineType': self.request.get(u'machineType'), - u'diskSizeGb': self.request.get(u'diskSizeGb'), - u'oauthScopes': self.request.get(u'oauthScopes'), - u'serviceAccount': self.request.get(u'serviceAccount'), - u'metadata': self.request.get(u'metadata'), - u'imageType': self.request.get(u'imageType'), - u'labels': self.request.get(u'labels'), - u'localSsdCount': self.request.get(u'localSsdCount'), - u'tags': self.request.get(u'tags'), - u'preemptible': self.request.get(u'preemptible'), - } - ) + return remove_nones_from_dict({ + u'machineType': self.request.get(u'machineType'), + u'diskSizeGb': self.request.get(u'diskSizeGb'), + u'oauthScopes': self.request.get(u'oauthScopes'), + u'serviceAccount': self.request.get(u'serviceAccount'), + u'metadata': self.request.get(u'metadata'), + u'imageType': self.request.get(u'imageType'), + u'labels': self.request.get(u'labels'), + u'localSsdCount': self.request.get(u'localSsdCount'), + u'tags': self.request.get(u'tags'), + u'preemptible': self.request.get(u'preemptible') + }) class ClusterMasterauth(object): @@ -890,33 +888,6 @@ class ClusterMasterauth(object): return remove_nones_from_dict({u'username': self.request.get(u'username'), u'password': self.request.get(u'password')}) -class ClusterPrivateclusterconfig(object): - def __init__(self, request, module): - self.module = module - if request: - self.request = request - else: - self.request = {} - - def to_request(self): - return remove_nones_from_dict( - { - u'enablePrivateNodes': self.request.get('enable_private_nodes'), - u'enablePrivateEndpoint': self.request.get('enable_private_endpoint'), - u'masterIpv4CidrBlock': self.request.get('master_ipv4_cidr_block'), - } - ) - - def from_response(self): - return remove_nones_from_dict( - { - u'enablePrivateNodes': self.request.get(u'enablePrivateNodes'), - u'enablePrivateEndpoint': self.request.get(u'enablePrivateEndpoint'), - u'masterIpv4CidrBlock': self.request.get(u'masterIpv4CidrBlock'), - } - ) - - class ClusterAddonsconfig(object): def __init__(self, request, module): self.module = module @@ -926,20 +897,16 @@ class ClusterAddonsconfig(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'httpLoadBalancing': ClusterHttploadbalancing(self.request.get('http_load_balancing', {}), self.module).to_request(), - u'horizontalPodAutoscaling': ClusterHorizontalpodautoscaling(self.request.get('horizontal_pod_autoscaling', {}), self.module).to_request(), - } - ) + return remove_nones_from_dict({ + u'httpLoadBalancing': ClusterHttploadbalancing(self.request.get('http_load_balancing', {}), self.module).to_request(), + u'horizontalPodAutoscaling': ClusterHorizontalpodautoscaling(self.request.get('horizontal_pod_autoscaling', {}), self.module).to_request() + }) def from_response(self): - return remove_nones_from_dict( - { - u'httpLoadBalancing': ClusterHttploadbalancing(self.request.get(u'httpLoadBalancing', {}), self.module).from_response(), - u'horizontalPodAutoscaling': ClusterHorizontalpodautoscaling(self.request.get(u'horizontalPodAutoscaling', {}), self.module).from_response(), - } - ) + return remove_nones_from_dict({ + u'httpLoadBalancing': ClusterHttploadbalancing(self.request.get(u'httpLoadBalancing', {}), self.module).from_response(), + u'horizontalPodAutoscaling': ClusterHorizontalpodautoscaling(self.request.get(u'horizontalPodAutoscaling', {}), self.module).from_response() + }) class ClusterHttploadbalancing(object): diff --git a/plugins/modules/gcp_container_node_pool.py b/plugins/modules/gcp_container_node_pool.py index d807654..38534cc 100644 --- a/plugins/modules/gcp_container_node_pool.py +++ b/plugins/modules/gcp_container_node_pool.py @@ -722,22 +722,18 @@ class NodePoolManagement(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'autoUpgrade': self.request.get('auto_upgrade'), - u'autoRepair': self.request.get('auto_repair'), - u'upgradeOptions': NodePoolUpgradeoptions(self.request.get('upgrade_options', {}), self.module).to_request(), - } - ) + return remove_nones_from_dict({ + u'autoUpgrade': self.request.get('auto_upgrade'), + u'autoRepair': self.request.get('auto_repair'), + u'upgradeOptions': NodePoolUpgradeoptions(self.request.get('upgrade_options', {}), self.module).to_request() + }) def from_response(self): - return remove_nones_from_dict( - { - u'autoUpgrade': self.request.get(u'autoUpgrade'), - u'autoRepair': self.request.get(u'autoRepair'), - u'upgradeOptions': NodePoolUpgradeoptions(self.request.get(u'upgradeOptions', {}), self.module).from_response(), - } - ) + return remove_nones_from_dict({ + u'autoUpgrade': self.request.get(u'autoUpgrade'), + u'autoRepair': self.request.get(u'autoRepair'), + u'upgradeOptions': NodePoolUpgradeoptions(self.request.get(u'upgradeOptions', {}), self.module).from_response() + }) class NodePoolUpgradeoptions(object): diff --git a/plugins/modules/gcp_pubsub_subscription.py b/plugins/modules/gcp_pubsub_subscription.py index 8b47f94..31732b8 100644 --- a/plugins/modules/gcp_pubsub_subscription.py +++ b/plugins/modules/gcp_pubsub_subscription.py @@ -259,11 +259,8 @@ def resource_to_request(module): request = { u'name': module.params.get('name'), u'topic': replace_resource_dict(module.params.get(u'topic', {}), 'name'), - u'labels': module.params.get('labels'), u'pushConfig': SubscriptionPushconfig(module.params.get('push_config', {}), module).to_request(), - u'ackDeadlineSeconds': module.params.get('ack_deadline_seconds'), - u'messageRetentionDuration': module.params.get('message_retention_duration'), - u'retainAckedMessages': module.params.get('retain_acked_messages'), + u'ackDeadlineSeconds': module.params.get('ack_deadline_seconds') } request = encode_request(request, module) return_vals = {} @@ -333,13 +330,10 @@ def is_different(module, response): # This is for doing comparisons with Ansible's current parameters. def response_to_hash(module, response): return { - u'name': module.params.get('name'), - u'topic': replace_resource_dict(module.params.get(u'topic', {}), 'name'), - u'labels': response.get(u'labels'), + u'name': response.get(u'name'), + u'topic': response.get(u'topic'), u'pushConfig': SubscriptionPushconfig(response.get(u'pushConfig', {}), module).from_response(), - u'ackDeadlineSeconds': response.get(u'ackDeadlineSeconds'), - u'messageRetentionDuration': response.get(u'messageRetentionDuration'), - u'retainAckedMessages': response.get(u'retainAckedMessages'), + u'ackDeadlineSeconds': response.get(u'ackDeadlineSeconds') } diff --git a/plugins/modules/gcp_sql_instance.py b/plugins/modules/gcp_sql_instance.py index b87573c..2c22eb5 100644 --- a/plugins/modules/gcp_sql_instance.py +++ b/plugins/modules/gcp_sql_instance.py @@ -670,7 +670,7 @@ def resource_to_request(module): u'name': module.params.get('name'), u'region': module.params.get('region'), u'replicaConfiguration': InstanceReplicaconfiguration(module.params.get('replica_configuration', {}), module).to_request(), - u'settings': InstanceSettings(module.params.get('settings', {}), module).to_request(), + u'settings': InstanceSettings(module.params.get('settings', {}), module).to_request() } return_vals = {} for k, v in request.items(): @@ -751,7 +751,7 @@ def response_to_hash(module, response): u'name': response.get(u'name'), u'region': response.get(u'region'), u'replicaConfiguration': InstanceReplicaconfiguration(response.get(u'replicaConfiguration', {}), module).from_response(), - u'settings': InstanceSettings(response.get(u'settings', {}), module).from_response(), + u'settings': InstanceSettings(response.get(u'settings', {}), module).from_response() } @@ -841,26 +841,20 @@ class InstanceReplicaconfiguration(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'failoverTarget': self.request.get('failover_target'), - u'mysqlReplicaConfiguration': InstanceMysqlreplicaconfiguration(self.request.get('mysql_replica_configuration', {}), self.module).to_request(), - u'replicaNames': self.request.get('replica_names'), - u'serviceAccountEmailAddress': self.request.get('service_account_email_address'), - } - ) + return remove_nones_from_dict({ + u'failoverTarget': self.request.get('failover_target'), + u'mysqlReplicaConfiguration': InstanceMysqlreplicaconfiguration(self.request.get('mysql_replica_configuration', {}), self.module).to_request(), + u'replicaNames': self.request.get('replica_names'), + u'serviceAccountEmailAddress': self.request.get('service_account_email_address') + }) def from_response(self): - return remove_nones_from_dict( - { - u'failoverTarget': self.request.get(u'failoverTarget'), - u'mysqlReplicaConfiguration': InstanceMysqlreplicaconfiguration( - self.request.get(u'mysqlReplicaConfiguration', {}), self.module - ).from_response(), - u'replicaNames': self.request.get(u'replicaNames'), - u'serviceAccountEmailAddress': self.request.get(u'serviceAccountEmailAddress'), - } - ) + return remove_nones_from_dict({ + u'failoverTarget': self.request.get(u'failoverTarget'), + u'mysqlReplicaConfiguration': InstanceMysqlreplicaconfiguration(self.request.get(u'mysqlReplicaConfiguration', {}), self.module).from_response(), + u'replicaNames': self.request.get(u'replicaNames'), + u'serviceAccountEmailAddress': self.request.get(u'serviceAccountEmailAddress') + }) class InstanceMysqlreplicaconfiguration(object): @@ -914,14 +908,14 @@ class InstanceSettings(object): def to_request(self): return remove_nones_from_dict({ - u'ipConfiguration': InstanceIpConfiguration(self.request.get('ip_configuration', {}), self.module).to_request(), + u'ipConfiguration': InstanceIpconfiguration(self.request.get('ip_configuration', {}), self.module).to_request(), u'tier': self.request.get('tier'), u'settingsVersion': self.request.get('settings_version') }) def from_response(self): return remove_nones_from_dict({ - u'ipConfiguration': InstanceIpConfiguration(self.request.get(u'ipConfiguration', {}), self.module).from_response(), + u'ipConfiguration': InstanceIpconfiguration(self.request.get(u'ipConfiguration', {}), self.module).from_response(), u'tier': self.request.get(u'tier'), u'settingsVersion': self.request.get(u'settingsVersion') }) @@ -936,22 +930,18 @@ class InstanceIpconfiguration(object): self.request = {} def to_request(self): - return remove_nones_from_dict( - { - u'ipv4Enabled': self.request.get('ipv4_enabled'), - u'authorizedNetworks': InstanceAuthorizednetworksArray(self.request.get('authorized_networks', []), self.module).to_request(), - u'requireSsl': self.request.get('require_ssl'), - } - ) + return remove_nones_from_dict({ + u'ipv4Enabled': self.request.get('ipv4_enabled'), + u'authorizedNetworks': InstanceAuthorizednetworksArray(self.request.get('authorized_networks', []), self.module).to_request(), + u'requireSsl': self.request.get('require_ssl') + }) def from_response(self): - return remove_nones_from_dict( - { - u'ipv4Enabled': self.request.get(u'ipv4Enabled'), - u'authorizedNetworks': InstanceAuthorizednetworksArray(self.request.get(u'authorizedNetworks', []), self.module).from_response(), - u'requireSsl': self.request.get(u'requireSsl'), - } - ) + return remove_nones_from_dict({ + u'ipv4Enabled': self.request.get(u'ipv4Enabled'), + u'authorizedNetworks': InstanceAuthorizednetworksArray(self.request.get(u'authorizedNetworks', []), self.module).from_response(), + u'requireSsl': self.request.get(u'requireSsl') + }) class InstanceAuthorizednetworksArray(object): diff --git a/plugins/modules/gcp_storage_bucket.py b/plugins/modules/gcp_storage_bucket.py index e8102a8..a98302c 100644 --- a/plugins/modules/gcp_storage_bucket.py +++ b/plugins/modules/gcp_storage_bucket.py @@ -1023,26 +1023,28 @@ class BucketAclArray(object): return items def _request_for_item(self, item): - return remove_nones_from_dict( - { - u'bucket': replace_resource_dict(item.get(u'bucket', {}), 'name'), - u'entity': item.get('entity'), - u'entityId': item.get('entity_id'), - u'projectTeam': BucketProjectteam(item.get('project_team', {}), self.module).to_request(), - u'role': item.get('role'), - } - ) + return remove_nones_from_dict({ + u'bucket': replace_resource_dict(item.get(u'bucket', {}), 'name'), + u'domain': item.get('domain'), + u'email': item.get('email'), + u'entity': item.get('entity'), + u'entityId': item.get('entity_id'), + u'id': item.get('id'), + u'projectTeam': BucketProjectteam(item.get('project_team', {}), self.module).to_request(), + u'role': item.get('role') + }) def _response_from_item(self, item): - return remove_nones_from_dict( - { - u'bucket': item.get(u'bucket'), - u'entity': item.get(u'entity'), - u'entityId': item.get(u'entityId'), - u'projectTeam': BucketProjectteam(item.get(u'projectTeam', {}), self.module).from_response(), - u'role': item.get(u'role'), - } - ) + return remove_nones_from_dict({ + u'bucket': item.get(u'bucket'), + u'domain': item.get(u'domain'), + u'email': item.get(u'email'), + u'entity': item.get(u'entity'), + u'entityId': item.get(u'entityId'), + u'id': item.get(u'id'), + u'projectTeam': BucketProjectteam(item.get(u'projectTeam', {}), self.module).from_response(), + u'role': item.get(u'role') + }) class BucketProjectteam(object): @@ -1122,19 +1124,32 @@ class BucketDefaultobjectaclArray(object): return items def _request_for_item(self, item): - return remove_nones_from_dict( - { - u'bucket': replace_resource_dict(item.get(u'bucket', {}), 'name'), - u'entity': item.get('entity'), - u'object': item.get('object'), - u'role': item.get('role'), - } - ) + return remove_nones_from_dict({ + u'bucket': replace_resource_dict(item.get(u'bucket', {}), 'name'), + u'domain': item.get('domain'), + u'email': item.get('email'), + u'entity': item.get('entity'), + u'entityId': item.get('entity_id'), + u'generation': item.get('generation'), + u'id': item.get('id'), + u'object': item.get('object'), + u'projectTeam': BucketProjectteam(item.get('project_team', {}), self.module).to_request(), + u'role': item.get('role') + }) def _response_from_item(self, item): - return remove_nones_from_dict( - {u'bucket': item.get(u'bucket'), u'entity': item.get(u'entity'), u'object': item.get(u'object'), u'role': item.get(u'role')} - ) + return remove_nones_from_dict({ + u'bucket': item.get(u'bucket'), + u'domain': item.get(u'domain'), + u'email': item.get(u'email'), + u'entity': item.get(u'entity'), + u'entityId': item.get(u'entityId'), + u'generation': item.get(u'generation'), + u'id': item.get(u'id'), + u'object': item.get(u'object'), + u'projectTeam': BucketProjectteam(item.get(u'projectTeam', {}), self.module).from_response(), + u'role': item.get(u'role') + }) class BucketProjectteam(object): diff --git a/plugins/modules/gcp_storage_bucket_access_control.py b/plugins/modules/gcp_storage_bucket_access_control.py index 49717bf..cb6a0b1 100644 --- a/plugins/modules/gcp_storage_bucket_access_control.py +++ b/plugins/modules/gcp_storage_bucket_access_control.py @@ -268,7 +268,7 @@ def resource_to_request(module): u'entity': module.params.get('entity'), u'entityId': module.params.get('entity_id'), u'projectTeam': BucketAccessControlProjectteam(module.params.get('project_team', {}), module).to_request(), - u'role': module.params.get('role'), + u'role': module.params.get('role') } return_vals = {} for k, v in request.items(): @@ -341,7 +341,7 @@ def response_to_hash(module, response): u'entityId': response.get(u'entityId'), u'id': response.get(u'id'), u'projectTeam': BucketAccessControlProjectteam(response.get(u'projectTeam', {}), module).from_response(), - u'role': response.get(u'role'), + u'role': response.get(u'role') }