From bfafab411354165bda448e7939f8cbcae1f3d913 Mon Sep 17 00:00:00 2001 From: Daniel Bast <2790401+dbast@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:09:48 +0100 Subject: [PATCH] Lint Tiltfiles with ruff and fix findings (#625) Signed-off-by: Daniel Bast <2790401+dbast@users.noreply.github.com> --- .pre-commit-config.yaml | 4 +- cert_manager/Tiltfile | 2 +- configmap/Tiltfile | 4 +- configmap/test/Tiltfile | 2 +- file_sync_only/Tiltfile | 7 +- get_obj/Tiltfile | 5 +- get_obj/test/Tiltfile | 2 +- get_obj/test/setup.Tiltfile | 2 +- git_resource/Tiltfile | 6 +- hasura/Tiltfile | 2 +- helm_remote/Tiltfile | 4 +- k8s_yaml_glob/Tiltfile | 1 - kubebuilder/Tiltfile | 34 ++++----- list_dependencies/Tiltfile | 14 ++-- list_port_forwards/Tiltfile | 14 ++-- logger/Tiltfile | 140 +++++++++++++++++------------------ min_k8s_version/Tiltfile | 8 +- namespace/Tiltfile | 2 +- nerdctl/Tiltfile | 2 +- pack/Tiltfile | 2 +- podman/Tiltfile | 4 +- podman/test_restart/Tiltfile | 2 +- procfile/Tiltfile | 2 +- pulumi/Tiltfile | 1 - pyproject.toml | 9 +++ syncback/Tiltfile | 2 +- vault_client/Tiltfile | 2 +- workflow/test/Tiltfile | 24 +++--- 28 files changed, 155 insertions(+), 148 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7b00618c6..0c67b58cf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,11 +11,11 @@ repos: - id: check-executables-have-shebangs - id: check-shebang-scripts-are-executable - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.2 + rev: v0.8.4 hooks: - id: ruff args: [--fix] - exclude: ^.*/Tiltfile$ + types_or: [tiltfile] - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.10.0.1 hooks: diff --git a/cert_manager/Tiltfile b/cert_manager/Tiltfile index 6957c4c2c..3422f1ddc 100644 --- a/cert_manager/Tiltfile +++ b/cert_manager/Tiltfile @@ -33,7 +33,7 @@ def deploy_cert_manager(registry="quay.io/jetstack", version="v1.3.1", load_to_k else: cert_manager_test_resources_versioned = cert_manager_test_resources.format(cert_manager_api_version='v1') - if load_to_kind == True: + if load_to_kind: print("Loading images to kind") # Prepull all the cert-manager images to your local environment and then load them directly into kind. This speeds up # setup if you're repeatedly destroying and recreating your kind cluster, as it doesn't have to pull the images over diff --git a/configmap/Tiltfile b/configmap/Tiltfile index 71bc9cda8..ca54ef6bf 100644 --- a/configmap/Tiltfile +++ b/configmap/Tiltfile @@ -40,8 +40,8 @@ def configmap_yaml(name, namespace="", from_file=None, watch=True, from_env_file for f in from_file: args.extend(["--from-file", f]) if watch: - l = f.split('=') - watch_file(l[len(l)-1]) + line = f.split('=') + watch_file(line[len(line)-1]) generator = True else: fail("Bad from_file argument: %s" % from_file) diff --git a/configmap/test/Tiltfile b/configmap/test/Tiltfile index 1e7b9dcef..6a75021f8 100644 --- a/configmap/test/Tiltfile +++ b/configmap/test/Tiltfile @@ -4,4 +4,4 @@ configmap_create('job-config', from_file='my-job.ini=./my-job.ini') configmap_create('env-job-config', from_env_file='my-job.env') configmap_from_dict('from-dict-config', inputs={"hello":"world"}) -k8s_yaml('job.yaml') \ No newline at end of file +k8s_yaml('job.yaml') diff --git a/file_sync_only/Tiltfile b/file_sync_only/Tiltfile index 736aab0bd..262801e40 100644 --- a/file_sync_only/Tiltfile +++ b/file_sync_only/Tiltfile @@ -37,9 +37,9 @@ def file_sync_only(image='', manifests=[], deps=["."], live_update=[], allow_dup # sync files at first time def _first_sync_from_liveupdate(image, live_update, k8s_resources): - for l in live_update: - if type(l) == "live_update_sync_step": - local_path, remote_path = _get_sync_params(l) + for step in live_update: + if type(step) == "live_update_sync_step": + local_path, remote_path = _get_sync_params(step) syncname = "firstsync-%s-%s" % (image.replace("/", "_"), local_path.replace("/", "_")) local_resource(syncname, 'touch %s' % local_path, @@ -81,4 +81,3 @@ def _get_related_resources(manifests, image): fail("found multiple image tags for %s in manifests %s" % (image, manifests)) return k8s_resources, tags_in_manifests[0] - diff --git a/get_obj/Tiltfile b/get_obj/Tiltfile index 2b7eadf0c..a1960c201 100644 --- a/get_obj/Tiltfile +++ b/get_obj/Tiltfile @@ -1,11 +1,10 @@ def get_container(decoded_yaml, container_selector): containers=decoded_yaml["spec"]["template"]["spec"]["containers"] - found_containers=[] for container in containers: if container["name"] == container_selector: return container - + fail("failed to find container %s in the manifest %s" % (container_selector, containers)) def get_image(container): @@ -13,7 +12,7 @@ def get_image(container): def remove_probe(container, probe): if container.get(probe): - container.pop(probe) + container.pop(probe) def get_obj(name, kind, container_selector = None, namespace = None, disable_probes = False): """ diff --git a/get_obj/test/Tiltfile b/get_obj/test/Tiltfile index 7b4709dd4..b5ccb08d9 100644 --- a/get_obj/test/Tiltfile +++ b/get_obj/test/Tiltfile @@ -23,4 +23,4 @@ k8s_resource( "8080:8080", "9229:9229" ] -) \ No newline at end of file +) diff --git a/get_obj/test/setup.Tiltfile b/get_obj/test/setup.Tiltfile index 9e90cb27c..7c1f249cb 100644 --- a/get_obj/test/setup.Tiltfile +++ b/get_obj/test/setup.Tiltfile @@ -5,4 +5,4 @@ docker_build( 'remote-dev-test-image', '.' ) -k8s_yaml('deployment.yaml') \ No newline at end of file +k8s_yaml('deployment.yaml') diff --git a/git_resource/Tiltfile b/git_resource/Tiltfile index c90437df9..ab301b214 100644 --- a/git_resource/Tiltfile +++ b/git_resource/Tiltfile @@ -106,10 +106,12 @@ def git_checkout(repository_url, checkout_dir=None, unsafe_mode=False): def deploy_from_dir(resource_name, directory, dockerfile='Dockerfile', namespace='default', resource_deps=[], port_forwards=[], build_callback=None, deployment_callback=None): if deployment_callback == None: - deployment_callback = lambda resource_name, image_name, namespace: _default_deployment_callback(resource_name, image_name, namespace) + def deployment_callback(resource_name, image_name, namespace): + return _default_deployment_callback(resource_name, image_name, namespace) if build_callback == None: - build_callback = lambda resource_name, directory, dockerfile: _default_build_callback(resource_name, directory, dockerfile=dockerfile) + def build_callback(resource_name, directory, dockerfile): + return _default_build_callback(resource_name, directory, dockerfile=dockerfile) image_name = build_callback(resource_name, directory, dockerfile=dockerfile) yaml = deployment_callback(resource_name, image_name, namespace) diff --git a/hasura/Tiltfile b/hasura/Tiltfile index 274f051b6..81ef0c32a 100644 --- a/hasura/Tiltfile +++ b/hasura/Tiltfile @@ -11,7 +11,7 @@ DEFAULT_HASURA_PORT = 8080 DEFAULT_HASURA_RESOURCE_NAME = 'hasura' def hasura_console(release_name='', - path='.', + path='.', hasura_resource_name=None, hasura_endpoint= 'http://localhost:8080', hasura_secret=DEFAULT_HASURA_SECRET, diff --git a/helm_remote/Tiltfile b/helm_remote/Tiltfile index 535f80de0..e20393060 100644 --- a/helm_remote/Tiltfile +++ b/helm_remote/Tiltfile @@ -131,11 +131,11 @@ def helm_remote_yaml(chart, repo_url='', repo_name='', release_name='', values=[ # str.isalnum accepts dots, which is only dangerous when slashes are allowed # https://helm.sh/docs/chart_best_practices/conventions/#chart-names - if chart.replace('-', '').isalnum() == False or chart != chart.replace('.', ''): + if not chart.replace('-', '').isalnum() or chart != chart.replace('.', ''): # https://helm.sh/docs/chart_best_practices/conventions/#chart-names fail('Chart name is not valid') - if repo_name != chart and repo_name.replace('-', '').isalnum() == False or repo_name != repo_name.replace('.', ''): + if repo_name != chart and not repo_name.replace('-', '').isalnum() or repo_name != repo_name.replace('.', ''): # https://helm.sh/docs/chart_best_practices/conventions/#chart-names if not repo_name.startswith('oci://'): fail('Repo name is not valid') diff --git a/k8s_yaml_glob/Tiltfile b/k8s_yaml_glob/Tiltfile index eab38e365..022505579 100644 --- a/k8s_yaml_glob/Tiltfile +++ b/k8s_yaml_glob/Tiltfile @@ -10,7 +10,6 @@ def k8s_yaml_glob(*glob_patterns, **kwargs): for glob_pattern in glob_patterns: script = 'import glob; print("|".join( p for p in glob.glob(\"' + glob_pattern + '")))' - cmd = python_cmd + " -c '" + script + "'" val = str(local(command=python_cmd + " -c '" + script + "'", quiet=False)).strip() yaml_paths = val.split("|") k8s_yaml(yaml_paths, **kwargs) diff --git a/kubebuilder/Tiltfile b/kubebuilder/Tiltfile index 9dc293818..a7d2df778 100644 --- a/kubebuilder/Tiltfile +++ b/kubebuilder/Tiltfile @@ -24,16 +24,16 @@ def kubebuilder(DOMAIN, GROUP, VERSION, KIND, IMG='controller:latest', CONTROLLE return encode_yaml_stream(decoded) return data - + def manifests(): return 'controller-gen ' + CONTROLLERGEN - + def generate(): return 'controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./...";' - + def vetfmt(): return 'go vet ./...; go fmt ./...' - + # build to tilt_bin beause kubebuilder has a dockerignore for bin/ def binary(): return 'CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -o tilt_bin/manager cmd/main.go' @@ -43,29 +43,29 @@ def kubebuilder(DOMAIN, GROUP, VERSION, KIND, IMG='controller:latest', CONTROLLE DIRNAME = os.path.basename(os. getcwd()) # if kubebuilder - if os.path.exists('go.mod') == False: + if not os.path.exists('go.mod'): local("go mod init %s" % DIRNAME) - - if os.path.exists('PROJECT') == False: + + if not os.path.exists('PROJECT'): local("kubebuilder init --domain %s" % DOMAIN) - - if os.path.exists('api') == False: + + if not os.path.exists('api'): local("kubebuilder create api --resource --controller --group %s --version %s --kind %s" % (GROUP, VERSION, KIND)) - + local(manifests() + generate()) - + local_resource('CRD', manifests() + 'kustomize build config/crd | kubectl apply -f -', deps=["api"]) - + k8s_yaml(yaml()) - + deps = ['internal/controller', 'cmd/main.go'] deps.append('api') - + local_resource('Watch&Compile', generate() + binary(), deps=deps, ignore=['*/*/zz_generated.deepcopy.go']) - + local_resource('Sample YAML', 'kubectl apply -f ./config/samples', deps=["./config/samples"], resource_deps=[DIRNAME + "-controller-manager"]) - - docker_build_with_restart(IMG, '.', + + docker_build_with_restart(IMG, '.', dockerfile_contents=DOCKERFILE, entrypoint='/manager', only=['./tilt_bin/manager'], diff --git a/list_dependencies/Tiltfile b/list_dependencies/Tiltfile index 23f05439a..3b9116120 100644 --- a/list_dependencies/Tiltfile +++ b/list_dependencies/Tiltfile @@ -3,10 +3,10 @@ load('ext://uibutton', 'cmd_button') display_deps_path = os.path.join(os.getcwd(), 'deps.py') def display_dependencies(): - cmd_button( - name = 'show_deps', - resource = '(Tiltfile)', - argv = [display_deps_path], - text = 'list pending dependencies', - icon_name = 'account_tree' - ) + cmd_button( + name = 'show_deps', + resource = '(Tiltfile)', + argv = [display_deps_path], + text = 'list pending dependencies', + icon_name = 'account_tree' + ) diff --git a/list_port_forwards/Tiltfile b/list_port_forwards/Tiltfile index c9452b5d0..2015d30ca 100644 --- a/list_port_forwards/Tiltfile +++ b/list_port_forwards/Tiltfile @@ -3,10 +3,10 @@ load('ext://uibutton', 'cmd_button') display_pf_script_path = os.path.join(os.getcwd(), "display_port_forwards.sh") def display_port_forwards(): - cmd_button( - name = 'which_ports', - resource = '(Tiltfile)', - argv = [display_pf_script_path], - text='List port forwards', - icon_name='travel_explore', - ) + cmd_button( + name = 'which_ports', + resource = '(Tiltfile)', + argv = [display_pf_script_path], + text='List port forwards', + icon_name='travel_explore', + ) diff --git a/logger/Tiltfile b/logger/Tiltfile index 765848736..c10d79af6 100644 --- a/logger/Tiltfile +++ b/logger/Tiltfile @@ -9,98 +9,98 @@ _log_level = 'info' _log_separator = '\n' + '*' * 20 + '\n' def _check_bool(value): - if not value: - return False - elif type(value) == 'bool': - return value - elif type(value) == 'string': - return value.lower() == 'true' - else: - return False + if not value: + return False + elif type(value) == 'bool': + return value + elif type(value) == 'string': + return value.lower() == 'true' + else: + return False def _is_log_level_enabled(log_level): - default_log_level = os.getenv('LOGGER_LOG_LEVEL', _log_level) - # validate default log level - if default_log_level not in _all_log_level: - fail(_build_message('Unknown log level: ' + default_log_level, True)) - # debug default log level enables all other log levels - if default_log_level == 'debug' and log_level in _all_log_level: - return True - # info default log level enables info, warning and error log levels - elif default_log_level == 'info' and log_level in _info_allowed: - return True - # warning default log level enables warning and error log levels - elif default_log_level == 'warning' and log_level in _warn_allowed: - return True - # error default log level enables only error log level - elif default_log_level == 'error' and log_level in _error_allowed: - return True - else: - return False + default_log_level = os.getenv('LOGGER_LOG_LEVEL', _log_level) + # validate default log level + if default_log_level not in _all_log_level: + fail(_build_message('Unknown log level: ' + default_log_level, True)) + # debug default log level enables all other log levels + if default_log_level == 'debug' and log_level in _all_log_level: + return True + # info default log level enables info, warning and error log levels + elif default_log_level == 'info' and log_level in _info_allowed: + return True + # warning default log level enables warning and error log levels + elif default_log_level == 'warning' and log_level in _warn_allowed: + return True + # error default log level enables only error log level + elif default_log_level == 'error' and log_level in _error_allowed: + return True + else: + return False def _build_message(content, use_log_separator=False): - message = content - if _check_bool(os.getenv('LOGGER_USE_LOG_SEPARATOR', use_log_separator)): - log_separator = os.getenv('LOGGER_LOG_SEPARATOR', _log_separator) - message = log_separator + content + log_separator - return message + message = content + if _check_bool(os.getenv('LOGGER_USE_LOG_SEPARATOR', use_log_separator)): + log_separator = os.getenv('LOGGER_LOG_SEPARATOR', _log_separator) + message = log_separator + content + log_separator + return message def is_debug_enabled(): - return _is_log_level_enabled('debug') + return _is_log_level_enabled('debug') def debug(content, use_log_separator=False): - if is_debug_enabled(): - print(_build_message(color.magenta('[DEBUG] ') + content, use_log_separator)) + if is_debug_enabled(): + print(_build_message(color.magenta('[DEBUG] ') + content, use_log_separator)) def is_info_enabled(): - return _is_log_level_enabled('info') + return _is_log_level_enabled('info') def info(content, use_log_separator=False): - if is_info_enabled(): - print(_build_message(color.blue('[INFO] ') + content, use_log_separator)) + if is_info_enabled(): + print(_build_message(color.blue('[INFO] ') + content, use_log_separator)) def is_warning_enabled(): - return _is_log_level_enabled('warning') + return _is_log_level_enabled('warning') def warning(content, force_warn=True, use_log_separator=False): - if is_warning_enabled(): - message = _build_message(color.yellow('[WARN] ') + content, use_log_separator) - if _check_bool(os.getenv('LOGGER_FORCE_WARN', force_warn)): - warn(message) - else: - print(message) + if is_warning_enabled(): + message = _build_message(color.yellow('[WARN] ') + content, use_log_separator) + if _check_bool(os.getenv('LOGGER_FORCE_WARN', force_warn)): + warn(message) + else: + print(message) def is_error_enabled(): - return _is_log_level_enabled('error') + return _is_log_level_enabled('error') def error(content, force_fail=True, use_log_separator=True): - if is_error_enabled(): - message = _build_message(color.red('[ERROR] ') + content, use_log_separator) - if _check_bool(os.getenv('LOGGER_FORCE_FAIL', force_fail)): - fail(message) - else: - print(message) + if is_error_enabled(): + message = _build_message(color.red('[ERROR] ') + content, use_log_separator) + if _check_bool(os.getenv('LOGGER_FORCE_FAIL', force_fail)): + fail(message) + else: + print(message) def log(log_level, content, force=False, use_log_separator=False): - if log_level == 'debug': - debug(content, use_log_separator) - elif log_level == 'info': - info(content, use_log_separator) - elif log_level == 'warning': - warning(content, force, use_log_separator) - elif log_level == 'error': - error(content, force, use_log_separator) - else: - print(content) + if log_level == 'debug': + debug(content, use_log_separator) + elif log_level == 'info': + info(content, use_log_separator) + elif log_level == 'warning': + warning(content, force, use_log_separator) + elif log_level == 'error': + error(content, force, use_log_separator) + else: + print(content) logger = struct( - is_debug_enabled = is_debug_enabled, - debug = debug, - is_info_enabled = is_info_enabled, - info = info, - is_warning_enabled = is_warning_enabled, - warning = warning, - is_error_enabled = is_error_enabled, - error = error, - log = log + is_debug_enabled = is_debug_enabled, + debug = debug, + is_info_enabled = is_info_enabled, + info = info, + is_warning_enabled = is_warning_enabled, + warning = warning, + is_error_enabled = is_error_enabled, + error = error, + log = log ) diff --git a/min_k8s_version/Tiltfile b/min_k8s_version/Tiltfile index b32329163..27d76d9bd 100644 --- a/min_k8s_version/Tiltfile +++ b/min_k8s_version/Tiltfile @@ -2,7 +2,7 @@ def min_k8s_version(min_version): version_str = _get_server_version() cur_ver = _version_tuple(version_str) min_ver = _version_tuple(min_version) - + if cur_ver < min_ver: print(" ---------------------------------------------------------- ") print("| |") @@ -18,7 +18,7 @@ def max_k8s_version(max_version): version_str = _get_server_version() cur_ver = _version_tuple(version_str) max_ver = _version_tuple(max_version) - + if cur_ver > max_ver: print(" ---------------------------------------------------------- ") print("| |") @@ -46,10 +46,10 @@ def _get_server_version(): return _get_server_version_pre_1_28_kubectl() else: return version_string.replace('v', '') - + return "" -def _get_server_version_pre_1_28_kubectl(): +def _get_server_version_pre_1_28_kubectl(): kubectl_version_output = str(local('kubectl version --short', quiet=True)) version_str = '' for line in kubectl_version_output.split('\n'): diff --git a/namespace/Tiltfile b/namespace/Tiltfile index 1fdf91766..017c5c372 100644 --- a/namespace/Tiltfile +++ b/namespace/Tiltfile @@ -101,4 +101,4 @@ def _set_rolebinding_namespace(o, ns): if k == 'subjects' and type(v) == 'list': for s in v: if type(s) == 'dict' and s.get('kind', None) == "ServiceAccount": - s['namespace'] = ns \ No newline at end of file + s['namespace'] = ns diff --git a/nerdctl/Tiltfile b/nerdctl/Tiltfile index ce11bccd5..71f5b8332 100644 --- a/nerdctl/Tiltfile +++ b/nerdctl/Tiltfile @@ -51,7 +51,7 @@ def nerdctl_build( if secret: cmd += ['--secret', secret] - + if platform: cmd += ['--platform', platform] diff --git a/pack/Tiltfile b/pack/Tiltfile index 37f8bcf4f..e65f53f9f 100644 --- a/pack/Tiltfile +++ b/pack/Tiltfile @@ -1,7 +1,7 @@ # -*- mode: Python -*- def pack( - name, + name, path=".", builder="gcr.io/paketo-buildpacks/builder:base", buildpacks=[], diff --git a/podman/Tiltfile b/podman/Tiltfile index bcf797b09..1ff6a84f5 100644 --- a/podman/Tiltfile +++ b/podman/Tiltfile @@ -77,6 +77,6 @@ ref, context, entrypoint, ignore=None, extra_flags=None, deps=None, live_update= ) % (extra_flags_str, shlex.quote(context)), ignore=ignore, deps=deps, - entrypoint=entrypoint, + entrypoint=entrypoint, live_update=live_update, - ) \ No newline at end of file + ) diff --git a/podman/test_restart/Tiltfile b/podman/test_restart/Tiltfile index af04c7680..cc2bd3abf 100644 --- a/podman/test_restart/Tiltfile +++ b/podman/test_restart/Tiltfile @@ -6,7 +6,7 @@ podman_build_with_restart( entrypoint='/app/main.sh', deps=['main.sh'], live_update=[ - sync('./main.sh', '/app/main.sh') + sync('./main.sh', '/app/main.sh') ] ) diff --git a/procfile/Tiltfile b/procfile/Tiltfile index 7eabe7e6e..9b46c131c 100644 --- a/procfile/Tiltfile +++ b/procfile/Tiltfile @@ -8,7 +8,7 @@ def procfile_resources(procfile='Procfile', set_port=False, starting_port=5000, procfile (Str): the path to the Procfile to load set_port (Bool): if True, give each process a unique $PORT value starting_port (Int): the number from which to start assigning ports - """ + """ port = starting_port lines = str(read_file(procfile)).splitlines() for line in lines: diff --git a/pulumi/Tiltfile b/pulumi/Tiltfile index 031e34d82..39adf5378 100644 --- a/pulumi/Tiltfile +++ b/pulumi/Tiltfile @@ -57,7 +57,6 @@ def pulumi_resource( apply_cmd = ['python3', pulumi_apply_path] delete_cmd = ["pulumi", "destroy", "-y"] - flags = [] for i in range(len(image_deps)): config = image_configs[i] if type(config) == 'string': diff --git a/pyproject.toml b/pyproject.toml index 1571bfe34..c7fdc9463 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,3 +11,12 @@ select = [ "W", # pycodestyle warnings (part of flake8) "I" # isort ] + +[tool.ruff.lint.per-file-ignores] +# Tiltfiles are written in Starlark, a subset of Python, so we need to disable +# some Ruff rules that don't apply. +"*Tiltfile*" = [ + "F821", # Undefined name + "E711", # Comparison to `None` should be `cond is not None` + "E721" # Use `is` and `is not` +] diff --git a/syncback/Tiltfile b/syncback/Tiltfile index 855e1250e..38492cc58 100644 --- a/syncback/Tiltfile +++ b/syncback/Tiltfile @@ -51,7 +51,7 @@ def syncback_command_args(k8s_object, src_dir, ignore=None, delete=False, paths= if paths and ignore: fail('Paths and ignore are mutually exclusive.') - + if not paths: if not ignore: ignore = [] diff --git a/vault_client/Tiltfile b/vault_client/Tiltfile index f8b4aa86e..b741d80e9 100644 --- a/vault_client/Tiltfile +++ b/vault_client/Tiltfile @@ -3,4 +3,4 @@ def vault_read_secret(path, field): def vault_set_env_vars(vault_addr, vault_token): os.putenv('VAULT_ADDR', vault_addr) - os.putenv('VAULT_TOKEN', vault_token) \ No newline at end of file + os.putenv('VAULT_TOKEN', vault_token) diff --git a/workflow/test/Tiltfile b/workflow/test/Tiltfile index 45a00237c..a6f1f53e2 100644 --- a/workflow/test/Tiltfile +++ b/workflow/test/Tiltfile @@ -12,24 +12,24 @@ test_clear = ['echo', 'resetting...'] local_resource( - name='database', - cmd=['echo', 'Workflow Test'], + name='database', + cmd=['echo', 'Workflow Test'], ) -workflow('test', - resource_name='database', - work_cmds=test_cmds, - clear_cmd=test_clear, +workflow('test', + resource_name='database', + work_cmds=test_cmds, + clear_cmd=test_clear, ) workflow('test2', - resource_name='database', - work_cmds=test_cmds, - clear_cmd=test_clear, + resource_name='database', + work_cmds=test_cmds, + clear_cmd=test_clear, ) workflow('test', - resource_name='(Tiltfile)', - work_cmds=test_cmds, - clear_cmd=test_clear, + resource_name='(Tiltfile)', + work_cmds=test_cmds, + clear_cmd=test_clear, )