Skip to content

Commit 4d1c3d7

Browse files
ilia-medvedev-codefreshilia-medvedev-codefresh
committed
lint - add error checks
1 parent 0687e71 commit 4d1c3d7

28 files changed

+796
-164
lines changed

‎codefresh/cfclient/idp.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package cfclient
22

33
import (
4-
"errors"
54
"fmt"
65
"log"
76
"net/url"
@@ -237,7 +236,7 @@ func (client *Client) GetIdpByName(idpName string) (*IDP, error) {
237236
}
238237
}
239238

240-
return nil, errors.New(fmt.Sprintf("[ERROR] IDP with name %s isn't found.", idpName))
239+
return nil, fmt.Errorf("[ERROR] IDP with name %s isn't found.", idpName)
241240
}
242241

243242
func (client *Client) GetIdpByID(idpID string) (*IDP, error) {
@@ -253,7 +252,7 @@ func (client *Client) GetIdpByID(idpID string) (*IDP, error) {
253252
}
254253
}
255254

256-
return nil, errors.New(fmt.Sprintf("[ERROR] IDP with ID %s isn't found.", idpID))
255+
return nil, fmt.Errorf("[ERROR] IDP with ID %s isn't found.", idpID)
257256
}
258257

259258
// get account idps
@@ -293,7 +292,7 @@ func (client *Client) GetAccountIdpByID(idpID string) (*IDP, error) {
293292
}
294293
}
295294

296-
return nil, errors.New(fmt.Sprintf("[ERROR] IDP with ID %s isn't found.", idpID))
295+
return nil, fmt.Errorf("[ERROR] IDP with ID %s isn't found.", idpID)
297296
}
298297

299298
// add account to idp

‎codefresh/cfclient/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
type Variable struct {
1010
Key string `json:"key"`
1111
Value string `json:"value"`
12-
Encrypted bool `json:"encrypted",omitempty`
12+
Encrypted bool `json:"encrypted,omitempty"`
1313
}
1414

1515
// CodefreshObject codefresh interface

‎codefresh/data_account.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,23 @@ func mapDataAccountToResource(account *cfclient.Account, d *schema.ResourceData)
6262
}
6363
d.SetId(account.ID)
6464

65-
d.Set("_id", account.ID)
66-
d.Set("name", account.Name)
67-
d.Set("admins", account.Admins)
65+
err := d.Set("_id", account.ID)
66+
67+
if err != nil {
68+
return err
69+
}
70+
71+
err = d.Set("name", account.Name)
72+
73+
if err != nil {
74+
return err
75+
}
76+
77+
err = d.Set("admins", account.Admins)
78+
79+
if err != nil {
80+
return err
81+
}
6882

6983
return nil
7084
}

‎codefresh/data_account_gitops_settings.go

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,36 @@ func mapDataAccountGitopsSettingsToResource(account *cfclient.GitopsActiveAccoun
6868
return fmt.Errorf("cannot get gitops settings as account wasn't properly retrived")
6969
}
7070
d.SetId(account.ID)
71-
d.Set("name", account.AccountName)
72-
d.Set("admins", account.Admins)
73-
d.Set("git_provider", account.GitProvider)
74-
d.Set("git_provider_api_url", account.GitApiUrl)
75-
d.Set("shared_config_repository", account.SharedConfigRepo)
71+
72+
err := d.Set("name", account.AccountName)
73+
74+
if err != nil {
75+
return err
76+
}
77+
78+
err = d.Set("admins", account.Admins)
79+
80+
if err != nil {
81+
return err
82+
}
83+
84+
err = d.Set("git_provider", account.GitProvider)
85+
86+
if err != nil {
87+
return err
88+
}
89+
90+
err = d.Set("git_provider_api_url", account.GitApiUrl)
91+
92+
if err != nil {
93+
return err
94+
}
95+
96+
err = d.Set("shared_config_repository", account.SharedConfigRepo)
97+
98+
if err != nil {
99+
return err
100+
}
76101

77102
return nil
78103
}

