From 5f2da8b99cf6a6b93f0de7861615c4f301a945a7 Mon Sep 17 00:00:00 2001 From: Tobias Babin Date: Tue, 18 Feb 2025 10:59:51 +0100 Subject: [PATCH 1/3] Adjusted module source to support terraform 1.10.x --- main.tf | 2 +- modules/htc_res_defs/main.tf | 4 ++-- modules/portal-backstage/main.tf | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.tf b/main.tf index 2d24254d..16800be5 100644 --- a/main.tf +++ b/main.tf @@ -54,7 +54,7 @@ locals { module "github_app" { count = var.with_backstage ? 1 : 0 - source = "github.com/humanitec-architecture/shared-terraform-modules?ref=v2024-06-12//modules/github-app" + source = "github.com/humanitec-architecture/shared-terraform-modules//modules/github-app?ref=v2024-06-12" credentials_file = "${path.module}/${local.github_app_credentials_file}" } diff --git a/modules/htc_res_defs/main.tf b/modules/htc_res_defs/main.tf index 426ac5f9..5c61b9e0 100644 --- a/modules/htc_res_defs/main.tf +++ b/modules/htc_res_defs/main.tf @@ -49,7 +49,7 @@ resource "humanitec_resource_definition_criteria" "k8s_namespace" { # in-cluster postgres module "default_postgres" { - source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-06-05//humanitec-resource-defs/postgres/basic" + source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic?ref=v2024-06-05" prefix = var.prefix } @@ -63,7 +63,7 @@ resource "humanitec_resource_definition_criteria" "default_postgres" { } module "default_mysql" { - source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-06-05//humanitec-resource-defs/mysql/basic" + source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/mysql/basic?ref=v2024-06-05" prefix = var.prefix } diff --git a/modules/portal-backstage/main.tf b/modules/portal-backstage/main.tf index fe374441..7468b6e0 100644 --- a/modules/portal-backstage/main.tf +++ b/modules/portal-backstage/main.tf @@ -20,7 +20,7 @@ locals { } module "portal_backstage" { - source = "github.com/humanitec-architecture/shared-terraform-modules?ref=v2024-06-12//modules/portal-backstage" + source = "github.com/humanitec-architecture/shared-terraform-modules//modules/portal-backstage?ref=v2024-06-12" cloud_provider = "gcp" @@ -45,7 +45,7 @@ locals { # in-cluster postgres module "backstage_postgres" { - source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-06-05//humanitec-resource-defs/postgres/basic" + source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic?ref=v2024-06-05" prefix = local.res_def_prefix } From a051edfa4cca66c5e2a87736e34f58f95719a3d7 Mon Sep 17 00:00:00 2001 From: Tobias Babin Date: Tue, 18 Feb 2025 11:14:06 +0100 Subject: [PATCH 2/3] Regenerated TF docs --- modules/htc_res_defs/README.md | 4 ++-- modules/portal-backstage/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/htc_res_defs/README.md b/modules/htc_res_defs/README.md index 6d96fb3e..5dbf3670 100644 --- a/modules/htc_res_defs/README.md +++ b/modules/htc_res_defs/README.md @@ -16,8 +16,8 @@ | Name | Source | Version | |------|--------|---------| -| default\_mysql | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-06-05//humanitec-resource-defs/mysql/basic | -| default\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-06-05//humanitec-resource-defs/postgres/basic | +| default\_mysql | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/mysql/basic | v2024-06-05 | +| default\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic | v2024-06-05 | ### Resources diff --git a/modules/portal-backstage/README.md b/modules/portal-backstage/README.md index a2ceb9ba..8625da60 100644 --- a/modules/portal-backstage/README.md +++ b/modules/portal-backstage/README.md @@ -17,8 +17,8 @@ | Name | Source | Version | |------|--------|---------| -| backstage\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-06-05//humanitec-resource-defs/postgres/basic | -| portal\_backstage | github.com/humanitec-architecture/shared-terraform-modules | v2024-06-12//modules/portal-backstage | +| backstage\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic | v2024-06-05 | +| portal\_backstage | github.com/humanitec-architecture/shared-terraform-modules//modules/portal-backstage | v2024-06-12 | ### Resources From 206ed1907164e4752fbe2342061db9af57933456 Mon Sep 17 00:00:00 2001 From: Tobias Babin Date: Tue, 18 Feb 2025 11:19:21 +0100 Subject: [PATCH 3/3] Updated docs for main README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a052177..a9b403da 100644 --- a/README.md +++ b/README.md @@ -251,7 +251,7 @@ Once you are finished with the reference architecture, you can remove all provis |------|--------|---------| | base | ./modules/base | n/a | | github | ./modules/github | n/a | -| github\_app | github.com/humanitec-architecture/shared-terraform-modules | v2024-06-12//modules/github-app | +| github\_app | github.com/humanitec-architecture/shared-terraform-modules//modules/github-app | v2024-06-12 | | portal\_backstage | ./modules/portal-backstage | n/a | ### Resources