Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ require (
golang.org/x/text v0.37.0 // indirect
golang.org/x/tools v0.44.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/grpc v1.82.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
google.golang.org/grpc v1.83.1 // indirect
google.golang.org/protobuf v1.36.11 // indirect
)
28 changes: 14 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
Expand Down Expand Up @@ -165,10 +165,10 @@ gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 h1:RmoJA1ujG+/lRGNfUnOMfhCy5EipVMyvUE+KNbPbTlw=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.82.1 h1:NnAxzGRA0677vCa4BUkOAnO5+FfQqVl9iUXeD0IqcGE=
google.golang.org/grpc v1.82.1/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.83.1 h1:HIO0+BEtBP6soyqvqC8sNUjZ7bTs+0hFQuFF+RAy++Y=
google.golang.org/grpc v1.83.1/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
Expand Down
41 changes: 27 additions & 14 deletions hostinger/dns_record.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"strings"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
Expand Down Expand Up @@ -40,9 +41,9 @@ func compareTXTContent(content1, content2 string) bool {

func resourceHostingerDNSRecord() *schema.Resource {
return &schema.Resource{
Create: resourceHostingerDNSRecordCreate,
Read: resourceHostingerDNSRecordRead,
Delete: resourceHostingerDNSRecordDelete,
CreateContext: resourceHostingerDNSRecordCreate,
ReadContext: resourceHostingerDNSRecordRead,
DeleteContext: resourceHostingerDNSRecordDelete,

Schema: map[string]*schema.Schema{
"id": {
Expand Down Expand Up @@ -79,7 +80,19 @@ func resourceHostingerDNSRecord() *schema.Resource {
}
}

func resourceHostingerDNSRecordCreate(d *schema.ResourceData, meta interface{}) error {
func resourceHostingerDNSRecordCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
return diag.FromErr(createDNSRecord(ctx, d, meta))
}

func resourceHostingerDNSRecordRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
return diag.FromErr(readDNSRecord(ctx, d, meta))
}

func resourceHostingerDNSRecordDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
return diag.FromErr(deleteDNSRecord(ctx, d, meta))
}

func createDNSRecord(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
client := meta.(*HostingerClient)

zone := d.Get("zone").(string)
Expand Down Expand Up @@ -108,7 +121,7 @@ func resourceHostingerDNSRecordCreate(d *schema.ResourceData, meta interface{})

body, _ := json.Marshal(payload)

req, err := http.NewRequest("PUT", url, bytes.NewBuffer(body))
req, err := http.NewRequestWithContext(ctx, "PUT", url, bytes.NewBuffer(body))
if err != nil {
return err
}
Expand All @@ -130,8 +143,8 @@ func resourceHostingerDNSRecordCreate(d *schema.ResourceData, meta interface{})
d.SetId(fmt.Sprintf("%s|%s|%s", name, recordType, value))

// Use retry logic to handle eventual consistency
err = retry.RetryContext(context.Background(), 30*time.Second, func() *retry.RetryError {
err := resourceHostingerDNSRecordRead(d, meta)
err = retry.RetryContext(ctx, 30*time.Second, func() *retry.RetryError {
err := readDNSRecord(ctx, d, meta)
if err != nil {
return retry.NonRetryableError(err)
}
Expand All @@ -149,7 +162,7 @@ func resourceHostingerDNSRecordCreate(d *schema.ResourceData, meta interface{})
return nil
}

func resourceHostingerDNSRecordRead(d *schema.ResourceData, meta interface{}) error {
func readDNSRecord(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
client := meta.(*HostingerClient)

zone := d.Get("zone").(string)
Expand All @@ -168,7 +181,7 @@ func resourceHostingerDNSRecordRead(d *schema.ResourceData, meta interface{}) er

url := fmt.Sprintf("%s/api/dns/v1/zones/%s", client.BaseURL, zone)

req, _ := http.NewRequest("GET", url, nil)
req, _ := http.NewRequestWithContext(ctx, "GET", url, nil)
client.addStandardHeaders(req)

resp, err := client.HTTPClient.Do(req)
Expand Down Expand Up @@ -238,7 +251,7 @@ func resourceHostingerDNSRecordRead(d *schema.ResourceData, meta interface{}) er
return nil
}

func resourceHostingerDNSRecordDelete(d *schema.ResourceData, meta interface{}) error {
func deleteDNSRecord(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
client := meta.(*HostingerClient)

zone := d.Get("zone").(string)
Expand All @@ -253,7 +266,7 @@ func resourceHostingerDNSRecordDelete(d *schema.ResourceData, meta interface{})
// First, fetch all existing records to see if there are other records we need to preserve
url := fmt.Sprintf("%s/api/dns/v1/zones/%s", client.BaseURL, zone)

req, err := http.NewRequest("GET", url, nil)
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
if err != nil {
return err
}
Expand Down Expand Up @@ -353,7 +366,7 @@ func resourceHostingerDNSRecordDelete(d *schema.ResourceData, meta interface{})
return fmt.Errorf("failed to marshal delete payload: %w", err)
}

req, err = http.NewRequest("DELETE", url, bytes.NewBuffer(body))
req, err = http.NewRequestWithContext(ctx, "DELETE", url, bytes.NewBuffer(body))
if err != nil {
return err
}
Expand Down Expand Up @@ -385,7 +398,7 @@ func resourceHostingerDNSRecordDelete(d *schema.ResourceData, meta interface{})
return fmt.Errorf("failed to marshal recreate payload: %w", err)
}

req, err = http.NewRequest("PUT", url, bytes.NewBuffer(body))
req, err = http.NewRequestWithContext(ctx, "PUT", url, bytes.NewBuffer(body))
if err != nil {
return err
}
Expand Down Expand Up @@ -422,7 +435,7 @@ func resourceHostingerDNSRecordDelete(d *schema.ResourceData, meta interface{})
return fmt.Errorf("failed to marshal delete payload: %w", err)
}

req, err = http.NewRequest("DELETE", url, bytes.NewBuffer(body))
req, err = http.NewRequestWithContext(ctx, "DELETE", url, bytes.NewBuffer(body))
if err != nil {
return err
}
Expand Down
Loading