Skip to content

Commit a33829d

Browse files
jeffreyavenjeffreyaven
committed
linting updatess
1 parent cace7b2 commit a33829d

File tree

6 files changed

+125
-81
lines changed

6 files changed

+125
-81
lines changed

‎stackql_deploy/cli.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ def parse_env_var(ctx, param, value):
8282
def setup_logger(command, args_dict):
8383
log_level = args_dict.get('log_level', 'INFO').upper() # Normalize to uppercase
8484
valid_levels = {'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'}
85-
85+
8686
if log_level not in valid_levels:
8787
raise click.ClickException(
8888
f"Invalid log level: {log_level}. Valid levels are: {', '.join(valid_levels)}"
8989
)
90-
90+
9191
logger.setLevel(log_level)
9292
logger.debug(f"'{command}' command called with args: {str(args_dict)}")
9393

‎stackql_deploy/cmd/base.py‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ def __init__(self, stackql, vars, logger, stack_dir, stack_env):
3030
)
3131

3232
def process_custom_auth(
33-
self,
34-
resource,
33+
self,
34+
resource,
3535
full_context
3636
):
3737
custom_auth = resource.get('auth', {})
3838
env_vars = {}
3939

4040
if custom_auth:
4141
self.logger.info(f"🔑 custom auth is configured for [{resource['name']}]")
42-
42+
4343
# Function to recursively search for keys of interest and populate env_vars
4444
def extract_env_vars(auth_config):
4545
for key, value in auth_config.items():
@@ -103,9 +103,9 @@ def process_exports(
103103
self.stackql,
104104
True,
105105
self.logger,
106-
custom_auth=custom_auth,
107-
env_vars=env_vars,
108-
retries=exports_retries,
106+
custom_auth=custom_auth,
107+
env_vars=env_vars,
108+
retries=exports_retries,
109109
delay=exports_retry_delay
110110
)
111111
self.logger.debug(f"exports: {exports}")
@@ -178,14 +178,14 @@ def check_if_resource_exists(
178178
show_query(show_queries, exists_query, self.logger)
179179
custom_auth, env_vars = self.process_custom_auth(resource, full_context)
180180
resource_exists = perform_retries(
181-
resource,
182-
exists_query,
183-
exists_retries,
184-
exists_retry_delay,
185-
self.stackql,
186-
self.logger,
187-
delete_test,
188-
custom_auth=custom_auth,
181+
resource,
182+
exists_query,
183+
exists_retries,
184+
exists_retry_delay,
185+
self.stackql,
186+
self.logger,
187+
delete_test,
188+
custom_auth=custom_auth,
189189
env_vars=env_vars
190190
)
191191
else:
@@ -215,14 +215,14 @@ def check_if_resource_is_correct_state(
215215
show_query(show_queries, statecheck_query, self.logger)
216216
custom_auth, env_vars = self.process_custom_auth(resource, full_context)
217217
is_correct_state = perform_retries(
218-
resource,
219-
statecheck_query,
220-
statecheck_retries,
221-
statecheck_retry_delay,
222-
self.stackql,
223-
self.logger,
224-
False,
225-
custom_auth=custom_auth,
218+
resource,
219+
statecheck_query,
220+
statecheck_retries,
221+
statecheck_retry_delay,
222+
self.stackql,
223+
self.logger,
224+
False,
225+
custom_auth=custom_auth,
226226
env_vars=env_vars
227227
)
228228
if is_correct_state:
@@ -255,13 +255,13 @@ def create_resource(
255255
show_query(show_queries, create_query, self.logger)
256256
custom_auth, env_vars = self.process_custom_auth(resource, full_context)
257257
msg = run_stackql_command(
258-
create_query,
259-
self.stackql,
260-
self.logger,
261-
custom_auth=custom_auth,
262-
env_vars=env_vars,
263-
ignore_errors=ignore_errors,
264-
retries=create_retries,
258+
create_query,
259+
self.stackql,
260+
self.logger,
261+
custom_auth=custom_auth,
262+
env_vars=env_vars,
263+
ignore_errors=ignore_errors,
264+
retries=create_retries,
265265
retry_delay=create_retry_delay
266266
)
267267
self.logger.debug(f"create response: {msg}")
@@ -288,13 +288,13 @@ def update_resource(
288288
show_query(show_queries, update_query, self.logger)
289289
custom_auth, env_vars = self.process_custom_auth(resource, full_context)
290290
msg = run_stackql_command(
291-
update_query,
292-
self.stackql,
293-
self.logger,
294-
custom_auth=custom_auth,
295-
env_vars=env_vars,
296-
ignore_errors=ignore_errors,
297-
retries=update_retries,
291+
update_query,
292+
self.stackql,
293+
self.logger,
294+
custom_auth=custom_auth,
295+
env_vars=env_vars,
296+
ignore_errors=ignore_errors,
297+
retries=update_retries,
298298
retry_delay=update_retry_delay
299299
)
300300
self.logger.debug(f"update response: {msg}")
@@ -322,13 +322,13 @@ def delete_resource(
322322
show_query(show_queries, delete_query, self.logger)
323323
custom_auth, env_vars = self.process_custom_auth(resource, full_context)
324324
msg = run_stackql_command(
325-
delete_query,
326-
self.stackql,
327-
self.logger,
328-
custom_auth=custom_auth,
329-
env_vars=env_vars,
330-
ignore_errors=ignore_errors,
331-
retries=delete_retries,
325+
delete_query,
326+
self.stackql,
327+
self.logger,
328+
custom_auth=custom_auth,
329+
env_vars=env_vars,
330+
ignore_errors=ignore_errors,
331+
retries=delete_retries,
332332
retry_delay=delete_retry_delay
333333
)
334334
self.logger.debug(f"delete response: {msg}")

‎stackql_deploy/cmd/build.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ def run(self, dry_run, show_queries, on_failure):
117117
# run exists check (check if resource exists)
118118
#
119119
resource_exists = self.check_if_resource_exists(
120-
resource_exists,
121-
resource,
122-
full_context,
123-
exists_query,
124-
exists_retries,
125-
exists_retry_delay,
126-
dry_run,
120+
resource_exists,
121+
resource,
122+
full_context,
123+
exists_query,
124+
exists_retries,
125+
exists_retry_delay,
126+
dry_run,
127127
show_queries
128128
)
129129

@@ -132,13 +132,13 @@ def run(self, dry_run, show_queries, on_failure):
132132
#
133133
if resource_exists:
134134
is_correct_state = self.check_if_resource_is_correct_state(
135-
is_correct_state,
136-
resource,
137-
full_context,
138-
statecheck_query,
139-
statecheck_retries,
140-
statecheck_retry_delay,
141-
dry_run,
135+
is_correct_state,
136+
resource,
137+
full_context,
138+
statecheck_query,
139+
statecheck_retries,
140+
statecheck_retry_delay,
141+
dry_run,
142142
show_queries
143143
)
144144

@@ -152,14 +152,14 @@ def run(self, dry_run, show_queries, on_failure):
152152
is_created_or_updated = False
153153
if not resource_exists:
154154
is_created_or_updated = self.create_resource(
155-
is_created_or_updated,
156-
resource,
157-
full_context,
158-
create_query,
159-
create_retries,
160-
create_retry_delay,
161-
dry_run,
162-
show_queries,
155+
is_created_or_updated,
156+
resource,
157+
full_context,
158+
create_query,
159+
create_retries,
160+
create_retry_delay,
161+
dry_run,
162+
show_queries,
163163
ignore_errors
164164
)
165165

@@ -168,14 +168,14 @@ def run(self, dry_run, show_queries, on_failure):
168168
#
169169
if resource_exists and not is_correct_state:
170170
is_created_or_updated = self.update_resource(
171-
is_created_or_updated,
172-
resource,
173-
full_context,
174-
update_query,
175-
update_retries,
176-
update_retry_delay,
177-
dry_run,
178-
show_queries,
171+
is_created_or_updated,
172+
resource,
173+
full_context,
174+
update_query,
175+
update_retries,
176+
update_retry_delay,
177+
dry_run,
178+
show_queries,
179179
ignore_errors
180180
)
181181

‎stackql_deploy/cmd/teardown.py‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,29 @@ def run(self, dry_run, show_queries, on_failure):
108108
ignore_errors = True # multi resources ignore errors on create or update
109109
elif type == 'resource':
110110
resource_exists = self.check_if_resource_exists(
111-
resource_exists, resource, full_context, exists_query, exists_retries, exists_retry_delay, dry_run, show_queries
111+
resource_exists,
112+
resource,
113+
full_context,
114+
exists_query,
115+
exists_retries,
116+
exists_retry_delay,
117+
dry_run,
118+
show_queries
112119
)
113120

114121
#
115122
# delete
116123
#
117124
if resource_exists:
118125
self.delete_resource(
119-
resource, full_context, delete_query, delete_retries, delete_retry_delay, dry_run, show_queries, ignore_errors
126+
resource,
127+
full_context,
128+
delete_query,
129+
delete_retries,
130+
delete_retry_delay,
131+
dry_run,
132+
show_queries,
133+
ignore_errors
120134
)
121135
else:
122136
self.logger.info(f"resource [{resource['name']}] does not exist, skipping delete")

‎stackql_deploy/cmd/test.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ def run(self, dry_run, show_queries, on_failure):
4848
if type in ('resource', 'multi'):
4949

5050
is_correct_state = self.check_if_resource_is_correct_state(
51-
False, resource, full_context, statecheck_query, statecheck_retries, statecheck_retry_delay, dry_run, show_queries
51+
False,
52+
resource,
53+
full_context,
54+
statecheck_query,
55+
statecheck_retries,
56+
statecheck_retry_delay,
57+
dry_run,
58+
show_queries
5259
)
5360

5461
if not is_correct_state and not dry_run:

‎stackql_deploy/lib/utils.py‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,15 @@ def error_detected(result):
102102
return True
103103
return False
104104

105-
def run_stackql_command(command, stackql, logger, custom_auth=None, env_vars=None, ignore_errors=False, retries=0, retry_delay=5):
105+
def run_stackql_command(command,
106+
stackql,
107+
logger,
108+
custom_auth=None,
109+
env_vars=None,
110+
ignore_errors=False,
111+
retries=0,
112+
retry_delay=5
113+
):
106114
attempt = 0
107115
while attempt <= retries:
108116
try:
@@ -293,7 +301,13 @@ def is_installed_version_higher(installed_version, requested_version, logger):
293301

294302
def run_test(resource, rendered_test_iql, stackql, logger, delete_test=False, custom_auth=None, env_vars=None):
295303
try:
296-
test_result = run_stackql_query(rendered_test_iql, stackql, True, logger, custom_auth=custom_auth, env_vars=env_vars)
304+
test_result = run_stackql_query(
305+
rendered_test_iql,
306+
stackql,
307+
True,
308+
logger,
309+
custom_auth=custom_auth,
310+
env_vars=env_vars)
297311
logger.debug(f"(utils.run_test) test query result for [{resource['name']}]:\n\n{test_result}\n")
298312

299313
if test_result == []:
@@ -338,7 +352,16 @@ def show_query(show_queries, query, logger):
338352
if show_queries:
339353
logger.info(f"🔍 query:\n\n{query}\n")
340354

341-
def perform_retries(resource, query, retries, delay, stackql, logger, delete_test=False, custom_auth=None, env_vars=None):
355+
def perform_retries(resource,
356+
query,
357+
retries,
358+
delay,
359+
stackql,
360+
logger,
361+
delete_test=False,
362+
custom_auth=None,
363+
env_vars=None
364+
):
342365
attempt = 0
343366
start_time = time.time() # Capture the start time of the operation
344367
while attempt < retries:

0 commit comments

Comments
 (0)