From 6fb5191d9a0b00272f87116df4a666ea35fa1854 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 24 Oct 2026 16:37:17 +1100 Subject: [PATCH 1/3] Add vcs remote for GitHub archives and release assets --- config/config.hcl | 5 +++++ config/remote_vcs/github-vcs.yaml | 7 +++++++ .../terragrunt.hcl | 1 + modules/artifactapi/main.tf | 13 +++++++++++++ modules/artifactapi/variables.tf | 14 ++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 config/remote_vcs/github-vcs.yaml diff --git a/config/config.hcl b/config/config.hcl index 66e6f0a..e63190a 100644 --- a/config/config.hcl +++ b/config/config.hcl @@ -77,6 +77,11 @@ locals { trimsuffix(basename(file_path), ".yaml") => content if startswith(file_path, "remote_rpm/") } + remote_vcs = { + for file_path, content in local.all_configs : + trimsuffix(basename(file_path), ".yaml") => content + if startswith(file_path, "remote_vcs/") + } local_terraform = { for file_path, content in local.all_configs : trimsuffix(basename(file_path), ".yaml") => content diff --git a/config/remote_vcs/github-vcs.yaml b/config/remote_vcs/github-vcs.yaml new file mode 100644 index 0000000..378f326 --- /dev/null +++ b/config/remote_vcs/github-vcs.yaml @@ -0,0 +1,7 @@ +base_url: https://github.com +description: GitHub source archives and release assets by ref +immutable_ttl: 0 +mutable_ttl: 600 +patterns: + - "^cli/cli/" + - "^psf/requests/" diff --git a/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl b/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl index 14379b7..25c48bf 100644 --- a/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl +++ b/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl @@ -31,6 +31,7 @@ inputs = { remote_puppet = local.config.remote_puppet remote_pypi = local.config.remote_pypi remote_rpm = local.config.remote_rpm + remote_vcs = local.config.remote_vcs local_terraform = local.config.local_terraform local_pypi = local.config.local_pypi local_rpm = local.config.local_rpm diff --git a/modules/artifactapi/main.tf b/modules/artifactapi/main.tf index 2a6cbe3..6abc127 100644 --- a/modules/artifactapi/main.tf +++ b/modules/artifactapi/main.tf @@ -148,6 +148,19 @@ resource "artifactapi_remote_puppet" "this" { stale_on_error = each.value.stale_on_error } +resource "artifactapi_remote_vcs" "this" { + for_each = var.remote_vcs + + name = each.key + base_url = each.value.base_url + description = each.value.description + immutable_ttl = each.value.immutable_ttl + mutable_ttl = each.value.mutable_ttl + patterns = each.value.patterns + mutable_patterns = each.value.mutable_patterns + stale_on_error = each.value.stale_on_error +} + resource "artifactapi_remote_ansible" "this" { for_each = var.remote_ansible diff --git a/modules/artifactapi/variables.tf b/modules/artifactapi/variables.tf index bc3760a..ebb10c1 100644 --- a/modules/artifactapi/variables.tf +++ b/modules/artifactapi/variables.tf @@ -155,6 +155,20 @@ variable "remote_puppet" { default = {} } +variable "remote_vcs" { + description = "Map of VCS (GitHub/Gitea archive and release) remote repositories" + type = map(object({ + base_url = string + description = optional(string, "") + immutable_ttl = optional(number, 0) + mutable_ttl = optional(number, 3600) + patterns = optional(list(string), []) + mutable_patterns = optional(list(string), []) + stale_on_error = optional(bool, true) + })) + default = {} +} + variable "remote_ansible" { description = "Map of Ansible Galaxy remote repositories" type = map(object({ -- 2.47.3 From 3ace41b48a219bee40fa890cf35485bc9a41eda3 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 24 Oct 2026 17:05:31 +1100 Subject: [PATCH 2/3] drop github-vcs remote; wire the kind only --- config/remote_vcs/github-vcs.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 config/remote_vcs/github-vcs.yaml diff --git a/config/remote_vcs/github-vcs.yaml b/config/remote_vcs/github-vcs.yaml deleted file mode 100644 index 378f326..0000000 --- a/config/remote_vcs/github-vcs.yaml +++ /dev/null @@ -1,7 +0,0 @@ -base_url: https://github.com -description: GitHub source archives and release assets by ref -immutable_ttl: 0 -mutable_ttl: 600 -patterns: - - "^cli/cli/" - - "^psf/requests/" -- 2.47.3 From 62771a36500a811f465149c4992d1b4b62e6575a Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 24 Oct 2026 17:24:55 +1100 Subject: [PATCH 3/3] retrigger CI for provider v0.13.0 -- 2.47.3