Skip to content

Commit

Permalink
Use additional_vars name
Browse files Browse the repository at this point in the history
  • Loading branch information
agonzalezrh committed Jan 31, 2025
1 parent eb2b20c commit bb87f0a
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions internal/models/ibm_resource_group_sandbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type IBMResourceGroupSandbox struct {
ErrorMessage string `json:"error_message,omitempty"`
ResourceGroup string `json:"resourcegroup"`
CleanupCount int `json:"cleanup_count"`
DeployerAdditionalVars map[string]any `json:"deployer_additional_vars,omitempty"`
DeployerAdditionalVars map[string]any `json:"additional_vars,omitempty"`
ToCleanup bool `json:"to_cleanup"`
}

Expand Down Expand Up @@ -469,7 +469,7 @@ func (a *IBMResourceGroupSandboxProvider) FetchAllByServiceUuid(serviceUuid stri
r.updated_at,
r.status,
r.cleanup_count,
COALESCE(oc.additional_vars, '{}'::jsonb) AS account_additional_vars
COALESCE(oc.additional_vars, '{}'::jsonb) AS additional_vars
FROM
resources r
LEFT JOIN
Expand Down Expand Up @@ -520,7 +520,7 @@ func (a *IBMResourceGroupSandboxProvider) FetchAllByServiceUuidWithCreds(service
r.status,
r.cleanup_count,
pgp_sym_decrypt(r.resource_credentials, $2),
COALESCE(oc.additional_vars, '{}'::jsonb) AS account_additional_vars
COALESCE(oc.additional_vars, '{}'::jsonb) AS additional_vars
FROM
resources r
LEFT JOIN
Expand Down Expand Up @@ -920,7 +920,7 @@ func (a *IBMResourceGroupSandboxProvider) FetchAll() ([]IBMResourceGroupSandbox,
r.updated_at,
r.status,
r.cleanup_count,
COALESCE(oc.additional_vars, '{}'::jsonb) AS account_additional_vars
COALESCE(oc.additional_vars, '{}'::jsonb) AS additional_vars
FROM resources r
LEFT JOIN ibm_resource_group_account_configurations oc ON oc.name = r.resource_data->>'ibm_resource_group_account'
WHERE r.resource_type = 'IBMResourceGroupSandbox'`,
Expand Down Expand Up @@ -1193,7 +1193,7 @@ func (p *IBMResourceGroupSandboxProvider) FetchByName(name string) (IBMResourceG
r.updated_at,
r.status,
r.cleanup_count,
COALESCE(oc.additional_vars, '{}'::jsonb) AS account_additional_vars
COALESCE(oc.additional_vars, '{}'::jsonb) AS additional_vars
FROM resources r
LEFT JOIN ibm_resource_group_account_configurations oc ON oc.name = resource_data->>'ibm_resource_group_account'
WHERE r.resource_name = $1 AND r.resource_type = 'IBMResourceGroupSandbox'`,
Expand Down Expand Up @@ -1230,7 +1230,7 @@ func (p *IBMResourceGroupSandboxProvider) FetchById(id int) (IBMResourceGroupSan
r.updated_at,
r.status,
r.cleanup_count,
COALESCE(oc.additional_vars, '{}'::jsonb) AS account_additional_vars
COALESCE(oc.additional_vars, '{}'::jsonb) AS additional_vars
FROM resources r
LEFT JOIN ibm_resource_group_account_configurations oc ON oc.name = resource_data->>'ibm_resource_group_account'
WHERE r.id = $1`,
Expand Down Expand Up @@ -1278,7 +1278,7 @@ func (a *IBMResourceGroupSandboxWithCreds) Reload() error {
r.status,
r.cleanup_count,
pgp_sym_decrypt(r.resource_credentials, $2),
COALESCE(oc.additional_vars, '{}'::jsonb) AS account_additional_vars
COALESCE(oc.additional_vars, '{}'::jsonb) AS additional_vars
FROM resources r
LEFT JOIN ibm_resource_group_account_configurations oc ON oc.name = resource_data->>'ibm_resource_group_account'
WHERE r.id = $1 AND r.resource_type = 'IBMResourceGroupSandbox'`,
Expand Down

0 comments on commit bb87f0a

Please sign in to comment.