azurerm_cosmosdb_fleet - fix resource name

Author: v-yhyeo0202

…vices/cosmos/cosmosdb_fleets_resource.go …rvices/cosmos/cosmosdb_fleet_resource.gointernal/services/cosmos/cosmosdb_fleets_resource.go renamed to internal/services/cosmos/cosmosdb_fleet_resource.go internal/services/cosmos/cosmosdb_fleets_resource.go renamed to internal/services/cosmos/cosmosdb_fleet_resource.go

@@ -6,6 +6,7 @@ package cosmos
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -21,26 +22,29 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 )
 
-//go:generate go run ../../tools/generator-tests resourceidentity -resource-name cosmosdb_fleets -service-package-name cosmos -properties "name,resource_group_name" -known-values "subscription_id:data.Subscriptions.Primary"
+//go:generate go run ../../tools/generator-tests resourceidentity -resource-name cosmosdb_fleet -service-package-name cosmos -properties "name,resource_group_name" -known-values "subscription_id:data.Subscriptions.Primary"
 
-type CosmosDbFleetsResource struct{}
+type CosmosDbFleetResource struct{}
 
-var _ sdk.ResourceWithIdentity = CosmosDbFleetsResource{}
+var _ sdk.ResourceWithIdentity = CosmosDbFleetResource{}
 
