Feat/scaleway.com

[francesco086]

Solves issue #660

[francesco086]

Regarding the change in the markdown tables: I use the VSCode formatter https://marketplace.visualstudio.com/items?itemName=fcrespo82.markdown-table-formatter

Do you want me to reverse the markdown table back to the original state?

[qdm12]

Thanks 👍 !

Two important things are to remove the field_type and field_name, unless there is reason I'm not aware of 😉

[qdm12]

Yeah let's revert this otherwise the git history is going to look all weird; Note you can open the vscode command palette and hit "save without formatting" 😉

I would however be okay with a separate PR to auto-format this + perhaps enforce this in the CI 🤔

[francesco086]

done 😄

I am happy to do this in a separate PR. I am not sure of a way to enforce this in CI, but I guess there must be a way.

[qdm12]

move the comments to the sections below, otherwise it's invalid JSON and it will fail to parse it (people will forget to remove comments)

[francesco086]

fair enough, changed - gonna push in a sec

[qdm12]

You should not need this, it should be deducted from the "domain" field

[francesco086]

Please help me out here. How should I extract this? The only way I can imagine is to count how many . are in the domain string, and if there are two take the first part of the domain string before the first . as name (according to the scaleway API). Is that correct?

[qdm12]

You should not need this, it should be deducted from the public IP address obtained and "ip_version"

[francesco086]

Uhm... again can you help me here? Do you have already a function that is able to distinguish between the two?

[francesco086]

I just found it in one of your comment below. Will change this in a moment!

[francesco086]

done

[qdm12]

to enforce it's positive and not too big:

Suggested change

	TTL int `json:"ttl"`
	TTL uint16 `json:"ttl"`

[francesco086]

good point! changed (also in the Provider strct)

[qdm12]

although this is a bit more concise, prefer using strongly typed structs:

Suggested change

	requestBody := map[string]interface{}{
	"changes": []map[string]interface{}{
	{
	"set": map[string]interface{}{
	"id_fields": map[string]interface{}{
	"name": p.field_name,
	"type": p.field_type,
	},
	"records": []map[string]interface{}{
	{
	"data": ip.String(),
	"ttl": p.ttl,
	},
	},
	},
	},
	},
	}
	type recordJSON struct {
	Data string `json:"data"`
	TTL uint16 `json:"ttl"`
	}
	type changeJSON struct{
	Set struct {
	IDFields struct {
	Name string `json:"name"`
	Type string `json:"type"`
	} `json:"id_fields"`
	Records []recordJSON `json:"records"`
	} `json:"set"`
	}
	var change changeJSON
	change.Set.IDFields.Name = p.field_name
	change.Set.IDFields.Type = p.field_type
	change.Set.Records = []recordJSON{{
	Data: ip.String(),
	TTL: p.ttl,
	}}
	requestBody := struct {
	Changes []changeJSON `json:"changes"`
	}{
	Changes: []changeJSON{change},
	}

you could also define those types at global scope if you prefer.

[francesco086]

I trust you. It's the first time I write code in go... in fact I heavily relied on github copilot for it (even though eventually I had to check again all the code and fix it by myself).

Changed following your suggestion

[qdm12]

nit You can encode directly to a buffer with - feel free to disregard since your code is actually shorter 😉

Suggested change

	requestBodyBytes, err := json.Marshal(requestBody)
	if err != nil {
	return netip.Addr{}, fmt.Errorf("json marshal: %w", err)
	}
	// Create the HTTP request
	request, err := http.NewRequestWithContext(ctx, http.MethodPatch, u.String(), bytes.NewReader(requestBodyBytes))
	buffer := bytes.NewBuffer(nil)
	encoder := json.NewEncoder(buffer)
	err = encoder.Encode(requestBody)
	if err != nil {
	return netip.Addr{}, fmt.Errorf("json encoding request body: %w", err)
	}
	request, err := http.NewRequestWithContext(ctx, http.MethodPatch, u.String(), buffer)

[francesco086]

Again, I just trust you 100% on this.

Changed

[qdm12]

nit maybe you could add a function headers.SetXAuthToken since there is already SetXAuthPassword and SetXAuthUsername - feel free to disregard as well.

[francesco086]

done

[qdm12]

Suggested change

	request.Header.Set("Content-Type", "application/json")
	request.Header.Set("Accept", "application/json")
	headers.SetContentType(request, "application/json")
	headers.SetAccept(request, "application/json")

[francesco086]

done

[qdm12]

is there any useful information in the body? if it's just for the error case, let's use instead:

Suggested change

	s, err := utils.ReadAndCleanBody(response.Body)
	if err != nil {
	return netip.Addr{}, fmt.Errorf("reading response: %w", err)
	}
	if response.StatusCode != http.StatusOK {
	return netip.Addr{}, fmt.Errorf("%w: %d: %s",
	errors.ErrHTTPStatusNotValid, response.StatusCode, utils.ToSingleLine(s))
	}
	if response.StatusCode != http.StatusOK {
	return netip.Addr{}, fmt.Errorf("%w: %d: %s",
	errors.ErrHTTPStatusNotValid, response.StatusCode, utils.BodyToSingleLine(response.Body))
	}

[francesco086]

the body looks something like

{
    "records": [
        {
            "id": "aa051759-72e6-4034-8af5-dafba3eebb79",
            "data": "127.1.2.3",
            "name": "",
            "priority": 0,
            "ttl": 300,
            "type": "A",
            "comment": null
        }
    ]
}

I think there is nothing useful, let me know if you disagree. Otherwise I will apply your change.

[francesco086]

Hi @qdm12 , any chance for a second round of review?