terraform: rename Azure location field

cli/internal/cloudcmd/iam.go

@@ -95,7 +95,7 @@ type GCPIAMConfig struct {
 
 // AzureIAMConfig holds the necessary values for Azure IAM configuration.
 type AzureIAMConfig struct {
-	Region           string
+	Location         string
 	ServicePrincipal string
 	ResourceGroup    string
 }
@@ -167,7 +167,7 @@ func (c *IAMCreator) createAzure(ctx context.Context, cl tfIAMClient, opts *IAMC
 	defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl}, opts.TFLogLevel)
 
 	vars := terraform.AzureIAMVariables{
-		Region:           opts.Azure.Region,
+		Location:         opts.Azure.Location,
 		ResourceGroup:    opts.Azure.ResourceGroup,
 		ServicePrincipal: opts.Azure.ServicePrincipal,
 	}

cli/internal/cloudcmd/iam_test.go

@@ -40,7 +40,7 @@ func TestIAMCreator(t *testing.T) {
 	}
 
 	validAzureIAMConfig := AzureIAMConfig{
-		Region:           "westus",
+		Location:         "westus",
 		ServicePrincipal: "constell-test",
 		ResourceGroup:    "constell-test",
 	}

cli/internal/cloudcmd/tfvars.go

@@ -188,7 +188,7 @@ func azureTerraformVars(conf *config.Config, imageRef string) (*terraform.AzureC
 
 func azureTerraformIAMVars(conf *config.Config, oldVars terraform.AzureIAMVariables) *terraform.AzureIAMVariables {
 	return &terraform.AzureIAMVariables{
-		Region:           conf.Provider.Azure.Location,
+		Location:         conf.Provider.Azure.Location,
 		ServicePrincipal: oldVars.ServicePrincipal,
 		ResourceGroup:    conf.Provider.Azure.ResourceGroup,
 	}

cli/internal/cmd/iamcreateazure.go

@@ -75,7 +75,7 @@ type azureIAMCreator struct {
 func (c *azureIAMCreator) getIAMConfigOptions() *cloudcmd.IAMConfigOptions {
 	return &cloudcmd.IAMConfigOptions{
 		Azure: cloudcmd.AzureIAMConfig{
-			Region:           c.flags.region,
+			Location:         c.flags.region,
 			ResourceGroup:    c.flags.resourceGroup,
 			ServicePrincipal: c.flags.servicePrincipal,
 		},

cli/internal/cmd/iamupgradeapply_test.go

@@ -37,7 +37,7 @@ func TestIamUpgradeApply(t *testing.T) {
 			require.NoError(t, fh.Write(
 				filepath.Join(constants.TerraformIAMWorkingDir, "terraform.tfvars"),
 				[]byte(
-					"region = \"foo\"\n"+
+					"location = \"foo\"\n"+
 						"resource_group_name = \"bar\"\n"+
 						"service_principal_name = \"baz\"\n",
 				),

cli/internal/terraform/terraform_test.go

@@ -122,7 +122,7 @@ func TestPrepareIAM(t *testing.T) {
 		ServiceAccountID: "const-test-case",
 	}
 	azureVars := &AzureIAMVariables{
-		Region:        "westus",
+		Location:      "westus",
 		ResourceGroup: "constell-test-rg",
 	}
 	awsVars := &AWSIAMVariables{
@@ -542,7 +542,7 @@ func TestCreateIAM(t *testing.T) {
 		ServiceAccountID: "const-test-case",
 	}
 	azureVars := &AzureIAMVariables{
-		Region:        "westus",
+		Location:      "westus",
 		ResourceGroup: "constell-test-rg",
 	}
 	awsVars := &AWSIAMVariables{

cli/internal/terraform/variables.go

@@ -244,8 +244,8 @@ type AzureNodeGroup struct {
 
 // AzureIAMVariables is user configuration for creating the IAM configuration with Terraform on Microsoft Azure.
 type AzureIAMVariables struct {
-	// Region is the Azure region to use. (e.g. westus)
-	Region string `hcl:"region" cty:"region"`
+	// Location is the Azure location to use. (e.g. westus)
+	Location string `hcl:"location" cty:"location"`
 	// ServicePrincipal is the name of the service principal to use.
 	ServicePrincipal string `hcl:"service_principal_name" cty:"service_principal_name"`
 	// ResourceGroup is the name of the resource group to use.

cli/internal/terraform/variables_test.go

@@ -236,7 +236,7 @@ marketplace_image = {
 
 func TestAzureIAMVariables(t *testing.T) {
 	vars := AzureIAMVariables{
-		Region:           "eu-central-1",
+		Location:         "eu-central-1",
 		ServicePrincipal: "my-service-principal",
 		ResourceGroup:    "my-resource-group",
 	}
@@ -368,7 +368,7 @@ func TestVariablesFromBytes(t *testing.T) {
 	assert.Equal(awsVars, loadedAWSVars)
 
 	azureVars := AzureIAMVariables{
-		Region: "test",
+		Location: "test",
 	}
 	var loadedAzureVars AzureIAMVariables
 	err = VariablesFromBytes([]byte(azureVars.String()), &loadedAzureVars)

terraform/infrastructure/iam/azure/main.tf

@@ -34,18 +34,18 @@ data "azuread_client_config" "current" {}
 # Create base resource group
 resource "azurerm_resource_group" "base_resource_group" {
   name     = var.resource_group_name
-  location = var.region
+  location = var.location
 }
 
 # Create identity resource group
 resource "azurerm_resource_group" "identity_resource_group" {
   name     = "${var.resource_group_name}-identity"
-  location = var.region
+  location = var.location
 }
 
 # Create managed identity
 resource "azurerm_user_assigned_identity" "identity_uami" {
-  location            = var.region
+  location            = var.location
   name                = var.service_principal_name
   resource_group_name = azurerm_resource_group.identity_resource_group.name
 }

terraform/infrastructure/iam/azure/variables.tf

@@ -8,7 +8,7 @@ variable "service_principal_name" {
   description = "Name for the service principal used within the cluster."
 }
 
-variable "region" {
+variable "location" {
   type        = string
-  description = "Azure region the cluster should reside in."
+  description = "Azure location the cluster should reside in."
 }

terraform/legacy-module/azure-constellation/main.tf

@@ -19,7 +19,7 @@ module "fetch_image" {
 
 module "azure_iam" {
   source                 = "../../infrastructure/iam/azure"
-  region                 = var.location
+  location               = var.location
   service_principal_name = var.service_principal_name
   resource_group_name    = var.resource_group_name
 }