fix(accounts): fix the account domains payload

internal/api/accounts.go

@@ -7,7 +7,7 @@ import (
 // AccountsClient is a client for working with accounts.
 type AccountsClient interface {
 	Get(ctx context.Context) (*Account, error)
-	GetDomains(ctx context.Context) (*AccountDomainsUpdate, error)
+	GetDomains(ctx context.Context) ([]*AccountDomain, error)
 	Update(ctx context.Context, data AccountUpdate) error
 	UpdateSettings(ctx context.Context, data AccountSettingsUpdate) error
 	UpdateDomains(ctx context.Context, data AccountDomainsUpdate) error
@@ -54,6 +54,14 @@ type AccountSettingsUpdate struct {
 	AccountSettings `json:"settings"`
 }
 
+// AccountDomain is the data retrieved when getting an account's domain names.
+type AccountDomain struct {
+	Name string `json:"name"`
+
+	// The fields below are present in the response but are currently ignored.
+	// id, created, updated, account_id
+}
+
 // AccountDomainsUpdate is the data sent when updating an account's domain names.
 type AccountDomainsUpdate struct {
 	DomainNames []string `json:"domain_names,omitempty"`

internal/client/accounts.go

@@ -59,7 +59,7 @@ func (c *AccountsClient) Get(ctx context.Context) (*api.Account, error) {
 }
 
 // GetDomains returns domain names for an account by ID.
-func (c *AccountsClient) GetDomains(ctx context.Context) (*api.AccountDomainsUpdate, error) {
+func (c *AccountsClient) GetDomains(ctx context.Context) ([]*api.AccountDomain, error) {
 	cfg := requestConfig{
 		method:       http.MethodGet,
 		url:          c.routePrefix + "domains",
@@ -69,12 +69,12 @@ func (c *AccountsClient) GetDomains(ctx context.Context) (*api.AccountDomainsUpd
 		successCodes: successCodesStatusOK,
 	}
 
-	var accountDomains api.AccountDomainsUpdate
-	if err := requestWithDecodeResponse(ctx, c.hc, cfg, &accountDomains.DomainNames); err != nil {
-		return nil, fmt.Errorf("failed to get account domains: %w", err)
+	var accountDomains []*api.AccountDomain
+	if err := requestWithDecodeResponse(ctx, c.hc, cfg, &accountDomains); err != nil {
+		return nil, fmt.Errorf("hey failed to get account domains: %w", err)
 	}
 
-	return &accountDomains, nil
+	return accountDomains, nil
 }
 
 // Update modifies an existing account by ID.
@@ -122,7 +122,7 @@ func (c *AccountsClient) UpdateDomains(ctx context.Context, data api.AccountDoma
 	cfg := requestConfig{
 		method:       http.MethodPatch,
 		url:          c.routePrefix + "domains",
-		body:         data.DomainNames,
+		body:         data,
 		apiKey:       c.apiKey,
 		basicAuthKey: c.basicAuthKey,
 		successCodes: successCodesStatusNoContent,

internal/provider/datasources/account.go

@@ -165,12 +165,6 @@ func (d *AccountDataSource) Read(ctx context.Context, req datasource.ReadRequest
 		return
 	}
 
-	accountDomains, err := client.GetDomains(ctx)
-	if err != nil {
-		resp.Diagnostics.Append(helpers.ResourceClientErrorDiagnostic("Account domains", "get", err))
-
-		return
-	}
 	model.ID = customtypes.NewUUIDValue(account.ID)
 	model.Created = customtypes.NewTimestampPointerValue(account.Created)
 	model.Updated = customtypes.NewTimestampPointerValue(account.Updated)
@@ -194,7 +188,20 @@ func (d *AccountDataSource) Read(ctx context.Context, req datasource.ReadRequest
 
 	model.Settings = settingsObject
 
-	domainNames, diags := types.ListValueFrom(ctx, types.StringType, accountDomains.DomainNames)
+	domains, err := client.GetDomains(ctx)
+	if err != nil {
+		resp.Diagnostics.Append(helpers.ResourceClientErrorDiagnostic("Account domains", "get", err))
+
+		return
+	}
+
+	// Convert the list of AccountDomain to a list of names as strings.
+	names := make([]string, 0, len(domains))
+	for _, name := range domains {
+		names = append(names, name.Name)
+	}
+
+	domainNames, diags := types.ListValueFrom(ctx, types.StringType, names)
 	resp.Diagnostics.Append(diags...)
 	if diags.HasError() {
 		return

internal/provider/datasources/account_test.go

@@ -31,6 +31,10 @@ func TestAccDatasource_account(t *testing.T) {
 					testutils.ExpectKnownValue(datasourceName, "id", os.Getenv("PREFECT_CLOUD_ACCOUNT_ID")),
 					testutils.ExpectKnownValueNotNull(datasourceName, "name"),
 					testutils.ExpectKnownValueNotNull(datasourceName, "handle"),
+
+					// These domain names were manually added to the account, because we're using a pre-existing account
+					// due to the fact that accounts cannot be created with the API/Terraform.
+					testutils.ExpectKnownValueList(datasourceName, "domain_names", []string{"example.com", "foobar.com"}),
 				},
 			},
 		},

internal/provider/resources/account.go

@@ -189,8 +189,14 @@ func copyAccountToModel(_ context.Context, account *api.Account, tfModel *Accoun
 
 // copyAccountDomainsToModel maps an API response to a model that is saved in Terraform state.
 // A model can be a Terraform Plan, State, or Config object.
-func copyAccountDomainsToModel(ctx context.Context, accountDomains *api.AccountDomainsUpdate, tfModel *AccountResourceModel) diag.Diagnostics {
-	domainNames, diags := types.ListValueFrom(ctx, types.StringType, accountDomains.DomainNames)
+func copyAccountDomainsToModel(ctx context.Context, accountDomains []*api.AccountDomain, tfModel *AccountResourceModel) diag.Diagnostics {
+	// Convert the list of AccountDomain to a list of names as strings.
+	names := make([]string, 0, len(accountDomains))
+	for _, name := range accountDomains {
+		names = append(names, name.Name)
+	}
+
+	domainNames, diags := types.ListValueFrom(ctx, types.StringType, names)
 	if diags.HasError() {
 		return diags
 	}