From 9653aa5c7f397a746a4fe63d0eec9c7b3f6bfd4b Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Mon, 12 Aug 2024 10:33:04 -0700 Subject: [PATCH 1/5] Add deprecation message to 'artifactory_saml_settings' resource Update doc for the same --- docs/resources/saml_settings.md | 4 +++- .../configuration/resource_artifactory_saml_settings.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/resources/saml_settings.md b/docs/resources/saml_settings.md index fbfe55bbd..df30a8c6c 100644 --- a/docs/resources/saml_settings.md +++ b/docs/resources/saml_settings.md @@ -1,5 +1,5 @@ --- -subcategory: "Configuration" +subcategory: "Deprecated" --- # Artifactory SAML SSO Settings Resource @@ -9,6 +9,8 @@ Only a single `artifactory_saml_settings` resource is meant to be defined. ~>The `artifactory_saml_settings` resource utilizes endpoints which are blocked/removed in SaaS environments (i.e. in Artifactory online), rendering this resource incompatible with Artifactory SaaS environments. +!>This resource is deprecated in favor of [platform_saml_settings](https://registry.terraform.io/providers/jfrog/platform/latest/docs/resources/saml_settings) resource in the Platform provider. + ## Example Usage ```hcl diff --git a/pkg/artifactory/resource/configuration/resource_artifactory_saml_settings.go b/pkg/artifactory/resource/configuration/resource_artifactory_saml_settings.go index bcdd16932..62441c123 100644 --- a/pkg/artifactory/resource/configuration/resource_artifactory_saml_settings.go +++ b/pkg/artifactory/resource/configuration/resource_artifactory_saml_settings.go @@ -124,6 +124,7 @@ func ResourceArtifactorySamlSettings() *schema.Resource { Description: `When set, an X.509 public certificate will be created by Artifactory. Download this certificate and upload it to your IDP and choose your own encryption algorithm. This process will let you encrypt the assertion section in your SAML response. Default value is "false".`, }, }, + DeprecationMessage: `This resource is deprecated in favor of "platform_saml_settings" (https://registry.terraform.io/providers/jfrog/platform/latest/docs/resources/saml_settings) resource in the Platform provider.`, } } From 579db5e987ab52a402b804cdfc2327c4e236df17 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Mon, 12 Aug 2024 10:43:24 -0700 Subject: [PATCH 2/5] Fix doc subcategories typo --- docs/resources/release_bundle_v2.md | 2 +- docs/resources/release_bundle_v2_promotion.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/resources/release_bundle_v2.md b/docs/resources/release_bundle_v2.md index 3ab92c79b..1f808e635 100644 --- a/docs/resources/release_bundle_v2.md +++ b/docs/resources/release_bundle_v2.md @@ -1,7 +1,7 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs page_title: "artifactory_release_bundle_v2 Resource - terraform-provider-artifactory" -subcategory: "lifecycle" +subcategory: "Lifecycle" description: |- This resource enables you to creates a new Release Bundle v2, uniquely identified by a combination of repository key, name, and version. For more information, see Understanding Release Bundles v2 https://jfrog.com/help/r/jfrog-artifactory-documentation/understanding-release-bundles-v2 and REST API https://jfrog.com/help/r/jfrog-rest-apis/create-release-bundle-v2-version. --- diff --git a/docs/resources/release_bundle_v2_promotion.md b/docs/resources/release_bundle_v2_promotion.md index 86d2a64ca..649dcbad4 100644 --- a/docs/resources/release_bundle_v2_promotion.md +++ b/docs/resources/release_bundle_v2_promotion.md @@ -1,7 +1,7 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs page_title: "artifactory_release_bundle_v2_promotion Resource - terraform-provider-artifactory" -subcategory: "lifecycle" +subcategory: "Lifecycle" description: |- This resource enables you to promote Release Bundle V2 version. For more information, see JFrog documentation https://jfrog.com/help/r/jfrog-artifactory-documentation/promote-a-release-bundle-v2-to-a-target-environment. --- From ffba8c3da886733c12043dc764544f4285ed9f92 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Mon, 12 Aug 2024 10:54:06 -0700 Subject: [PATCH 3/5] Update docs for deprecated resources --- docs/resources/permission_target.md | 4 ++-- docs/resources/release_bundle_custom_webhook.md | 4 +++- docs/resources/release_bundle_webhook.md | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/resources/permission_target.md b/docs/resources/permission_target.md index 7c9c03489..e7162b98c 100644 --- a/docs/resources/permission_target.md +++ b/docs/resources/permission_target.md @@ -1,11 +1,11 @@ --- -subcategory: "Security" +subcategory: "Deprecated" --- # Artifactory Permission Target Resource Provides an Artifactory permission target resource. This can be used to create and manage Artifactory permission targets. -~> This resource has been deprecated in favor of [platform_permission](https://registry.terraform.io/providers/jfrog/platform/latest/docs/resources/permission) resource. +!>This resource has been deprecated in favor of [platform_permission](https://registry.terraform.io/providers/jfrog/platform/latest/docs/resources/permission) resource. ## Example Usage diff --git a/docs/resources/release_bundle_custom_webhook.md b/docs/resources/release_bundle_custom_webhook.md index 1d964e4c8..5617ab48b 100644 --- a/docs/resources/release_bundle_custom_webhook.md +++ b/docs/resources/release_bundle_custom_webhook.md @@ -1,10 +1,12 @@ --- -subcategory: "Webhook" +subcategory: "Deprecated" --- # Artifactory Release Bundle Custom Webhook Resource Provides an Artifactory custom webhook resource. This can be used to register and manage Artifactory webhook subscription which enables you to be notified or notify other users when such events take place in Artifactory. +!>This resource is being deprecated and replaced by `artifactory_destination_custom_webhook` resource. + ## Example Usage ```hcl diff --git a/docs/resources/release_bundle_webhook.md b/docs/resources/release_bundle_webhook.md index 83a4c1c2a..b6be91dca 100644 --- a/docs/resources/release_bundle_webhook.md +++ b/docs/resources/release_bundle_webhook.md @@ -1,10 +1,12 @@ --- -subcategory: "Webhook" +subcategory: "Deprecated" --- # Artifactory Release Bundle Webhook Resource Provides an Artifactory webhook resource. This can be used to register and manage Artifactory webhook subscription which enables you to be notified or notify other users when such events take place in Artifactory. +!>This resource is being deprecated and replaced by `artifactory_destination_webhook` resource. + ## Example Usage . ```hcl From 26c2a8353b21e4afafb756380c9099b817a77c6a Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Mon, 12 Aug 2024 13:12:55 -0700 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63a255c93..e50b82b7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -## 11.5.2 (August 12, 2024). Tested on Artifactory 7.90.7 with Terraform 1.9.4 and OpenTofu 1.8.1 +## 11.6.0 (August 12, 2024) + +NOTES: + +* resource/artifactory_saml_settings: This resource is being deprecated and replaced by new [platform_saml_settings](https://registry.terraform.io/providers/jfrog/platform/latest/docs/resources/saml_settings) resource in the Platform provider. PR: [#1052](https://github.com/jfrog/terraform-provider-artifactory/pull/1052) BUG FIXES: From 485cc3f897b8d23781dc8ca0bb605427fabac273 Mon Sep 17 00:00:00 2001 From: JFrog CI Date: Mon, 12 Aug 2024 20:53:54 +0000 Subject: [PATCH 5/5] JFrog Pipelines - Add Artifactory version to CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e50b82b7a..119bc64f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 11.6.0 (August 12, 2024) +## 11.6.0 (August 12, 2024). Tested on Artifactory 7.90.7 with Terraform 1.9.4 and OpenTofu 1.8.1 NOTES: