Skip to content
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

Fix issue with not being able to update dependencies on actions #247

Merged
merged 1 commit into from
Jul 18, 2022
Merged

Fix issue with not being able to update dependencies on actions #247

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
111 changes: 56 additions & 55 deletions auth0/resource_auth0_action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ import (
"context"
"fmt"
"net/http"
"strings"

"github.com/auth0/go-auth0/management"
"github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

"github.com/auth0/terraform-provider-auth0/auth0/internal/hash"
)

func newAction() *schema.Resource {
Expand All @@ -35,7 +32,7 @@ func newAction() *schema.Resource {
Type: schema.TypeList,
Required: true,
MinItems: 1,
MaxItems: 1, // NOTE: Changes must be made together with expandAction()
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"id": {
Expand All @@ -62,7 +59,6 @@ func newAction() *schema.Resource {
"dependencies": {
Type: schema.TypeSet,
Optional: true,
MinItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Expand All @@ -77,7 +73,6 @@ func newAction() *schema.Resource {
},
},
},
Set: hash.StringKey("name"),
Description: "List of third party npm modules, and their versions, that this action depends on",
},
"runtime": {
Expand All @@ -93,7 +88,6 @@ func newAction() *schema.Resource {
"secrets": {
Type: schema.TypeList,
Optional: true,
MinItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Expand Down Expand Up @@ -131,18 +125,17 @@ func newAction() *schema.Resource {

func createAction(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
action := expandAction(d)

api := m.(*management.Management)
if err := api.Action.Create(action); err != nil {
return diag.FromErr(err)
}

d.SetId(action.GetID())

d.Partial(true)
if result := deployAction(ctx, d, m); result.HasError() {
return result
}
d.Partial(false)

return readAction(ctx, d, m)
}
Expand Down Expand Up @@ -176,78 +169,86 @@ func readAction(ctx context.Context, d *schema.ResourceData, m interface{}) diag

func updateAction(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
action := expandAction(d)

api := m.(*management.Management)
if err := api.Action.Update(d.Id(), action); err != nil {
return diag.FromErr(err)
}

d.Partial(true)
if result := deployAction(ctx, d, m); result.HasError() {
return result
}
d.Partial(false)

return readAction(ctx, d, m)
}

func deployAction(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
deployExists := d.Get("deploy").(bool)
if deployExists {
api := m.(*management.Management)

err := resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
action, err := api.Action.Read(d.Id())
if err != nil {
return resource.NonRetryableError(err)
func deleteAction(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api := m.(*management.Management)
if err := api.Action.Delete(d.Id()); err != nil {
if mErr, ok := err.(management.Error); ok {
if mErr.Status() == http.StatusNotFound {
d.SetId("")
return nil
}
}
return diag.FromErr(err)
}

if strings.ToLower(action.GetStatus()) == "failed" {
return resource.NonRetryableError(
fmt.Errorf("action %q failed to build, check the Auth0 UI for errors", action.GetName()),
)
}
return nil
}

if strings.ToLower(action.GetStatus()) != "built" {
return resource.RetryableError(
fmt.Errorf(
"expected action %q status %q to equal %q",
action.GetName(),
action.GetStatus(),
"built",
),
)
}
func deployAction(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
deployExists := d.Get("deploy").(bool)
if !deployExists {
return nil
}

return nil
})
api := m.(*management.Management)

err := resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
action, err := api.Action.Read(d.Id())
if err != nil {
return diag.FromErr(fmt.Errorf("action %q never reached built state: %w", d.Get("name"), err))
return resource.NonRetryableError(err)
}

actionVersion, err := api.Action.Deploy(d.Id())
if err != nil {
return diag.FromErr(err)
if action.GetStatus() == management.ActionStatusFailed {
return resource.NonRetryableError(
fmt.Errorf(
"action %q failed to build, check the Auth0 UI for errors",
action.GetName(),
),
)
}

return diag.FromErr(d.Set("version_id", actionVersion.GetID()))
}
if action.GetStatus() != management.ActionStatusBuilt {
return resource.RetryableError(
fmt.Errorf(
"expected action %q status %q to equal %q",
action.GetName(),
action.GetStatus(),
"built",
),
)
}

return nil
}
return nil
})
if err != nil {
return diag.FromErr(
fmt.Errorf(
"action %q never reached built state: %w",
d.Get("name").(string),
err,
),
)
}

func deleteAction(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api := m.(*management.Management)
if err := api.Action.Delete(d.Id()); err != nil {
if mErr, ok := err.(management.Error); ok {
if mErr.Status() == http.StatusNotFound {
d.SetId("")
return nil
}
}
actionVersion, err := api.Action.Deploy(d.Id())
if err != nil {
return diag.FromErr(err)
}

return nil
return diag.FromErr(d.Set("version_id", actionVersion.GetID()))
}

func expandAction(d *schema.ResourceData) *management.Action {
Expand Down
Loading