[PRMP-580] Update cron and delay continuous workspace teardown

Author: megan-bower4

.github/workflows/cron-tear-down-sandbox.yml

@@ -2,7 +2,7 @@ name: 'Z-CRON: Tear down - Sandboxes'
 
 on:
   schedule:
-    - cron: 59 17 * * 1-5 # utc time
+    - cron: 59 18-21 * * 1-5 # utc time
 
 permissions:
   pull-requests: write

README.md

@@ -7,12 +7,12 @@ This repository is used to build the infrastructure the NDR. That is it's sole p
 - [Terraform](https://developer.hashicorp.com/terraform/install)
 - [Terraform docs](https://github.com/terraform-docs/terraform-docs)
 
-To install terraform-docs on WSL use the following command
+To install terraform-docs on WSL use the following commands (e.g. for v0.20.0):
 ```
-curl -sSLo ./terraform-docs.tar.gz https://terraform-docs.io/dl/v0.20.0/terraform-docs-v0.20.0-$(uname)-amd64.tar.gz &&
-tar -xzf terraform-docs.tar.gz &&
-chmod +x terraform-docs &&
-sudo mv terraform-docs /usr/local/bin/terraform-docs &&
+curl -sSLo ./terraform-docs.tar.gz https://terraform-docs.io/dl/v0.20.0/terraform-docs-v0.20.0-$(uname)-amd64.tar.gz
+tar -xzf terraform-docs.tar.gz
+chmod +x terraform-docs
+sudo mv terraform-docs /usr/local/bin/terraform-docs
 rm terraform-docs.tar.gz
 ```
 

infrastructure/api.tf

@@ -23,7 +23,7 @@ resource "aws_api_gateway_base_path_mapping" "api_mapping" {
   stage_name  = var.environment
   domain_name = local.api_gateway_full_domain_name
 
-  depends_on = [aws_api_gateway_deployment.ndr_api_deploy, aws_api_gateway_rest_api.ndr_doc_store_api, aws_api_gateway_stage.ndr_api]
+  depends_on = [aws_api_gateway_deployment.ndr_api_deploy, aws_api_gateway_rest_api.ndr_doc_store_api]
 }
 
 resource "aws_api_gateway_resource" "auth_resource" {

infrastructure/api_mtls.tf

@@ -35,7 +35,6 @@ resource "aws_api_gateway_base_path_mapping" "api_mapping_mtls" {
 
   depends_on = [
     aws_api_gateway_deployment.ndr_api_deploy_mtls,
-    aws_api_gateway_stage.ndr_api_mtls,
     aws_api_gateway_rest_api.ndr_doc_store_api_mtls
   ]
 }

scripts/cleanup_sandboxes.py

@@ -1,3 +1,4 @@
+import time
 import boto3, os, requests, sys
 
 from botocore.exceptions import ClientError
@@ -62,3 +63,4 @@ def get_workspaces() -> list[str]:
     for workspace in workspaces:
         if workspace not in excluded:
             trigger_delete_workflow(token=gh_pat, sandbox=workspace)
+            time.sleep(300)