@@ -148,6 +148,20 @@ initContainers:
148148 DEFAULT_BINARY_PATHS = {'pg': sorted([''] + glob.glob('/usr/pgsql-*/bin')).pop()}
149149 with open('/etc/pgadmin/conf.d/~postgres-operator/pgadmin-settings.json') as _f:
150150 _conf, _data = re.compile(r'[A-Z_0-9]+'), json.load(_f)
151+ folder_path = '/etc/pgadmin/conf.d/~postgres-operator/oauth-config/'
152+ if os.path.isdir(folder_path):
153+ for filename in os.listdir(folder_path):
154+ with open(os.path.join(folder_path, filename), "r", encoding="utf-8") as f:
155+ try:
156+ oath = json.load(f)
157+ if oath.get("OAUTH2_NAME") not in [
158+ o.get("OAUTH2_NAME") for o in _data.get("OAUTH2_CONFIG")]:
159+ _data.get("OAUTH2_CONFIG").append(oath)
160+ for o in _data.get("OAUTH2_CONFIG"):
161+ if o.get("OAUTH2_NAME") == oath.get("OAUTH2_NAME"):
162+ o.update(oath)
163+ except Exception as e:
164+ print(f"An unexpected error occurred: {e}")
151165 if type(_data) is dict:
152166 globals().update({k: v for k, v in _data.items() if _conf.fullmatch(k)})
153167 if os.path.isfile('/etc/pgadmin/conf.d/~postgres-operator/ldap-bind-password'):
@@ -367,6 +381,20 @@ initContainers:
367381 DEFAULT_BINARY_PATHS = {'pg': sorted([''] + glob.glob('/usr/pgsql-*/bin')).pop()}
368382 with open('/etc/pgadmin/conf.d/~postgres-operator/pgadmin-settings.json') as _f:
369383 _conf, _data = re.compile(r'[A-Z_0-9]+'), json.load(_f)
384+ folder_path = '/etc/pgadmin/conf.d/~postgres-operator/oauth-config/'
385+ if os.path.isdir(folder_path):
386+ for filename in os.listdir(folder_path):
387+ with open(os.path.join(folder_path, filename), "r", encoding="utf-8") as f:
388+ try:
389+ oath = json.load(f)
390+ if oath.get("OAUTH2_NAME") not in [
391+ o.get("OAUTH2_NAME") for o in _data.get("OAUTH2_CONFIG")]:
392+ _data.get("OAUTH2_CONFIG").append(oath)
393+ for o in _data.get("OAUTH2_CONFIG"):
394+ if o.get("OAUTH2_NAME") == oath.get("OAUTH2_NAME"):
395+ o.update(oath)
396+ except Exception as e:
397+ print(f"An unexpected error occurred: {e}")
370398 if type(_data) is dict:
371399 globals().update({k: v for k, v in _data.items() if _conf.fullmatch(k)})
372400 if os.path.isfile('/etc/pgadmin/conf.d/~postgres-operator/ldap-bind-password'):
0 commit comments