Merge branch 'master' into jfrogGH-621-bulk-import

chb0github · Oct 13, 2023 · d2bf147 · d2bf147
2 parents 1574ee7 + ae1a3fd
commit d2bf147
Show file tree

Hide file tree

Showing 6 changed files with 456 additions and 217 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 9.6.0 (Oct 13, 2023). Tested on Artifactory 7.68.14 with Terraform CLI v1.6.1
+
+IMPROVEMENTS:
+
+* resource/artifactory_certificate is migrated to Plugin Framework. PR: [#826](https://github.com/jfrog/terraform-provider-artifactory/pull/826)
+
 ## 9.5.1 (Oct 12, 2023). Tested on Artifactory 7.68.14 with Terraform CLI v1.6.1
 
 SECURITY:

diff --git a/docs/resources/certificate.md b/docs/resources/certificate.md
@@ -27,7 +27,8 @@ resource "artifactory_remote_maven_repository" "my-remote" {
 The following arguments are supported:
 
 * `alias` - (Required) Name of certificate.
-* `content` - (Required) PEM-encoded client certificate and private key.
+* `content` - (Optional) PEM-encoded client certificate and private key. Cannot be set with `file` attribute simultaneously.
+* `file` - (Optional) Path to the PEM file. Cannot be set with `content` attribute simultaneously.
 
 ## Attribute Reference
 

diff --git a/pkg/artifactory/provider/framework.go b/pkg/artifactory/provider/framework.go
@@ -172,6 +172,7 @@ func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.R
 		security.NewPermissionTargetResource,
 		security.NewGlobalEnvironmentResource,
 		security.NewDistributionPublicKeyResource,
+		security.NewCertificateResource,
 		configuration.NewLdapSettingResource,
 		configuration.NewLdapGroupSettingResource,
 		configuration.NewBackupResource,

diff --git a/pkg/artifactory/provider/resources.go b/pkg/artifactory/provider/resources.go
@@ -75,7 +75,6 @@ func resourcesMap() map[string]*schema.Resource {
 		"artifactory_local_repository_single_replication":     replication.ResourceArtifactoryLocalRepositorySingleReplication(),
 		"artifactory_local_repository_multi_replication":      replication.ResourceArtifactoryLocalRepositoryMultiReplication(),
 		"artifactory_remote_repository_replication":           replication.ResourceArtifactoryRemoteRepositoryReplication(),
-		"artifactory_certificate":                             security.ResourceArtifactoryCertificate(),
 		"artifactory_api_key":                                 security.ResourceArtifactoryApiKey(),
 		"artifactory_access_token":                            security.ResourceArtifactoryAccessToken(),
 		"artifactory_general_security":                        configuration.ResourceArtifactoryGeneralSecurity(),