diff --git a/docs/guides/ske_log_alerts.md b/docs/guides/ske_log_alerts.md index 60498b059..93ef89b0b 100644 --- a/docs/guides/ske_log_alerts.md +++ b/docs/guides/ske_log_alerts.md @@ -13,7 +13,7 @@ This guide walks you through setting up log-based alerting in STACKIT Observabil ```hcl provider "stackit" { - region = "eu01" + default_region = "eu01" } provider "kubernetes" { @@ -196,4 +196,4 @@ This guide walks you through setting up log-based alerting in STACKIT Observabil } } } - ``` \ No newline at end of file + ``` diff --git a/docs/index.md b/docs/index.md index c3ceba33e..160f8a9b8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -203,7 +203,6 @@ See this [example](https://professional-service.git.onstackit.cloud/professional - `private_key_path` (String) Path for the private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key. - `rabbitmq_custom_endpoint` (String) Custom endpoint for the RabbitMQ service - `redis_custom_endpoint` (String) Custom endpoint for the Redis service -- `region` (String, Deprecated) Region will be used as the default location for regional services. Not all services require a region, some are global - `resourcemanager_custom_endpoint` (String) Custom endpoint for the Resource Manager service - `scf_custom_endpoint` (String) Custom endpoint for the Cloud Foundry (SCF) service - `secretsmanager_custom_endpoint` (String) Custom endpoint for the Secrets Manager service diff --git a/docs/resources/network_area.md b/docs/resources/network_area.md index be6f6eae1..0848b5067 100644 --- a/docs/resources/network_area.md +++ b/docs/resources/network_area.md @@ -69,7 +69,6 @@ resource "stackit_network_area" "example" { resource "stackit_network_area_region" "example" { organization_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" network_area_id = stackit_network_area.example.network_area_id - region = "eu01" ipv4 = { transfer_network = "192.168.1.0/24" network_ranges = [ diff --git a/stackit/internal/core/core.go b/stackit/internal/core/core.go index 478b92c71..d539952e8 100644 --- a/stackit/internal/core/core.go +++ b/stackit/internal/core/core.go @@ -35,10 +35,8 @@ type EphemeralProviderData struct { } type ProviderData struct { - RoundTripper http.RoundTripper - ServiceAccountEmail string - // Deprecated: Use DefaultRegion instead - Region string + RoundTripper http.RoundTripper + ServiceAccountEmail string DefaultRegion string ALBCertificatesCustomEndpoint string ALBCustomEndpoint string @@ -87,10 +85,7 @@ type ProviderData struct { func (pd *ProviderData) GetRegion() string { if pd.DefaultRegion != "" { return pd.DefaultRegion - } else if pd.Region != "" { - return pd.Region } - // final fallback return "eu01" } diff --git a/stackit/internal/core/core_test.go b/stackit/internal/core/core_test.go index 8824e870c..d94671641 100644 --- a/stackit/internal/core/core_test.go +++ b/stackit/internal/core/core_test.go @@ -70,22 +70,7 @@ func TestProviderData_GetRegion(t *testing.T) { want: "eu02", }, { - name: "(legacy) region is set", - providerData: &ProviderData{ - Region: "eu02", - }, - want: "eu02", - }, - { - name: "default region wins over (legacy) region", - providerData: &ProviderData{ - DefaultRegion: "eu02", - Region: "eu01", - }, - want: "eu02", - }, - { - name: "final fallback - neither region (legacy) nor default region is set", + name: "no default region, use fallback", providerData: &ProviderData{}, want: "eu01", }, diff --git a/stackit/internal/services/iaasalpha/iaas_vpc_acc_test.go b/stackit/internal/services/iaasalpha/iaas_vpc_acc_test.go index fe4697375..829f6cbaa 100644 --- a/stackit/internal/services/iaasalpha/iaas_vpc_acc_test.go +++ b/stackit/internal/services/iaasalpha/iaas_vpc_acc_test.go @@ -772,8 +772,8 @@ func TestAccVPCRegionMin(t *testing.T) { data "stackit_vpc_region" "region" { project_id = stackit_vpc.vpc.project_id - vpc_id = stackit_vpc.vpc.vpc_id region = "eu01" + vpc_id = stackit_vpc.vpc.vpc_id } `, testutil.NewConfigBuilder().Experiments(testutil.ExperimentVPC).BuildProviderConfig(), resourceVpcRegionMinConfig), ConfigPlanChecks: resource.ConfigPlanChecks{ diff --git a/stackit/provider.go b/stackit/provider.go index 3a88d9dc4..b89bb0895 100644 --- a/stackit/provider.go +++ b/stackit/provider.go @@ -5,14 +5,11 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/ephemeral" - "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/provider" "github.com/hashicorp/terraform-plugin-framework/provider/schema" "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" sdkauth "github.com/stackitcloud/stackit-sdk-go/core/auth" @@ -179,8 +176,6 @@ type providerModel struct { WifFederatedToken types.String `tfsdk:"service_account_federated_token"` UseOIDC types.Bool `tfsdk:"use_oidc"` - // Deprecated: Use DefaultRegion instead - Region types.String `tfsdk:"region"` DefaultRegion types.String `tfsdk:"default_region"` // Custom endpoints @@ -244,7 +239,6 @@ func (p *Provider) Schema(_ context.Context, _ provider.SchemaRequest, resp *pro "use_oidc": "Enables OIDC for Authentication. This can also be sourced from the `STACKIT_USE_OIDC` Environment Variable. Defaults to `false`.", "oidc_request_url": "The URL for the OIDC provider from which to request an ID token. For use when authenticating as a Service Account using OpenID Connect.", "oidc_request_token": "The bearer token for the request to the OIDC provider. For use when authenticating as a Service Account using OpenID Connect.", - "region": "Region will be used as the default location for regional services. Not all services require a region, some are global", "default_region": "Region will be used as the default location for regional services. Not all services require a region, some are global", "alb_certificates_custom_endpoint": "Custom endpoint for the Application Load Balancer TLS Certificate service", "alb_waf_custom_endpoint": "Custom endpoint for the Application Load Balancer Web Application Firewall service", @@ -341,20 +335,9 @@ func (p *Provider) Schema(_ context.Context, _ provider.SchemaRequest, resp *pro Optional: true, Description: descriptions["oidc_request_url"], }, - "region": schema.StringAttribute{ - Optional: true, - Description: descriptions["region"], - DeprecationMessage: "This attribute is deprecated. Use 'default_region' instead", - Validators: []validator.String{ - stringvalidator.ConflictsWith(path.MatchRoot("default_region")), - }, - }, "default_region": schema.StringAttribute{ Optional: true, Description: descriptions["default_region"], - Validators: []validator.String{ - stringvalidator.ConflictsWith(path.MatchRoot("region")), - }, }, "enable_beta_resources": schema.BoolAttribute{ Optional: true, @@ -566,7 +549,6 @@ func (p *Provider) Configure(ctx context.Context, req provider.ConfigureRequest, setStringField(providerConfig.TokenCustomEndpoint, func(v string) { sdkConfig.TokenCustomUrl = v }) setStringField(providerConfig.DefaultRegion, func(v string) { providerData.DefaultRegion = v }) - setStringField(providerConfig.Region, func(v string) { providerData.Region = v }) // nolint:staticcheck // preliminary handling of deprecated attribute setBoolField(providerConfig.EnableBetaResources, func(v bool) { providerData.EnableBetaResources = v }) setStringField(providerConfig.ALBCertificatesCustomEndpoint, func(v string) { providerData.ALBCertificatesCustomEndpoint = v }) diff --git a/templates/guides/ske_log_alerts.md.tmpl b/templates/guides/ske_log_alerts.md.tmpl index 60498b059..93ef89b0b 100644 --- a/templates/guides/ske_log_alerts.md.tmpl +++ b/templates/guides/ske_log_alerts.md.tmpl @@ -13,7 +13,7 @@ This guide walks you through setting up log-based alerting in STACKIT Observabil ```hcl provider "stackit" { - region = "eu01" + default_region = "eu01" } provider "kubernetes" { @@ -196,4 +196,4 @@ This guide walks you through setting up log-based alerting in STACKIT Observabil } } } - ``` \ No newline at end of file + ``` diff --git a/templates/resources/network_area.md.tmpl b/templates/resources/network_area.md.tmpl index 0f6108403..da4968dc3 100644 --- a/templates/resources/network_area.md.tmpl +++ b/templates/resources/network_area.md.tmpl @@ -57,7 +57,6 @@ resource "stackit_network_area" "example" { resource "stackit_network_area_region" "example" { organization_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" network_area_id = stackit_network_area.example.network_area_id - region = "eu01" ipv4 = { transfer_network = "192.168.1.0/24" network_ranges = [