Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_cosmos_account: change virtual_network_rule to virtual_network_subnet_ids and virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint to accept subnet ids in batch #28514

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

azurerm_cosmos_account: change virtual_network_rule to virtual_network_subnet_ids and virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint to accept subnet ids in batch #28514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 142 additions & 19 deletions internal/services/cosmos/cosmosdb_account_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,22 +461,22 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
Default: false,
},

"virtual_network_rule": {
"virtual_network_subnet_ids": {
Type: pluginsdk.TypeSet,
Optional: true,
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"id": {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: azure.ValidateResourceID,
},
"ignore_missing_vnet_service_endpoint": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: false,
},
},
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: azure.ValidateResourceID,
},
Set: resourceAzureRMCosmosDBAccountVirtualNetworkRuleHash,
},

"virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint": {
Type: pluginsdk.TypeSet,
Optional: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: azure.ValidateResourceID,
},
Set: resourceAzureRMCosmosDBAccountVirtualNetworkRuleHash,
},
Expand Down Expand Up @@ -778,6 +778,55 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
Default: string(cosmosdb.MinimalTlsVersionTlsOneTwo),
ValidateFunc: validation.StringInSlice(cosmosdb.PossibleValuesForMinimalTlsVersion(), false),
}

resource.Schema["virtual_network_subnet_ids"] = &pluginsdk.Schema{
Type: pluginsdk.TypeSet,
Optional: true,
Computed: true,
ConflictsWith: []string{"virtual_network_rule"},
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: azure.ValidateResourceID,
},
Set: resourceAzureRMCosmosDBAccountVirtualNetworkRuleHash,
}

resource.Schema["virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint"] = &pluginsdk.Schema{
Type: pluginsdk.TypeSet,
Optional: true,
Computed: true,
ConflictsWith: []string{"virtual_network_rule"},
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: azure.ValidateResourceID,
},
Set: resourceAzureRMCosmosDBAccountVirtualNetworkRuleHash,
}

resource.Schema["virtual_network_rule"] = &pluginsdk.Schema{
Type: pluginsdk.TypeSet,
Optional: true,
Computed: true,
ConflictsWith: []string{
"virtual_network_subnet_ids",
"virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint",
},
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"id": {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: azure.ValidateResourceID,
},
"ignore_missing_vnet_service_endpoint": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: false,
},
},
},
Set: resourceAzureRMCosmosDBAccountVirtualNetworkRuleHash,
}
}

return resource
Expand Down Expand Up @@ -871,7 +920,6 @@ func resourceCosmosDbAccountCreate(d *pluginsdk.ResourceData, meta interface{})
Locations: geoLocations,
Capabilities: capabilities,
MinimalTlsVersion: pointer.To(cosmosdb.MinimalTlsVersion(d.Get("minimal_tls_version").(string))),
VirtualNetworkRules: expandAzureRmCosmosDBAccountVirtualNetworkRules(d),
EnableMultipleWriteLocations: utils.Bool(enableMultipleWriteLocations),
EnablePartitionMerge: pointer.To(partitionMergeEnabled),
EnableBurstCapacity: pointer.To(burstCapacityEnabled),
Expand All @@ -886,6 +934,12 @@ func resourceCosmosDbAccountCreate(d *pluginsdk.ResourceData, meta interface{})
Tags: tags.Expand(t),
}

if !features.FivePointOhBeta() {
account.Properties.VirtualNetworkRules = expandAzureRmCosmosDBAccountVirtualNetworkRules(d)
} else {
account.Properties.VirtualNetworkRules = expandAzureRmCosmosDBAccountVirtualNetworkSubnetIds(d)
}

