chore: single multienv directory

gip-inclusion · Sep 27, 2023 · 7302f61 · 7302f61
1 parent e416d27
commit 7302f61
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 54 deletions.
diff --git a/.../environments/staging/.terraform.lock.hcl → deployment/.terraform.lock.hcl b/.../environments/staging/.terraform.lock.hcl → deployment/.terraform.lock.hcl
diff --git a/deployment/README.md b/deployment/README.md
@@ -34,7 +34,7 @@ This is preferably shared by environments.
 Use the `-chdir=` option to target a specific environment:
 
 ```bash
-docker compose run --rm tf -chdir=environments/staging plan
+docker compose run --rm tf plan
 ```
 
 ### initializing the state backend
@@ -43,7 +43,7 @@ docker compose run --rm tf -chdir=environments/staging plan
 
 ```bash
 set +o history
-docker compose run --rm tf -chdir=environments/<ENVIRONMENT>/ init \
+docker compose run --rm tf init \
     -backend-config "bucket=data-inclusion-terraform" \
     -backend-config "key=stack_data/<ENVIRONMENT>" \
     -backend-config "region=fr-par" \
@@ -60,7 +60,7 @@ The deployment is configured through variables. The set of variables will be dif
 To generate a configuration file for a specific environment:
 
 ```bash
-USER_ID=$(id -u) docker compose run --rm tf-vars environments/<ENVIRONMENT>
+USER_ID=$(id -u) docker compose run --rm tf-vars .
 ```
 
 The generated `terraform.tfvars.json` file can be filled with the appropriate values for that environment.
@@ -73,10 +73,10 @@ The generated `terraform.tfvars.json` file can be filled with the appropriate va
 
 ```bash
 # review changes
-docker compose run --rm tf -chdir=environments/staging plan
+docker compose run --rm tf plan
 
 # apply
-docker compose run --rm tf -chdir=environments/staging apply
+docker compose run --rm tf apply
 ```
 
 ### updating auto generated documentation

diff --git a/deployment/environments/staging/backend.tf → deployment/backend.tf b/deployment/environments/staging/backend.tf → deployment/backend.tf
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
@@ -17,7 +17,6 @@ services:
     user: "${USER_UID:-1000}:0"
     working_dir: /deployment
     entrypoint: terraform-docs markdown --recursive --recursive-path ../../modules --output-file README.md
-    command: environments/staging
     volumes:
       - .:/deployment
 

diff --git a/deployment/environments/staging/README.md b/deployment/environments/staging/README.md
diff --git a/deployment/environments/staging/main.tf → deployment/main.tf b/deployment/environments/staging/main.tf → deployment/main.tf
@@ -71,7 +71,7 @@ variable "ssh_private_key" {
 }
 
 module "stack_data" {
-  source = "../../modules/stack_data"
+  source = "./modules/stack_data"
 
   scaleway_access_key          = var.scaleway_access_key
   scaleway_secret_key          = var.scaleway_secret_key