diff --git a/stack_orchestrator/deploy/deployment_context.py b/stack_orchestrator/deploy/deployment_context.py index 27e32812..239e9c5c 100644 --- a/stack_orchestrator/deploy/deployment_context.py +++ b/stack_orchestrator/deploy/deployment_context.py @@ -56,9 +56,8 @@ class DeploymentContext: self.stack.init_from_file(self.get_stack_file()) deployment_file_path = self.get_deployment_file() if deployment_file_path.exists(): - with deployment_file_path: - obj = get_yaml().load(open(deployment_file_path, "r")) - self.id = obj[constants.cluster_id_key] + obj = get_yaml().load(open(deployment_file_path, "r")) + self.id = obj[constants.cluster_id_key] # Handle the case of a legacy deployment with no file # Code below is intended to match the output from _make_default_cluster_name() # TODO: remove when we no longer need to support legacy deployments diff --git a/stack_orchestrator/deploy/spec.py b/stack_orchestrator/deploy/spec.py index 99dfb16f..bc1247eb 100644 --- a/stack_orchestrator/deploy/spec.py +++ b/stack_orchestrator/deploy/spec.py @@ -92,9 +92,8 @@ class Spec: return self.obj.get(item, default) def init_from_file(self, file_path: Path): - with file_path: - self.obj = get_yaml().load(open(file_path, "r")) - self.file_path = file_path + self.obj = get_yaml().load(open(file_path, "r")) + self.file_path = file_path def get_image_registry(self): return self.obj.get(constants.image_registry_key) diff --git a/stack_orchestrator/deploy/stack.py b/stack_orchestrator/deploy/stack.py index 1a493534..39ad0083 100644 --- a/stack_orchestrator/deploy/stack.py +++ b/stack_orchestrator/deploy/stack.py @@ -27,5 +27,4 @@ class Stack: self.name = name def init_from_file(self, file_path: Path): - with file_path: - self.obj = get_yaml().load(open(file_path, "r")) + self.obj = get_yaml().load(open(file_path, "r")) diff --git a/stack_orchestrator/util.py b/stack_orchestrator/util.py index fd445600..18dbae02 100644 --- a/stack_orchestrator/util.py +++ b/stack_orchestrator/util.py @@ -180,9 +180,7 @@ def get_k8s_dir(): def get_parsed_deployment_spec(spec_file): spec_file_path = Path(spec_file) try: - with spec_file_path: - deploy_spec = get_yaml().load(open(spec_file_path, "r")) - return deploy_spec + return get_yaml().load(open(spec_file_path, "r")) except FileNotFoundError as error: # We try here to generate a useful diagnostic error print(f"Error: spec file: {spec_file_path} does not exist")