‎codefresh/data_account_idp.go

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,41 @@ func dataSourceAccountIdpRead(d *schema.ResourceData, meta interface{}) error {
9090
func mapDataAccountIdpToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) error {
9191

9292
d.SetId(cfClientIDP.ID)
93-
d.Set("client_name", cfClientIDP.ClientName)
94-
d.Set("client_type", cfClientIDP.ClientType)
95-
d.Set("display_name", cfClientIDP.DisplayName)
96-
d.Set("redirect_url", cfClientIDP.RedirectUrl)
97-
d.Set("redirect_ui_url", cfClientIDP.RedirectUiUrl)
98-
d.Set("login_url", cfClientIDP.LoginUrl)
93+
err := d.Set("client_name", cfClientIDP.ClientName)
94+
95+
if err != nil {
96+
return err
97+
}
98+
99+
err = d.Set("client_type", cfClientIDP.ClientType)
100+
101+
if err != nil {
102+
return err
103+
}
104+
105+
err = d.Set("display_name", cfClientIDP.DisplayName)
106+
107+
if err != nil {
108+
return err
109+
}
110+
111+
err = d.Set("redirect_url", cfClientIDP.RedirectUrl)
112+
113+
if err != nil {
114+
return err
115+
}
116+
117+
err = d.Set("redirect_ui_url", cfClientIDP.RedirectUiUrl)
118+
119+
if err != nil {
120+
return err
121+
}
122+
123+
err = d.Set("login_url", cfClientIDP.LoginUrl)
124+
125+
if err != nil {
126+
return err
127+
}
99128

100129
return nil
101130
}

‎codefresh/data_context.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,28 @@ func mapDataContextToResource(context *cfclient.Context, d *schema.ResourceData)
5858
}
5959
d.SetId(context.Metadata.Name)
6060

61-
d.Set("name", context.Metadata.Name)
62-
d.Set("type", context.Spec.Type)
61+
err := d.Set("name", context.Metadata.Name)
62+
63+
if err != nil {
64+
return err
65+
}
66+
67+
err = d.Set("type", context.Spec.Type)
68+
69+
if err != nil {
70+
return err
71+
}
72+
6373
data, err := yaml.Marshal(context.Spec.Data)
6474
if err != nil {
6575
return err
6676
}
67-
d.Set("data", string(data))
77+
78+
err = d.Set("data", string(data))
79+
80+
if err != nil {
81+
return err
82+
}
6883

6984
return nil
7085
}

‎codefresh/data_current_account.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,17 @@ func mapDataCurrentAccountToResource(currentAccount *cfclient.CurrentAccount, d
6969
}
7070
d.SetId(currentAccount.ID)
7171

72-
d.Set("_id", currentAccount.ID)
73-
d.Set("name", currentAccount.Name)
72+
err := d.Set("_id", currentAccount.ID)
73+
74+
if err != nil {
75+
return err
76+
}
77+
78+
err = d.Set("name", currentAccount.Name)
79+
80+
if err != nil {
81+
return err
82+
}
7483

7584
// users := make(map[string](map[string]interface{}))
7685
// for n, user := range currentAccount.Users {
@@ -89,6 +98,11 @@ func mapDataCurrentAccountToResource(currentAccount *cfclient.CurrentAccount, d
8998
users[n]["id"] = user.ID
9099
}
91100

92-
d.Set("users", users)
101+
err = d.Set("users", users)
102+
103+
if err != nil {
104+
return err
105+
}
106+
93107
return nil
94108
}

‎codefresh/data_current_account_user.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,19 @@ func mapDataCurrentAccountUserToResource(currentAccount *cfclient.CurrentAccount
7272
if (userAttributeName == "name" && user.UserName == userAttributeValue) || (userAttributeName == "email" && user.Email == userAttributeValue) {
7373
isFound = true
7474
d.SetId(user.ID)
75-
d.Set("name", user.UserName)
76-
d.Set("email", user.Email)
75+
err := d.Set("name", user.UserName)
76+
77+
if err != nil {
78+
return err
79+
}
80+
81+
82+
err = d.Set("email", user.Email)
83+
84+
if err != nil {
85+
return err
86+
}
87+
7788
break
7889
}
7990
}

‎codefresh/data_idps.go

