Skip to content

Fixes a regression in the AWS intialization script for Dev and Test venue #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tloubrieu-jpl merged 6 commits into from
Jul 27, 2026
+8 −2
Merged

Fixes a regression in the AWS intialization script for Dev and Test venue #553

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a53b8f7
split terraform scripts according to lifecycle of the components, val…
Jul 21, 2026
01d96f2
split terraform scripts according to lifecycle of the components, val…
Jul 21, 2026
152d404
Merge branch 'isolate_opensearch_tf' of https://github.com/NASA-PDS/r…
Jul 21, 2026
f1741b8
fix regression on run-init-on-aws with --terragrunt option
Jul 24, 2026
8612faa
fix regression on run-init-on-aws with --terragrunt option
Jul 24, 2026
b6b0690
Merge branch 'init_aws_fix' of https://github.com/NASA-PDS/registry i…
Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions terraform/run-init-on-aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ def print_section(self, emoji: str, message: str):

def check_terraform_directory(self) -> bool:
"""Check that the opensearch_serverless and applications Terraform state directories exist."""
marker = "terragrunt.hcl" if self.tf_cmd == "terragrunt" else "main.tf"
for tf_dir in (self.tf_opensearch_dir, self.tf_applications_dir):
if not (tf_dir / "main.tf").exists():
print(f"Error: Terraform directory not found or missing main.tf: {tf_dir}")
if not (tf_dir / marker).exists():
print(f"Error: Terraform directory not found or missing {marker}: {tf_dir}")

@nutjob4life nutjob4life Jul 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general diagnostic messages should go to the standard error:

print(
    f"Error: Terraform directory not found or missing {marker}: {tf_dir}",
    file=sys.stderr
)

return False
return True

Expand Down Expand Up @@ -597,6 +598,11 @@ def main():
initializer.tf_cmd = "terragrunt"
if args.working_dir:
working_dir = args.working_dir.resolve()
elif args.terragrunt:
working_dir = Path.cwd()
else:
working_dir = None
if working_dir:
initializer.tf_opensearch_dir = working_dir / "opensearch_serverless"
initializer.tf_applications_dir = working_dir / "applications"
sys.exit(initializer.run())
Expand Down