From e138b1f84028796101bdb9712af4cc10b84bff87 Mon Sep 17 00:00:00 2001 From: Tobias Babin Date: Tue, 18 Feb 2025 11:47:33 +0100 Subject: [PATCH 1/2] Adjusted module source path for compatibility with terraform 1.10.x --- main.tf | 2 +- modules/base/humanitec.tf | 4 ++-- modules/portal-backstage/main.tf | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.tf b/main.tf index 3162ca7..220c1e2 100644 --- a/main.tf +++ b/main.tf @@ -53,7 +53,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/base/humanitec.tf b/modules/base/humanitec.tf index 21a1b24..88ec3f9 100644 --- a/modules/base/humanitec.tf +++ b/modules/base/humanitec.tf @@ -54,7 +54,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-11-05//humanitec-resource-defs/postgres/basic" + source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic?ref=v2024-11-05" prefix = "default-" } @@ -65,7 +65,7 @@ resource "humanitec_resource_definition_criteria" "default_postgres" { } module "default_mysql" { - source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-11-05//humanitec-resource-defs/mysql/basic" + source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/mysql/basic?ref=v2024-11-05" prefix = "default-" } diff --git a/modules/portal-backstage/main.tf b/modules/portal-backstage/main.tf index 3eb311f..d46e67c 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 = "azure" @@ -49,7 +49,7 @@ locals { # in-cluster postgres module "backstage_postgres" { - source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-11-05//humanitec-resource-defs/postgres/basic" + source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic?ref=v2024-11-05" prefix = local.res_def_prefix } From b9e032689840d467e7a9bf2d3cb69b4d1c968820 Mon Sep 17 00:00:00 2001 From: Tobias Babin Date: Tue, 18 Feb 2025 11:48:31 +0100 Subject: [PATCH 2/2] Regeneraged TF docs --- README.md | 2 +- modules/base/README.md | 4 ++-- modules/portal-backstage/README.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0b5d48e..c3eb23a 100644 --- a/README.md +++ b/README.md @@ -255,7 +255,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 diff --git a/modules/base/README.md b/modules/base/README.md index 5143d55..29db17a 100644 --- a/modules/base/README.md +++ b/modules/base/README.md @@ -30,8 +30,8 @@ Module that provides the reference architecture. | Name | Source | Version | |------|--------|---------| | azure\_aks | Azure/aks/azurerm | ~> 7 | -| default\_mysql | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-11-05//humanitec-resource-defs/mysql/basic | -| default\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-11-05//humanitec-resource-defs/postgres/basic | +| default\_mysql | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/mysql/basic | v2024-11-05 | +| default\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic | v2024-11-05 | ### Resources diff --git a/modules/portal-backstage/README.md b/modules/portal-backstage/README.md index afa440f..574458e 100644 --- a/modules/portal-backstage/README.md +++ b/modules/portal-backstage/README.md @@ -16,8 +16,8 @@ | Name | Source | Version | |------|--------|---------| -| backstage\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-11-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-11-05 | +| portal\_backstage | github.com/humanitec-architecture/shared-terraform-modules//modules/portal-backstage | v2024-06-12 | ### Resources