DXCDT-482: Fix deleting the universal login template within auth0_branding #695
Conversation
sergiught
force-pushed
the
patch/DXCDT-482-ul-delete
branch
from
c8ffa26 to
d51701a
Compare
| Computed: true, | ||
| Description: "The body of login pages.", | ||
| Type: schema.TypeString, | ||
| Required: true, |
There was a problem hiding this comment.
Marking this as required to prevent instances where the font block is present with no attributes assigned.
| @@ -66,6 +73,7 @@ func NewResource() *schema.Resource { | |||
| "font": { | |||
| Type: schema.TypeList, | |||
| Optional: true, | |||
| Computed: true, | |||
There was a problem hiding this comment.
Marking this now as computed in order to not require any custom logic within the read func that only reads the font details if this is present within the config as it goes against best practices.
| @@ -32,6 +38,7 @@ func NewResource() *schema.Resource { | |||
| "colors": { | |||
| Type: schema.TypeList, | |||
| Optional: true, | |||
| Computed: true, | |||
There was a problem hiding this comment.
Marking this now as computed in order to not require any custom logic within the read func that only reads the colors details if this is present within the config as it goes against best practices.
| ) | ||
| if _, ok := d.GetOk("colors"); ok { |
There was a problem hiding this comment.
This was a very weird custom logic we had within the read func that was only assigning the API data if the config blocks were present.
|
|
||
| if err := checkForCustomDomains(api); err == nil { |
There was a problem hiding this comment.
We're only fetching template data if there's a custom domain set.
| oldUL, newUL := d.GetChange("universal_login") | ||
| oldUniversalLogin := oldUL.([]interface{}) | ||
| newUniversalLogin := newUL.([]interface{}) | ||
|
|
||
| // This indicates that a removal of the block happened, and we need to delete the template. | ||
| if len(newUniversalLogin) == 0 && len(oldUniversalLogin) != 0 { | ||
| if err := api.Branding.DeleteUniversalLogin(); err != nil { | ||
| return diag.FromErr(err) | ||
| } | ||
|
|
||
| return readBranding(ctx, d, m) | ||
| } |
There was a problem hiding this comment.
This is the part that actually fixes the GitHub issue around the deletion of the template.
| "because no custom domains are available on the tenant.", | ||
| AttributePath: cty.Path{cty.GetAttrStep{Name: "universal_login"}}, | ||
| }, | ||
| if err == errNoCustomDomain { |
There was a problem hiding this comment.
The delete func was also improved to directly allow the deletion of the resource if there are no custom domains set.
| if universalLogin == nil { | ||
| return nil, nil | ||
| } |
There was a problem hiding this comment.
This was unnecessary.
sergiught
force-pushed
the
patch/DXCDT-482-ul-delete
branch
from
a069314 to
9877a28
Compare
🔧 Changes
As raised within #659, removing the universal login block does not trigger a deletion of the template. This PR fixes that and further improves the auth0_branding resource, more info within comments.
📚 References
🔬 Testing
📝 Checklist