Merge remote-tracking branch 'origin/main' into benvin/alpine

# Conflicts:
#	environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl

config/config.hcl

@@ -82,6 +82,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

environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl

@@ -32,6 +32,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

modules/artifactapi/main.tf

@@ -162,6 +162,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
 

modules/artifactapi/variables.tf

@@ -168,6 +168,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({