diff --git a/cli/internal/cloudcmd/tfvars.go b/cli/internal/cloudcmd/tfvars.go index c06b7afca..67640e2c0 100644 --- a/cli/internal/cloudcmd/tfvars.go +++ b/cli/internal/cloudcmd/tfvars.go @@ -104,7 +104,7 @@ func awsTerraformVars(conf *config.Config, imageRef string) *terraform.AWSCluste EnableSNP: conf.GetAttestationConfig().GetVariant().Equal(variant.AWSSEVSNP{}), CustomEndpoint: conf.CustomEndpoint, InternalLoadBalancer: conf.InternalLoadBalancer, - AdditionalTags: conf.Tags, + AdditionalTags: conf.Tags, } } @@ -159,7 +159,7 @@ func azureTerraformVars(conf *config.Config, imageRef string) (*terraform.AzureC CustomEndpoint: conf.CustomEndpoint, InternalLoadBalancer: conf.InternalLoadBalancer, MarketplaceImage: nil, - AdditionalTags: conf.Tags, + AdditionalTags: conf.Tags, } if conf.UseMarketplaceImage() { @@ -228,7 +228,7 @@ func gcpTerraformVars(conf *config.Config, imageRef string) *terraform.GCPCluste CustomEndpoint: conf.CustomEndpoint, InternalLoadBalancer: conf.InternalLoadBalancer, CCTechnology: ccTech, - AdditionalLabels: conf.Tags, + AdditionalLabels: conf.Tags, } } @@ -247,9 +247,9 @@ func openStackTerraformVars(conf *config.Config, imageRef string) (*terraform.Op if _, hasOSAuthURL := os.LookupEnv("OS_AUTH_URL"); !hasOSAuthURL && conf.Provider.OpenStack.Cloud == "" { return nil, errors.New( "neither environment variable OS_AUTH_URL nor cloud name for \"clouds.yaml\" is set. OpenStack authentication requires a set of " + - "OS_* environment variables that are typically sourced into the current shell with an openrc file " + - "or a cloud name for \"clouds.yaml\". " + - "See https://docs.openstack.org/openstacksdk/latest/user/config/configuration.html for more information", + "OS_* environment variables that are typically sourced into the current shell with an openrc file " + + "or a cloud name for \"clouds.yaml\". " + + "See https://docs.openstack.org/openstacksdk/latest/user/config/configuration.html for more information", ) } diff --git a/cli/internal/cmd/configgenerate.go b/cli/internal/cmd/configgenerate.go index 5a47bebff..c59db4203 100644 --- a/cli/internal/cmd/configgenerate.go +++ b/cli/internal/cmd/configgenerate.go @@ -46,7 +46,7 @@ type generateFlags struct { rootFlags k8sVersion versions.ValidK8sVersion attestationVariant variant.Variant - tags cloudprovider.Tags + tags cloudprovider.Tags } func (f *generateFlags) parse(flags *pflag.FlagSet) error { diff --git a/terraform/infrastructure/aws/main.tf b/terraform/infrastructure/aws/main.tf index 76cc20e70..5f6012de3 100644 --- a/terraform/infrastructure/aws/main.tf +++ b/terraform/infrastructure/aws/main.tf @@ -213,5 +213,5 @@ module "jump_host" { ports = [for port in local.load_balancer_ports : port.port] security_groups = [aws_security_group.security_group.id] iam_instance_profile = var.iam_instance_profile_name_worker_nodes - additional_tags = var.additional_tags + additional_tags = var.additional_tags } diff --git a/terraform/infrastructure/aws/modules/jump_host/variables.tf b/terraform/infrastructure/aws/modules/jump_host/variables.tf index 553083236..d733e43b3 100644 --- a/terraform/infrastructure/aws/modules/jump_host/variables.tf +++ b/terraform/infrastructure/aws/modules/jump_host/variables.tf @@ -29,6 +29,6 @@ variable "security_groups" { } variable "additional_tags" { - type = map + type = map(any) description = "Additional tags for the jump host." } diff --git a/terraform/infrastructure/aws/variables.tf b/terraform/infrastructure/aws/variables.tf index 2fa4890b0..7a1ea058e 100644 --- a/terraform/infrastructure/aws/variables.tf +++ b/terraform/infrastructure/aws/variables.tf @@ -81,6 +81,6 @@ variable "enable_snp" { } variable "additional_tags" { - type = map + type = map(any) description = "Additional tags that should be applied to created resources." } diff --git a/terraform/infrastructure/azure/main.tf b/terraform/infrastructure/azure/main.tf index 8c455ed14..993042d5e 100644 --- a/terraform/infrastructure/azure/main.tf +++ b/terraform/infrastructure/azure/main.tf @@ -122,7 +122,7 @@ resource "azurerm_nat_gateway" "gateway" { resource_group_name = var.resource_group sku_name = "Standard" idle_timeout_in_minutes = 10 - tags = var.additional_tags + tags = var.additional_tags } resource "azurerm_subnet_nat_gateway_association" "example" { @@ -276,7 +276,7 @@ module "jump_host" { subnet_id = azurerm_subnet.loadbalancer_subnet[0].id ports = [for port in local.ports : port.port] lb_internal_ip = azurerm_lb.loadbalancer.frontend_ip_configuration[0].private_ip_address - tags = var.additional_tags + tags = var.additional_tags } data "azurerm_subscription" "current" { diff --git a/terraform/infrastructure/azure/modules/jump_host/main.tf b/terraform/infrastructure/azure/modules/jump_host/main.tf index 9dadc3c52..c35136ff7 100644 --- a/terraform/infrastructure/azure/modules/jump_host/main.tf +++ b/terraform/infrastructure/azure/modules/jump_host/main.tf @@ -3,7 +3,7 @@ resource "azurerm_linux_virtual_machine" "jump_host" { resource_group_name = var.resource_group location = var.location size = "Standard_D2as_v5" - tags = var.tags + tags = var.tags network_interface_ids = [ azurerm_network_interface.jump_host.id, @@ -64,7 +64,7 @@ resource "azurerm_network_interface" "jump_host" { name = "${var.base_name}-jump-host" resource_group_name = var.resource_group location = var.location - tags = var.tags + tags = var.tags ip_configuration { name = "public" @@ -79,7 +79,7 @@ resource "azurerm_public_ip" "jump_host" { resource_group_name = var.resource_group location = var.location allocation_method = "Dynamic" - tags = var.tags + tags = var.tags } resource "tls_private_key" "ssh_key" { diff --git a/terraform/infrastructure/azure/modules/jump_host/variables.tf b/terraform/infrastructure/azure/modules/jump_host/variables.tf index 9946aa22f..b59f8f915 100644 --- a/terraform/infrastructure/azure/modules/jump_host/variables.tf +++ b/terraform/infrastructure/azure/modules/jump_host/variables.tf @@ -30,5 +30,5 @@ variable "location" { variable "tags" { description = "Tags of the jump host." - type = map + type = map(any) } diff --git a/terraform/infrastructure/azure/variables.tf b/terraform/infrastructure/azure/variables.tf index b85448b7b..03fbf921e 100644 --- a/terraform/infrastructure/azure/variables.tf +++ b/terraform/infrastructure/azure/variables.tf @@ -91,6 +91,6 @@ variable "marketplace_image" { } variable "additional_tags" { - type = map + type = map(any) description = "Additional tags that should be applied to created resources." } diff --git a/terraform/infrastructure/gcp/main.tf b/terraform/infrastructure/gcp/main.tf index 8137348f3..a98ff39e2 100644 --- a/terraform/infrastructure/gcp/main.tf +++ b/terraform/infrastructure/gcp/main.tf @@ -196,7 +196,7 @@ resource "google_compute_address" "loadbalancer_ip_internal" { subnetwork = google_compute_subnetwork.ilb_subnet[0].id purpose = "SHARED_LOADBALANCER_VIP" address_type = "INTERNAL" - labels = var.additional_labels + labels = var.additional_labels } resource "google_compute_global_address" "loadbalancer_ip" { diff --git a/terraform/infrastructure/gcp/variables.tf b/terraform/infrastructure/gcp/variables.tf index c0d033311..3be31c6af 100644 --- a/terraform/infrastructure/gcp/variables.tf +++ b/terraform/infrastructure/gcp/variables.tf @@ -71,6 +71,6 @@ variable "cc_technology" { } variable "additional_labels" { - type = map + type = map(any) description = "Additional labels that should be given to created recources." }