Update data source

jfrog · Sep 13, 2024 · b805edb · b805edb
1 parent cc89d20
commit b805edb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/pkg/artifactory/datasource/security/datasource_artifactory_permission_target.go b/pkg/artifactory/datasource/security/datasource_artifactory_permission_target.go
@@ -7,11 +7,21 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
 	"github.com/jfrog/terraform-provider-shared/util"
 	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 )
 
+const PermissionsEndPoint = "artifactory/api/v2/security/permissions/"
+const (
+	PermRead            = "read"
+	PermWrite           = "write"
+	PermAnnotate        = "annotate"
+	PermDelete          = "delete"
+	PermManage          = "manage"
+	PermManagedXrayMeta = "managedXrayMeta"
+	PermDistribute      = "distribute"
+)
+
 type PermissionTargetParams struct {
 	Name          string                   `json:"name"`
 	Repo          *PermissionTargetSection `json:"repo,omitempty"`
@@ -55,13 +65,13 @@ func BuildPermissionTargetSchema() map[string]*schema.Schema {
 					Elem: &schema.Schema{
 						Type: schema.TypeString,
 						ValidateFunc: validation.StringInSlice([]string{
-							security.PermRead,
-							security.PermAnnotate,
-							security.PermWrite,
-							security.PermDelete,
-							security.PermManage,
-							security.PermManagedXrayMeta,
-							security.PermDistribute,
+							PermRead,
+							PermAnnotate,
+							PermWrite,
+							PermDelete,
+							PermManage,
+							PermManagedXrayMeta,
+							PermDistribute,
 						}, false),
 					},
 					Set:      schema.HashString,
@@ -135,7 +145,7 @@ func DataSourceArtifactoryPermissionTarget() *schema.Resource {
 	dataSourcePermissionTargetRead := func(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 		permissionTarget := new(PermissionTargetParams)
 		targetName := d.Get("name").(string)
-		resp, err := m.(util.ProviderMetadata).Client.R().SetResult(permissionTarget).Get(security.PermissionsEndPoint + targetName)
+		resp, err := m.(util.ProviderMetadata).Client.R().SetResult(permissionTarget).Get(PermissionsEndPoint + targetName)
 
 		if err != nil {
 			return diag.FromErr(err)

diff --git a/pkg/artifactory/datasource/security/datasource_artifactory_permission_target_test.go b/pkg/artifactory/datasource/security/datasource_artifactory_permission_target_test.go
@@ -9,14 +9,13 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	datasource "github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/datasource/security"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
 	"github.com/jfrog/terraform-provider-shared/testutil"
 	"github.com/jfrog/terraform-provider-shared/util"
 )
 
 func deletePermissionTarget(t *testing.T, name string) error {
 	restyClient := acctest.GetTestResty(t)
-	_, err := restyClient.R().Delete(security.PermissionsEndPoint + name)
+	_, err := restyClient.R().Delete(datasource.PermissionsEndPoint + name)
 
 	return err
 }
@@ -55,7 +54,7 @@ func createPermissionTarget(targetName string, userName string, t *testing.T) {
 	}
 
 	restyClient := acctest.GetTestResty(t)
-	postPermissionTarget := security.PermissionsEndPoint + permissionTarget.Name
+	postPermissionTarget := datasource.PermissionsEndPoint + permissionTarget.Name
 	if _, err := restyClient.R().
 		AddRetryCondition(repository.Retry400).
 		SetBody(permissionTarget).