Skip to content

Commit

Permalink
Revert "HOTT-4852: Make deployments depend on workers"
Browse files Browse the repository at this point in the history
  • Loading branch information
jebw authored Feb 15, 2024
1 parent 0e54b6b commit ab20709
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ files: |
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.86.0
rev: v1.84.0
hooks:
- id: terraform_fmt
- id: terraform_validate
Expand All @@ -28,7 +28,7 @@ repos:
- id: check-yaml

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.39.0
rev: v0.38.0
hooks:
- id: markdownlint
args: ["--fix"]
12 changes: 6 additions & 6 deletions terraform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ Terraform to deploy the service into AWS.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_backend_admin_uk"></a> [backend\_admin\_uk](#module\_backend\_admin\_uk) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.13.0 |
| <a name="module_backend_admin_xi"></a> [backend\_admin\_xi](#module\_backend\_admin\_xi) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.13.0 |
| <a name="module_backend_uk"></a> [backend\_uk](#module\_backend\_uk) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.13.0 |
| <a name="module_backend_xi"></a> [backend\_xi](#module\_backend\_xi) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.13.0 |
| <a name="module_worker_uk"></a> [worker\_uk](#module\_worker\_uk) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.13.0 |
| <a name="module_worker_xi"></a> [worker\_xi](#module\_worker\_xi) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.13.0 |
| <a name="module_backend_admin_uk"></a> [backend\_admin\_uk](#module\_backend\_admin\_uk) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.12.0 |
| <a name="module_backend_admin_xi"></a> [backend\_admin\_xi](#module\_backend\_admin\_xi) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.12.0 |
| <a name="module_backend_uk"></a> [backend\_uk](#module\_backend\_uk) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.12.0 |
| <a name="module_backend_xi"></a> [backend\_xi](#module\_backend\_xi) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.12.0 |
| <a name="module_worker_uk"></a> [worker\_uk](#module\_worker\_uk) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.12.0 |
| <a name="module_worker_xi"></a> [worker\_xi](#module\_worker\_xi) | [email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service | aws/ecs-service-v1.12.0 |

## Resources

Expand Down
4 changes: 1 addition & 3 deletions terraform/admin_uk.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
module "backend_admin_uk" {
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.13.0"

depends_on = [module.worker_uk]
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.12.0"

service_name = "backend-admin-uk"
service_count = var.service_count
Expand Down
4 changes: 1 addition & 3 deletions terraform/admin_xi.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
module "backend_admin_xi" {
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.13.0"

depends_on = [module.worker_xi]
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.12.0"

service_name = "backend-admin-xi"
service_count = var.service_count
Expand Down
4 changes: 1 addition & 3 deletions terraform/backend_uk.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
module "backend_uk" {
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.13.0"

depends_on = [module.worker_uk]
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.12.0"

service_name = "backend-uk"
service_count = var.service_count
Expand Down
4 changes: 1 addition & 3 deletions terraform/backend_xi.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
module "backend_xi" {
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.13.0"

depends_on = [module.worker_xi]
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.12.0"

service_name = "backend-xi"
service_count = var.service_count
Expand Down
2 changes: 1 addition & 1 deletion terraform/worker_uk.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "worker_uk" {
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.13.0"
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.12.0"

service_name = "worker-uk"
region = var.region
Expand Down
2 changes: 1 addition & 1 deletion terraform/worker_xi.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "worker_xi" {
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.13.0"
source = "[email protected]:trade-tariff/trade-tariff-platform-terraform-modules.git//aws/ecs-service?ref=aws/ecs-service-v1.12.0"

service_name = "worker-xi"
region = var.region
Expand Down

0 comments on commit ab20709

Please sign in to comment.