Skip to content

Commit

Permalink
split createupdate in azurerm_public_ip and azurerm_public_ip_prefix (#…
Browse files Browse the repository at this point in the history 
…26099)
  • Loading branch information
@catriona-m
catriona-m authored May 27, 2024
1 parent c7c8e54 commit 630dfd5
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 25 deletions.
47 changes: 35 additions & 12 deletions internal/services/network/public_ip_prefix_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (

func resourcePublicIpPrefix() *pluginsdk.Resource {
return &pluginsdk.Resource{
Create: resourcePublicIpPrefixCreateUpdate,
Create: resourcePublicIpPrefixCreate,
Read: resourcePublicIpPrefixRead,
Update: resourcePublicIpPrefixCreateUpdate,
Update: resourcePublicIpPrefixUpdate,
Delete: resourcePublicIpPrefixDelete,
Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
_, err := publicipprefixes.ParsePublicIPPrefixID(id)
Expand Down Expand Up @@ -94,7 +94,7 @@ func resourcePublicIpPrefix() *pluginsdk.Resource {
}
}

func resourcePublicIpPrefixCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
func resourcePublicIpPrefixCreate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.PublicIPPrefixes
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
Expand All @@ -103,17 +103,16 @@ func resourcePublicIpPrefixCreateUpdate(d *pluginsdk.ResourceData, meta interfac
log.Printf("[INFO] preparing arguments for AzureRM Public IP Prefix creation.")

id := publicipprefixes.NewPublicIPPrefixID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
if d.IsNewResource() {
existing, err := client.Get(ctx, id, publicipprefixes.DefaultGetOperationOptions())
if err != nil {
if !response.WasNotFound(existing.HttpResponse) {
return fmt.Errorf("checking for presence of existing %s: %s", id, err)
}
}

existing, err := client.Get(ctx, id, publicipprefixes.DefaultGetOperationOptions())
if err != nil {
if !response.WasNotFound(existing.HttpResponse) {
return tf.ImportAsExistsError("azurerm_public_ip_prefix", id.ID())
return fmt.Errorf("checking for presence of existing %s: %s", id, err)
}
}
if !response.WasNotFound(existing.HttpResponse) {
return tf.ImportAsExistsError("azurerm_public_ip_prefix", id.ID())
}

publicIpPrefix := publicipprefixes.PublicIPPrefix{
Location: pointer.To(location.Normalize(d.Get("location").(string))),
Expand All @@ -133,14 +132,38 @@ func resourcePublicIpPrefixCreateUpdate(d *pluginsdk.ResourceData, meta interfac
}

if err := client.CreateOrUpdateThenPoll(ctx, id, publicIpPrefix); err != nil {
return fmt.Errorf("creating/updating %s: %+v", id, err)
return fmt.Errorf("creating %s: %+v", id, err)
}

d.SetId(id.ID())

return resourcePublicIpPrefixRead(d, meta)
}

func resourcePublicIpPrefixUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.PublicIPPrefixes
ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

if d.HasChange("tags") {

id, err := publicipprefixes.ParsePublicIPPrefixID(d.Id())
if err != nil {
return err
}

payload := publicipprefixes.TagsObject{
Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
}

if _, err = client.UpdateTags(ctx, *id, payload); err != nil {
return fmt.Errorf("updating %s: %+v", id, err)
}
}

return resourcePublicIpPrefixRead(d, meta)
}

func resourcePublicIpPrefixRead(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.PublicIPPrefixes
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
Expand Down
104 changes: 91 additions & 13 deletions internal/services/network/public_ip_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

func resourcePublicIp() *pluginsdk.Resource {
return &pluginsdk.Resource{
Create: resourcePublicIpCreateUpdate,
Create: resourcePublicIpCreate,
Read: resourcePublicIpRead,
Update: resourcePublicIpCreateUpdate,
Update: resourcePublicIpUpdate,
Delete: resourcePublicIpDelete,

Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
Expand Down Expand Up @@ -178,7 +179,7 @@ func resourcePublicIp() *pluginsdk.Resource {
}
}

func resourcePublicIpCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
func resourcePublicIpCreate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.PublicIPAddresses
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
Expand All @@ -187,25 +188,24 @@ func resourcePublicIpCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) e
log.Printf("[INFO] preparing arguments for AzureRM Public IP creation.")

id := commonids.NewPublicIPAddressID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
if d.IsNewResource() {
existing, err := client.Get(ctx, id, publicipaddresses.DefaultGetOperationOptions())
if err != nil {
if !response.WasNotFound(existing.HttpResponse) {
return fmt.Errorf("checking for presence of existing %s: %+v", id, err)
}
}

existing, err := client.Get(ctx, id, publicipaddresses.DefaultGetOperationOptions())
if err != nil {
if !response.WasNotFound(existing.HttpResponse) {
return tf.ImportAsExistsError("azurerm_public_ip", id.ID())
return fmt.Errorf("checking for presence of existing %s: %+v", id, err)
}
}

if !response.WasNotFound(existing.HttpResponse) {
return tf.ImportAsExistsError("azurerm_public_ip", id.ID())
}

sku := d.Get("sku").(string)
ipAllocationMethod := d.Get("allocation_method").(string)

if strings.EqualFold(sku, "standard") {
if !strings.EqualFold(ipAllocationMethod, "static") {
return fmt.Errorf("Static IP allocation must be used when creating Standard SKU public IP addresses.")
return fmt.Errorf("static IP allocation must be used when creating Standard SKU public IP addresses")
}
}

Expand Down Expand Up @@ -286,13 +286,91 @@ func resourcePublicIpCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) e
}

if err := client.CreateOrUpdateThenPoll(ctx, id, publicIp); err != nil {
return fmt.Errorf("creating/updating %s: %+v", id, err)
return fmt.Errorf("updating %s: %+v", id, err)
}

d.SetId(id.ID())
return resourcePublicIpRead(d, meta)
}

func resourcePublicIpUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.PublicIPAddresses
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

log.Printf("[INFO] preparing arguments for AzureRM Public IP update.")

id, err := commonids.ParsePublicIPAddressID(d.Id())
if err != nil {
return err
}

existing, err := client.Get(ctx, *id, publicipaddresses.DefaultGetOperationOptions())
if err != nil {
return fmt.Errorf("retrieving %s: %+v", id, err)
}

if existing.Model == nil {
return fmt.Errorf("retrieving %s: `model` was nil", id)
}
if existing.Model.Properties == nil {
return fmt.Errorf("retrieving %s: `properties` was nil", id)
}

payload := existing.Model

if d.HasChange("allocation_method") {
payload.Properties.PublicIPAllocationMethod = pointer.To(publicipaddresses.IPAllocationMethod(d.Get("allocation_method").(string)))
}

if d.HasChange("ddos_protection_mode") {
if payload.Properties.DdosSettings == nil {
payload.Properties.DdosSettings = &publicipaddresses.DdosSettings{}
}
payload.Properties.DdosSettings.ProtectionMode = pointer.To(publicipaddresses.DdosSettingsProtectionMode(d.Get("ddos_protection_mode").(string)))
}

if d.HasChange("ddos_protection_plan_id") {
if !strings.EqualFold(string(*payload.Properties.DdosSettings.ProtectionMode), "enabled") {
return fmt.Errorf("ddos protection plan id can only be set when ddos protection is enabled")
}
if payload.Properties.DdosSettings == nil {
payload.Properties.DdosSettings = &publicipaddresses.DdosSettings{}
}
payload.Properties.DdosSettings.DdosProtectionPlan = &publicipaddresses.SubResource{
Id: pointer.To(d.Get("ddos_protection_plan_id").(string)),
}
}

if d.HasChange("idle_timeout_in_minutes") {
payload.Properties.IdleTimeoutInMinutes = utils.Int64(d.Get("idle_timeout_in_minutes").(int64))
}

if d.HasChange("domain_name_label") {
if payload.Properties.DnsSettings == nil {
payload.Properties.DnsSettings = &publicipaddresses.PublicIPAddressDnsSettings{}
}
payload.Properties.DnsSettings.DomainNameLabel = utils.String(d.Get("domain_name_label").(string))
}

if d.HasChange("reverse_fqdn") {
if payload.Properties.DnsSettings == nil {
payload.Properties.DnsSettings = &publicipaddresses.PublicIPAddressDnsSettings{}
}
payload.Properties.DnsSettings.ReverseFqdn = utils.String(d.Get("reverse_fqdn").(string))
}

if d.HasChanges("tags") {
payload.Tags = tags.Expand(d.Get("tags").(map[string]interface{}))
}

if err = client.CreateOrUpdateThenPoll(ctx, *id, *payload); err != nil {
return fmt.Errorf("updating %s: %+v", id, err)
}

return resourcePublicIpRead(d, meta)
}

func resourcePublicIpRead(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Network.PublicIPAddresses
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
Expand Down

0 comments on commit 630dfd5

Please sign in to comment.