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.

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

Added entities for work with DNS v2 API. #249

Merged
merged 18 commits into from
Feb 26, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Added comments in import functions for domains_v2 resources. Used d.I…
…d() instead of creating new variable with name resourceID.
dchudik authored Feb 13, 2024
commit 5f3bd5eeef8d655290f5c1dba2228f7c61ece196
24 changes: 11 additions & 13 deletions selectel/resource_selectel_domains_rrset_v2.go
Original file line number Diff line number Diff line change
@@ -120,13 +120,12 @@ func resourceDomainsRRSetV2Read(ctx context.Context, d *schema.ResourceData, met
return diag.FromErr(err)
}

rrsetID := d.Id()
zoneID := d.Get("zone_id").(string)
zoneIDWithRRSetID := fmt.Sprintf("zone_id: %s, rrset_id: %s", zoneID, rrsetID)
zoneIDWithRRSetID := fmt.Sprintf("zone_id: %s, rrset_id: %s", zoneID, d.Id())

log.Print(msgGet(objectRRSet, zoneIDWithRRSetID))

rrset, err := client.GetRRSet(ctx, zoneID, rrsetID)
rrset, err := client.GetRRSet(ctx, zoneID, d.Id())
if err != nil {
d.SetId("")
return diag.FromErr(errGettingObject(objectRRSet, zoneIDWithRRSetID, err))
@@ -151,7 +150,8 @@ func resourceDomainsRRSetV2ImportState(ctx context.Context, d *schema.ResourceDa
if err != nil {
return nil, err
}

// concat zone_name,rrset_name,rrset_type with symbol "/" instead of rrset id for importing rrset.
// example: terraform import domains_rrset_v2.<resource_name> <zone_name>/<rrset_name>/<rrset_type>
parts := strings.Split(d.Id(), "/")
if len(parts) != 3 {
return nil, errors.New("id must include three parts: zone_name/rrset_name/rrset_type")
@@ -182,12 +182,11 @@ func resourceDomainsRRSetV2ImportState(ctx context.Context, d *schema.ResourceDa
}

func resourceDomainsRRSetV2Update(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
rrsetID := d.Id()
zoneID := d.Get("zone_id").(string)

client, err := getDomainsV2Client(d, meta)
if err != nil {
return diag.FromErr(errUpdatingObject(objectRRSet, rrsetID, err))
return diag.FromErr(errUpdatingObject(objectRRSet, d.Id(), err))
}

if d.HasChanges("ttl", "comment", "records") {
@@ -205,9 +204,9 @@ func resourceDomainsRRSetV2Update(ctx context.Context, d *schema.ResourceData, m
if comment, ok := d.GetOk("comment"); ok {
updateOpts.Comment = comment.(string)
}
err = client.UpdateRRSet(ctx, zoneID, rrsetID, &updateOpts)
err = client.UpdateRRSet(ctx, zoneID, d.Id(), &updateOpts)
if err != nil {
return diag.FromErr(errUpdatingObject(objectRRSet, rrsetID, err))
return diag.FromErr(errUpdatingObject(objectRRSet, d.Id(), err))
}
}

@@ -216,18 +215,17 @@ func resourceDomainsRRSetV2Update(ctx context.Context, d *schema.ResourceData, m

func resourceDomainsRRSetV2Delete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
zoneID := d.Get("zone_id").(string)
rrsetID := d.Id()

client, err := getDomainsV2Client(d, meta)
if err != nil {
return diag.FromErr(errDeletingObject(objectRRSet, rrsetID, err))
return diag.FromErr(errDeletingObject(objectRRSet, d.Id(), err))
}

log.Print(msgDelete(objectRRSet, fmt.Sprintf("zone_id: %s, rrset_id: %s", zoneID, rrsetID)))
log.Print(msgDelete(objectRRSet, fmt.Sprintf("zone_id: %s, rrset_id: %s", zoneID, d.Id())))

err = client.DeleteRRSet(ctx, zoneID, rrsetID)
err = client.DeleteRRSet(ctx, zoneID, d.Id())
if err != nil {
return diag.FromErr(errDeletingObject(objectRRSet, rrsetID, err))
return diag.FromErr(errDeletingObject(objectRRSet, d.Id(), err))
}

return nil
26 changes: 12 additions & 14 deletions selectel/resource_selectel_domains_zone_v2.go
Original file line number Diff line number Diff line change
@@ -141,6 +141,8 @@ func resourceDomainsZoneV2ImportState(ctx context.Context, d *schema.ResourceDat
return nil, err
}

// use zone name instead of zone id for importing zone.
// example: terraform import domains_zone_v2.<resource_name> <zone_name>
zoneName := d.Id()

log.Println(msgImport(objectZone, zoneName))
@@ -159,23 +161,21 @@ func resourceDomainsZoneV2ImportState(ctx context.Context, d *schema.ResourceDat
}

func resourceDomainsZoneV2Update(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
zoneID := d.Id()

client, err := getDomainsV2Client(d, meta)
if err != nil {
return diag.FromErr(errUpdatingObject(objectZone, zoneID, err))
return diag.FromErr(errUpdatingObject(objectZone, d.Id(), err))
}

if d.HasChange("comment") {
comment := ""
if v, ok := d.GetOk("comment"); ok {
comment = v.(string)
}
log.Println(msgUpdate(objectZone, zoneID, comment))
log.Println(msgUpdate(objectZone, d.Id(), comment))

err = client.UpdateZoneComment(ctx, zoneID, comment)
err = client.UpdateZoneComment(ctx, d.Id(), comment)
if err != nil {
return diag.FromErr(errUpdatingObject(objectZone, zoneID, err))
return diag.FromErr(errUpdatingObject(objectZone, d.Id(), err))
}
}

@@ -184,11 +184,11 @@ func resourceDomainsZoneV2Update(ctx context.Context, d *schema.ResourceData, me
if v, ok := d.GetOk("disabled"); ok {
disabled = v.(bool)
}
log.Println(msgUpdate(objectZone, zoneID, disabled))
log.Println(msgUpdate(objectZone, d.Id(), disabled))

err = client.UpdateZoneState(ctx, zoneID, disabled)
err = client.UpdateZoneState(ctx, d.Id(), disabled)
if err != nil {
return diag.FromErr(errUpdatingObject(objectZone, zoneID, err))
return diag.FromErr(errUpdatingObject(objectZone, d.Id(), err))
}
}

@@ -201,13 +201,11 @@ func resourceDomainsZoneV2Delete(ctx context.Context, d *schema.ResourceData, me
return diag.FromErr(err)
}

zoneID := d.Id()

log.Println(msgDelete(objectZone, zoneID))
log.Println(msgDelete(objectZone, d.Id()))

err = client.DeleteZone(ctx, zoneID)
err = client.DeleteZone(ctx, d.Id())
if err != nil {
return diag.FromErr(errDeletingObject(objectZone, zoneID, err))
return diag.FromErr(errDeletingObject(objectZone, d.Id(), err))
}

return nil