Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ resource "meshstack_building_block_definition" "this" {
- **Cross-cutting concerns** like workload identity federation settings may be grouped into an `object({})` typed variable (e.g. `variable "workload_identity"`) when the fields are logically inseparable
- Only `variable "meshstack"` and `variable "hub"` use shared `object({})` conventions across all integrations
- Pin provider versions with `~> X.Y.Z` (allow patch updates, not minor/major). **Exception:** the `meshcloud/meshstack` provider is pre-1.0, so pin to the minor version with `~> 0.Y.0` (e.g. `~> 0.20.0`)
- Terraform baseline: `>= 1.11.0` to cover OpenTofu v1.11.0 with write-only/ephemeral attribute support
- Terraform baseline: `>= 1.12.0` to cover OpenTofu v1.12.0 with `const` variable support (requires OpenTofu ≥ 1.12 or Terraform ≥ 1.15)

---

Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/update-module-refs.yml

This file was deleted.

3 changes: 3 additions & 0 deletions modules/aks/github-connector/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of meshcloud/meshstack-hub repo.<br>
Expand Down Expand Up @@ -225,6 +226,8 @@ EOT
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
2 changes: 2 additions & 0 deletions modules/aks/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ data "azuread_domains" "aad_domains" {
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
3 changes: 3 additions & 0 deletions modules/aks/starterkit/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of meshcloud/meshstack-hub repo.<br>
Expand Down Expand Up @@ -330,6 +331,8 @@ EOT
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
5 changes: 3 additions & 2 deletions modules/aws/route53-dns-alias-record/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -63,7 +64,7 @@ output "building_block_definition" {
data "meshstack_integrations" "integrations" {}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/aws/route53-dns-alias-record/backplane?ref=32698080a28bce13ba224334ad5bfbb2233236ae"
source = "github.com/meshcloud/meshstack-hub//modules/aws/route53-dns-alias-record/backplane?ref=${var.hub.git_ref}"

hosted_zone_ids = var.hosted_zone_ids
create_oidc_provider = var.create_oidc_provider
Expand Down Expand Up @@ -226,7 +227,7 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.11.0"
required_version = ">= 1.12.0"

required_providers {
aws = {
Expand Down
5 changes: 3 additions & 2 deletions modules/aws/route53-dns-record/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -63,7 +64,7 @@ output "building_block_definition" {
data "meshstack_integrations" "integrations" {}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/aws/route53-dns-record/backplane?ref=32698080a28bce13ba224334ad5bfbb2233236ae"
source = "github.com/meshcloud/meshstack-hub//modules/aws/route53-dns-record/backplane?ref=${var.hub.git_ref}"

hosted_zone_ids = var.hosted_zone_ids
create_oidc_provider = var.create_oidc_provider
Expand Down Expand Up @@ -220,7 +221,7 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.11.0"
required_version = ">= 1.12.0"

required_providers {
aws = {
Expand Down
5 changes: 3 additions & 2 deletions modules/aws/s3_bucket/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -41,7 +42,7 @@ output "building_block_definition" {
}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/aws/s3_bucket/backplane?ref=b9c1f3f2201e7e22b04dbf71a3ceab7a0246a7b3"
source = "github.com/meshcloud/meshstack-hub//modules/aws/s3_bucket/backplane?ref=${var.hub.git_ref}"

workload_identity_federation = {
issuer = var.workload_identity.issuer
Expand Down Expand Up @@ -147,7 +148,7 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.11.0"
required_version = ">= 1.12.0"

required_providers {
aws = {
Expand Down
5 changes: 3 additions & 2 deletions modules/azure/budget-alert/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -56,7 +57,7 @@ output "building_block_definition" {
data "meshstack_integrations" "integrations" {}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/azure/budget-alert/backplane?ref=226e58cb166002c7e505d6deb9e7bbf7e9c9edd1"
source = "github.com/meshcloud/meshstack-hub//modules/azure/budget-alert/backplane?ref=${var.hub.git_ref}"

name = var.backplane_name
scope = var.azure_scope
Expand Down Expand Up @@ -216,7 +217,7 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.11.0"
required_version = ">= 1.12.0"

required_providers {
meshstack = {
Expand Down
2 changes: 2 additions & 0 deletions modules/azure/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ resource "meshstack_landingzone" "azure_default" {
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
5 changes: 3 additions & 2 deletions modules/azure/service-principal/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -51,7 +52,7 @@ output "building_block_definition" {
data "meshstack_integrations" "integrations" {}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/azure/service-principal/backplane?ref=ce07c0a83c58ab924fc4ab3e62907dde1a44edf3"
source = "github.com/meshcloud/meshstack-hub//modules/azure/service-principal/backplane?ref=${var.hub.git_ref}"
name = var.backplane_name
scope = var.azure_scope

Expand Down Expand Up @@ -251,7 +252,7 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.11.0"
required_version = ">= 1.12.0"

required_providers {
meshstack = {
Expand Down
5 changes: 3 additions & 2 deletions modules/azure/storage-account/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -62,7 +63,7 @@ output "building_block_definition" {
data "meshstack_integrations" "integrations" {}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/azure/storage-account/backplane?ref=0a6d313e509e1c9052712f0d9c41c2d0a96f9a39"
source = "github.com/meshcloud/meshstack-hub//modules/azure/storage-account/backplane?ref=${var.hub.git_ref}"

name = var.backplane_name
scope = var.azure_scope
Expand Down Expand Up @@ -211,7 +212,7 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.11.0"
required_version = ">= 1.12.0"

required_providers {
meshstack = {
Expand Down
5 changes: 4 additions & 1 deletion modules/gcp/storage-bucket/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -46,7 +47,7 @@ output "building_block_definition" {
data "meshstack_integrations" "integrations" {}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/gcp/storage-bucket/backplane?ref=b9c1f3f2201e7e22b04dbf71a3ceab7a0246a7b3"
source = "github.com/meshcloud/meshstack-hub//modules/gcp/storage-bucket/backplane?ref=${var.hub.git_ref}"

project_id = var.gcp_project_id
workload_identity_federation = {
Expand Down Expand Up @@ -176,6 +177,8 @@ EOT
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
3 changes: 3 additions & 0 deletions modules/github/repository/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of meshcloud/meshstack-hub repo.<br>
Expand Down Expand Up @@ -248,6 +249,8 @@ EOT
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
5 changes: 4 additions & 1 deletion modules/kubernetes/manifest/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand All @@ -70,7 +71,7 @@ output "building_block_definition" {
}

module "backplane" {
source = "github.com/meshcloud/meshstack-hub//modules/kubernetes/manifest/backplane?ref=50756692c3b74dde5a2ec0b080e43108e0d0c9d9"
source = "github.com/meshcloud/meshstack-hub//modules/kubernetes/manifest/backplane?ref=${var.hub.git_ref}"

kubeconfig_admin = var.kubernetes_kubeconfig
namespace = var.kubernetes_namespace
Expand Down Expand Up @@ -196,6 +197,8 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
3 changes: 3 additions & 0 deletions modules/meshstack/noop/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of the meshstack-hub repo.
Expand Down Expand Up @@ -189,6 +190,8 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
3 changes: 3 additions & 0 deletions modules/ske/forgejo-connector/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub release reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of meshcloud/meshstack-hub repo.<br>
Expand Down Expand Up @@ -262,6 +263,8 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
3 changes: 3 additions & 0 deletions modules/ske/ske-starterkit/meshstack_integration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ variable "hub" {
git_ref = optional(string, "main")
bbd_draft = optional(bool, true)
})
const = true
default = {}
description = <<-EOT
`git_ref`: Hub reference. Set to a tag (e.g. 'v1.2.3') or branch or commit sha of meshcloud/meshstack-hub repo.<br>
Expand Down Expand Up @@ -263,6 +264,8 @@ resource "meshstack_building_block_definition" "this" {
}

terraform {
required_version = ">= 1.12.0"

required_providers {
meshstack = {
source = "meshcloud/meshstack"
Expand Down
Loading
Loading