Update Templates (#4)

Update terraform templates to avoid issues with the length of names of resources.
berops · Oct 2, 2024 · 3d6edbf · 3d6edbf
1 parent 0993ac3
commit 3d6edbf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/templates/terraformer/aws/networking/networking.tpl b/templates/terraformer/aws/networking/networking.tpl
@@ -12,7 +12,7 @@
 {{- $resourceSuffix := printf "%s_%s_%s" $region $specName $uniqueFingerPrint }}
 
 {{- $vpcResourceName  := printf "claudie_vpc_%s"  $resourceSuffix }}
-{{- $vpcName          := printf "vpc%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $vpcName          := printf "vpc%s%s-%s"      $clusterHash $uniqueFingerPrint $region }}
 
 resource "aws_vpc" "{{ $vpcResourceName }}" {
   provider   = aws.nodepool_{{ $resourceSuffix }}
@@ -26,7 +26,7 @@ resource "aws_vpc" "{{ $vpcResourceName }}" {
 
 
 {{- $internetGatewayResourceName  := printf "claudie_gateway_%s"   $resourceSuffix }}
-{{- $internetGatewayName          := printf "gtw%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $internetGatewayName          := printf "gtw%s%s-%s"           $clusterHash $uniqueFingerPrint $region }}
 
 resource "aws_internet_gateway" "{{ $internetGatewayResourceName }}" {
   provider = aws.nodepool_{{ $resourceSuffix }}
@@ -39,7 +39,7 @@ resource "aws_internet_gateway" "{{ $internetGatewayResourceName }}" {
 }
 
 {{- $routeTableResourceName  := printf "claudie_route_table_%s"   $resourceSuffix }}
-{{- $routeTableName          := printf "rt%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $routeTableName          := printf "rt%s%s-%s"                $clusterHash $uniqueFingerPrint $region }}
 
 resource "aws_route_table" "{{ $routeTableResourceName }}" {
   provider     = aws.nodepool_{{ $resourceSuffix }}
@@ -56,7 +56,7 @@ resource "aws_route_table" "{{ $routeTableResourceName }}" {
 }
 
 {{- $securityGroupResourceName  := printf "claudie_sg_%s"   $resourceSuffix }}
-{{- $securityGroupName          := printf "sg%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $securityGroupName          := printf "sg%s%s-%s"       $clusterHash $uniqueFingerPrint $region }}
 
 resource "aws_security_group" "{{ $securityGroupResourceName }}" {
   provider               = aws.nodepool_{{ $resourceSuffix }}

diff --git a/templates/terraformer/azure/networking/networking.tpl b/templates/terraformer/azure/networking/networking.tpl
@@ -28,8 +28,8 @@ variable "{{ $basePriority }}" {
 {{- $resourceSuffix := printf "%s_%s_%s" $sanitisedRegion $specName $uniqueFingerPrint }}
 
 
-{{- $resourceGroupResourceName  := printf "rg_%s"   $resourceSuffix }}
-{{- $resourceGroupName          := printf "rg%s-%s-%s-%s" $clusterHash $sanitisedRegion $specName $uniqueFingerPrint }}
+{{- $resourceGroupResourceName  := printf "rg_%s"     $resourceSuffix }}
+{{- $resourceGroupName          := printf "rg%s%s-%s" $clusterHash $uniqueFingerPrint $sanitisedRegion }}
 
 resource "azurerm_resource_group" "{{ $resourceGroupResourceName }}" {
   provider = azurerm.nodepool_{{ $resourceSuffix }}
@@ -43,7 +43,7 @@ resource "azurerm_resource_group" "{{ $resourceGroupResourceName }}" {
 }
 
 {{- $virtualNetworkResourceName  := printf "claudie_vn_%s"   $resourceSuffix }}
-{{- $virtualNetworkName          := printf "vn%s-%s-%s-%s" $clusterHash $sanitisedRegion $specName $uniqueFingerPrint }}
+{{- $virtualNetworkName          := printf "vn%s%s-%s"      $clusterHash $uniqueFingerPrint $sanitisedRegion }}
 
 resource "azurerm_virtual_network" "{{ $virtualNetworkResourceName }}" {
   provider            = azurerm.nodepool_{{ $resourceSuffix }}
@@ -59,7 +59,7 @@ resource "azurerm_virtual_network" "{{ $virtualNetworkResourceName }}" {
 }
 
 {{- $networkSecurityGroupResourceName  := printf "claudie_nsg_%s"   $resourceSuffix }}
-{{- $networkSecurityGroupName          := printf "nsg%s-%s-%s-%s" $clusterHash $sanitisedRegion $specName $uniqueFingerPrint }}
+{{- $networkSecurityGroupName          := printf "nsg%s%s-%s"       $clusterHash $uniqueFingerPrint $sanitisedRegion  }}
 
 resource "azurerm_network_security_group" "{{ $networkSecurityGroupResourceName }}" {
   provider            = azurerm.nodepool_{{ $resourceSuffix }}

diff --git a/templates/terraformer/gcp/networking/networking.tpl b/templates/terraformer/gcp/networking/networking.tpl
@@ -20,7 +20,7 @@
 {{- end }}
 
 {{- $computeNetworkResourceName  := printf "network_%s"   $resourceSuffix }}
-{{- $computeNetworkName          := printf "net%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $computeNetworkName          := printf "net%s%s-%s"   $clusterHash $uniqueFingerPrint $region }}
 
 resource "google_compute_network" "{{ $computeNetworkResourceName }}" {
   provider                = google.nodepool_{{ $resourceSuffix }}
@@ -30,7 +30,7 @@ resource "google_compute_network" "{{ $computeNetworkResourceName }}" {
 }
 
 {{- $computeFirewallResourceName     := printf "firewall_%s"  $resourceSuffix }}
-{{- $computeFirewallName             := printf "fwl%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $computeFirewallName             := printf "fwl%s%s-%s"   $clusterHash $uniqueFingerPrint $region }}
 
 
 resource "google_compute_firewall" "{{ $computeFirewallResourceName }}" {

diff --git a/templates/terraformer/genesiscloud/networking/networking.tpl b/templates/terraformer/genesiscloud/networking/networking.tpl
@@ -20,7 +20,7 @@ data "genesiscloud_images" "base_os_{{ $resourceSuffix }}" {
 }
 
 {{- $securityGroupResourceName := printf "claudie_security_group_%s" $resourceSuffix }}
-{{- $securityGroupName         := printf "sg%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $securityGroupName         := printf "sg%s%s-%s" $clusterHash $uniqueFingerPrint $region }}
 
 resource "genesiscloud_security_group" "{{ $securityGroupResourceName }}" {
   provider = genesiscloud.nodepool_{{ $resourceSuffix }}

diff --git a/templates/terraformer/hetzner/networking/networking.tpl b/templates/terraformer/hetzner/networking/networking.tpl
@@ -9,7 +9,7 @@
 {{- $resourceSuffix        := printf "%s_%s" $specName $uniqueFingerPrint }}
 
 {{- $firewallResourceName  := printf "firewall_%s" $resourceSuffix }}
-{{- $firewallName  := printf "fwl%s-%s-%s" $clusterHash $specName $uniqueFingerPrint }}
+{{- $firewallName  := printf "fwl%s%s" $clusterHash $uniqueFingerPrint }}
 
 resource "hcloud_firewall" "{{ $firewallResourceName }}" {
   provider = hcloud.nodepool_{{ $resourceSuffix }}

diff --git a/templates/terraformer/oci/networking/networking.tpl b/templates/terraformer/oci/networking/networking.tpl
@@ -35,7 +35,7 @@ variable "{{ $varCompartmentID }}" {
 }
 
 {{- $coreVCNResourceName  := printf "claudie_vcn_%s"   $resourceSuffix }}
-{{- $coreVCNName          := printf "vcn%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $coreVCNName          := printf "vcn%s%s-%s"       $clusterHash $uniqueFingerPrint $region }}
 
 resource "oci_core_vcn" "{{ $coreVCNResourceName }}" {
   provider        = oci.nodepool_{{ $resourceSuffix }}
@@ -50,7 +50,7 @@ resource "oci_core_vcn" "{{ $coreVCNResourceName }}" {
 }
 
 {{- $coreGatewayResourceName  := printf "claudie_gateway_%s"   $resourceSuffix }}
-{{- $coreGatewayName          := printf "gtw%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $coreGatewayName          := printf "gtw%s%s-%s"           $clusterHash $uniqueFingerPrint $region }}
 
 resource "oci_core_internet_gateway" "{{ $coreGatewayResourceName }}" {
   provider        = oci.nodepool_{{ $resourceSuffix }}
@@ -66,7 +66,7 @@ resource "oci_core_internet_gateway" "{{ $coreGatewayResourceName }}" {
 }
 
 {{- $coreSecurityListResourceName  := printf "claudie_security_rules_%s"   $resourceSuffix }}
-{{- $coreSecurityListName          := printf "sl%s-%s-%s-%s" $clusterHash $region $specName $uniqueFingerPrint }}
+{{- $coreSecurityListName          := printf "sl%s%s-%s"                   $clusterHash $uniqueFingerPrint $region }}
 
 resource "oci_core_default_security_list" "{{ $coreSecurityListResourceName }}" {
   provider                    = oci.nodepool_{{ $resourceSuffix }}