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.

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

Add check for 409 status when creating permission target #888

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
BUG FIXES:

* data/artifactory_virtual_maven_repository: Restore data source after being removed from the provider by mistake. PR: [#887](https://github.com/jfrog/terraform-provider-artifactory/pull/887) Issue: [#873](https://github.com/jfrog/terraform-provider-artifactory/issues/873)
* resource/artifactory_permission_target: Add check for '409 Conflict' error during resource creation and ignores it. PR: [#888](https://github.com/jfrog/terraform-provider-artifactory/pull/888) Issue: [#853](https://github.com/jfrog/terraform-provider-artifactory/issues/853)

## 10.1.3 (Feb 7, 2024)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package security
import (
"context"
"net/http"
"regexp"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
Expand Down Expand Up @@ -323,26 +324,37 @@ func PackPermissionTarget(permissionTarget *PermissionTargetParams, d *schema.Re
errors = setValue("release_bundle", packPermission(permissionTarget.ReleaseBundle))
}

if errors != nil && len(errors) > 0 {
if len(errors) > 0 {
return diag.Errorf("failed to marshal permission target %q", errors)
}
return nil
}

var conflictRegex = regexp.MustCompile(`.*Can't create permission target '.+' for type .+\. It already exists.*`)

func resourcePermissionTargetCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
permissionTarget := unpackPermissionTarget(ctx, d)

if _, err := m.(util.ProvderMetadata).Client.R().AddRetryCondition(repository.Retry400).SetBody(permissionTarget).Post(PermissionsEndPoint + permissionTarget.Name); err != nil {
return diag.FromErr(err)
resp, err := m.(util.ProvderMetadata).Client.R().
AddRetryCondition(repository.Retry400).
SetBody(permissionTarget).
Post(PermissionsEndPoint + permissionTarget.Name)
if err != nil {
if !(resp.StatusCode() == http.StatusConflict && conflictRegex.Match(resp.Body())) {
return diag.FromErr(err)
}
}

d.SetId(permissionTarget.Name)
return nil
return resourcePermissionTargetRead(ctx, d, m)
}

func resourcePermissionTargetRead(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
permissionTarget := new(PermissionTargetParams)
resp, err := m.(util.ProvderMetadata).Client.R().SetResult(permissionTarget).Get(PermissionsEndPoint + d.Id())
var permissionTarget PermissionTargetParams

resp, err := m.(util.ProvderMetadata).Client.R().
SetResult(&permissionTarget).
Get(PermissionsEndPoint + d.Id())
if err != nil {
if resp != nil && resp.StatusCode() == http.StatusNotFound {
d.SetId("")
Expand All @@ -351,13 +363,16 @@ func resourcePermissionTargetRead(_ context.Context, d *schema.ResourceData, m i
return diag.FromErr(err)
}

return PackPermissionTarget(permissionTarget, d)
return PackPermissionTarget(&permissionTarget, d)
}

func resourcePermissionTargetUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
permissionTarget := unpackPermissionTarget(ctx, d)

if _, err := m.(util.ProvderMetadata).Client.R().SetBody(permissionTarget).Put(PermissionsEndPoint + d.Id()); err != nil {
_, err := m.(util.ProvderMetadata).Client.R().
SetBody(permissionTarget).
Put(PermissionsEndPoint + d.Id())
if err != nil {
return diag.FromErr(err)
}

Expand Down
Loading