mirror of
https://github.com/ansible-collections/kubernetes.core.git
synced 2026-05-06 21:12:37 +00:00
Enable black formatting test (#259)
Enable black formatting test SUMMARY Signed-off-by: Abhijeet Kasurde akasurde@redhat.com ISSUE TYPE Bugfix Pull Request COMPONENT NAME plugins/action/k8s_info.py plugins/connection/kubectl.py plugins/doc_fragments/helm_common_options.py plugins/doc_fragments/k8s_auth_options.py plugins/doc_fragments/k8s_delete_options.py plugins/doc_fragments/k8s_name_options.py plugins/doc_fragments/k8s_resource_options.py plugins/doc_fragments/k8s_scale_options.py plugins/doc_fragments/k8s_state_options.py plugins/doc_fragments/k8s_wait_options.py plugins/filter/k8s.py plugins/inventory/k8s.py plugins/lookup/k8s.py plugins/lookup/kustomize.py plugins/module_utils/ansiblemodule.py plugins/module_utils/apply.py plugins/module_utils/args_common.py plugins/module_utils/client/discovery.py plugins/module_utils/client/resource.py plugins/module_utils/common.py plugins/module_utils/exceptions.py plugins/module_utils/hashes.py plugins/module_utils/helm.py plugins/module_utils/k8sdynamicclient.py plugins/module_utils/selector.py plugins/modules/helm.py plugins/modules/helm_info.py plugins/modules/helm_plugin.py plugins/modules/helm_plugin_info.py plugins/modules/helm_repository.py plugins/modules/helm_template.py plugins/modules/k8s.py plugins/modules/k8s_cluster_info.py plugins/modules/k8s_cp.py plugins/modules/k8s_drain.py plugins/modules/k8s_exec.py plugins/modules/k8s_info.py plugins/modules/k8s_json_patch.py plugins/modules/k8s_log.py plugins/modules/k8s_rollback.py plugins/modules/k8s_scale.py plugins/modules/k8s_service.py tests/integration/targets/kubernetes/library/test_tempfile.py tests/unit/module_utils/test_apply.py tests/unit/module_utils/test_common.py tests/unit/module_utils/test_discoverer.py tests/unit/module_utils/test_hashes.py tests/unit/module_utils/test_marshal.py tests/unit/module_utils/test_selector.py tox.ini Reviewed-by: None <None> Reviewed-by: Mike Graves <mgraves@redhat.com> Reviewed-by: None <None>
This commit is contained in:
@@ -15,7 +15,8 @@
|
||||
# Implement ConfigMapHash and SecretHash equivalents
|
||||
# Based on https://github.com/kubernetes/kubernetes/pull/49961
|
||||
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
__metaclass__ = type
|
||||
|
||||
import json
|
||||
@@ -23,6 +24,7 @@ import hashlib
|
||||
|
||||
try:
|
||||
import string
|
||||
|
||||
maketrans = string.maketrans
|
||||
except AttributeError:
|
||||
maketrans = str.maketrans
|
||||
@@ -44,21 +46,21 @@ def sorted_dict(unsorted_dict):
|
||||
|
||||
def generate_hash(resource):
|
||||
# Get name from metadata
|
||||
metada = resource.get('metadata', {})
|
||||
key = 'name'
|
||||
resource['name'] = metada.get('name', '')
|
||||
generate_name = metada.get('generateName', '')
|
||||
if resource['name'] == '' and generate_name:
|
||||
del(resource['name'])
|
||||
key = 'generateName'
|
||||
resource['generateName'] = generate_name
|
||||
if resource['kind'] == 'ConfigMap':
|
||||
marshalled = marshal(sorted_dict(resource), ['data', 'kind', key])
|
||||
del(resource[key])
|
||||
metada = resource.get("metadata", {})
|
||||
key = "name"
|
||||
resource["name"] = metada.get("name", "")
|
||||
generate_name = metada.get("generateName", "")
|
||||
if resource["name"] == "" and generate_name:
|
||||
del resource["name"]
|
||||
key = "generateName"
|
||||
resource["generateName"] = generate_name
|
||||
if resource["kind"] == "ConfigMap":
|
||||
marshalled = marshal(sorted_dict(resource), ["data", "kind", key])
|
||||
del resource[key]
|
||||
return encode(marshalled)
|
||||
if resource['kind'] == 'Secret':
|
||||
marshalled = marshal(sorted_dict(resource), ['data', 'kind', key, 'type'])
|
||||
del(resource[key])
|
||||
if resource["kind"] == "Secret":
|
||||
marshalled = marshal(sorted_dict(resource), ["data", "kind", key, "type"])
|
||||
del resource[key]
|
||||
return encode(marshalled)
|
||||
raise NotImplementedError
|
||||
|
||||
@@ -67,8 +69,10 @@ def marshal(data, keys):
|
||||
ordered = OrderedDict()
|
||||
for key in keys:
|
||||
ordered[key] = data.get(key, "")
|
||||
return json.dumps(ordered, separators=(',', ':')).encode('utf-8')
|
||||
return json.dumps(ordered, separators=(",", ":")).encode("utf-8")
|
||||
|
||||
|
||||
def encode(resource):
|
||||
return hashlib.sha256(resource).hexdigest()[:10].translate(maketrans("013ae", "ghkmt"))
|
||||
return (
|
||||
hashlib.sha256(resource).hexdigest()[:10].translate(maketrans("013ae", "ghkmt"))
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user