// These values may not have changed but they need to be in the update params...
if v, ok := d.GetOk("default_identity_type"); ok {
account.Properties.DefaultIdentity = pointer.To(v.(string))
Expand Down Expand Up @@ -1069,7 +1123,8 @@ func resourceCosmosDbAccountUpdate(d *pluginsdk.ResourceData, meta interface{})
// are included in the 'DatabaseAccountCreateUpdateParameters'
// later, however we need to know if they changed or not...
// TODO Post 4.0 remove `enable_automatic_failover` from this list
if d.HasChanges("consistency_policy", "virtual_network_rule", "cors_rule", "access_key_metadata_writes_enabled",
if d.HasChanges("consistency_policy", "virtual_network_rule", "virtual_network_subnet_ids",
"virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint", "cors_rule", "access_key_metadata_writes_enabled",
"network_acl_bypass_for_azure_services", "network_acl_bypass_ids", "analytical_storage",
"capacity", "create_mode", "restore", "key_vault_key_id", "managed_hsm_key_id", "mongo_server_version",
"public_network_access_enabled", "ip_range_filter", "offer_type", "is_virtual_network_filter_enabled",
Expand Down Expand Up @@ -1112,7 +1167,6 @@ func resourceCosmosDbAccountUpdate(d *pluginsdk.ResourceData, meta interface{})
Capabilities: capabilities,
ConsistencyPolicy: expandAzureRmCosmosDBAccountConsistencyPolicy(d),
Locations: cosmosLocations,
VirtualNetworkRules: expandAzureRmCosmosDBAccountVirtualNetworkRules(d),
EnableMultipleWriteLocations: props.EnableMultipleWriteLocations,
PublicNetworkAccess: pointer.To(publicNetworkAccess),
EnableAnalyticalStorage: enableAnalyticalStorage,
Expand All @@ -1128,6 +1182,12 @@ func resourceCosmosDbAccountUpdate(d *pluginsdk.ResourceData, meta interface{})
Tags: t,
}

if !features.FivePointOhBeta() {
account.Properties.VirtualNetworkRules = expandAzureRmCosmosDBAccountVirtualNetworkRules(d)
} else {
account.Properties.VirtualNetworkRules = expandAzureRmCosmosDBAccountVirtualNetworkSubnetIds(d)
}

if key, err := customermanagedkeys.ExpandKeyVaultOrManagedHSMKey(d, customermanagedkeys.VersionTypeAny, apiEnvs.KeyVault, apiEnvs.ManagedHSM); err != nil {
return err
} else if key != nil {
Expand Down Expand Up @@ -1459,8 +1519,17 @@ func resourceCosmosDbAccountRead(d *pluginsdk.ResourceData, meta interface{}) er
return fmt.Errorf("setting `capabilities`: %+v", err)
}

if err = d.Set("virtual_network_rule", flattenAzureRmCosmosDBAccountVirtualNetworkRules(props.VirtualNetworkRules)); err != nil {
return fmt.Errorf("setting `virtual_network_rule`: %+v", err)
if !features.FivePointOhBeta() {
if err = d.Set("virtual_network_rule", flattenAzureRmCosmosDBAccountVirtualNetworkRules(props.VirtualNetworkRules)); err != nil {
return fmt.Errorf("setting `virtual_network_rule`: %+v", err)
}
} else {
if err = d.Set("virtual_network_subnet_ids", flattenAzureRmCosmosDBAccountVirtualNetworkSubnetIds(props.VirtualNetworkRules)); err != nil {
return fmt.Errorf("setting `virtual_network_subnet_ids`: %+v", err)
}
if err = d.Set("virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint", flattenAzureRmCosmosDBAccountVirtualNetworkSubnetIdsIgnoreMissingVnetServiceEndpoint(props.VirtualNetworkRules)); err != nil {
return fmt.Errorf("setting `virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint`: %+v", err)
}
}

d.Set("access_key_metadata_writes_enabled", !*props.DisableKeyBasedMetadataWriteAccess)
Expand Down Expand Up @@ -1804,6 +1873,28 @@ func expandAzureRmCosmosDBAccountVirtualNetworkRules(d *pluginsdk.ResourceData)
return &s
}

func expandAzureRmCosmosDBAccountVirtualNetworkSubnetIds(d *pluginsdk.ResourceData) *[]cosmosdb.VirtualNetworkRule {
subnetIds := d.Get("virtual_network_subnet_ids").(*pluginsdk.Set).List()
subnetIdsIgnoreMissingVnetServiceEndpoint := d.Get("virtual_network_subnet_ids_ignore_missing_vnet_service_endpoint").(*pluginsdk.Set).List()

s := make([]cosmosdb.VirtualNetworkRule, 0)
for _, id := range subnetIds {
s = append(s, cosmosdb.VirtualNetworkRule{
Id: pointer.To(id.(string)),
IgnoreMissingVNetServiceEndpoint: pointer.FromBool(false),
})
}

for _, id := range subnetIdsIgnoreMissingVnetServiceEndpoint {
s = append(s, cosmosdb.VirtualNetworkRule{
Id: pointer.To(id.(string)),
IgnoreMissingVNetServiceEndpoint: pointer.FromBool(true),
})
}

return &s
}

func flattenAzureRmCosmosDBAccountConsistencyPolicy(policy *cosmosdb.ConsistencyPolicy) []interface{} {
result := map[string]interface{}{}
result["consistency_level"] = string(policy.DefaultConsistencyLevel)
Expand Down Expand Up @@ -1908,6 +1999,38 @@ func flattenAzureRmCosmosDBAccountVirtualNetworkRules(rules *[]cosmosdb.VirtualN
return &results
}

func flattenAzureRmCosmosDBAccountVirtualNetworkSubnetIds(rules *[]cosmosdb.VirtualNetworkRule) *pluginsdk.Set {
result := pluginsdk.Set{
F: resourceAzureRMCosmosDBAccountVirtualNetworkRuleHash,
}

if rules != nil {
for _, r := range *rules {
if !pointer.From(r.IgnoreMissingVNetServiceEndpoint) {
result.Add(pointer.From(r.Id))
}
}
}

return &result
}

func flattenAzureRmCosmosDBAccountVirtualNetworkSubnetIdsIgnoreMissingVnetServiceEndpoint(rules *[]cosmosdb.VirtualNetworkRule) *pluginsdk.Set {
result := pluginsdk.Set{
F: resourceAzureRMCosmosDBAccountVirtualNetworkRuleHash,
}

if rules != nil {
for _, r := range *rules {
if pointer.From(r.IgnoreMissingVNetServiceEndpoint) {
result.Add(pointer.From(r.Id))
}
}
}

return &result
}

func resourceAzureRMCosmosDBAccountGeoLocationHash(v interface{}) int {
var buf bytes.Buffer

Expand Down
Loading
Loading