diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-03 15:28:46 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-03-03 15:29:00 -0500 |
| commit | 00b03095554a175cba0a4a47da6ee4cc5f39f7de (patch) | |
| tree | 3101448517a710585cb9a1ba064e08c50ed0dba6 /roles | |
| parent | e2bc346fc99de637d03762b4b813b596afffc7dc (diff) | |
| download | openshift-00b03095554a175cba0a4a47da6ee4cc5f39f7de.tar.gz openshift-00b03095554a175cba0a4a47da6ee4cc5f39f7de.tar.bz2 openshift-00b03095554a175cba0a4a47da6ee4cc5f39f7de.tar.xz openshift-00b03095554a175cba0a4a47da6ee4cc5f39f7de.zip | |
Re-generate modules
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_policy_group.py | 11 | ||||
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_policy_user.py | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/roles/lib_openshift/library/oc_adm_policy_group.py b/roles/lib_openshift/library/oc_adm_policy_group.py index 3bc5dea0e..0ab1c8d49 100644 --- a/roles/lib_openshift/library/oc_adm_policy_group.py +++ b/roles/lib_openshift/library/oc_adm_policy_group.py @@ -253,7 +253,8 @@ class Yedit(object): continue elif data and not isinstance(data, dict): - return None + raise YeditException("Unexpected item type found while going through key " + + "path: {} (at key: {})".format(key, dict_key)) data[dict_key] = {} data = data[dict_key] @@ -262,7 +263,7 @@ class Yedit(object): int(arr_ind) <= len(data) - 1): data = data[int(arr_ind)] else: - return None + raise YeditException("Unexpected item type found while going through key path: {}".format(key)) if key == '': data = item @@ -276,6 +277,12 @@ class Yedit(object): elif key_indexes[-1][1] and isinstance(data, dict): data[key_indexes[-1][1]] = item + # didn't add/update to an existing list, nor add/update key to a dict + # so we must have been provided some syntax like a.b.c[<int>] = "data" for a + # non-existent array + else: + raise YeditException("Error adding to object at path: {}".format(key)) + return data @staticmethod diff --git a/roles/lib_openshift/library/oc_adm_policy_user.py b/roles/lib_openshift/library/oc_adm_policy_user.py index 1ac9bf54d..91bd85122 100644 --- a/roles/lib_openshift/library/oc_adm_policy_user.py +++ b/roles/lib_openshift/library/oc_adm_policy_user.py @@ -253,7 +253,8 @@ class Yedit(object): continue elif data and not isinstance(data, dict): - return None + raise YeditException("Unexpected item type found while going through key " + + "path: {} (at key: {})".format(key, dict_key)) data[dict_key] = {} data = data[dict_key] @@ -262,7 +263,7 @@ class Yedit(object): int(arr_ind) <= len(data) - 1): data = data[int(arr_ind)] else: - return None + raise YeditException("Unexpected item type found while going through key path: {}".format(key)) if key == '': data = item @@ -276,6 +277,12 @@ class Yedit(object): elif key_indexes[-1][1] and isinstance(data, dict): data[key_indexes[-1][1]] = item + # didn't add/update to an existing list, nor add/update key to a dict + # so we must have been provided some syntax like a.b.c[<int>] = "data" for a + # non-existent array + else: + raise YeditException("Error adding to object at path: {}".format(key)) + return data @staticmethod |