From b2629e627929480d23a7c753618205f23cffcac5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:32:59 +0200 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#1519) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 23.10.1 → 23.11.0](https://github.com/psf/black/compare/23.10.1...23.11.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- ocp_resources/catalog_source.py | 36 +++++------- ocp_resources/controller_revision.py | 6 +- ocp_resources/cron_job.py | 12 ++-- ocp_resources/csi_storage_capacity.py | 8 +-- ocp_resources/data_import_cron.py | 34 +++++------ ocp_resources/data_source.py | 12 ++-- ocp_resources/datavolume.py | 58 ++++++++----------- ocp_resources/endpoint_slice.py | 10 ++-- ocp_resources/endpoints.py | 12 ++-- ocp_resources/hook.py | 14 ++--- ocp_resources/host.py | 28 +++++---- ocp_resources/image_stream.py | 12 ++-- ocp_resources/kube_descheduler.py | 20 +++---- ocp_resources/migration.py | 14 ++--- ocp_resources/mtv.py | 6 +- .../network_attachment_definition.py | 6 +- .../node_network_configuration_policy.py | 10 ++-- ocp_resources/node_network_state.py | 14 ++--- ocp_resources/ocs_initialization.py | 10 ++-- ocp_resources/operator_source.py | 20 +++---- ocp_resources/persistent_volume.py | 12 ++-- ocp_resources/persistent_volume_claim.py | 14 ++--- ocp_resources/plan.py | 50 ++++++++-------- ocp_resources/provider.py | 22 ++++--- ocp_resources/resource.py | 14 ++--- ocp_resources/restore.py | 10 ++-- ocp_resources/route.py | 6 +- ocp_resources/secret.py | 12 ++-- ocp_resources/subscription.py | 20 +++---- ocp_resources/virtual_machine_export.py | 20 +++---- 31 files changed, 230 insertions(+), 294 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 335edaea1a..b5dfac664b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - id: isort - repo: https://github.com/psf/black - rev: "23.10.1" + rev: "23.11.0" hooks: - id: black args: [--preview] diff --git a/ocp_resources/catalog_source.py b/ocp_resources/catalog_source.py index 1e03861c98..bf0d5a397b 100644 --- a/ocp_resources/catalog_source.py +++ b/ocp_resources/catalog_source.py @@ -38,30 +38,26 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - if not all( - [self.source_type, self.image, self.display_name, self.publisher] - ): + if not all([ + self.source_type, self.image, self.display_name, self.publisher + ]): raise ValueError( "Passing yaml_file or all parameters 'source_type', 'image'," " 'display_name' and 'publisher' is required." ) - self.res.update( - { - "spec": { - "sourceType": self.source_type, - "image": self.image, - "displayName": self.display_name, - "publisher": self.publisher, - } + self.res.update({ + "spec": { + "sourceType": self.source_type, + "image": self.image, + "displayName": self.display_name, + "publisher": self.publisher, } - ) + }) if self.update_strategy_registry_poll_interval: - self.res["spec"].update( - { - "updateStrategy": { - "registryPoll": { - "interval": self.update_strategy_registry_poll_interval, - }, + self.res["spec"].update({ + "updateStrategy": { + "registryPoll": { + "interval": self.update_strategy_registry_poll_interval, }, - } - ) + }, + }) diff --git a/ocp_resources/controller_revision.py b/ocp_resources/controller_revision.py index bfd489fbf1..8a02c56071 100644 --- a/ocp_resources/controller_revision.py +++ b/ocp_resources/controller_revision.py @@ -38,8 +38,8 @@ def to_dict(self): super().to_dict() if not self.yaml_file: if self.owner_references: - self.res.setdefault("metadata", {}).update( - {"ownerReference": self.owner_references} - ) + self.res.setdefault("metadata", {}).update({ + "ownerReference": self.owner_references + }) if self.revision_object: self.res.update({"data": self.revision_object.res}) diff --git a/ocp_resources/cron_job.py b/ocp_resources/cron_job.py index c5e76d0c98..c34ef43423 100644 --- a/ocp_resources/cron_job.py +++ b/ocp_resources/cron_job.py @@ -52,14 +52,12 @@ def to_dict(self): "yaml_file or parameters 'job_template' and 'schedule' are" " required." ) - self.res.update( - { - "spec": { - "jobTemplate": self.job_template, - "schedule": self.schedule, - } + self.res.update({ + "spec": { + "jobTemplate": self.job_template, + "schedule": self.schedule, } - ) + }) if self.timezone: self.res["spec"]["timezone"] = self.timezone if self.suspend: diff --git a/ocp_resources/csi_storage_capacity.py b/ocp_resources/csi_storage_capacity.py index 24c6a661ec..6794ae5ee6 100644 --- a/ocp_resources/csi_storage_capacity.py +++ b/ocp_resources/csi_storage_capacity.py @@ -39,11 +39,9 @@ def to_dict(self): raise ValueError( "yaml_file or parameter 'storage_class_name' is required." ) - self.res.update( - { - "storageClassName": self.storage_class_name, - } - ) + self.res.update({ + "storageClassName": self.storage_class_name, + }) if self.maximum_volume_size: self.res["maximumVolumeSize"] = self.maximum_volume_size if self.node_topology: diff --git a/ocp_resources/data_import_cron.py b/ocp_resources/data_import_cron.py index aea9bd24d7..a49abfd62c 100644 --- a/ocp_resources/data_import_cron.py +++ b/ocp_resources/data_import_cron.py @@ -59,31 +59,25 @@ def to_dict(self): if self.image_stream and self.url: raise ValueError("imageStream and url can not coexist") - self.res.update( - { - "spec": { - "template": { - "spec": { - "source": { - "registry": {"pullMethod": self.pull_method} - }, - "storage": { - "resources": {"requests": {"storage": self.size}} - }, - } + self.res.update({ + "spec": { + "template": { + "spec": { + "source": {"registry": {"pullMethod": self.pull_method}}, + "storage": { + "resources": {"requests": {"storage": self.size}} + }, } } } - ) + }) spec = self.res["spec"]["template"]["spec"] if self.bind_immediate_annotation: - self.res["metadata"].setdefault("annotations", {}).update( - { - f"{NamespacedResource.ApiGroup.CDI_KUBEVIRT_IO}/storage.bind.immediate.requested": ( - "true" - ) - } - ) + self.res["metadata"].setdefault("annotations", {}).update({ + f"{NamespacedResource.ApiGroup.CDI_KUBEVIRT_IO}/storage.bind.immediate.requested": ( + "true" + ) + }) if self.image_stream: spec["source"]["registry"]["imageStream"] = self.image_stream if self.url: diff --git a/ocp_resources/data_source.py b/ocp_resources/data_source.py index eb0f24450d..247bca42da 100644 --- a/ocp_resources/data_source.py +++ b/ocp_resources/data_source.py @@ -33,13 +33,11 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "source": self.source, - }, - } - ) + self.res.update({ + "spec": { + "source": self.source, + }, + }) @property def pvc(self): diff --git a/ocp_resources/datavolume.py b/ocp_resources/datavolume.py index 051d475cf9..29e98afe44 100644 --- a/ocp_resources/datavolume.py +++ b/ocp_resources/datavolume.py @@ -156,16 +156,14 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "source": {self.source: {"url": self.url}}, - self.api_name: { - "resources": {"requests": {"storage": self.size}}, - }, - } + self.res.update({ + "spec": { + "source": {self.source: {"url": self.url}}, + self.api_name: { + "resources": {"requests": {"storage": self.size}}, + }, } - ) + }) if self.access_modes: self.res["spec"][self.api_name]["accessModes"] = [self.access_modes] if self.content_type: @@ -185,25 +183,21 @@ def to_dict(self): if self.source == "upload" or self.source == "blank": self.res["spec"]["source"][self.source] = {} if self.hostpath_node: - self.res["metadata"].setdefault("annotations", {}).update( - { - f"{NamespacedResource.ApiGroup.KUBEVIRT_IO}/provisionOnNode": ( - self.hostpath_node - ) - } - ) + self.res["metadata"].setdefault("annotations", {}).update({ + f"{NamespacedResource.ApiGroup.KUBEVIRT_IO}/provisionOnNode": ( + self.hostpath_node + ) + }) if self.multus_annotation: - self.res["metadata"].setdefault("annotations", {}).update( - { - f"{NamespacedResource.ApiGroup.K8S_V1_CNI_CNCF_IO}/networks": ( - self.multus_annotation - ) - } - ) + self.res["metadata"].setdefault("annotations", {}).update({ + f"{NamespacedResource.ApiGroup.K8S_V1_CNI_CNCF_IO}/networks": ( + self.multus_annotation + ) + }) if self.bind_immediate_annotation: - self.res["metadata"].setdefault("annotations", {}).update( - {f"{self.api_group}/storage.bind.immediate.requested": "true"} - ) + self.res["metadata"].setdefault("annotations", {}).update({ + f"{self.api_group}/storage.bind.immediate.requested": "true" + }) if self.source == "pvc": self.res["spec"]["source"]["pvc"] = { "name": self.source_pvc or "dv-source", @@ -212,13 +206,11 @@ def to_dict(self): if self.preallocation is not None: self.res["spec"]["preallocation"] = self.preallocation if self.delete_after_completion: - self.res["metadata"].setdefault("annotations", {}).update( - { - f"{self.api_group}/storage.deleteAfterCompletion": ( - self.delete_after_completion - ) - } - ) + self.res["metadata"].setdefault("annotations", {}).update({ + f"{self.api_group}/storage.deleteAfterCompletion": ( + self.delete_after_completion + ) + }) def wait_deleted(self, timeout=TIMEOUT_4MINUTES): """ diff --git a/ocp_resources/endpoint_slice.py b/ocp_resources/endpoint_slice.py index 9fee7d166c..443b5bb4c6 100644 --- a/ocp_resources/endpoint_slice.py +++ b/ocp_resources/endpoint_slice.py @@ -59,11 +59,9 @@ def to_dict(self): "yaml_file or parameters 'address_type' and 'endpoints' are" " required." ) - self.res.update( - { - "addressTypes": self.address_type, - "endpoints": self.endpoints, - } - ) + self.res.update({ + "addressTypes": self.address_type, + "endpoints": self.endpoints, + }) if self.ports: self.res["ports"] = self.ports diff --git a/ocp_resources/endpoints.py b/ocp_resources/endpoints.py index 9cce321b46..d983b2bcbb 100644 --- a/ocp_resources/endpoints.py +++ b/ocp_resources/endpoints.py @@ -55,11 +55,9 @@ def to_dict(self): raise ValueError( "yaml_file or parameters 'addresses' and 'ports' are required." ) - self.res.update( - { - "subsets": { - "addresses": self.addresses, - "ports": self.ports, - } + self.res.update({ + "subsets": { + "addresses": self.addresses, + "ports": self.ports, } - ) + }) diff --git a/ocp_resources/hook.py b/ocp_resources/hook.py index 79e2d76795..4636f4ebd4 100644 --- a/ocp_resources/hook.py +++ b/ocp_resources/hook.py @@ -42,11 +42,9 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "image": self.image, - "playbook": self.playbook, - }, - } - ) + self.res.update({ + "spec": { + "image": self.image, + "playbook": self.playbook, + }, + }) diff --git a/ocp_resources/host.py b/ocp_resources/host.py index c457f9a59b..f974f66c39 100644 --- a/ocp_resources/host.py +++ b/ocp_resources/host.py @@ -46,19 +46,17 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "id": self.host_id, - "ipAddress": self.ip_address, - "secret": { - "name": self.secret_name, - "namespace": self.secret_namespace, - }, - "provider": { - "name": self.provider_name, - "namespace": self.provider_namespace, - }, - } + self.res.update({ + "spec": { + "id": self.host_id, + "ipAddress": self.ip_address, + "secret": { + "name": self.secret_name, + "namespace": self.secret_namespace, + }, + "provider": { + "name": self.provider_name, + "namespace": self.provider_namespace, + }, } - ) + }) diff --git a/ocp_resources/image_stream.py b/ocp_resources/image_stream.py index 184567e88c..2a054f5f70 100644 --- a/ocp_resources/image_stream.py +++ b/ocp_resources/image_stream.py @@ -39,11 +39,9 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "lookupPolicy": {"local": self.lookup_policy}, - "tags": self.tags, - } + self.res.update({ + "spec": { + "lookupPolicy": {"local": self.lookup_policy}, + "tags": self.tags, } - ) + }) diff --git a/ocp_resources/kube_descheduler.py b/ocp_resources/kube_descheduler.py index 576fe8ad12..7e860fc0ef 100644 --- a/ocp_resources/kube_descheduler.py +++ b/ocp_resources/kube_descheduler.py @@ -51,15 +51,13 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "deschedulingIntervalSeconds": self.descheduling_interval, - "logLevel": self.log_level, - "managementState": self.management_state, - "mode": self.mode, - "operatorLogLevel": self.operator_log_level, - "profiles": self.profiles, - } + self.res.update({ + "spec": { + "deschedulingIntervalSeconds": self.descheduling_interval, + "logLevel": self.log_level, + "managementState": self.management_state, + "mode": self.mode, + "operatorLogLevel": self.operator_log_level, + "profiles": self.profiles, } - ) + }) diff --git a/ocp_resources/migration.py b/ocp_resources/migration.py index 1ea9194f00..6439207bf1 100644 --- a/ocp_resources/migration.py +++ b/ocp_resources/migration.py @@ -46,16 +46,14 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "plan": { - "name": self.plan_name, - "namespace": self.plan_namespace, - } + self.res.update({ + "spec": { + "plan": { + "name": self.plan_name, + "namespace": self.plan_namespace, } } - ) + }) if self.cut_over: self.res["spec"]["cutover"] = self.cut_over.strftime( diff --git a/ocp_resources/mtv.py b/ocp_resources/mtv.py index 9932ac6279..f74862246d 100644 --- a/ocp_resources/mtv.py +++ b/ocp_resources/mtv.py @@ -125,9 +125,9 @@ def wait_for_resource_status( condition_category == condition.category or condition_category is None ) - if all( - [valid_status_type, valid_message, valid_reason, valid_category] - ): + if all([ + valid_status_type, valid_message, valid_reason, valid_category + ]): return except TimeoutExpiredError: diff --git a/ocp_resources/network_attachment_definition.py b/ocp_resources/network_attachment_definition.py index 0988666666..74774b5ba8 100644 --- a/ocp_resources/network_attachment_definition.py +++ b/ocp_resources/network_attachment_definition.py @@ -154,9 +154,9 @@ def to_dict(self): super().to_dict() if self.tuning_type: self.old_nad_format = True - self.res["spec"]["config"].setdefault("plugins", []).append( - {"type": self.tuning_type} - ) + self.res["spec"]["config"].setdefault("plugins", []).append({ + "type": self.tuning_type + }) self.res["spec"]["config"] = json.dumps(self.res["spec"]["config"]) diff --git a/ocp_resources/node_network_configuration_policy.py b/ocp_resources/node_network_configuration_policy.py index 46b28f2b37..529211bbc9 100644 --- a/ocp_resources/node_network_configuration_policy.py +++ b/ocp_resources/node_network_configuration_policy.py @@ -114,12 +114,10 @@ def _nodes(self): if self.node_selector: return list(Node.get(dyn_client=self.client, name=self.node_selector)) if self.node_selector_labels: - node_labels = ",".join( - [ - f"{label_key}={label_value}" - for label_key, label_value in self.node_selector_labels.items() - ] - ) + node_labels = ",".join([ + f"{label_key}={label_value}" + for label_key, label_value in self.node_selector_labels.items() + ]) return list(Node.get(dyn_client=self.client, label_selector=node_labels)) def set_interface(self, interface): diff --git a/ocp_resources/node_network_state.py b/ocp_resources/node_network_state.py index d7c5bf14ee..8aff647378 100644 --- a/ocp_resources/node_network_state.py +++ b/ocp_resources/node_network_state.py @@ -47,15 +47,13 @@ def set_interface(self, interface): def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "nodeName": self.name, - "managed": True, - "desiredState": self.desired_state, - } + self.res.update({ + "spec": { + "nodeName": self.name, + "managed": True, + "desiredState": self.desired_state, } - ) + }) def apply(self): retries_on_conflict = 3 diff --git a/ocp_resources/ocs_initialization.py b/ocp_resources/ocs_initialization.py index 85f41adab7..de75dd5b89 100644 --- a/ocp_resources/ocs_initialization.py +++ b/ocp_resources/ocs_initialization.py @@ -43,10 +43,8 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file and self.enable_ceph_tools is not None: - self.res.update( - { - "spec": { - "enableCephTools": self.enable_ceph_tools, - } + self.res.update({ + "spec": { + "enableCephTools": self.enable_ceph_tools, } - ) + }) diff --git a/ocp_resources/operator_source.py b/ocp_resources/operator_source.py index 0b48d5035b..1f3db6aeef 100644 --- a/ocp_resources/operator_source.py +++ b/ocp_resources/operator_source.py @@ -36,15 +36,13 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "type": "appregistry", - "endpoint": "https://quay.io/cnr", - "registryNamespace": self.registry_namespace, - "displayName": self.display_name, - "publisher": self.publisher, - "authorizationToken": {"secretName": self.secret}, - } + self.res.update({ + "spec": { + "type": "appregistry", + "endpoint": "https://quay.io/cnr", + "registryNamespace": self.registry_namespace, + "displayName": self.display_name, + "publisher": self.publisher, + "authorizationToken": {"secretName": self.secret}, } - ) + }) diff --git a/ocp_resources/persistent_volume.py b/ocp_resources/persistent_volume.py index 79f090cf8c..524bf02aaf 100644 --- a/ocp_resources/persistent_volume.py +++ b/ocp_resources/persistent_volume.py @@ -18,10 +18,8 @@ def max_available_pvs(self): """ Returns the maximum number (int) of PV's which are in 'Available' state """ - return len( - [ - pv - for pv in self.api.get()["items"] - if pv.status.phase == Resource.Condition.AVAILABLE - ] - ) + return len([ + pv + for pv in self.api.get()["items"] + if pv.status.phase == Resource.Condition.AVAILABLE + ]) diff --git a/ocp_resources/persistent_volume_claim.py b/ocp_resources/persistent_volume_claim.py index 21e938ec59..564d60ce89 100644 --- a/ocp_resources/persistent_volume_claim.py +++ b/ocp_resources/persistent_volume_claim.py @@ -66,15 +66,13 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "volumeMode": self.volume_mode, - "accessModes": [self.accessmodes], - "resources": {"requests": {"storage": self.size}}, - } + self.res.update({ + "spec": { + "volumeMode": self.volume_mode, + "accessModes": [self.accessmodes], + "resources": {"requests": {"storage": self.size}}, } - ) + }) """ Hostpath-provisioner is "node aware", when using it, a node attribute on the claim must be introduced as follows. diff --git a/ocp_resources/plan.py b/ocp_resources/plan.py index b2441d0914..65dc847906 100644 --- a/ocp_resources/plan.py +++ b/ocp_resources/plan.py @@ -112,32 +112,30 @@ def generate_hook_spec(hook_name, hook_namespace, hook_type): def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "warm": self.warm_migration, - "targetNamespace": self.target_namespace, - "map": { - "storage": { - "name": self.storage_map_name, - "namespace": self.storage_map_namespace, - }, - "network": { - "name": self.network_map_name, - "namespace": self.network_map_namespace, - }, + self.res.update({ + "spec": { + "warm": self.warm_migration, + "targetNamespace": self.target_namespace, + "map": { + "storage": { + "name": self.storage_map_name, + "namespace": self.storage_map_namespace, }, - "vms": self.virtual_machines_list, - "provider": { - "source": { - "name": self.source_provider_name, - "namespace": self.source_provider_namespace, - }, - "destination": { - "name": self.destination_provider_name, - "namespace": self.destination_provider_namespace, - }, + "network": { + "name": self.network_map_name, + "namespace": self.network_map_namespace, }, - } + }, + "vms": self.virtual_machines_list, + "provider": { + "source": { + "name": self.source_provider_name, + "namespace": self.source_provider_namespace, + }, + "destination": { + "name": self.destination_provider_name, + "namespace": self.destination_provider_namespace, + }, + }, } - ) + }) diff --git a/ocp_resources/provider.py b/ocp_resources/provider.py index 2e937dec72..93676db73f 100644 --- a/ocp_resources/provider.py +++ b/ocp_resources/provider.py @@ -44,16 +44,14 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "type": self.provider_type, - "url": self.url, - "secret": { - "name": self.secret_name, - "namespace": self.secret_namespace, - }, - "settings": {"vddkInitImage": self.vddk_init_image}, - } + self.res.update({ + "spec": { + "type": self.provider_type, + "url": self.url, + "secret": { + "name": self.secret_name, + "namespace": self.secret_namespace, + }, + "settings": {"vddkInitImage": self.vddk_init_image}, } - ) + }) diff --git a/ocp_resources/resource.py b/ocp_resources/resource.py index 15d7412880..236b4d5947 100644 --- a/ocp_resources/resource.py +++ b/ocp_resources/resource.py @@ -99,14 +99,12 @@ def get_client(config_file=None, config_dict=None, context=None): def sub_resource_level(current_class, owner_class, parent_class): # return the name of the last class in MRO list that is not one of base # classes; otherwise return None - for class_iterator in reversed( - [ - class_iterator - for class_iterator in current_class.mro() - if class_iterator not in owner_class.mro() - and issubclass(class_iterator, parent_class) - ] - ): + for class_iterator in reversed([ + class_iterator + for class_iterator in current_class.mro() + if class_iterator not in owner_class.mro() + and issubclass(class_iterator, parent_class) + ]): return class_iterator.__name__ diff --git a/ocp_resources/restore.py b/ocp_resources/restore.py index ca15e3efc1..788995d761 100644 --- a/ocp_resources/restore.py +++ b/ocp_resources/restore.py @@ -41,12 +41,10 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "backupName": self.backup_name, - } + self.res.update({ + "spec": { + "backupName": self.backup_name, } - ) + }) if self.included_namespaces: self.res["spec"]["includedNamespaces"] = self.included_namespaces diff --git a/ocp_resources/route.py b/ocp_resources/route.py index 771b7466dc..9afb13db01 100644 --- a/ocp_resources/route.py +++ b/ocp_resources/route.py @@ -38,9 +38,9 @@ def to_dict(self): super().to_dict() if not self.yaml_file: if self.service: - self.res.update( - {"spec": {"to": {"kind": "Service", "name": self.service}}} - ) + self.res.update({ + "spec": {"to": {"kind": "Service", "name": self.service}} + }) if self.destination_ca_cert: self.res["spec"]["tls"] = { "destinationCACertificate": self.destination_ca_cert, diff --git a/ocp_resources/secret.py b/ocp_resources/secret.py index a3cfcee31e..9052ab76e5 100644 --- a/ocp_resources/secret.py +++ b/ocp_resources/secret.py @@ -45,14 +45,12 @@ def to_dict(self): super().to_dict() if not self.yaml_file: if self.accesskeyid: - self.res.update( - { - "data": { - "accessKeyId": self.accesskeyid, - "secretKey": self.secretkey, - } + self.res.update({ + "data": { + "accessKeyId": self.accesskeyid, + "secretKey": self.secretkey, } - ) + }) if self.htpasswd: self.res.update({"data": {"htpasswd": self.htpasswd}}) if self.data_dict: diff --git a/ocp_resources/subscription.py b/ocp_resources/subscription.py index 0dcee0cd81..c1312fc792 100644 --- a/ocp_resources/subscription.py +++ b/ocp_resources/subscription.py @@ -44,18 +44,16 @@ def __init__( def to_dict(self): super().to_dict() if not self.yaml_file: - self.res.update( - { - "spec": { - "sourceNamespace": self.source_namespace, - "source": self.source, - "name": self.package_name or self.name, - "channel": self.channel, - "installPlanApproval": self.install_plan_approval, - "startingCSV": self.starting_csv, - } + self.res.update({ + "spec": { + "sourceNamespace": self.source_namespace, + "source": self.source, + "name": self.package_name or self.name, + "channel": self.channel, + "installPlanApproval": self.install_plan_approval, + "startingCSV": self.starting_csv, } - ) + }) if self.node_selector: self.res["spec"].setdefault("config", {}).setdefault( diff --git a/ocp_resources/virtual_machine_export.py b/ocp_resources/virtual_machine_export.py index 42d782ca22..6bde47176d 100644 --- a/ocp_resources/virtual_machine_export.py +++ b/ocp_resources/virtual_machine_export.py @@ -56,15 +56,13 @@ def to_dict(self): raise ValueError( "source_kind and source_name or a yaml_file is required" ) - self.res.update( - { - "spec": { - "tokenSecretRef": self.token_secret_ref, - "source": { - "apiGroup": self.source_api_group, - "kind": self.source_kind, - "name": self.source_name, - }, - } + self.res.update({ + "spec": { + "tokenSecretRef": self.token_secret_ref, + "source": { + "apiGroup": self.source_api_group, + "kind": self.source_kind, + "name": self.source_name, + }, } - ) + })