From afdb3bb2d422c2116def1543213a200ea01f6eb9 Mon Sep 17 00:00:00 2001 From: Carlo Goetz Date: Wed, 19 Aug 2026 17:20:27 +0200 Subject: [PATCH] chore(albwaf): remove beta status for albwaf resources --- docs/data-sources/alb_waf_configuration.md | 3 -- .../data-sources/alb_waf_custom_rule_group.md | 3 -- docs/data-sources/alb_waf_managed_rule_set.md | 3 -- docs/resources/alb_waf_configuration.md | 3 -- docs/resources/alb_waf_custom_rule_group.md | 3 -- docs/resources/alb_waf_managed_rule_set.md | 3 -- .../services/albwaf/albwaf_acc_test.go | 30 +++++++++---------- .../albwaf/custom_rule_group/datasource.go | 8 +---- .../albwaf/custom_rule_group/resource.go | 8 +---- .../albwaf/managed_rule_set/datasource.go | 8 +---- .../albwaf/managed_rule_set/resource.go | 8 +---- .../albwaf/waf_configuration/datasource.go | 8 +---- .../albwaf/waf_configuration/resource.go | 7 +---- 13 files changed, 21 insertions(+), 74 deletions(-) diff --git a/docs/data-sources/alb_waf_configuration.md b/docs/data-sources/alb_waf_configuration.md index 86133d404..7fd213a5d 100644 --- a/docs/data-sources/alb_waf_configuration.md +++ b/docs/data-sources/alb_waf_configuration.md @@ -4,15 +4,12 @@ page_title: "stackit_alb_waf_configuration Data Source - stackit" subcategory: "" description: |- ALB WAF Custom Rule Group resource schema. Uses the default_region specified in the provider configuration as a fallback in case no region is defined on resource level. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_alb_waf_configuration (Data Source) ALB WAF Custom Rule Group resource schema. Uses the `default_region` specified in the provider configuration as a fallback in case no `region` is defined on resource level. -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/docs/data-sources/alb_waf_custom_rule_group.md b/docs/data-sources/alb_waf_custom_rule_group.md index 4adfc985d..771b10f84 100644 --- a/docs/data-sources/alb_waf_custom_rule_group.md +++ b/docs/data-sources/alb_waf_custom_rule_group.md @@ -4,15 +4,12 @@ page_title: "stackit_alb_waf_custom_rule_group Data Source - stackit" subcategory: "" description: |- ALB WAF Custom Rule Group resource schema. Uses the default_region specified in the provider configuration as a fallback in case no region is defined on resource level. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_alb_waf_custom_rule_group (Data Source) ALB WAF Custom Rule Group resource schema. Uses the `default_region` specified in the provider configuration as a fallback in case no `region` is defined on resource level. -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/docs/data-sources/alb_waf_managed_rule_set.md b/docs/data-sources/alb_waf_managed_rule_set.md index c14a428bb..3f13e5819 100644 --- a/docs/data-sources/alb_waf_managed_rule_set.md +++ b/docs/data-sources/alb_waf_managed_rule_set.md @@ -4,15 +4,12 @@ page_title: "stackit_alb_waf_managed_rule_set Data Source - stackit" subcategory: "" description: |- ALB WAF Managed Rule Set DataSource schema. Uses the default_region specified in the provider configuration as a fallback in case no region is defined on datasource level. - ~> This datasource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_alb_waf_managed_rule_set (Data Source) ALB WAF Managed Rule Set DataSource schema. Uses the `default_region` specified in the provider configuration as a fallback in case no `region` is defined on datasource level. -~> This datasource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/docs/resources/alb_waf_configuration.md b/docs/resources/alb_waf_configuration.md index b7525ebed..cef387a1c 100644 --- a/docs/resources/alb_waf_configuration.md +++ b/docs/resources/alb_waf_configuration.md @@ -4,15 +4,12 @@ page_title: "stackit_alb_waf_configuration Resource - stackit" subcategory: "" description: |- ALB WAF Custom Rule Group resource schema. Uses the default_region specified in the provider configuration as a fallback in case no region is defined on resource level. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_alb_waf_configuration (Resource) ALB WAF Custom Rule Group resource schema. Uses the `default_region` specified in the provider configuration as a fallback in case no `region` is defined on resource level. -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/docs/resources/alb_waf_custom_rule_group.md b/docs/resources/alb_waf_custom_rule_group.md index cd8d5b9df..5da0b0320 100644 --- a/docs/resources/alb_waf_custom_rule_group.md +++ b/docs/resources/alb_waf_custom_rule_group.md @@ -4,15 +4,12 @@ page_title: "stackit_alb_waf_custom_rule_group Resource - stackit" subcategory: "" description: |- ALB WAF Custom Rule Group resource schema. Uses the default_region specified in the provider configuration as a fallback in case no region is defined on resource level. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_alb_waf_custom_rule_group (Resource) ALB WAF Custom Rule Group resource schema. Uses the `default_region` specified in the provider configuration as a fallback in case no `region` is defined on resource level. -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/docs/resources/alb_waf_managed_rule_set.md b/docs/resources/alb_waf_managed_rule_set.md index 390e30ded..ea1a29cf8 100644 --- a/docs/resources/alb_waf_managed_rule_set.md +++ b/docs/resources/alb_waf_managed_rule_set.md @@ -4,15 +4,12 @@ page_title: "stackit_alb_waf_managed_rule_set Resource - stackit" subcategory: "" description: |- ALB WAF Managed Rule Set resource schema. Uses the default_region specified in the provider configuration as a fallback in case no region is defined on resource level. - ~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our guide https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources for how to opt-in to use beta resources. --- # stackit_alb_waf_managed_rule_set (Resource) ALB WAF Managed Rule Set resource schema. Uses the `default_region` specified in the provider configuration as a fallback in case no `region` is defined on resource level. -~> This resource is in beta and may be subject to breaking changes in the future. Use with caution. See our [guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources) for how to opt-in to use beta resources. - ## Example Usage ```terraform diff --git a/stackit/internal/services/albwaf/albwaf_acc_test.go b/stackit/internal/services/albwaf/albwaf_acc_test.go index c6c7d778c..ce7989ec3 100644 --- a/stackit/internal/services/albwaf/albwaf_acc_test.go +++ b/stackit/internal/services/albwaf/albwaf_acc_test.go @@ -137,7 +137,7 @@ func TestAccCustomRuleGroupMin(t *testing.T) { // Creation { ConfigVariables: testCustomRuleGroupMin, - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), customRuleGroupMinConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), customRuleGroupMinConfig), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("stackit_alb_waf_custom_rule_group.custom_rule_group", "project_id", testutil.ProjectId), resource.TestCheckResourceAttr("stackit_alb_waf_custom_rule_group.custom_rule_group", "region", testutil.Region), @@ -169,7 +169,7 @@ func TestAccCustomRuleGroupMin(t *testing.T) { name = stackit_alb_waf_custom_rule_group.custom_rule_group.name } `, - testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), customRuleGroupMinConfig, + testutil.NewConfigBuilder().BuildProviderConfig(), customRuleGroupMinConfig, ), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.stackit_alb_waf_custom_rule_group.custom_rule_group", "project_id", testutil.ProjectId), @@ -220,7 +220,7 @@ func TestAccCustomRuleGroupMin(t *testing.T) { // Update { ConfigVariables: testCustomRuleGroupMinUpdated(), - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), customRuleGroupMinConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), customRuleGroupMinConfig), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("stackit_alb_waf_custom_rule_group.custom_rule_group", plancheck.ResourceActionReplace), @@ -258,7 +258,7 @@ func TestAccCustomRuleGroupMax(t *testing.T) { // Creation { ConfigVariables: testCustomRuleGroupMax, - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), customRuleGroupMaxConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), customRuleGroupMaxConfig), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("stackit_alb_waf_custom_rule_group.custom_rule_group", "project_id", testutil.ProjectId), resource.TestCheckResourceAttr("stackit_alb_waf_custom_rule_group.custom_rule_group", "region", testutil.Region), @@ -295,7 +295,7 @@ func TestAccCustomRuleGroupMax(t *testing.T) { name = stackit_alb_waf_custom_rule_group.custom_rule_group.name } `, - testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), customRuleGroupMaxConfig, + testutil.NewConfigBuilder().BuildProviderConfig(), customRuleGroupMaxConfig, ), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.stackit_alb_waf_custom_rule_group.custom_rule_group", "project_id", testutil.ProjectId), @@ -351,7 +351,7 @@ func TestAccCustomRuleGroupMax(t *testing.T) { // Update { ConfigVariables: testCustomRuleGroupMaxUpdated(), - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), customRuleGroupMaxConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), customRuleGroupMaxConfig), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("stackit_alb_waf_custom_rule_group.custom_rule_group", plancheck.ResourceActionUpdate), @@ -393,7 +393,7 @@ func TestAccManagedRuleSet(t *testing.T) { // Creation { ConfigVariables: testManagedRuleSet, - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), managedRuleSetConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), managedRuleSetConfig), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("stackit_alb_waf_managed_rule_set.managed_rule_set", "project_id", testutil.ProjectId), resource.TestCheckResourceAttr("stackit_alb_waf_managed_rule_set.managed_rule_set", "region", testutil.Region), @@ -414,7 +414,7 @@ func TestAccManagedRuleSet(t *testing.T) { name = stackit_alb_waf_managed_rule_set.managed_rule_set.name } `, - testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), managedRuleSetConfig, + testutil.NewConfigBuilder().BuildProviderConfig(), managedRuleSetConfig, ), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.stackit_alb_waf_managed_rule_set.managed_rule_set", "project_id", testutil.ProjectId), @@ -448,7 +448,7 @@ func TestAccManagedRuleSet(t *testing.T) { // Update { ConfigVariables: testManagedRuleSetUpdated(), - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), managedRuleSetConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), managedRuleSetConfig), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("stackit_alb_waf_managed_rule_set.managed_rule_set", plancheck.ResourceActionReplace), @@ -475,7 +475,7 @@ func TestAccWafConfigurationMin(t *testing.T) { // Creation { ConfigVariables: testConfigVarsMin, - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), wafMinConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), wafMinConfig), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("stackit_alb_waf_configuration.waf_instance", "project_id", testutil.ProjectId), resource.TestCheckResourceAttr("stackit_alb_waf_configuration.waf_instance", "region", testutil.Region), @@ -494,7 +494,7 @@ func TestAccWafConfigurationMin(t *testing.T) { name = stackit_alb_waf_configuration.waf_instance.name } `, - testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), wafMinConfig, + testutil.NewConfigBuilder().BuildProviderConfig(), wafMinConfig, ), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.stackit_alb_waf_configuration.waf", "project_id", testutil.ProjectId), @@ -527,7 +527,7 @@ func TestAccWafConfigurationMin(t *testing.T) { // Update { ConfigVariables: testConfigVarsMinUpdated(), - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), wafMinConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), wafMinConfig), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("stackit_alb_waf_configuration.waf_instance", plancheck.ResourceActionReplace), @@ -553,7 +553,7 @@ func TestAccWafConfigurationMax(t *testing.T) { // Creation { ConfigVariables: testConfigVarsMax, - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), wafMaxConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), wafMaxConfig), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("stackit_alb_waf_managed_rule_set.managed_rule_set", "name", testutil.ConvertConfigVariable(testConfigVarsMax["rule_set_name"])), resource.TestCheckResourceAttr("stackit_alb_waf_custom_rule_group.custom_rule_group", "name", testutil.ConvertConfigVariable(testConfigVarsMax["custom_rule_group_name"])), @@ -588,7 +588,7 @@ func TestAccWafConfigurationMax(t *testing.T) { name = stackit_alb_waf_configuration.waf_instance.name } `, - testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), wafMaxConfig, + testutil.NewConfigBuilder().BuildProviderConfig(), wafMaxConfig, ), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrPair( @@ -629,7 +629,7 @@ func TestAccWafConfigurationMax(t *testing.T) { // Update { ConfigVariables: testConfigVarsMaxUpdated(), - Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().EnableBetaResources(true).BuildProviderConfig(), wafMaxConfig), + Config: fmt.Sprintf("%s\n%s", testutil.NewConfigBuilder().BuildProviderConfig(), wafMaxConfig), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("stackit_alb_waf_configuration.waf_instance", plancheck.ResourceActionReplace), diff --git a/stackit/internal/services/albwaf/custom_rule_group/datasource.go b/stackit/internal/services/albwaf/custom_rule_group/datasource.go index 51649be50..bc07b4de6 100644 --- a/stackit/internal/services/albwaf/custom_rule_group/datasource.go +++ b/stackit/internal/services/albwaf/custom_rule_group/datasource.go @@ -18,7 +18,6 @@ import ( "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/albwaf/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -44,11 +43,6 @@ func (r *customRuleGroupDataSource) Configure(ctx context.Context, req datasourc return } - features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_alb_waf_custom_rule_group", core.Resource) - if resp.Diagnostics.HasError() { - return - } - apiClient := utils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics) if resp.Diagnostics.HasError() { return @@ -63,7 +57,7 @@ func (r *customRuleGroupDataSource) Metadata(_ context.Context, req datasource.M func (r *customRuleGroupDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) { resp.Schema = schema.Schema{ - Description: features.AddBetaDescription(fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), core.Resource), + Description: fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Description: descriptions["id"], diff --git a/stackit/internal/services/albwaf/custom_rule_group/resource.go b/stackit/internal/services/albwaf/custom_rule_group/resource.go index 76de82db0..86d3ded3e 100644 --- a/stackit/internal/services/albwaf/custom_rule_group/resource.go +++ b/stackit/internal/services/albwaf/custom_rule_group/resource.go @@ -29,7 +29,6 @@ import ( "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/albwaf/utils" tfutils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" @@ -133,11 +132,6 @@ func (r *customRuleGroupResource) Configure(ctx context.Context, req resource.Co return } - features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_alb_waf_custom_rule_group", core.Resource) - if resp.Diagnostics.HasError() { - return - } - apiClient := utils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics) if resp.Diagnostics.HasError() { return @@ -176,7 +170,7 @@ var descriptions = map[string]string{ func (r *customRuleGroupResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) { resp.Schema = schema.Schema{ - Description: features.AddBetaDescription(fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), core.Resource), + Description: fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Description: descriptions["id"], diff --git a/stackit/internal/services/albwaf/managed_rule_set/datasource.go b/stackit/internal/services/albwaf/managed_rule_set/datasource.go index 66956272b..58f74d144 100644 --- a/stackit/internal/services/albwaf/managed_rule_set/datasource.go +++ b/stackit/internal/services/albwaf/managed_rule_set/datasource.go @@ -17,7 +17,6 @@ import ( "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/albwaf/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -43,11 +42,6 @@ func (d *managedRuleSetDataSource) Configure(ctx context.Context, req datasource return } - features.CheckBetaResourcesEnabled(ctx, &d.providerData, &resp.Diagnostics, "stackit_alb_waf_managed_rule_set", core.Datasource) - if resp.Diagnostics.HasError() { - return - } - apiClient := utils.ConfigureClient(ctx, &d.providerData, &resp.Diagnostics) if resp.Diagnostics.HasError() { return @@ -62,7 +56,7 @@ func (d *managedRuleSetDataSource) Metadata(_ context.Context, req datasource.Me func (d *managedRuleSetDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) { resp.Schema = schema.Schema{ - Description: features.AddBetaDescription(fmt.Sprintf("ALB WAF Managed Rule Set DataSource schema. %s", core.DatasourceRegionFallbackDocstring), core.Datasource), + Description: fmt.Sprintf("ALB WAF Managed Rule Set DataSource schema. %s", core.DatasourceRegionFallbackDocstring), Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Description: descriptions["id"], diff --git a/stackit/internal/services/albwaf/managed_rule_set/resource.go b/stackit/internal/services/albwaf/managed_rule_set/resource.go index 1bd9f4ab2..167211ed5 100644 --- a/stackit/internal/services/albwaf/managed_rule_set/resource.go +++ b/stackit/internal/services/albwaf/managed_rule_set/resource.go @@ -23,7 +23,6 @@ import ( "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/features" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/albwaf/utils" tfutils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" @@ -88,11 +87,6 @@ func (r *managedRuleSetResource) Configure(ctx context.Context, req resource.Con return } - features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_alb_waf_managed_rule_set", core.Resource) - if resp.Diagnostics.HasError() { - return - } - apiClient := utils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics) if resp.Diagnostics.HasError() { return @@ -124,7 +118,7 @@ var descriptions = map[string]string{ func (r *managedRuleSetResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) { resp.Schema = schema.Schema{ - Description: features.AddBetaDescription(fmt.Sprintf("ALB WAF Managed Rule Set resource schema. %s", core.ResourceRegionFallbackDocstring), core.Resource), + Description: fmt.Sprintf("ALB WAF Managed Rule Set resource schema. %s", core.ResourceRegionFallbackDocstring), Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Description: descriptions["id"], diff --git a/stackit/internal/services/albwaf/waf_configuration/datasource.go b/stackit/internal/services/albwaf/waf_configuration/datasource.go index 937f9d474..85f8349cf 100644 --- a/stackit/internal/services/albwaf/waf_configuration/datasource.go +++ b/stackit/internal/services/albwaf/waf_configuration/datasource.go @@ -18,7 +18,6 @@ import ( "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/features" albwafUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/albwaf/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -44,11 +43,6 @@ func (d *wafDatasource) Configure(ctx context.Context, req datasource.ConfigureR return } - features.CheckBetaResourcesEnabled(ctx, &d.providerData, &resp.Diagnostics, "stackit_alb_waf_configuration", core.Datasource) - if resp.Diagnostics.HasError() { - return - } - d.client = albwafUtils.ConfigureClient(ctx, &d.providerData, &resp.Diagnostics) if resp.Diagnostics.HasError() { return @@ -58,7 +52,7 @@ func (d *wafDatasource) Configure(ctx context.Context, req datasource.ConfigureR func (d *wafDatasource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) { resp.Schema = schema.Schema{ - Description: features.AddBetaDescription(fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), core.Resource), + Description: fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Description: descriptions["id"], diff --git a/stackit/internal/services/albwaf/waf_configuration/resource.go b/stackit/internal/services/albwaf/waf_configuration/resource.go index 481c0d18e..61f0392c3 100644 --- a/stackit/internal/services/albwaf/waf_configuration/resource.go +++ b/stackit/internal/services/albwaf/waf_configuration/resource.go @@ -22,7 +22,6 @@ import ( "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/features" albwafUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/albwaf/utils" tfutils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" @@ -107,10 +106,6 @@ func (r *wafResource) Configure(ctx context.Context, req resource.ConfigureReque if !ok { return } - features.CheckBetaResourcesEnabled(ctx, &r.providerData, &resp.Diagnostics, "stackit_alb_waf_configuration", core.Resource) - if resp.Diagnostics.HasError() { - return - } apiClient := albwafUtils.ConfigureClient(ctx, &r.providerData, &resp.Diagnostics) if resp.Diagnostics.HasError() { return @@ -135,7 +130,7 @@ var descriptions = map[string]string{ func (r *wafResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) { resp.Schema = schema.Schema{ - Description: features.AddBetaDescription(fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), core.Resource), + Description: fmt.Sprintf("ALB WAF Custom Rule Group resource schema. %s", core.ResourceRegionFallbackDocstring), Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Description: descriptions["id"],