Skip to content

Commit

Permalink
Move logic around to make it more readable
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
  • Loading branch information
LKaemmerling committed Jun 21, 2021
1 parent 895813e commit 68a3d6a
Showing 1 changed file with 18 additions and 19 deletions.
37 changes: 18 additions & 19 deletions internal/rdns/resource_hcloud_rdns.go
Expand Up @@ -122,54 +122,53 @@ func resourceReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m int
d.SetId("")
return nil
}
if !serverOK {
if !floatingIPOK {
log.Printf("[WARN] Invalid floating_ip_id (%s), removing from state: %v", d.Id(), floatingIPOK)
d.SetId("")
return nil
}

floatingIP, _, err := c.FloatingIP.GetByID(ctx, floatingIPID.(int))
if serverOK {
server, _, err := c.Server.GetByID(ctx, serverID.(int))
if err != nil {
return diag.FromErr(err)
}
if floatingIP == nil {
log.Printf("[WARN] Floating IP (%s) not found, removing from state", d.Id())
if server == nil {
log.Printf("[WARN] Server (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}

d.SetId(generateRDNSID(nil, floatingIP, ip))
action, _, err := c.FloatingIP.ChangeDNSPtr(ctx, floatingIP, ip, &ptr)
d.SetId(generateRDNSID(server, nil, ip))
action, _, err := c.Server.ChangeDNSPtr(ctx, server, ip, &ptr)
if err != nil {
return diag.FromErr(err)
}

if err := hcclient.WaitForAction(ctx, &c.Action, action); err != nil {
return diag.FromErr(err)
}

return resourceReverseDNSRead(ctx, d, m)
}
if !floatingIPOK {
log.Printf("[WARN] Invalid floating_ip_id (%s), removing from state: %v", d.Id(), floatingIPOK)
d.SetId("")
return nil
}

server, _, err := c.Server.GetByID(ctx, serverID.(int))
floatingIP, _, err := c.FloatingIP.GetByID(ctx, floatingIPID.(int))
if err != nil {
return diag.FromErr(err)
}
if server == nil {
log.Printf("[WARN] Server (%s) not found, removing from state", d.Id())
if floatingIP == nil {
log.Printf("[WARN] Floating IP (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}

d.SetId(generateRDNSID(server, nil, ip))
action, _, err := c.Server.ChangeDNSPtr(ctx, server, ip, &ptr)
d.SetId(generateRDNSID(nil, floatingIP, ip))
action, _, err := c.FloatingIP.ChangeDNSPtr(ctx, floatingIP, ip, &ptr)
if err != nil {
return diag.FromErr(err)
}

if err := hcclient.WaitForAction(ctx, &c.Action, action); err != nil {
return diag.FromErr(err)
}

return resourceReverseDNSRead(ctx, d, m)
}

Expand Down

0 comments on commit 68a3d6a

Please sign in to comment.