Including system metadata when posting to utility API

internal/controld/config.go

@@ -69,14 +69,23 @@ func (u ErrorResponse) Error() string {
 }
 
 type utilityRequest struct {
-	UID      string `json:"uid"`
-	ClientID string `json:"client_id,omitempty"`
+	UID      string            `json:"uid"`
+	ClientID string            `json:"client_id,omitempty"`
+	Metadata map[string]string `json:"metadata"`
 }
 
 // UtilityOrgRequest contains request data for calling Org API.
 type UtilityOrgRequest struct {
-	ProvToken string `json:"prov_token"`
-	Hostname  string `json:"hostname"`
+	ProvToken string            `json:"prov_token"`
+	Hostname  string            `json:"hostname"`
+	Metadata  map[string]string `json:"metadata"`
+}
+
+// ResolverConfigRequest contains request data for fetching resolver config.
+type ResolverConfigRequest struct {
+	RawUID   string
+	Version  string
+	Metadata map[string]string
 }
 
 // LogsRequest contains request data for sending runtime logs to API.
@@ -85,26 +94,28 @@ type LogsRequest struct {
 	Data io.ReadCloser `json:"-"`
 }
 
-// FetchResolverConfig fetch Control D config for given uid.
-func FetchResolverConfig(ctx context.Context, rawUID, version string, cdDev bool) (*ResolverConfig, error) {
+// FetchResolverConfig fetch Control D config for a given request.
+func FetchResolverConfig(ctx context.Context, req *ResolverConfigRequest, cdDev bool) (*ResolverConfig, error) {
 	logger := ctrld.LoggerFromCtx(ctx)
 	ctrld.Log(ctx, logger.Debug(), "Fetching ControlD resolver configuration")
 
-	uid, clientID := ParseRawUID(rawUID)
+	uid, clientID := ParseRawUID(req.RawUID)
 	ctrld.Log(ctx, logger.Debug(), "Parsed UID: %s, ClientID: %s", uid, clientID)
 
-	req := utilityRequest{UID: uid}
+	uReq := utilityRequest{
+		UID:      uid,
+		Metadata: req.Metadata,
+	}
 	if clientID != "" {
-		req.ClientID = clientID
+		uReq.ClientID = clientID
 		ctrld.Log(ctx, logger.Debug(), "Including client ID in request")
 	}
-	body, _ := json.Marshal(req)
-
+	body, _ := json.Marshal(uReq)
 	ctrld.Log(ctx, logger.Debug(), "Sending resolver config request to ControlD API")
-	return postUtilityAPI(ctx, version, cdDev, false, bytes.NewReader(body))
+	return postUtilityAPI(ctx, req.Version, cdDev, false, bytes.NewReader(body))
 }
 
-// FetchResolverUID fetch resolver uid from provision token.
+// FetchResolverUID fetch resolver uid from a given request.
 func FetchResolverUID(ctx context.Context, req *UtilityOrgRequest, version string, cdDev bool) (*ResolverConfig, error) {
 	logger := ctrld.LoggerFromCtx(ctx)
 	ctrld.Log(ctx, logger.Debug(), "Fetching resolver UID from provision token")
@@ -115,15 +126,16 @@ func FetchResolverUID(ctx context.Context, req *UtilityOrgRequest, version strin
 	}
 
 	hostname := req.Hostname
-	if hostname == "" {
+	if req.Hostname == "" {
 		hostname, _ = os.Hostname()
 		ctrld.Log(ctx, logger.Debug(), "Using system hostname: %s", hostname)
+		req.Hostname = hostname
 	} else {
 		ctrld.Log(ctx, logger.Debug(), "Using provided hostname: %s", hostname)
 	}
 
 	ctrld.Log(ctx, logger.Debug(), "Sending UID request to ControlD API")
-	body, _ := json.Marshal(UtilityOrgRequest{ProvToken: req.ProvToken, Hostname: hostname})
+	body, _ := json.Marshal(req)
 	return postUtilityAPI(ctx, version, cdDev, false, bytes.NewReader(body))
 }
 
@@ -135,7 +147,7 @@ func UpdateCustomLastFailed(ctx context.Context, rawUID, version string, cdDev,
 		req.ClientID = clientID
 	}
 	body, _ := json.Marshal(req)
-	return postUtilityAPI(ctx, version, cdDev, true, bytes.NewReader(body))
+	return postUtilityAPI(ctx, version, cdDev, lastUpdatedFailed, bytes.NewReader(body))
 }
 
 func postUtilityAPI(ctx context.Context, version string, cdDev, lastUpdatedFailed bool, body io.Reader) (*ResolverConfig, error) {

internal/controld/controld_test.go

@@ -3,10 +3,13 @@
 package controld
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/Control-D-Inc/ctrld"
 )
 
 func TestFetchResolverConfig(t *testing.T) {
@@ -20,11 +23,18 @@ func TestFetchResolverConfig(t *testing.T) {
 		{"valid dev", "p2", true, false},
 		{"invalid uid", "abcd1234", false, true},
 	}
+
+	ctx := context.Background()
 	for _, tc := range tests {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
-			got, err := FetchResolverConfig(tc.uid, "dev-test", tc.dev)
+			req := &ResolverConfigRequest{
+				RawUID:   tc.uid,
+				Version:  "dev-test",
+				Metadata: ctrld.SystemMetadata(ctx),
+			}
+			got, err := FetchResolverConfig(ctx, req, tc.dev)
 			require.False(t, (err != nil) != tc.wantErr, err)
 			if !tc.wantErr {
 				assert.NotEmpty(t, got.DOH)