Skip to content

Commit 2d9bb90

Browse files
authored
Merge pull request #33 from humanitec-architecture/change-module-source-format
Fix: Adjust module source to support terraform 1.10.x
2 parents d3a754c + 5451b52 commit 2d9bb90

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ Once you are finished with the reference architecture, you can remove all provis
254254
|------|--------|---------|
255255
| base | ./modules/base | n/a |
256256
| github | ./modules/github | n/a |
257-
| github\_app | github.com/humanitec-architecture/shared-terraform-modules | v2024-06-12//modules/github-app |
257+
| github\_app | github.com/humanitec-architecture/shared-terraform-modules//modules/github-app | v2024-06-12 |
258258
| portal\_backstage | ./modules/portal-backstage | n/a |
259259

260260
### Resources

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ locals {
4848
module "github_app" {
4949
count = var.with_backstage ? 1 : 0
5050

51-
source = "github.com/humanitec-architecture/shared-terraform-modules?ref=v2024-06-12//modules/github-app"
51+
source = "github.com/humanitec-architecture/shared-terraform-modules//modules/github-app?ref=v2024-06-12"
5252

5353
credentials_file = "${path.module}/${local.github_app_credentials_file}"
5454
}

modules/base/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Module that provides the reference architecture.
3232
|------|--------|---------|
3333
| aws\_eks | terraform-aws-modules/eks/aws | ~> 20.2 |
3434
| aws\_vpc | terraform-aws-modules/vpc/aws | ~> 5.1 |
35-
| default\_mysql | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-06-05//humanitec-resource-defs/mysql/basic |
36-
| default\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-06-05//humanitec-resource-defs/postgres/basic |
35+
| default\_mysql | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/mysql/basic | v2024-06-05 |
36+
| default\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic | v2024-06-05 |
3737
| ebs\_csi\_irsa\_role | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.30 |
3838

3939
### Resources

modules/base/humanitec.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ resource "humanitec_resource_definition_criteria" "k8s_namespace" {
7272
# in-cluster postgres
7373

7474
module "default_postgres" {
75-
source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-06-05//humanitec-resource-defs/postgres/basic"
75+
source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic?ref=v2024-06-05"
7676

7777
prefix = local.res_def_prefix
7878
}
@@ -83,7 +83,7 @@ resource "humanitec_resource_definition_criteria" "default_postgres" {
8383
}
8484

8585
module "default_mysql" {
86-
source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-06-05//humanitec-resource-defs/mysql/basic"
86+
source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/mysql/basic?ref=v2024-06-05"
8787

8888
prefix = local.res_def_prefix
8989
}

modules/portal-backstage/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ This module deploys the [Humanitec Reference Architecture Backstage](https://git
2222

2323
| Name | Source | Version |
2424
|------|--------|---------|
25-
| backstage\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster | v2024-06-05//humanitec-resource-defs/postgres/basic |
26-
| portal\_backstage | github.com/humanitec-architecture/shared-terraform-modules | v2024-06-12//modules/portal-backstage |
25+
| backstage\_postgres | github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic | v2024-06-05 |
26+
| portal\_backstage | github.com/humanitec-architecture/shared-terraform-modules//modules/portal-backstage | v2024-06-12 |
2727

2828
### Resources
2929

modules/portal-backstage/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ locals {
2020
}
2121

2222
module "portal_backstage" {
23-
source = "github.com/humanitec-architecture/shared-terraform-modules?ref=v2024-06-12//modules/portal-backstage"
23+
source = "github.com/humanitec-architecture/shared-terraform-modules//modules/portal-backstage?ref=v2024-06-12"
2424

2525
cloud_provider = "aws"
2626

@@ -45,7 +45,7 @@ locals {
4545
# in-cluster postgres
4646

4747
module "backstage_postgres" {
48-
source = "github.com/humanitec-architecture/resource-packs-in-cluster?ref=v2024-06-05//humanitec-resource-defs/postgres/basic"
48+
source = "github.com/humanitec-architecture/resource-packs-in-cluster//humanitec-resource-defs/postgres/basic?ref=v2024-06-05"
4949

5050
prefix = local.res_def_prefix
5151
}

0 commit comments

Comments
 (0)