From 4a52a605adc32dbe85b79eb21443f78be58320e7 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Thu, 18 Jul 2024 14:57:04 -0700 Subject: [PATCH 1/4] Add deprecation message for 'platform_myjfrog_ip_allowlist' --- CHANGELOG.md | 4 ++++ docs/resources/myjfrog_ip_allowlist.md | 3 +++ pkg/platform/resource_myjfrog_ip_allowlist.go | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23a529e..3e86643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.9.0 (July 19, 2024). Tested on Artifactory 7.84.17 with Terraform 1.9.2 and OpenTofu 1.7.3 +NOTES: + +* resource/platform_myjfrog_ip_allowlist is being deprecated and is moved to new [MyJFrog provider](https://registry.terraform.io/providers/jfrog/myjfrog/latest). Use the `myjfrog_ip_allowlist` resource there instead. PR: [#105](https://github.com/jfrog/terraform-provider-platform/pull/105) + IMPROVEMENTS: * resource/platform_oidc_configuration: Add `Azure` option for `provider_type` attribute. PR: [#112](https://github.com/jfrog/terraform-provider-platform/pull/112) diff --git a/docs/resources/myjfrog_ip_allowlist.md b/docs/resources/myjfrog_ip_allowlist.md index e9ad7bd..ed55759 100644 --- a/docs/resources/myjfrog_ip_allowlist.md +++ b/docs/resources/myjfrog_ip_allowlist.md @@ -6,6 +6,7 @@ description: |- Provides a MyJFrog IP allowlist https://jfrog.com/help/r/jfrog-hosting-models-documentation/configure-the-ip/cidr-allowlist resource to manage list of allow IP/CIDR addresses. To use this resource, you need an access token. Only a Primary Admin can generate MyJFrog tokens. For more information, see Generate a Token in MyJFrog https://jfrog.com/help/r/jfrog-hosting-models-documentation/generate-a-token-in-myjfrog. ->This resource is supported only on the Cloud (SaaS) platform. ~>The rate limit is 5 times per hour for actions that result in a successful outcome (for Create, Update, and Delete actions). See Allowlist REST API https://jfrog.com/help/r/jfrog-rest-apis/allowlist-rest-api for full list of limitations. + !>This resource is being deprecated and moved to the new provider jfrog/myjfrog. Use myjfrog_ip_allowlist resource there instead. --- # platform_myjfrog_ip_allowlist (Resource) @@ -16,6 +17,8 @@ Provides a MyJFrog [IP allowlist](https://jfrog.com/help/r/jfrog-hosting-models- ~>The rate limit is **5 times per hour** for actions that result in a successful outcome (for Create, Update, and Delete actions). See [Allowlist REST API](https://jfrog.com/help/r/jfrog-rest-apis/allowlist-rest-api) for full list of limitations. +!>This resource is being deprecated and moved to the new provider `jfrog/myjfrog`. Use `myjfrog_ip_allowlist` resource there instead. + ## Example Usage ```terraform diff --git a/pkg/platform/resource_myjfrog_ip_allowlist.go b/pkg/platform/resource_myjfrog_ip_allowlist.go index da71ff6..0580d35 100644 --- a/pkg/platform/resource_myjfrog_ip_allowlist.go +++ b/pkg/platform/resource_myjfrog_ip_allowlist.go @@ -113,7 +113,9 @@ func (r *ipAllowListResource) Schema(ctx context.Context, req resource.SchemaReq MarkdownDescription: "Provides a MyJFrog [IP allowlist](https://jfrog.com/help/r/jfrog-hosting-models-documentation/configure-the-ip/cidr-allowlist) resource to manage list of allow IP/CIDR addresses. " + "To use this resource, you need an access token. Only a Primary Admin can generate MyJFrog tokens. For more information, see [Generate a Token in MyJFrog](https://jfrog.com/help/r/jfrog-hosting-models-documentation/generate-a-token-in-myjfrog).\n\n" + "->This resource is supported only on the Cloud (SaaS) platform.\n\n" + - "~>The rate limit is **5 times per hour** for actions that result in a successful outcome (for Create, Update, and Delete actions). See [Allowlist REST API](https://jfrog.com/help/r/jfrog-rest-apis/allowlist-rest-api) for full list of limitations.", + "~>The rate limit is **5 times per hour** for actions that result in a successful outcome (for Create, Update, and Delete actions). See [Allowlist REST API](https://jfrog.com/help/r/jfrog-rest-apis/allowlist-rest-api) for full list of limitations.\n\n" + + "!>This resource is being deprecated and moved to the new provider `jfrog/myjfrog`. Use `myjfrog_ip_allowlist` resource there instead.", + DeprecationMessage: "This resource is being deprecated and moved to the new provider 'jfrog/myjfrog'. Use 'myjfrog_ip_allowlist' resource there instead.", } } From e3b89f734397749428249207b6024b681c4f067b Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Fri, 19 Jul 2024 13:37:00 -0700 Subject: [PATCH 2/4] Add link to new provider in doc --- docs/resources/myjfrog_ip_allowlist.md | 4 ++-- pkg/platform/resource_myjfrog_ip_allowlist.go | 2 +- sample.tf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/resources/myjfrog_ip_allowlist.md b/docs/resources/myjfrog_ip_allowlist.md index ed55759..bdc3832 100644 --- a/docs/resources/myjfrog_ip_allowlist.md +++ b/docs/resources/myjfrog_ip_allowlist.md @@ -6,7 +6,7 @@ description: |- Provides a MyJFrog IP allowlist https://jfrog.com/help/r/jfrog-hosting-models-documentation/configure-the-ip/cidr-allowlist resource to manage list of allow IP/CIDR addresses. To use this resource, you need an access token. Only a Primary Admin can generate MyJFrog tokens. For more information, see Generate a Token in MyJFrog https://jfrog.com/help/r/jfrog-hosting-models-documentation/generate-a-token-in-myjfrog. ->This resource is supported only on the Cloud (SaaS) platform. ~>The rate limit is 5 times per hour for actions that result in a successful outcome (for Create, Update, and Delete actions). See Allowlist REST API https://jfrog.com/help/r/jfrog-rest-apis/allowlist-rest-api for full list of limitations. - !>This resource is being deprecated and moved to the new provider jfrog/myjfrog. Use myjfrog_ip_allowlist resource there instead. + !>This resource is being deprecated and moved to the new provider jfrog/myjfrog https://registry.terraform.io/providers/jfrog/myjfrog. Use myjfrog_ip_allowlist resource there instead. --- # platform_myjfrog_ip_allowlist (Resource) @@ -17,7 +17,7 @@ Provides a MyJFrog [IP allowlist](https://jfrog.com/help/r/jfrog-hosting-models- ~>The rate limit is **5 times per hour** for actions that result in a successful outcome (for Create, Update, and Delete actions). See [Allowlist REST API](https://jfrog.com/help/r/jfrog-rest-apis/allowlist-rest-api) for full list of limitations. -!>This resource is being deprecated and moved to the new provider `jfrog/myjfrog`. Use `myjfrog_ip_allowlist` resource there instead. +!>This resource is being deprecated and moved to the new provider [jfrog/myjfrog](https://registry.terraform.io/providers/jfrog/myjfrog). Use `myjfrog_ip_allowlist` resource there instead. ## Example Usage diff --git a/pkg/platform/resource_myjfrog_ip_allowlist.go b/pkg/platform/resource_myjfrog_ip_allowlist.go index 0580d35..f780b24 100644 --- a/pkg/platform/resource_myjfrog_ip_allowlist.go +++ b/pkg/platform/resource_myjfrog_ip_allowlist.go @@ -114,7 +114,7 @@ func (r *ipAllowListResource) Schema(ctx context.Context, req resource.SchemaReq "To use this resource, you need an access token. Only a Primary Admin can generate MyJFrog tokens. For more information, see [Generate a Token in MyJFrog](https://jfrog.com/help/r/jfrog-hosting-models-documentation/generate-a-token-in-myjfrog).\n\n" + "->This resource is supported only on the Cloud (SaaS) platform.\n\n" + "~>The rate limit is **5 times per hour** for actions that result in a successful outcome (for Create, Update, and Delete actions). See [Allowlist REST API](https://jfrog.com/help/r/jfrog-rest-apis/allowlist-rest-api) for full list of limitations.\n\n" + - "!>This resource is being deprecated and moved to the new provider `jfrog/myjfrog`. Use `myjfrog_ip_allowlist` resource there instead.", + "!>This resource is being deprecated and moved to the new provider [jfrog/myjfrog](https://registry.terraform.io/providers/jfrog/myjfrog). Use `myjfrog_ip_allowlist` resource there instead.", DeprecationMessage: "This resource is being deprecated and moved to the new provider 'jfrog/myjfrog'. Use 'myjfrog_ip_allowlist' resource there instead.", } } diff --git a/sample.tf b/sample.tf index 9c5720f..d0a3f5e 100644 --- a/sample.tf +++ b/sample.tf @@ -2,7 +2,7 @@ terraform { required_providers { platform = { source = "jfrog/platform" - version = "1.4.1" + version = "1.9.0" } } } From faf1d2387ed965bf1cb5e4401c357e25c9adb538 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Fri, 19 Jul 2024 13:38:11 -0700 Subject: [PATCH 3/4] Update CHANGELOG --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e86643..7df902e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ -## 1.9.0 (July 19, 2024). Tested on Artifactory 7.84.17 with Terraform 1.9.2 and OpenTofu 1.7.3 +## 1.10.0 (July 21, 2024) NOTES: -* resource/platform_myjfrog_ip_allowlist is being deprecated and is moved to new [MyJFrog provider](https://registry.terraform.io/providers/jfrog/myjfrog/latest). Use the `myjfrog_ip_allowlist` resource there instead. PR: [#105](https://github.com/jfrog/terraform-provider-platform/pull/105) +* resource/platform_myjfrog_ip_allowlist is being deprecated and is moved to new [MyJFrog provider](https://registry.terraform.io/providers/jfrog/myjfrog/latest). Use the `myjfrog_ip_allowlist` resource there instead. PR: [#113](https://github.com/jfrog/terraform-provider-platform/pull/113) + +## 1.9.0 (July 19, 2024). Tested on Artifactory 7.84.17 with Terraform 1.9.2 and OpenTofu 1.7.3 IMPROVEMENTS: From 05e9cac96d46845f8b144fcedc5d3a74b72b95d2 Mon Sep 17 00:00:00 2001 From: JFrog CI Date: Fri, 19 Jul 2024 20:44:01 +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 7df902e..7f07180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.10.0 (July 21, 2024) +## 1.10.0 (July 21, 2024). Tested on Artifactory 7.84.17 with Terraform 1.9.2 and OpenTofu 1.7.3 NOTES: