Update Azure Cosmos DB API to to 2020-04-01 from 2015-04-08

azurerm/internal/services/cosmos/client/client.go

@@ -1,19 +1,44 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb"
+	"github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2020-04-01/documentdb"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 
 type Client struct {
-	DatabaseClient *documentdb.DatabaseAccountsClient
+	CassandraClient *documentdb.CassandraResourcesClient
+	DatabaseClient  *documentdb.DatabaseAccountsClient
+	GremlinClient   *documentdb.GremlinResourcesClient
+	MongoDbClient   *documentdb.MongoDBResourcesClient
+	SqlClient       *documentdb.SQLResourcesClient
+	TableClient     *documentdb.TableResourcesClient
 }
 
 func NewClient(o *common.ClientOptions) *Client {
+	cassandraClient := documentdb.NewCassandraResourcesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&cassandraClient.Client, o.ResourceManagerAuthorizer)
+
 	databaseClient := documentdb.NewDatabaseAccountsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&databaseClient.Client, o.ResourceManagerAuthorizer)
 
+	gremlinClient := documentdb.NewGremlinResourcesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&gremlinClient.Client, o.ResourceManagerAuthorizer)
+
+	mongoDbClient := documentdb.NewMongoDBResourcesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&mongoDbClient.Client, o.ResourceManagerAuthorizer)
+
+	sqlClient := documentdb.NewSQLResourcesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&sqlClient.Client, o.ResourceManagerAuthorizer)
+
+	tableClient := documentdb.NewTableResourcesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&tableClient.Client, o.ResourceManagerAuthorizer)
+
 	return &Client{
-		DatabaseClient: &databaseClient,
+		CassandraClient: &cassandraClient,
+		DatabaseClient:  &databaseClient,
+		GremlinClient:   &gremlinClient,
+		MongoDbClient:   &mongoDbClient,
+		SqlClient:       &sqlClient,
+		TableClient:     &tableClient,
 	}
 }

azurerm/internal/services/cosmos/common/ip_rules.go

@@ -0,0 +1,32 @@
+package common
+
+import (
+	"strings"
+
+	"github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2020-04-01/documentdb"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
+)
+
+func CosmosDBIpRulesToIpRangeFilter(ipRules *[]documentdb.IPAddressOrRange) string {
+	ipRangeFilter := make([]string, 0)
+	if ipRules != nil {
+		for _, ipRule := range *ipRules {
+			ipRangeFilter = append(ipRangeFilter, *ipRule.IPAddressOrRange)
+		}
+	}
+
+	return strings.Join(ipRangeFilter, ",")
+}
+
+func CosmosDBIpRangeFilterToIpRules(ipRangeFilter string) *[]documentdb.IPAddressOrRange {
+	ipRules := make([]documentdb.IPAddressOrRange, 0)
+	if len(ipRangeFilter) > 0 {
+		for _, ipRange := range strings.Split(ipRangeFilter, ",") {
+			ipRules = append(ipRules, documentdb.IPAddressOrRange{
+				IPAddressOrRange: utils.String(ipRange),
+			})
+		}
+	}
+
+	return &ipRules
+}

azurerm/internal/services/cosmos/common/ip_rules_test.go

@@ -0,0 +1,91 @@
+package common
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2020-04-01/documentdb"
+)
+
+var (
+	ipAddressOne = "127.0.0.1/32"
+	ipAddressTwo = "168.63.129.16/32"
+)
+
+func TestCosmosDBIpRulesToIpRangeFilter(t *testing.T) {
+	testData := []struct {
+		Name     string
+		Input    *[]documentdb.IPAddressOrRange
+		Expected string
+	}{
+		{
+			Name:     "Nil",
+			Input:    nil,
+			Expected: "",
+		},
+		{
+			Name: "One element",
+			Input: &[]documentdb.IPAddressOrRange{
+				{IPAddressOrRange: &ipAddressOne},
+			},
+			Expected: "127.0.0.1/32",
+		},
+		{
+			Name: "Multiple elements",
+			Input: &[]documentdb.IPAddressOrRange{
+				{IPAddressOrRange: &ipAddressOne},
+				{IPAddressOrRange: &ipAddressTwo},
+			},
+			Expected: "127.0.0.1/32,168.63.129.16/32",
+		},
+	}
+
+	for _, v := range testData {
+		t.Logf("[DEBUG] Testing %q", v.Name)
+
+		actual := CosmosDBIpRulesToIpRangeFilter(v.Input)
+
+		if actual != v.Expected {
+			t.Fatalf("Expected %q but got %q", v.Expected, actual)
+		}
+	}
+}
+
+func TestCosmosDBIpRangeFilterToIpRules(t *testing.T) {
+	testData := []struct {
+		Name     string
+		Input    string
+		Expected *[]documentdb.IPAddressOrRange
+	}{
+		{
+			Name:     "Empty",
+			Input:    "",
+			Expected: &[]documentdb.IPAddressOrRange{},
+		},
+		{
+			Name:  "One element",
+			Input: ipAddressOne,
+			Expected: &[]documentdb.IPAddressOrRange{
+				{IPAddressOrRange: &ipAddressOne},
+			},
+		},
+		{
+			Name:  "Multiple elements",
+			Input: "127.0.0.1/32,168.63.129.16/32",
+			Expected: &[]documentdb.IPAddressOrRange{
+				{IPAddressOrRange: &ipAddressOne},
+				{IPAddressOrRange: &ipAddressTwo},
+			},
+		},
+	}
+
+	for _, v := range testData {
+		t.Logf("[DEBUG] Testing %q", v.Name)
+
+		actual := CosmosDBIpRangeFilterToIpRules(v.Input)
+
+		if !reflect.DeepEqual(actual, v.Expected) {
+			t.Fatalf("Expected %+v but got %+v", v.Expected, actual)
+		}
+	}
+}

azurerm/internal/services/cosmos/common/throughput.go

@@ -0,0 +1,24 @@
+package common
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2020-04-01/documentdb"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
+)
+
+func GetThroughputFromResult(throughputResponse documentdb.ThroughputSettingsGetResults) *int32 {
+	props := throughputResponse.ThroughputSettingsGetProperties
+	if props == nil {
+		return nil
+	}
+
+	res := props.Resource
+	if res == nil {
+		return nil
+	}
+
+	return res.Throughput
+}
+
+func ConvertThroughputFromResourceData(throughput interface{}) *int32 {
+	return utils.Int32(int32(throughput.(int)))
+}