Merge pull request #15800 from hashicorp/f/3.0

provider: enabling 3.0 mode

internal/clients/client.go

@@ -39,7 +39,6 @@ import (
 	dataprotection "github.com/hashicorp/terraform-provider-azurerm/internal/services/dataprotection/client"
 	datashare "github.com/hashicorp/terraform-provider-azurerm/internal/services/datashare/client"
 	desktopvirtualization "github.com/hashicorp/terraform-provider-azurerm/internal/services/desktopvirtualization/client"
-	devspace "github.com/hashicorp/terraform-provider-azurerm/internal/services/devspace/client"
 	devtestlabs "github.com/hashicorp/terraform-provider-azurerm/internal/services/devtestlabs/client"
 	digitaltwins "github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/client"
 	disks "github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/client"
@@ -97,7 +96,6 @@ import (
 	serviceBus "github.com/hashicorp/terraform-provider-azurerm/internal/services/servicebus/client"
 	serviceFabric "github.com/hashicorp/terraform-provider-azurerm/internal/services/servicefabric/client"
 	serviceFabricManaged "github.com/hashicorp/terraform-provider-azurerm/internal/services/servicefabricmanaged/client"
-	serviceFabricMesh "github.com/hashicorp/terraform-provider-azurerm/internal/services/servicefabricmesh/client"
 	signalr "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/client"
 	appPlatform "github.com/hashicorp/terraform-provider-azurerm/internal/services/springcloud/client"
 	sql "github.com/hashicorp/terraform-provider-azurerm/internal/services/sql/client"
@@ -151,7 +149,6 @@ type Client struct {
 	DataProtection        *dataprotection.Client
 	DataShare             *datashare.Client
 	DesktopVirtualization *desktopvirtualization.Client
-	DevSpace              *devspace.Client
 	DevTestLabs           *devtestlabs.Client
 	DigitalTwins          *digitaltwins.Client
 	Disks                 *disks.Client
@@ -208,7 +205,6 @@ type Client struct {
 	Sentinel              *sentinel.Client
 	ServiceBus            *serviceBus.Client
 	ServiceFabric         *serviceFabric.Client
-	ServiceFabricMesh     *serviceFabricMesh.Client
 	ServiceFabricManaged  *serviceFabricManaged.Client
 	SignalR               *signalr.Client
 	Storage               *storage.Client
@@ -265,7 +261,6 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
 	client.DataProtection = dataprotection.NewClient(o)
 	client.DataShare = datashare.NewClient(o)
 	client.DesktopVirtualization = desktopvirtualization.NewClient(o)
-	client.DevSpace = devspace.NewClient(o)
 	client.DevTestLabs = devtestlabs.NewClient(o)
 	client.DigitalTwins = digitaltwins.NewClient(o)
 	client.Disks = disks.NewClient(o)
@@ -323,7 +318,6 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
 	client.ServiceBus = serviceBus.NewClient(o)
 	client.ServiceFabric = serviceFabric.NewClient(o)
 	client.ServiceFabricManaged = serviceFabricManaged.NewClient(o)
-	client.ServiceFabricMesh = serviceFabricMesh.NewClient(o)
 	client.SignalR = signalr.NewClient(o)
 	client.Sql = sql.NewClient(o)
 	client.Storage = storage.NewClient(o)

internal/common/client_options.go

@@ -63,8 +63,8 @@ func setUserAgent(client *autorest.Client, tfVersion, partnerID string, disableT
 	tfUserAgent := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io) Terraform Plugin SDK/%s", tfVersion, meta.SDKVersionString())
 
 	providerUserAgent := fmt.Sprintf("%s terraform-provider-azurerm/%s", tfUserAgent, version.ProviderVersion)
-	if features.ThreePointOhBeta() {
-		providerUserAgent = fmt.Sprintf("%s terraform-provider-azurerm/%s+3.0-beta", tfUserAgent, version.ProviderVersion)
+	if features.FourPointOhBeta() {
+		providerUserAgent = fmt.Sprintf("%s terraform-provider-azurerm/%s+4.0-beta", tfUserAgent, version.ProviderVersion)
 	}
 	client.UserAgent = strings.TrimSpace(fmt.Sprintf("%s %s", client.UserAgent, providerUserAgent))
 

internal/features/three_point_oh.go

@@ -1,10 +1,5 @@
 package features
 
-import (
-	"os"
-	"strings"
-)
-
 // nolint gocritic
 // DeprecatedInThreePointOh returns the deprecation message if the provider
 // is running in 3.0 mode - otherwise is returns an empty string (such that
@@ -13,40 +8,17 @@ import (
 // This will be used to signify resources which will be Deprecated in 3.0,
 // but not Removed (which will happen in a later, presumably 4.x release).
 func DeprecatedInThreePointOh(deprecationMessage string) string {
-	if !ThreePointOhBeta() {
-		return ""
-	}
-
 	return deprecationMessage
 }
 
 // ThreePointOh returns whether this provider is running in 3.0 mode
 // that is to say - the final 3.0 release
-//
-// This exists to allow breaking changes to be piped through the provider
-// during the development of 2.x until 3.0 is ready.
 func ThreePointOh() bool {
-	return false
+	return true
 }
 
 // ThreePointOhBeta returns whether this provider is running in 3.0 mode
-// which is an opt-in Beta of the (non-breaking changes) coming in 3.0.
-//
-// Any features behind this flag should be backwards-compatible to allow
-// users to try out 3.0 functionality.
-//
-// This flag can be controlled by setting the Environment Variable
-// `ARM_THREEPOINTZERO_BETA` to `true`.
+// or an opt-in Beta of the (non-breaking changes) coming in 3.0.
 func ThreePointOhBeta() bool {
-	return ThreePointOh() || strings.EqualFold(os.Getenv("ARM_THREEPOINTZERO_BETA"), "true")
-}
-
-// ThreePointOhAppServiceResources returns whether this provider is opted into
-// the Beta Resources coming in v3.0 - or explicitly opted into v3.0.
-func ThreePointOhAppServiceResources() bool {
-	if ThreePointOh() || ThreePointOhBeta() {
-		return true
-	}
-
-	return strings.EqualFold(os.Getenv("ARM_THREEPOINTZERO_BETA_RESOURCES"), "true")
+	return true
 }

internal/provider/services.go

@@ -1,7 +1,6 @@
 package provider
 
 import (
-	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/aadb2c"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/advisor"
@@ -36,7 +35,6 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/dataprotection"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/datashare"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/desktopvirtualization"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/devspace"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/devtestlabs"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks"
@@ -94,7 +92,6 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/servicebus"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/servicefabric"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/servicefabricmanaged"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/servicefabricmesh"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/springcloud"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/sql"
@@ -223,7 +220,6 @@ func SupportedUntypedServices() []sdk.UntypedServiceRegistration {
 			sentinel.Registration{},
 			servicebus.Registration{},
 			servicefabric.Registration{},
-			servicefabricmesh.Registration{},
 			signalr.Registration{},
 			sql.Registration{},
 			storage.Registration{},
@@ -236,10 +232,6 @@ func SupportedUntypedServices() []sdk.UntypedServiceRegistration {
 			vmware.Registration{},
 			web.Registration{},
 		}
-
-		if !features.ThreePointOhBeta() {
-			out = append(out, devspace.Registration{})
-		}
 		return out
 	}()
 }

internal/services/appservice/registration.go

@@ -22,7 +22,7 @@ func (r Registration) Name() string {
 }
 
 func (r Registration) DataSources() []sdk.DataSource {
-	if features.ThreePointOhAppServiceResources() {
+	if features.ThreePointOhBeta() {
 		return []sdk.DataSource{
 			AppServiceSourceControlTokenDataSource{},
 			LinuxFunctionAppDataSource{},
@@ -36,7 +36,7 @@ func (r Registration) DataSources() []sdk.DataSource {
 }
 
 func (r Registration) Resources() []sdk.Resource {
-	if features.ThreePointOhAppServiceResources() {
+	if features.ThreePointOhBeta() {
 		return []sdk.Resource{
 			AppServiceSourceControlTokenResource{},
 			FunctionAppActiveSlotResource{},

internal/services/containers/kubernetes_cluster_resource.go

@@ -1011,7 +1011,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
 		resource.Schema[k] = v
 	}
 
-	if features.KubeConfigsAreSensitive() {
+	if features.ThreePointOhBeta() {
 		resource.Schema["kube_config"] = &pluginsdk.Schema{
 			Type:      pluginsdk.TypeList,
 			Computed:  true,