From a67737c072aae7b0b5fd7ad20dcda7aa8759b1c1 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Fri, 15 Nov 2024 10:00:46 -0800 Subject: [PATCH 1/4] Set deprecation message for artifactory_group resource --- docs/resources/group.md | 4 +++- .../resource/security/resource_artifactory_group.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/resources/group.md b/docs/resources/group.md index a309331ba..c2e2721eb 100644 --- a/docs/resources/group.md +++ b/docs/resources/group.md @@ -1,12 +1,14 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs page_title: "artifactory_group Resource - terraform-provider-artifactory" -subcategory: "Security" +subcategory: "Deprecated" --- # Artifactory Group Resource Provides an Artifactory group resource. This can be used to create and manage Artifactory groups. +!>This resource is deprecated and will be removed in the next major version. Use `platform_group` resource in the JFrog Platform provider instead. + ## Example Usage ```terraform diff --git a/pkg/artifactory/resource/security/resource_artifactory_group.go b/pkg/artifactory/resource/security/resource_artifactory_group.go index 942679052..373300128 100644 --- a/pkg/artifactory/resource/security/resource_artifactory_group.go +++ b/pkg/artifactory/resource/security/resource_artifactory_group.go @@ -77,6 +77,7 @@ func (r *ArtifactoryGroupResource) Metadata(ctx context.Context, req resource.Me func (r *ArtifactoryGroupResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { resp.Schema = schema.Schema{ MarkdownDescription: "Provides an Artifactory group resource. This can be used to create and manage Artifactory groups. A group represents a role in the system and is assigned a set of permissions.", + DeprecationMessage: "This resource is deprecated. Use 'platform_group' resource in the JFrog Platform provider instead.", Attributes: map[string]schema.Attribute{ "id": schema.StringAttribute{ Computed: true, From c8a4f3d640890e6c1a73769e57897d83681592d9 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Fri, 15 Nov 2024 10:35:27 -0800 Subject: [PATCH 2/4] Update group doc with link to new resource --- docs/resources/group.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/group.md b/docs/resources/group.md index c2e2721eb..be7a0ac7a 100644 --- a/docs/resources/group.md +++ b/docs/resources/group.md @@ -7,7 +7,7 @@ subcategory: "Deprecated" Provides an Artifactory group resource. This can be used to create and manage Artifactory groups. -!>This resource is deprecated and will be removed in the next major version. Use `platform_group` resource in the JFrog Platform provider instead. +!>This resource is deprecated and will be removed in the next major version. Use [`platform_group` resource](https://registry.terraform.io/providers/jfrog/platform/latest/docs/resources/group) in the JFrog Platform provider instead. ## Example Usage From 04a75fa1cb5b925166ec645160da3fd62acc7b58 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Fri, 15 Nov 2024 10:36:18 -0800 Subject: [PATCH 3/4] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 755372dfd..155487ab7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 12.5.0 (November 15, 2024) + +NOTES: + +* resource/artifactory_group: This resource is being deprecated and replaced by new [platform_group](https://registry.terraform.io/providers/jfrog/platform/latest/docs/resources/group) resource in the Platform provider. PR: [#1130](https://github.com/jfrog/terraform-provider-artifactory/pull/1130) + ## 12.4.1 (November 11, 2024). Tested on Artifactory 7.98.8 with Terraform 1.9.8 and OpenTofu 1.8.5 BUG FIXES: From f3750d4f5dbd58497ccd9daa3a9678c25b36a37b Mon Sep 17 00:00:00 2001 From: JFrog CI Date: Fri, 15 Nov 2024 19:09:02 +0000 Subject: [PATCH 4/4] 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 155487ab7..2a13c499c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 12.5.0 (November 15, 2024) +## 12.5.0 (November 15, 2024). Tested on Artifactory 7.98.8 with Terraform 1.9.8 and OpenTofu 1.8.5 NOTES: