Upgrade terraform providers, capabilities template

Author: BSick7

.gitignore

@@ -28,7 +28,5 @@ override.tf.json
 # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
 # example: *tfplan*
 
-.nullstone.json
-.terraform.lock.hcl
 __backend__.tf
 .nullstone/active-workspace.yml

.nullstone/module.yml

@@ -11,3 +11,4 @@ subplatform: ""
 type: server/ec2
 appCategories: []
 is_public: true
+tool_name: "terraform"

.terraform.lock.hcl

@@ -1,2 +1,5 @@
+# 0.2.0 (Sep 22, 2025)
+* Upgraded terraform providers.
+
 # 0.1.0 (Aug 08, 2023)
 * Initial release.

CHANGELOG.md

@@ -0,0 +1,2 @@
+lock-providers:
+	terraform providers lock -platform=linux_amd64 -platform=linux_arm64 -platform=darwin_amd64 -platform=darwin_arm64 -platform=windows_amd64

Makefile

@@ -1,21 +1,22 @@
 {{ range . -}}
 provider "ns" {
-  capability_id = {{ .Id }}
-  alias         = "cap_{{ .Id }}"
+  capability_name = "{{ .Name }}"
+  alias           = "{{ .TfModuleName }}"
 }
 
 module "{{ .TfModuleName }}" {
   source  = "{{ .Source }}/any"
-  {{ if (ne .SourceVersion "latest") }}version = "{{ .SourceVersion }}"{{ end }}
+  {{- if (ne .SourceVersion "latest") }}
+  version = "{{ .SourceVersion }}"
+  {{- end }}
 
   app_metadata = local.app_metadata
-  {{ range $key, $value := .Variables -}}
-  {{ if not $value.Unused -}}{{ if $value.Value -}}
+  {{ range $key, $value := .Variables -}}{{- if $value.HasValue }}
   {{ $key }} = jsondecode({{ $value.Value | to_json_string }})
   {{- end -}}{{- end }}
-  {{ end }}
+
   providers = {
-    ns = ns.cap_{{ .Id}}
+    ns = ns.{{ .TfModuleName }}
   }
 }
 {{ end }}
@@ -25,10 +26,10 @@ module "caps" {
 }
 
 locals {
-  modules       = [
+  modules      = [
 {{- range $index, $element := .ExceptNeedsDestroyed.TfModuleAddrs -}}
 {{ if $index }}, {{ end }}{{ $element }}
 {{- end -}}
 ]
-  capabilities  = module.caps.outputs
+  capabilities = module.caps.outputs
 }

capabilities.tf.tmpl

@@ -1,5 +1,5 @@
 output "region" {
-  value       = data.aws_region.this.name
+  value       = data.aws_region.this.region
   description = "string ||| The AWS region where the EC2 instance resides."
 }
 
@@ -19,20 +19,12 @@ output "adminer" {
   sensitive   = true
 }
 
-locals {
-  // Private and public URLs are shown in the Nullstone UI
-  // Typically, they are created through capabilities attached to the application
-  // If this module has URLs, add them here as list(string)
-  additional_private_urls = [aws_instance.this.private_dns]
-  additional_public_urls  = []
-}
-
 output "private_urls" {
-  value       = concat([for url in try(local.capabilities.private_urls, []) : url["url"]], local.additional_private_urls)
+  value       = local.private_urls
   description = "list(string) ||| A list of URLs only accessible inside the network"
 }
 
 output "public_urls" {
-  value       = concat([for url in try(local.capabilities.public_urls, []) : url["url"]], local.additional_public_urls)
+  value       = local.public_urls
   description = "list(string) ||| A list of URLs accessible to the public"
 }

outputs.tf

@@ -0,0 +1,35 @@
+locals {
+  // Private and public URLs are shown in the Nullstone UI
+  // Typically, they are created through capabilities attached to the application
+  // If this module has URLs, add them here as list(string)
+  additional_private_urls = [aws_instance.this.private_dns]
+  additional_public_urls  = []
+
+  private_urls = concat([for url in try(local.capabilities.private_urls, []) : url["url"]], local.additional_private_urls)
+  public_urls  = concat([for url in try(local.capabilities.public_urls, []) : url["url"]], local.additional_public_urls)
+}
+
+locals {
+  uri_matcher = "^(?:(?P<scheme>[^:/?#]+):)?(?://(?P<authority>[^/?#]*))?"
+}
+
+locals {
+  authority_matcher = "^(?:(?P<user>[^@]*)@)?(?:(?P<host>[^:]*))(?:[:](?P<port>[\\d]*))?"
+  // These tests are here to verify the authority_matcher regex above
+  // To verify, uncomment the following lines and issue "echo 'local.tests' | terraform console"
+  /*
+  tests = tomap({
+    "nullstone.io" : regex(local.authority_matcher, "nullstone.io"),
+    "brad@nullstone.io" : regex(local.authority_matcher, "brad@nullstone.io"),
+    "brad:password@nullstone.io" : regex(local.authority_matcher, "brad:password@nullstone.io"),
+    "nullstone.io:9000" : regex(local.authority_matcher, "nullstone.io:9000"),
+    "brad@nullstone.io:9000" : regex(local.authority_matcher, "brad@nullstone.io:9000"),
+    "brad:password@nullstone.io:9000" : regex(local.authority_matcher, "brad:password@nullstone.io:9000"),
+  })
+  */
+}
+
+locals {
+  private_hosts = [for url in local.private_urls : lookup(regex(local.authority_matcher, lookup(regex(local.uri_matcher, url), "authority")), "host")]
+  public_hosts  = [for url in local.public_urls : lookup(regex(local.authority_matcher, lookup(regex(local.uri_matcher, url), "authority")), "host")]
+}