diff --git a/Makefile b/Makefile index 56e74f8..5b986d7 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,6 @@ define vault_env endef init: - @# Drop any stale dependency locks so provider sources are re-resolved - @# purely from config. Locks are gitignored and CI can reuse a workspace - @# carrying a lock from an earlier (old provider source) run, which -upgrade - @# on some OpenTofu versions tries to re-resolve instead of dropping. - @find . -name '.terraform.lock.hcl' -not -path '*/.git/*' -delete @$(call vault_env) && \ terragrunt run --all --non-interactive init -- -upgrade diff --git a/environments/root.hcl b/environments/root.hcl index e8c3882..a1dd781 100644 --- a/environments/root.hcl +++ b/environments/root.hcl @@ -15,12 +15,6 @@ terraform { ca_file = "/etc/pki/tls/certs/ca-bundle.crt" } required_version = ">= 1.10" - required_providers { - artifactapi = { - source = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/artifactapi" - version = "0.1.2" - } - } } EOF } diff --git a/modules/artifactapi/versions.tf b/modules/artifactapi/versions.tf new file mode 100644 index 0000000..4ade0a3 --- /dev/null +++ b/modules/artifactapi/versions.tf @@ -0,0 +1,9 @@ +terraform { + required_version = ">= 1.10" + required_providers { + artifactapi = { + source = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/artifactapi" + version = ">= 0.1.2" + } + } +}