Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ouranos committed Jul 11, 2022
1 parent 75d9a2c commit 76b30a7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
10 changes: 2 additions & 8 deletions internal/provider/resource_cloudflare_access_application.go
Expand Up @@ -65,10 +65,7 @@ func resourceCloudflareAccessApplicationCreate(ctx context.Context, d *schema.Re
}

if _, ok := d.GetOk("saas_app"); ok {
saasApp, err := convertSaasSchemaToStruct(d)
if err != nil {
return diag.FromErr(err)
}
saasApp := convertSaasSchemaToStruct(d)
newAccessApplication.SaasApplication = saasApp
}

Expand Down Expand Up @@ -190,10 +187,7 @@ func resourceCloudflareAccessApplicationUpdate(ctx context.Context, d *schema.Re
}

if _, ok := d.GetOk("saas_app"); ok {
saasConfig, err := convertSaasSchemaToStruct(d)
if err != nil {
return diag.FromErr(err)
}
saasConfig := convertSaasSchemaToStruct(d)
updatedAccessApplication.SaasApplication = saasConfig
}

Expand Down
4 changes: 2 additions & 2 deletions internal/provider/schema_cloudflare_access_application.go
Expand Up @@ -286,15 +286,15 @@ func convertCORSStructToSchema(d *schema.ResourceData, headers *cloudflare.Acces
return []interface{}{m}
}

func convertSaasSchemaToStruct(d *schema.ResourceData) (*cloudflare.SaasApplication, error) {
func convertSaasSchemaToStruct(d *schema.ResourceData) *cloudflare.SaasApplication {
SaasConfig := cloudflare.SaasApplication{}
if _, ok := d.GetOk("saas_app"); ok {
SaasConfig.SPEntityID = d.Get("saas_app.0.sp_entity_id").(string)
SaasConfig.ConsumerServiceUrl = d.Get("saas_app.0.consumer_service_url").(string)
SaasConfig.NameIDFormat = d.Get("saas_app.0.name_id_format").(string)
}

return &SaasConfig, nil
return &SaasConfig
}

func convertSaasStructToSchema(d *schema.ResourceData, app *cloudflare.SaasApplication) []interface{} {
Expand Down

0 comments on commit 76b30a7

Please sign in to comment.