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

Jump to bottom

azurerm_container_registry - Avoid unnecessary recreate when georeplication.tags update #24994

Merged
merged 4 commits into from Mar 6, 2024
Merged

azurerm_container_registry - Avoid unnecessary recreate when georeplication.tags update #24994

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f515fe0
Fix some issue introduced from #15340
magodo Feb 23, 2024
70f21d8
Check georeplication zone redundency by value
magodo Feb 23, 2024
8f98a3a
pass ci
magodo Feb 23, 2024
fda7022
Update test
magodo Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 3 additions & 28 deletions internal/services/containers/container_registry_resource.go
View file
Open in desktop
Expand Up @@ -65,11 +65,9 @@ func resourceContainerRegistry() *pluginsdk.Resource {
CustomizeDiff: pluginsdk.CustomizeDiffShim(func(ctx context.Context, d *pluginsdk.ResourceDiff, v interface{}) error {
sku := d.Get("sku").(string)

hasGeoReplications := false
geoReplications := d.Get("georeplications").([]interface{})
hasGeoReplicationsApplied := hasGeoReplications || len(geoReplications) > 0
// if locations have been specified for geo-replication then, the SKU has to be Premium
if hasGeoReplicationsApplied && !strings.EqualFold(sku, string(registries.SkuNamePremium)) {
if len(geoReplications) > 0 && !strings.EqualFold(sku, string(registries.SkuNamePremium)) {
return fmt.Errorf("ACR geo-replication can only be applied when using the Premium Sku.")
}

Expand Down Expand Up @@ -318,14 +316,8 @@ func resourceContainerRegistryUpdate(d *pluginsdk.ResourceData, meta interface{}
Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
}

var hasGeoReplicationLocationsChanges bool
var hasNewGeoReplicationLocations bool
oldGeoReplicationLocations := make([]interface{}, 0)
newGeoReplicationLocations := make([]interface{}, 0)

// geo replication is only supported by Premium Sku
hasGeoReplicationsApplied := hasNewGeoReplicationLocations || len(newReplications) > 0
if hasGeoReplicationsApplied && !strings.EqualFold(sku, string(registries.SkuNamePremium)) {
if len(newReplications) > 0 && !strings.EqualFold(sku, string(registries.SkuNamePremium)) {
return fmt.Errorf("ACR geo-replication can only be applied when using the Premium Sku.")
}

Expand All @@ -334,11 +326,6 @@ func resourceContainerRegistryUpdate(d *pluginsdk.ResourceData, meta interface{}
if err != nil {
return fmt.Errorf("applying geo replications for %s: %+v", id, err)
}
} else if hasGeoReplicationLocationsChanges {
err := applyGeoReplicationLocations(ctx, meta, *id, expandReplicationsFromLocations(oldGeoReplicationLocations), expandReplicationsFromLocations(newGeoReplicationLocations))
if err != nil {
return fmt.Errorf("applying geo replications for %s: %+v", id, err)
}
}

if err := client.UpdateThenPoll(ctx, *id, parameters); err != nil {
Expand Down Expand Up @@ -432,7 +419,7 @@ func applyGeoReplicationLocations(ctx context.Context, meta interface{}, registr
// each properties are non-nil. Whilst we are still doing nil check here in case.
if oprop, nprop := oldRepl.Properties, newRepl.Properties; oprop != nil && nprop != nil {
// zoneRedundency can't be updated in place
if oprop.ZoneRedundancy != nprop.ZoneRedundancy {
if ov, nv := oprop.ZoneRedundancy, nprop.ZoneRedundancy; ov != nil && nv != nil && *ov != *nv {
needUpdate = true
needReplace = true
}
Expand Down Expand Up @@ -743,18 +730,6 @@ func expandExportPolicy(enabled bool) *registries.ExportPolicy {
return &exportPolicy
}

func expandReplicationsFromLocations(p []interface{}) []replications.Replication {
reps := make([]replications.Replication, 0)
for _, value := range p {
location := azure.NormalizeLocation(value)
reps = append(reps, replications.Replication{
Location: location,
Name: &location,
})
}
return reps
}

func expandReplications(p []interface{}) []replications.Replication {
reps := make([]replications.Replication, 0)
if p == nil {
Expand Down