Lines changed: 75 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,30 +131,92 @@ func mapDataIdpToResource(idp cfclient.IDP, d *schema.ResourceData) error {
131131

132132
d.SetId(idp.ID)
133133

134-
d.Set("access_token", idp.Access_token) // string `json:"access_token,omitempty"`
134+
err := d.Set("access_token", idp.Access_token) // string `json:"access_token,omitempty"`
135135

136-
d.Set("accounts", datautil.FlattenStringArr(idp.Accounts)) //
136+
if err != nil {
137+
return err
138+
}
139+
140+
err = d.Set("accounts", datautil.FlattenStringArr(idp.Accounts)) //
141+
142+
if err != nil {
143+
return err
144+
}
137145
//d.Set("apiHost", idp.ApiHost) // string `json:"apiHost,omitempty"`
138146
//d.Set("apiPathPrefix", idp.ApiPathPrefix) // string `json:"apiPathPrefix,omitempty"`
139147
//d.Set("apiURL", idp.ApiURL) // string `json:"apiURL,omitempty"`
140148
//d.Set("appId", idp.AppId) // string `json:"appId,omitempty"`
141149
//d.Set("authURL", idp.AuthURL) // string `json:"authURL,omitempty"`
142-
d.Set("client_host", idp.ClientHost) // string `json:"clientHost,omitempty"`
143-
d.Set("client_id", idp.ClientId) // string `json:"clientId,omitempty"`
144-
d.Set("client_name", idp.ClientName) // string `json:"clientName,omitempty"`
145-
d.Set("client_secret", idp.ClientSecret) // string `json:"clientSecret,omitempty"`
146-
d.Set("client_type", idp.ClientType) // string `json:"clientType,omitempty"`
147-
d.Set("cookie_iv", idp.CookieIv) // string `json:"cookieIv,omitempty"`
148-
d.Set("cookie_key", idp.CookieKey) // string `json:"cookieKey,omitempty"`
149-
d.Set("display_name", idp.DisplayName) // string `json:"displayName,omitempty"`
150-
d.Set("_id", idp.ID) // string `json:"_id,omitempty"`
150+
err = d.Set("client_host", idp.ClientHost) // string `json:"clientHost,omitempty"`
151+
152+
if err != nil {
153+
return err
154+
}
155+
156+
err = d.Set("client_id", idp.ClientId) // string `json:"clientId,omitempty"`
157+
158+
if err != nil {
159+
return err
160+
}
161+
162+
err = d.Set("client_name", idp.ClientName) // string `json:"clientName,omitempty"`
163+
164+
if err != nil {
165+
return err
166+
}
167+
168+
err = d.Set("client_secret", idp.ClientSecret) // string `json:"clientSecret,omitempty"`
169+
170+
if err != nil {
171+
return err
172+
}
173+
174+
err = d.Set("client_type", idp.ClientType) // string `json:"clientType,omitempty"`
175+
176+
if err != nil {
177+
return err
178+
}
179+
180+
181+
err = d.Set("cookie_iv", idp.CookieIv) // string `json:"cookieIv,omitempty"`
182+
183+
if err != nil {
184+
return err
185+
}
186+
187+
err = d.Set("cookie_key", idp.CookieKey) // string `json:"cookieKey,omitempty"`
188+
189+
if err != nil {
190+
return err
191+
}
192+
193+
err = d.Set("display_name", idp.DisplayName) // string `json:"displayName,omitempty"`
194+
195+
if err != nil {
196+
return err
197+
}
198+
199+
err = d.Set("_id", idp.ID) // string `json:"_id,omitempty"`
200+
201+
if err != nil {
202+
return err
203+
}
151204
//d.Set("IDPLoginUrl", idp.IDPLoginUrl) // string `json:"IDPLoginUrl,omitempty"`
152205
//d.Set("loginUrl", idp.LoginUrl) // string `json:"loginUrl,omitempty"`
153206
//d.Set("redirectUiUrl", idp.RedirectUiUrl) // string `json:"redirectUiUrl,omitempty"`
154207
//d.Set("redirectUrl", idp.RedirectUrl) // string `json:"redirectUrl,omitempty"`
155208
//d.Set("refreshTokenURL", idp.RefreshTokenURL) // string `json:"refreshTokenURL,omitempty"`
156-
d.Set("scopes", datautil.FlattenStringArr(idp.Scopes)) // []string `json:"scopes,omitempty"`
157-
d.Set("tenant", idp.Tenant) // string `json:"tenant,omitempty"`
209+
err = d.Set("scopes", datautil.FlattenStringArr(idp.Scopes)) // []string `json:"scopes,omitempty"`
210+
211+
if err != nil {
212+
return err
213+
}
214+
215+
err = d.Set("tenant", idp.Tenant) // string `json:"tenant,omitempty"`
216+
217+
if err != nil {
218+
return err
219+
}
158220
//d.Set("tokenSecret", idp.TokenSecret) // string `json:"tokenSecret,omitempty"`
159221
//d.Set("tokenURL", idp.TokenURL) // string `json:"tokenURL,omitempty"`
160222
//d.Set("userProfileURL", idp.UserProfileURL) // string `json:"userProfileURL,omitempty"`

‎codefresh/data_project.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,17 @@ func mapDataProjectToResource(project *cfClient.Project, d *schema.ResourceData)
6262
}
6363
d.SetId(project.ID)
6464

65-
d.Set("_id", project.ID)
66-
d.Set("tags", project.Tags)
65+
err := d.Set("_id", project.ID)
66+
67+
if err != nil {
68+
return err
69+
}
70+
71+
err = d.Set("tags", project.Tags)
72+
73+
if err != nil {
74+
return err
75+
}
6776

6877
return nil
6978
}

0 commit comments

Comments
 (0)