Skip to content

Commit f04c66c

Browse files
committed
reload secret vars every time, don't bother wiht self.blah
1 parent 41676ef commit f04c66c

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

docker/main.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
"/var/run/secret-plugin/secret_vars.yaml")
3232

3333
class Plugin(BaseHTTPRequestHandler):
34-
def __init__(self):
35-
self.secret_vars = {}
36-
super().__init__()
37-
3834
def args(self):
3935
"""
4036
this just gets the args requested, I thought
@@ -78,11 +74,11 @@ def return_secret_vars(self, appset_name: str, secret_var_names: list):
7874
logging.info(secret_var_names)
7975

8076
# reload secrets file before checking
81-
self.reload_secret_vars()
77+
secret_vars = self.reload_secret_vars()
8278

8379
# iterate through requested secret keys
8480
for secret_var in secret_var_names:
85-
if secret_var not in self.secret_vars:
81+
if secret_var not in secret_vars:
8682
msg = (f"'{secret_var}' not found in k8s secret, as requested by"
8783
f" {appset_name}")
8884
logging.warning(msg)
@@ -93,7 +89,7 @@ def return_secret_vars(self, appset_name: str, secret_var_names: list):
9389

9490
# creates a dict with the requested secret key name and value
9591
# then, appends it to the return_list
96-
return_dict[secret_var] = self.secret_vars[secret_var]
92+
return_dict[secret_var] = secret_vars[secret_var]
9793

9894
return [return_dict]
9995

@@ -103,7 +99,7 @@ def reload_secret_vars(self):
10399
"""
104100
logging.info(f"♻️ Reloading {SECRET_VARS_FILE}")
105101
with open(SECRET_VARS_FILE) as yaml_file:
106-
self.secret_vars = yaml.safe_load(yaml_file)
102+
return yaml.safe_load(yaml_file)
107103

108104
def do_POST(self):
109105
args = self.args()

0 commit comments

Comments
 (0)