Merge pull request #842 from jfrog/revert-permission-target-to-sdkv2

Revert permission target resource back to SDKv2 version
jfrog · Nov 6, 2023 · e315c99 · e315c99
2 parents 60d964c + 5906e26
commit e315c99
Show file tree

Hide file tree

Showing 5 changed files with 289 additions and 421 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 9.7.4 (Nov 3, 2023). Tested on Artifactory 7.71.3 with Terraform CLI v1.6.3
+
+IMPROVEMENTS:
+
+* resource/artifactory_permission_target: Revert back to using Terraform SDKv2 due to unresolved performance issue from Terraform Framework. Issue: [#757](https://github.com/jfrog/terraform-provider-artifactory/issues/757) and [#805](https://github.com/jfrog/terraform-provider-artifactory/issues/805) PR: [#842](https://github.com/jfrog/terraform-provider-artifactory/pull/842)
+
 ## 9.7.3 (Nov 2, 2023). Tested on Artifactory 7.71.3 with Terraform CLI v1.6.3
 
 SECURITY:
@@ -258,7 +264,7 @@ IMPROVEMENTS:
 
 * resource/artifactory_permission_target is migrated to Plugin Framework, improved attribute validation.
 
-  PR: [#742](https://github.com/jfrog/terraform-provider-artifactory/pull/42)
+PR: [#742](https://github.com/jfrog/terraform-provider-artifactory/pull/742)
 
 ## 7.11.2 (May 30, 2023). Tested on Artifactory 7.59.9
 

diff --git a/pkg/artifactory/provider/framework.go b/pkg/artifactory/provider/framework.go
@@ -186,7 +186,6 @@ func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.R
 		user.NewAnonymousUserResource,
 		security.NewGroupResource,
 		security.NewScopedTokenResource,
-		security.NewPermissionTargetResource,
 		security.NewGlobalEnvironmentResource,
 		security.NewDistributionPublicKeyResource,
 		security.NewCertificateResource,

diff --git a/pkg/artifactory/provider/resources.go b/pkg/artifactory/provider/resources.go
@@ -69,6 +69,7 @@ func resourcesMap() map[string]*schema.Resource {
 		"artifactory_virtual_rpm_repository":                  virtual.ResourceArtifactoryVirtualRpmRepository(),
 		"artifactory_virtual_helm_repository":                 virtual.ResourceArtifactoryVirtualHelmRepository(),
 		"artifactory_unmanaged_user":                          user.ResourceArtifactoryUser(), // alias of artifactory_user
+		"artifactory_permission_target":                       security.ResourceArtifactoryPermissionTarget(),
 		"artifactory_pull_replication":                        replication.ResourceArtifactoryPullReplication(),
 		"artifactory_push_replication":                        replication.ResourceArtifactoryPushReplication(),
 		"artifactory_local_repository_single_replication":     replication.ResourceArtifactoryLocalRepositorySingleReplication(),