Skip to content

Commit ed93fc1

Browse files
korenyonikorenyoni
committed
Use reusable idp package.
1 parent de02dd7 commit ed93fc1

File tree

3 files changed

+73
-593
lines changed

3 files changed

+73
-593
lines changed

‎codefresh/resource_account_idp.go

+41-51
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
1010
"github.com/codefresh-io/terraform-provider-codefresh/codefresh/internal/datautil"
11+
"github.com/codefresh-io/terraform-provider-codefresh/codefresh/internal/idp"
1112
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
1213
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1314
)
@@ -51,16 +52,14 @@ func resourceAccountIdp() *schema.Resource {
5152
}),
5253
),
5354
// Defined in resource_idp, as schema is the same for global and account scoped IDPs
54-
Schema: idpSchema,
55+
Schema: idp.IdpSchema,
5556
}
5657
}
5758

5859
func resourceAccountIDPCreate(d *schema.ResourceData, meta interface{}) error {
59-
6060
client := meta.(*cfclient.Client)
6161

6262
id, err := client.CreateIDP(mapResourceToAccountIDP(d), false)
63-
6463
if err != nil {
6564
log.Printf("[DEBUG] Error while creating idp. Error = %v", err)
6665
return err
@@ -71,15 +70,13 @@ func resourceAccountIDPCreate(d *schema.ResourceData, meta interface{}) error {
7170
}
7271

7372
func resourceAccountIDPRead(d *schema.ResourceData, meta interface{}) error {
74-
7573
client := meta.(*cfclient.Client)
7674
idpID := d.Id()
7775

7876
var cfClientIDP *cfclient.IDP
7977
var err error
8078

8179
cfClientIDP, err = client.GetAccountIdpByID(idpID)
82-
8380
if err != nil {
8481
if err.Error() == fmt.Sprintf("[ERROR] IDP with ID %s isn't found.", d.Id()) {
8582
d.SetId("")
@@ -91,7 +88,6 @@ func resourceAccountIDPRead(d *schema.ResourceData, meta interface{}) error {
9188
}
9289

9390
err = mapAccountIDPToResource(*cfClientIDP, d)
94-
9591
if err != nil {
9692
log.Printf("[DEBUG] Error while getting mapping response to IDP object. Error = %v", err)
9793
return err
@@ -104,7 +100,6 @@ func resourceAccountIDPDelete(d *schema.ResourceData, meta interface{}) error {
104100
client := meta.(*cfclient.Client)
105101

106102
err := client.DeleteIDPAccount(d.Id())
107-
108103
if err != nil {
109104
log.Printf("[DEBUG] Error while deleting account level IDP. Error = %v", err)
110105
return err
@@ -114,11 +109,9 @@ func resourceAccountIDPDelete(d *schema.ResourceData, meta interface{}) error {
114109
}
115110

116111
func resourceAccountIDPUpdate(d *schema.ResourceData, meta interface{}) error {
117-
118112
client := meta.(*cfclient.Client)
119113

120114
err := client.UpdateIDP(mapResourceToAccountIDP(d), false)
121-
122115
if err != nil {
123116
log.Printf("[DEBUG] Error while updating idp. Error = %v", err)
124117
return err
@@ -136,7 +129,7 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
136129
d.Set("login_url", cfClientIDP.LoginUrl)
137130
d.Set("client_type", cfClientIDP.ClientType)
138131

139-
if cfClientIDP.ClientType == "github" {
132+
if cfClientIDP.ClientType == idp.GitHub {
140133
attributes := []map[string]interface{}{{
141134
"client_id": cfClientIDP.ClientId,
142135
// Codefresh API Returns the client secret as an encrypted string on the server side
@@ -150,10 +143,10 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
150143
"api_path_prefix": cfClientIDP.ApiPathPrefix,
151144
}}
152145

153-
d.Set("github", attributes)
146+
d.Set(idp.GitHub, attributes)
154147
}
155148

156-
if cfClientIDP.ClientType == "gitlab" {
149+
if cfClientIDP.ClientType == idp.GitLab {
157150
attributes := []map[string]interface{}{{
158151
"client_id": cfClientIDP.ClientId,
159152
"client_secret": d.Get("gitlab.0.client_secret"),
@@ -162,10 +155,10 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
162155
"api_url": cfClientIDP.ApiURL,
163156
}}
164157

165-
d.Set("gitlab", attributes)
158+
d.Set(idp.GitLab, attributes)
166159
}
167160

168-
if cfClientIDP.ClientType == "okta" {
161+
if cfClientIDP.ClientType == idp.Okta {
169162
attributes := []map[string]interface{}{{
170163
"client_id": cfClientIDP.ClientId,
171164
"client_secret": d.Get("okta.0.client_secret"),
@@ -178,7 +171,7 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
178171
d.Set("okta", attributes)
179172
}
180173

181-
if cfClientIDP.ClientType == "google" {
174+
if cfClientIDP.ClientType == idp.Google {
182175
attributes := []map[string]interface{}{{
183176
"client_id": cfClientIDP.ClientId,
184177
"client_secret": d.Get("google.0.client_secret"),
@@ -188,23 +181,22 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
188181
"sync_field": cfClientIDP.SyncField,
189182
}}
190183

191-
d.Set("google", attributes)
184+
d.Set(idp.Google, attributes)
192185
}
193186

194-
if cfClientIDP.ClientType == "auth0" {
187+
if cfClientIDP.ClientType == idp.Auth0 {
195188
attributes := []map[string]interface{}{{
196189
"client_id": cfClientIDP.ClientId,
197190
"client_secret": d.Get("auth0.0.client_secret"),
198191
"domain": cfClientIDP.ClientHost,
199192
}}
200193

201-
d.Set("auth0", attributes)
194+
d.Set(idp.Auth0, attributes)
202195
}
203196

204-
if cfClientIDP.ClientType == "azure" {
197+
if cfClientIDP.ClientType == idp.Azure {
205198

206199
syncInterval, err := strconv.Atoi(cfClientIDP.SyncInterval)
207-
208200
if err != nil {
209201
return err
210202
}
@@ -218,10 +210,10 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
218210
"tenant": cfClientIDP.Tenant,
219211
}}
220212

221-
d.Set("azure", attributes)
213+
d.Set(idp.Azure, attributes)
222214
}
223215

224-
if cfClientIDP.ClientType == "onelogin" {
216+
if cfClientIDP.ClientType == idp.OneLogin {
225217
attributes := []map[string]interface{}{{
226218
"client_id": cfClientIDP.ClientId,
227219
"client_secret": d.Get("onelogin.0.client_secret"),
@@ -234,23 +226,22 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
234226
"app_id": cfClientIDP.AppId,
235227
}}
236228

237-
d.Set("onelogin", attributes)
229+
d.Set(idp.OneLogin, attributes)
238230
}
239231

240-
if cfClientIDP.ClientType == "keycloak" {
232+
if cfClientIDP.ClientType == idp.Keycloak {
241233
attributes := []map[string]interface{}{{
242234
"client_id": cfClientIDP.ClientId,
243235
"client_secret": d.Get("keycloak.0.client_secret"),
244236
"host": cfClientIDP.Host,
245237
"realm": cfClientIDP.Realm,
246238
}}
247239

248-
d.Set("keycloak", attributes)
240+
d.Set(idp.Keycloak, attributes)
249241
}
250242

251-
if cfClientIDP.ClientType == "saml" {
243+
if cfClientIDP.ClientType == idp.SAML {
252244
syncInterval, err := strconv.Atoi(cfClientIDP.SyncInterval)
253-
254245
if err != nil {
255246
return err
256247
}
@@ -269,10 +260,10 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
269260
"access_token": d.Get("saml.0.access_token"),
270261
}}
271262

272-
d.Set("saml", attributes)
263+
d.Set(idp.SAML, attributes)
273264
}
274265

275-
if cfClientIDP.ClientType == "ldap" {
266+
if cfClientIDP.ClientType == idp.LDAP {
276267
attributes := []map[string]interface{}{{
277268
"url": cfClientIDP.Url,
278269
"password": d.Get("ldap.0.password"),
@@ -284,14 +275,13 @@ func mapAccountIDPToResource(cfClientIDP cfclient.IDP, d *schema.ResourceData) e
284275
"search_base_for_sync": cfClientIDP.SearchBaseForSync,
285276
}}
286277

287-
d.Set("ldap", attributes)
278+
d.Set(idp.LDAP, attributes)
288279
}
289280

290281
return nil
291282
}
292283

293284
func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
294-
295285
cfClientIDP := &cfclient.IDP{
296286
ID: d.Id(),
297287
DisplayName: d.Get("display_name").(string),
@@ -301,8 +291,8 @@ func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
301291
LoginUrl: d.Get("login_url").(string),
302292
}
303293

304-
if _, ok := d.GetOk("github"); ok {
305-
cfClientIDP.ClientType = "github"
294+
if _, ok := d.GetOk(idp.GitHub); ok {
295+
cfClientIDP.ClientType = idp.GitHub
306296
cfClientIDP.ClientId = d.Get("github.0.client_id").(string)
307297
cfClientIDP.ClientSecret = d.Get("github.0.client_secret").(string)
308298
cfClientIDP.AuthURL = d.Get("github.0.authentication_url").(string)
@@ -312,17 +302,17 @@ func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
312302
cfClientIDP.ApiPathPrefix = d.Get("github.0.api_path_prefix").(string)
313303
}
314304

315-
if _, ok := d.GetOk("gitlab"); ok {
316-
cfClientIDP.ClientType = "gitlab"
305+
if _, ok := d.GetOk(idp.GitLab); ok {
306+
cfClientIDP.ClientType = idp.GitLab
317307
cfClientIDP.ClientId = d.Get("gitlab.0.client_id").(string)
318308
cfClientIDP.ClientSecret = d.Get("gitlab.0.client_secret").(string)
319309
cfClientIDP.AuthURL = d.Get("gitlab.0.authentication_url").(string)
320310
cfClientIDP.UserProfileURL = d.Get("gitlab.0.user_profile_url").(string)
321311
cfClientIDP.ApiURL = d.Get("gitlab.0.api_url").(string)
322312
}
323313

324-
if _, ok := d.GetOk("okta"); ok {
325-
cfClientIDP.ClientType = "okta"
314+
if _, ok := d.GetOk(idp.Okta); ok {
315+
cfClientIDP.ClientType = idp.Okta
326316
cfClientIDP.ClientId = d.Get("okta.0.client_id").(string)
327317
cfClientIDP.ClientSecret = d.Get("okta.0.client_secret").(string)
328318
cfClientIDP.ClientHost = d.Get("okta.0.client_host").(string)
@@ -331,8 +321,8 @@ func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
331321
cfClientIDP.Access_token = d.Get("okta.0.access_token").(string)
332322
}
333323

334-
if _, ok := d.GetOk("google"); ok {
335-
cfClientIDP.ClientType = "google"
324+
if _, ok := d.GetOk(idp.Google); ok {
325+
cfClientIDP.ClientType = idp.Google
336326
cfClientIDP.ClientId = d.Get("google.0.client_id").(string)
337327
cfClientIDP.ClientSecret = d.Get("google.0.client_secret").(string)
338328
cfClientIDP.KeyFile = d.Get("google.0.json_keyfile").(string)
@@ -341,15 +331,15 @@ func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
341331
cfClientIDP.SyncField = d.Get("google.0.sync_field").(string)
342332
}
343333

344-
if _, ok := d.GetOk("auth0"); ok {
345-
cfClientIDP.ClientType = "auth0"
334+
if _, ok := d.GetOk(idp.Auth0); ok {
335+
cfClientIDP.ClientType = idp.Auth0
346336
cfClientIDP.ClientId = d.Get("auth0.0.client_id").(string)
347337
cfClientIDP.ClientSecret = d.Get("auth0.0.client_secret").(string)
348338
cfClientIDP.ClientHost = d.Get("auth0.0.domain").(string)
349339
}
350340

351-
if _, ok := d.GetOk("azure"); ok {
352-
cfClientIDP.ClientType = "azure"
341+
if _, ok := d.GetOk(idp.Azure); ok {
342+
cfClientIDP.ClientType = idp.Azure
353343
cfClientIDP.ClientId = d.Get("azure.0.app_id").(string)
354344
cfClientIDP.ClientSecret = d.Get("azure.0.client_secret").(string)
355345
cfClientIDP.AppId = d.Get("azure.0.object_id").(string)
@@ -358,8 +348,8 @@ func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
358348
cfClientIDP.SyncInterval = strconv.Itoa(d.Get("azure.0.sync_interval").(int))
359349
}
360350

361-
if _, ok := d.GetOk("onelogin"); ok {
362-
cfClientIDP.ClientType = "onelogin"
351+
if _, ok := d.GetOk(idp.OneLogin); ok {
352+
cfClientIDP.ClientType = idp.OneLogin
363353
cfClientIDP.ClientId = d.Get("onelogin.0.client_id").(string)
364354
cfClientIDP.ClientSecret = d.Get("onelogin.0.client_secret").(string)
365355
cfClientIDP.ClientHost = d.Get("onelogin.0.domain").(string)
@@ -368,16 +358,16 @@ func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
368358
cfClientIDP.ApiClientSecret = d.Get("onelogin.0.api_client_secret").(string)
369359
}
370360

371-
if _, ok := d.GetOk("keycloak"); ok {
372-
cfClientIDP.ClientType = "keycloak"
361+
if _, ok := d.GetOk(idp.Keycloak); ok {
362+
cfClientIDP.ClientType = idp.Keycloak
373363
cfClientIDP.ClientId = d.Get("keycloak.0.client_id").(string)
374364
cfClientIDP.ClientSecret = d.Get("keycloak.0.client_secret").(string)
375365
cfClientIDP.Host = d.Get("keycloak.0.host").(string)
376366
cfClientIDP.Realm = d.Get("keycloak.0.realm").(string)
377367
}
378368

379-
if _, ok := d.GetOk("saml"); ok {
380-
cfClientIDP.ClientType = "saml"
369+
if _, ok := d.GetOk(idp.SAML); ok {
370+
cfClientIDP.ClientType = idp.SAML
381371
cfClientIDP.SamlProvider = d.Get("saml.0.provider").(string)
382372
cfClientIDP.EntryPoint = d.Get("saml.0.endpoint").(string)
383373
cfClientIDP.ApplicationCert = d.Get("saml.0.application_certificate").(string)
@@ -392,8 +382,8 @@ func mapResourceToAccountIDP(d *schema.ResourceData) *cfclient.IDP {
392382
cfClientIDP.Access_token = d.Get("saml.0.access_token").(string)
393383
}
394384

395-
if _, ok := d.GetOk("ldap"); ok {
396-
cfClientIDP.ClientType = "ldap"
385+
if _, ok := d.GetOk(idp.LDAP); ok {
386+
cfClientIDP.ClientType = idp.LDAP
397387
cfClientIDP.Url = d.Get("ldap.0.url").(string)
398388
cfClientIDP.Password = d.Get("ldap.0.password").(string)
399389
cfClientIDP.DistinguishedName = d.Get("ldap.0.distinguished_name").(string)

0 commit comments

Comments
 (0)