diff --git a/scripts/test-terraform-import-plan-check.py b/scripts/test-terraform-import-plan-check.py index 460a0cc1..465d2506 100755 --- a/scripts/test-terraform-import-plan-check.py +++ b/scripts/test-terraform-import-plan-check.py @@ -340,13 +340,13 @@ class ImportPlanCheckerTests(unittest.TestCase): self.assertFalse((REPOSITORY / "terraform" / "versions.tf").exists()) self.assertFalse((REPOSITORY / "terraform" / "main.tf").exists()) - def test_dev_adoption_complete_is_pinned_in_locals(self) -> None: + def test_adoption_complete_is_pinned_in_locals(self) -> None: dev = (REPOSITORY / "terraform/live/dev/main.tf").read_text(encoding="utf-8") staging = (REPOSITORY / "terraform/live/staging/main.tf").read_text( encoding="utf-8" ) self.assertRegex(dev, r"adoption_complete\s+= true") - self.assertRegex(staging, r"adoption_complete\s+= false") + self.assertRegex(staging, r"adoption_complete\s+= true") self.assertNotIn('variable "adoption_complete"', dev) self.assertNotIn('variable "environment"', dev) self.assertNotIn('variable "release_version_label"', dev) diff --git a/terraform/live/README.md b/terraform/live/README.md index aa85eec0..46fbfb20 100644 --- a/terraform/live/README.md +++ b/terraform/live/README.md @@ -1,7 +1,7 @@ # Live Terraform roots `live/dev/` is the adopted HCP workspace `shoc-frontend-new-dev`. -`live/staging/` is `shoc-frontend-new-staging` (`adoption_complete = false`). +`live/staging/` is `shoc-frontend-new-staging` (`adoption_complete = true`). Do not collapse these into one `terraform/` root in the same PR as application CD. Flattening retargets two live HCP working directories and belongs in its diff --git a/terraform/live/staging/main.tf b/terraform/live/staging/main.tf index 6d26831c..56606900 100644 --- a/terraform/live/staging/main.tf +++ b/terraform/live/staging/main.tf @@ -1,6 +1,6 @@ locals { - # Staging is not fully adopted. Pinned in code, never a workspace variable. - adoption_complete = false + # Controlled ownership transfer. Pinned in code, never a workspace variable. + adoption_complete = true environment = "staging" workspace_name = "shoc-frontend-new-staging"