From b5e9a31b52490d4ee5e4682db34959adc42b0b32 Mon Sep 17 00:00:00 2001 From: Michael Dixon Date: Mon, 14 Nov 2022 17:30:03 +1100 Subject: [PATCH 1/3] Fixes #13 --- charts/viya4-home-dir-builder/home_dir_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/viya4-home-dir-builder/home_dir_builder.py b/charts/viya4-home-dir-builder/home_dir_builder.py index a53b332..6eefde7 100644 --- a/charts/viya4-home-dir-builder/home_dir_builder.py +++ b/charts/viya4-home-dir-builder/home_dir_builder.py @@ -142,7 +142,7 @@ def home_dir_builder(consul_token, viya_base_url, client_id, client_secret, home if dry_run == '0': try: new_home_dir = Path(home, uid) - new_home_dir.mkdir(mode=750) + new_home_dir.mkdir(mode=0a750) log.info(f"Created home directory for {uid}") try: os.chown(new_home_dir, uids[uid], 1001) From 52176cdab033ce326f91fe579b6482b4dcdd605c Mon Sep 17 00:00:00 2001 From: Michael Dixon Date: Mon, 14 Nov 2022 17:31:33 +1100 Subject: [PATCH 2/3] Fixes #14 --- charts/viya4-home-dir-builder/home_dir_builder.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/viya4-home-dir-builder/home_dir_builder.py b/charts/viya4-home-dir-builder/home_dir_builder.py index 6eefde7..399674c 100644 --- a/charts/viya4-home-dir-builder/home_dir_builder.py +++ b/charts/viya4-home-dir-builder/home_dir_builder.py @@ -105,7 +105,10 @@ def get_uids(viya_base_url, access_token): for user in users: url = f"{viya_base_url}/identities/users/{user['id']}/identifier" response = requests.request("GET", url, headers=headers) - uid[user['id']] = response.json()["uid"] + try: + uid[user['id']] = response.json()["uid"] + except: + log.error(f"Unable to get details for for {user['id']}") return(uid) def home_dir_builder(consul_token, viya_base_url, client_id, client_secret, home_dir_path, user_exceptions, dry_run): From 78e38c737f83114d8a8902a70a34a6f2342903b5 Mon Sep 17 00:00:00 2001 From: Michael Dixon Date: Mon, 14 Nov 2022 17:33:58 +1100 Subject: [PATCH 3/3] Bump chart version --- charts/viya4-home-dir-builder/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/viya4-home-dir-builder/Chart.yaml b/charts/viya4-home-dir-builder/Chart.yaml index de604ef..20e05b3 100644 --- a/charts/viya4-home-dir-builder/Chart.yaml +++ b/charts/viya4-home-dir-builder/Chart.yaml @@ -9,6 +9,6 @@ maintainers: type: application -version: 0.2.2 +version: 0.2.3 appVersion: latest