Skip to content

Fix codefresh_account refresh for on-prem installations #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2023
Merged

Fix codefresh_account refresh for on-prem installations #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions client/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ type Account struct {
RepoPermission string `json:"repoPermission,omitempty"`
Limits *Limits `json:"limits,omitempty"`
Features map[string]bool `json:"features,omitempty"`
// Features *Features `json:"features,omitempty"`
// RuntimeEnvironments ToDo
// Remaining ToDo
// ID string `json:"id"`
}

type AccountDetails struct {
Expand Down
16 changes: 5 additions & 11 deletions codefresh/resource_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,24 +155,21 @@ func resourceAccountDelete(d *schema.ResourceData, meta interface{}) error {
}

func mapAccountToResource(account *cfClient.Account, d *schema.ResourceData) error {

err := d.Set("name", account.Name)
if err != nil {
return err
}

// err = d.Set("admins", account.Admins)
// if err != nil {
// return err
// }
err = d.Set("features", account.Features)
if err != nil {
return err
}

err = d.Set("limits", []map[string]interface{}{flattenLimits(*account.Limits)})
if err != nil {
return err
if account.Limits != nil { // On-prem API does not return 'limits' field
err = d.Set("limits", []map[string]interface{}{flattenLimits(*account.Limits)})
if err != nil {
return err
}
}

err = d.Set("build", []map[string]interface{}{flattenBuild(*account.Build)})
Expand All @@ -197,12 +194,9 @@ func flattenBuild(build cfClient.Build) map[string]interface{} {
return res
}
func mapResourceToAccount(d *schema.ResourceData) *cfClient.Account {
// admins := d.Get("admins").(*schema.Set).List()

account := &cfClient.Account{
ID: d.Id(),
Name: d.Get("name").(string),
// Admins: convertStringArr(admins),
}

if _, ok := d.GetOk("features"); ok {
Expand Down