-type CosmosDbFleetsModel struct {
+type CosmosDbFleetModel struct {
 	Name              string            `tfschema:"name"`
 	ResourceGroupName string            `tfschema:"resource_group_name"`
 	Location          string            `tfschema:"location"`
 	Tags              map[string]string `tfschema:"tags"`
 }
 
-func (CosmosDbFleetsResource) Arguments() map[string]*pluginsdk.Schema {
+func (CosmosDbFleetResource) Arguments() map[string]*pluginsdk.Schema {
 	return map[string]*pluginsdk.Schema{
 		"name": {
-			Type:         pluginsdk.TypeString,
-			Required:     true,
-			ForceNew:     true,
-			ValidateFunc: validation.StringIsNotEmpty,
+			Type:     pluginsdk.TypeString,
+			Required: true,
+			ForceNew: true,
+			ValidateFunc: validation.StringMatch(
+				regexp.MustCompile("^(?=.{3,50}$)[a-z0-9]+(?:-[a-z0-9]+)*$"),
+				"CosmosDB Fleet name must be 3 - 50 characters long, contain only lowercase letters, numbers and hyphens.",
+			),
 		},
 
 		"resource_group_name": commonschema.ResourceGroupName(),
@@ -60,26 +64,26 @@ func (CosmosDbFleetsResource) Arguments() map[string]*pluginsdk.Schema {
 	}
 }
 
-func (CosmosDbFleetsResource) Attributes() map[string]*pluginsdk.Schema {
+func (CosmosDbFleetResource) Attributes() map[string]*pluginsdk.Schema {
 	return map[string]*pluginsdk.Schema{}
 }
 
-func (CosmosDbFleetsResource) ModelObject() interface{} {
-	return &CosmosDbFleetsResource{}
+func (CosmosDbFleetResource) ModelObject() interface{} {
+	return &CosmosDbFleetResource{}
 }
 
-func (CosmosDbFleetsResource) ResourceType() string {
-	return "azurerm_cosmosdb_fleets"
+func (CosmosDbFleetResource) ResourceType() string {
+	return "azurerm_cosmosdb_fleet"
 }
 
-func (r CosmosDbFleetsResource) Create() sdk.ResourceFunc {
+func (r CosmosDbFleetResource) Create() sdk.ResourceFunc {
 	return sdk.ResourceFunc{
 		Timeout: 30 * time.Minute,
 		Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
 			client := metadata.Client.Cosmos.FleetsClient
 			subscriptionId := metadata.Client.Account.SubscriptionId
 
-			var config CosmosDbFleetsModel
+			var config CosmosDbFleetModel
 			if err := metadata.Decode(&config); err != nil {
 				return fmt.Errorf("decoding: %+v", err)
 			}
@@ -111,7 +115,7 @@ func (r CosmosDbFleetsResource) Create() sdk.ResourceFunc {
 	}
 }
 
-func (r CosmosDbFleetsResource) Read() sdk.ResourceFunc {
+func (r CosmosDbFleetResource) Read() sdk.ResourceFunc {
 	return sdk.ResourceFunc{
 		Timeout: 5 * time.Minute,
 		Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
@@ -130,7 +134,7 @@ func (r CosmosDbFleetsResource) Read() sdk.ResourceFunc {
 				return fmt.Errorf("retrieving %s: %+v", id, err)
 			}
 
-			state := CosmosDbFleetsModel{
+			state := CosmosDbFleetModel{
 				Name:              id.FleetName,
 				ResourceGroupName: id.ResourceGroupName,
 			}
@@ -149,7 +153,7 @@ func (r CosmosDbFleetsResource) Read() sdk.ResourceFunc {
 	}
 }
 
-func (CosmosDbFleetsResource) Delete() sdk.ResourceFunc {
+func (CosmosDbFleetResource) Delete() sdk.ResourceFunc {
 	return sdk.ResourceFunc{
 		Timeout: 30 * time.Minute,
 		Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
@@ -168,10 +172,10 @@ func (CosmosDbFleetsResource) Delete() sdk.ResourceFunc {
 	}
 }
 
-func (CosmosDbFleetsResource) IDValidationFunc() pluginsdk.SchemaValidateFunc {
+func (CosmosDbFleetResource) IDValidationFunc() pluginsdk.SchemaValidateFunc {
 	return fleets.ValidateFleetID
 }
 
-func (CosmosDbFleetsResource) Identity() resourceids.ResourceId {
+func (CosmosDbFleetResource) Identity() resourceids.ResourceId {
 	return &fleets.FleetId{}
 }

…/cosmos/cosmosdb_fleets_resource_test.go …s/cosmos/cosmosdb_fleet_resource_test.gointernal/services/cosmos/cosmosdb_fleets_resource_test.go renamed to internal/services/cosmos/cosmosdb_fleet_resource_test.go internal/services/cosmos/cosmosdb_fleets_resource_test.go renamed to internal/services/cosmos/cosmosdb_fleet_resource_test.go

@@ -15,11 +15,11 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 )
 
-type CosmosDbFleetsResource struct{}
+type CosmosDbFleetResource struct{}
 
-func TestAccCosmosDbFleets_basic(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleets", "test")
-	r := CosmosDbFleetsResource{}
+func TestAccCosmosDbFleet_basic(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleet", "test")
+	r := CosmosDbFleetResource{}
 
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
@@ -32,9 +32,9 @@ func TestAccCosmosDbFleets_basic(t *testing.T) {
 	})
 }
 
-func TestAccCosmosDbFleets_requiresImport(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleets", "test")
-	r := CosmosDbFleetsResource{}
+func TestAccCosmosDbFleet_requiresImport(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleet", "test")
+	r := CosmosDbFleetResource{}
 
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
@@ -47,9 +47,9 @@ func TestAccCosmosDbFleets_requiresImport(t *testing.T) {
 	})
 }
 
-func TestAccCosmosDbFleets_complete(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleets", "test")
-	r := CosmosDbFleetsResource{}
+func TestAccCosmosDbFleet_complete(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleet", "test")
+	r := CosmosDbFleetResource{}
 
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
@@ -62,9 +62,9 @@ func TestAccCosmosDbFleets_complete(t *testing.T) {
 	})
 }
 
-func TestAccCosmosDbFleets_update(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleets", "test")
-	r := CosmosDbFleetsResource{}
+func TestAccCosmosDbFleet_update(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_cosmosdb_fleet", "test")
+	r := CosmosDbFleetResource{}
 
 	data.ResourceTestIgnoreRecreate(t, r, []acceptance.TestStep{
 		{
@@ -89,7 +89,7 @@ func TestAccCosmosDbFleets_update(t *testing.T) {
 	})
 }
 
-func (CosmosDbFleetsResource) Exists(ctx context.Context, client *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
+func (CosmosDbFleetResource) Exists(ctx context.Context, client *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
 	id, err := fleets.ParseFleetID(state.ID)
 	if err != nil {
 		return nil, err
@@ -103,7 +103,7 @@ func (CosmosDbFleetsResource) Exists(ctx context.Context, client *clients.Client
 	return pointer.To(resp.Model != nil), nil
 }
 
-func (CosmosDbFleetsResource) template(data acceptance.TestData) string {
+func (CosmosDbFleetResource) template(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
@@ -116,35 +116,35 @@ resource "azurerm_resource_group" "test" {
 `, data.RandomInteger, data.Locations.Primary)
 }
 
-func (r CosmosDbFleetsResource) basic(data acceptance.TestData) string {
+func (r CosmosDbFleetResource) basic(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_cosmosdb_fleets" "test" {
+resource "azurerm_cosmosdb_fleet" "test" {
   name                = "acctest-cosfleets-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
 }
 `, r.template(data), data.RandomInteger)
 }
 
-func (r CosmosDbFleetsResource) requiresImport(data acceptance.TestData) string {
+func (r CosmosDbFleetResource) requiresImport(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_cosmosdb_fleets" "import" {
-  name                = azurerm_cosmosdb_fleets.test.name
-  resource_group_name = azurerm_cosmosdb_fleets.test.resource_group_name
-  location            = azurerm_cosmosdb_fleets.test.location
+resource "azurerm_cosmosdb_fleet" "import" {
+  name                = azurerm_cosmosdb_fleet.test.name
+  resource_group_name = azurerm_cosmosdb_fleet.test.resource_group_name
+  location            = azurerm_cosmosdb_fleet.test.location
 }
 `, r.basic(data))
 }
 
-func (r CosmosDbFleetsResource) complete(data acceptance.TestData) string {
+func (r CosmosDbFleetResource) complete(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_cosmosdb_fleets" "test" {
+resource "azurerm_cosmosdb_fleet" "test" {
   name                = "acctest-cosfleets-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location

internal/services/cosmos/registration.go

@@ -25,7 +25,7 @@ func (r Registration) DataSources() []sdk.DataSource {
 
 func (r Registration) Resources() []sdk.Resource {
 	return []sdk.Resource{
-		CosmosDbFleetsResource{},
+		CosmosDbFleetResource{},
 		CosmosDbMongoUserDefinitionResource{},
 		CosmosDbPostgreSQLClusterResource{},
 		CosmosDbPostgreSQLCoordinatorConfigurationResource{},

…ite/docs/r/cosmosdb_fleets.html.markdown …site/docs/r/cosmosdb_fleet.html.markdownwebsite/docs/r/cosmosdb_fleets.html.markdown renamed to website/docs/r/cosmosdb_fleet.html.markdown website/docs/r/cosmosdb_fleets.html.markdown renamed to website/docs/r/cosmosdb_fleet.html.markdown

@@ -1,22 +1,27 @@
 ---
 subcategory: "CosmosDB (DocumentDB)"
 layout: "azurerm"
-page_title: "Azure Resource Manager: azurerm_cosmosdb_fleets"
+page_title: "Azure Resource Manager: azurerm_cosmosdb_fleet"
 description: |-
   Manages a Cosmos DB Fleets.
 ---
 
-# azurerm_cosmosdb_fleets
+# azurerm_cosmosdb_fleet
 
 Manages a Cosmos DB Fleets.
 
 ## Example Usage
 
 ```hcl
-resource "azurerm_cosmosdb_fleets" "example" {
-  name                = "example"
-  resource_group_name = "example"
-  location            = "West Europe"
+resource "azurerm_resource_group" "example" {
+  name     = "example-resources"
+  location = "West Europe"
+}
+
+resource "azurerm_cosmosdb_fleet" "example" {
+  name                = "fleet-test"
+  resource_group_name = "azurerm_resource_group.example.name"
+  location            = "azurerm_resource_group.example.location"
 }
 ```
 
@@ -53,5 +58,5 @@ The `timeouts` block allows you to specify [timeouts](https://developer.hashicor
 Cosmos DB Fleets can be imported using the `resource id`, e.g.
 
 ```shell
-terraform import azurerm_cosmosdb_fleets.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.DocumentDB/fleets/fleets1
+terraform import azurerm_cosmosdb_fleet.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.DocumentDB/fleets/fleets1
 ```