Spaces in environment variables, will this stop me busting things? Possibly not.

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+## [v0.6.x]  - 2025-08-15
+### Added
+- Cloud stack environment delete variables
+- SRS list domains
+- SRS list contacts
+- 
+### Fixed
+- Added handling of null json types to maybe bool, which will evaluate to false, since they are falsy in js 
+- Updated dependencies 
+- Fixes in DNS handling - split out Get and Search endpoints - lament the pagination.
+
+
 
 ## [v0.6.0] - 2025-06-17
 ### Fixed
@@ -9,6 +21,7 @@ All notable changes to this project will be documented in this file. The format
 - Update pr make file to use golangci-lint GitHub action.
 - Split url helpers and type helpers in to their own packages.
 
+
 ## [v0.5.0] - 2025-06-12
 ### Added
 - Added support for all endpoints under `/server/firewall/`.

pkg/api/cloud/db/response.go

@@ -26,7 +26,7 @@ type (
 		Database models.Database `json:"return"`
 		models.APIResponse
 	}
-	// ListResponse is the returned response from the List endpoint.
+	// ListResponse is the returned response from the ListDomains endpoint.
 	ListResponse struct {
 		Return struct {
 			Databases []models.Database `json:"data"`

pkg/api/cloud/db/user/response.go

@@ -5,7 +5,7 @@ import (
 )
 
 type (
-	// ListResponse is the returned response from the List endpoint.
+	// ListResponse is the returned response from the ListDomains endpoint.
 	ListResponse struct {
 		Return struct {
 			Users []models.DatabaseUser `json:"data"`

pkg/api/cloud/stack/environment/delete.go

@@ -0,0 +1,45 @@
+package environment
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+
+	"github.com/sitehostnz/gosh/pkg/net"
+)
+
+// Update applies updates to the stacks environment.
+func (s *Client) Delete(ctx context.Context, request DeleteRequest) (response DeleteResponse, err error) {
+	uri := "cloud/stack/environment/delete.json"
+	keys := []string{
+		"client_id",
+		"server",
+		"project",
+		"service",
+	}
+
+	values := url.Values{}
+	values.Add("client_id", s.client.ClientID)
+	values.Add("server", request.ServerName)
+	values.Add("project", request.Project)
+	values.Add("service", request.Service)
+
+	args := make([]string, len(request.EnvironmentVariables))
+	i := 0
+	for x, v := range request.EnvironmentVariables {
+		args[i] = fmt.Sprintf("variables[%d][name]", x)
+		values.Add(args[i], v.Name)
+		i++
+	}
+
+	req, err := s.client.NewRequest("POST", uri, net.Encode(values, append(keys, args...)))
+	if err != nil {
+		return response, err
+	}
+
+	if err := s.client.Do(ctx, req, &response); err != nil {
+		return response, err
+	}
+
+	return response, nil
+}

pkg/api/cloud/stack/environment/request.go

@@ -17,4 +17,12 @@ type (
 		Service              string `json:"service"`
 		EnvironmentVariables []models.EnvironmentVariable
 	}
+
+	// DeleteRequest is a request to remove variables from a stack environment.
+	DeleteRequest struct {
+		ServerName           string `json:"server"`
+		Project              string `json:"project"`
+		Service              string `json:"service"`
+		EnvironmentVariables []models.EnvironmentVariable
+	}
 )

pkg/api/cloud/stack/environment/response.go

@@ -3,17 +3,26 @@ package environment
 import "github.com/sitehostnz/gosh/pkg/models"
 
 type (
-	// GetResponse is the response that returns a stacks environment variables.
+	// GetResponse is the response contains the results of a call to get an environment.
+	// It contains the environment details and variables.
 	GetResponse struct {
 		EnvironmentVariables []models.EnvironmentVariable `json:"return"`
 		models.APIResponse
 	}
 
-	// UpdateResponse is the result of updating an environment on a stack.
+	// UpdateResponse is the result of adding or updating variables in a stack environment.
 	UpdateResponse struct {
 		Return struct {
 			models.Job `json:"job"`
 		} `json:"return"`
 		models.APIResponse
 	}
+
+	// DeleteResponse is the result of deleting variables from a stack environment.
+	DeleteResponse struct {
+		Return struct {
+			models.Job `json:"job"`
+		} `json:"return"`
+		models.APIResponse
+	}
 )

pkg/api/cloud/stack/environment/update.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/url"
+	"strings"
 
 	"github.com/sitehostnz/gosh/pkg/net"
 )
@@ -31,11 +32,10 @@ func (s *Client) Update(ctx context.Context, request UpdateRequest) (response Up
 		values.Add(args[i], v.Name)
 		i++
 
-		if v.Content != "" {
-			args[i] = fmt.Sprintf("variables[%d][content]", x)
-			values.Add(args[i], v.Content)
-			i++
-		}
+		// we're allowed empty strings here now, as properties need to be explicitly removed
+		args[i] = fmt.Sprintf("variables[%d][content]", x)
+		values.Add(args[i], strings.TrimSpace(v.Content))
+		i++
 	}
 
 	req, err := s.client.NewRequest("POST", uri, net.Encode(values, append(keys, args...)))

pkg/api/dns/zoneget.go

@@ -2,16 +2,35 @@
 
 import (
 	"context"
-	"net/url"
-
 	"github.com/sitehostnz/gosh/pkg/net"
+	"net/url"
 )
 
-// GetZone searches for a domain in the DNS made easy service
-// by sending a request with a query containing the domain name.
-// If the response contains any matching domain, it returns it as part of the GetZoneResponse.
-// If the response is empty, a control to handle this case is missing and should be added.
 func (s *Client) GetZone(ctx context.Context, request GetZoneRequest) (response GetZoneResponse, err error) {
+
+	resp, err := s.SearchZone(ctx, SearchZoneRequest{
+		Query: request.DomainName,
+		Limit: 1,
+	})
+
+	if err != nil {
+		return response, err
+	}
+
+	response.APIResponse = resp.APIResponse
+
+	// iterate over the domains to find the one we are looking for.
+	// Since we've set a limit ths should be one...
+	if len(resp.Return) > 0 {
+		response.Return = resp.Return[0]
+	}
+	return response, nil
+}
+
+// SearchZone searches for a domain in the DNS service
+// by sending a request with a query containing the domain name.
+// Matching domains are included in the SearchZoneResponse.
+func (s *Client) SearchZone(ctx context.Context, request SearchZoneRequest) (response SearchZoneResponse, err error) {
 	u := "dns/search_domains.json"
 
 	keys := []string{
@@ -21,18 +40,26 @@
 
 	values := url.Values{}
 	values.Add("client_id", s.client.ClientID)
-	values.Add("query[domain]", request.DomainName)
+	values.Add("query[domain]", request.Query)
+
+	// would like to do this, but it's kinda not... working
+	//if request.Offset > 0 {
+	//	keys = append(keys, "offset[offset]")
+	//	values.Add("offset[offset]", strconv.Itoa(request.Offset))
+	//}
+	//
+	//if request.Limit > 0 {
+	//	keys = append(keys, "offset[limit]")
+	//	values.Add("offset[limit]", strconv.Itoa(request.Limit))
+	//}
 
 	req, err := s.client.NewRequest("POST", u, net.Encode(values, keys))
 	if err != nil {
 		return response, err
 	}
-
 	if err := s.client.Do(ctx, req, &response); err != nil {
 		return response, err
 	}
 
-	// TODO add control for empty response
-
 	return response, nil
 }

pkg/api/dns/zonerequest.go

@@ -6,6 +6,12 @@
 		DomainName string `json:"name"`
 	}
 
+	SearchZoneRequest struct {
+		Query  string `json:"query"`
+		Offset int    `json:"offset"`
+		Limit  int    `json:"limit"`
+	}
+
 	// CreateZoneRequest represents a request to create a DNSZone (domain).
 	CreateZoneRequest struct {
 		DomainName string `json:"name"`

pkg/api/dns/zoneresponse.go

@@ -28,11 +28,18 @@
 		models.APIResponse
 	}
 
-	// GetZoneResponse represents a request to get a DNSZone (domain).
-	GetZoneResponse struct {
+	// SearchZoneResponse represents a request to search for a Domain (domain).
+	SearchZoneResponse struct {
 		Return []struct {
 			Name string `json:"name"`
 		} `json:"return"`
 		models.APIResponse
 	}
+
+	GetZoneResponse struct {
+		Return struct {
+			Name string `json:"name"`
+		} `json:"return"`
+		models.APIResponse
+	}
 )

pkg/api/srs/doc.go

@@ -0,0 +1 @@
+package srs

pkg/api/srs/list_contacts.go

@@ -0,0 +1,20 @@
+package srs
+
+import (
+	"context"
+)
+
+// ListContacts the domain name contacts
+func (s *Client) ListContacts(ctx context.Context) (response ListContactsResponse, err error) {
+	u := "srs/list_contacts.json"
+	req, err := s.client.NewRequest("GET", u, "")
+	if err != nil {
+		return response, err
+	}
+
+	if err := s.client.Do(ctx, req, &response); err != nil {
+		return response, err
+	}
+
+	return response, nil
+}

pkg/api/srs/list_domains.go

@@ -0,0 +1,20 @@
+package srs
+
+import (
+	"context"
+)
+
+// ListDomains the registered domain names
+func (s *Client) ListDomains(ctx context.Context) (response ListDomainsResponse, err error) {
+	u := "srs/list_domains.json"
+	req, err := s.client.NewRequest("GET", u, "")
+	if err != nil {
+		return response, err
+	}
+
+	if err := s.client.Do(ctx, req, &response); err != nil {
+		return response, err
+	}
+
+	return response, nil
+}

pkg/api/srs/models.go

@@ -0,0 +1,17 @@
+package srs
+
+import (
+	"github.com/sitehostnz/gosh/pkg/api"
+)
+
+// Client is a Service to work with API Jobs.
+type Client struct {
+	client *api.Client
+}
+
+// New is used to instantiate the Client struct.
+func New(c *api.Client) *Client {
+	return &Client{
+		client: c,
+	}
+}

pkg/api/srs/request.go

@@ -0,0 +1,7 @@
+package srs
+
+//type (
+//	ListRequest struct {
+//		//		Domain string `json:"domain"`
+//	}
+//)

pkg/api/srs/response.go

@@ -0,0 +1,19 @@
+package srs
+
+import "github.com/sitehostnz/gosh/pkg/models"
+
+type (
+	ListDomainsResponse struct {
+		Return struct {
+			models.Pagination
+			Domains []models.Domain `json:"data"`
+		} `json:"return"`
+		models.APIResponse
+	}
+
+	ListContactsResponse struct {
+		DomainContacts []models.DomainContact `json:"return"`
+
+		models.APIResponse
+	}
+)