Skip to content

fix(iam): handle http 409 transient error #3142

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

Merged
merged 2 commits into from
Jun 25, 2025
Merged

fix(iam): handle http 409 transient error #3142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
918935d
fix(iam): handle http 409 transient error
Gnoale Jun 4, 2025
60059ee
use internal transport retry api
Gnoale Jun 25, 2025
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
31 changes: 27 additions & 4 deletions internal/services/iam/group_membership.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import (
"context"
"fmt"
"strings"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/transport"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
)

Expand Down Expand Up @@ -53,11 +55,11 @@ func resourceIamGroupMembershipCreate(ctx context.Context, d *schema.ResourceDat
userID := types.ExpandStringPtr(d.Get("user_id"))
applicationID := types.ExpandStringPtr(d.Get("application_id"))

group, err := api.AddGroupMember(&iam.AddGroupMemberRequest{
group, err := MakeGroupRequest(ctx, api, &iam.AddGroupMemberRequest{
GroupID: d.Get("group_id").(string),
UserID: userID,
ApplicationID: applicationID,
}, scw.WithContext(ctx))
})
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -74,7 +76,7 @@ func resourceIamGroupMembershipRead(ctx context.Context, d *schema.ResourceData,
if err != nil {
return diag.FromErr(err)
}

// http GET request should not return a 409 error
group, err := api.GetGroup(&iam.GetGroupRequest{
GroupID: groupID,
}, scw.WithContext(ctx))
Expand Down Expand Up @@ -139,7 +141,7 @@ func resourceIamGroupMembershipDelete(ctx context.Context, d *schema.ResourceDat
req.ApplicationID = &applicationID
}

_, err = api.RemoveGroupMember(req, scw.WithContext(ctx))
_, err = MakeGroupRequest(ctx, api, req)
if err != nil {
if httperrors.Is404(err) {
d.SetId("")
Expand Down Expand Up @@ -178,3 +180,24 @@ func ExpandGroupMembershipID(id string) (groupID string, userID string, applicat

return
}

func MakeGroupRequest(ctx context.Context, api *iam.API, request any) (*iam.Group, error) {
retryInterval := 100 * time.Millisecond

group, err := transport.RetryOnTransientStateError(func() (*iam.Group, error) {
switch req := request.(type) {
case *iam.AddGroupMemberRequest:
return api.AddGroupMember(req, scw.WithContext(ctx))
case *iam.RemoveGroupMemberRequest:
return api.RemoveGroupMember(req, scw.WithContext(ctx))
default:
return nil, fmt.Errorf("invalid request type: %T", req)
}
}, func() (string, error) {
time.Sleep(retryInterval) // lintignore: R018

return "", nil
})

return group, err
}
Loading