From 3b7a5a64480d7483ea049313318d134d120181d5 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Wed, 21 Dec 2022 11:11:24 -0800 Subject: [PATCH 1/4] Update go.mod to use latest shared lib Update tests to follow new projectKey validation --- go.mod | 2 +- go.sum | 4 ++-- pkg/project/resource_project.go | 2 +- pkg/project/resource_project_test.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5c74538c..b196e8b3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/hashicorp/terraform-plugin-docs v0.7.0 github.com/hashicorp/terraform-plugin-log v0.3.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.14.0 - github.com/jfrog/terraform-provider-shared v1.7.0 + github.com/jfrog/terraform-provider-shared v1.8.0 ) require ( diff --git a/go.sum b/go.sum index c1fb65d9..5914f3a2 100644 --- a/go.sum +++ b/go.sum @@ -160,8 +160,8 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jfrog/terraform-provider-shared v1.7.0 h1:1rVylhL9W5YDKq4zXU1gISRitmeyg8lu7H8u+wP4544= -github.com/jfrog/terraform-provider-shared v1.7.0/go.mod h1:oIzDjD2mOlfXymkzwp5kbFG3Bqy3ymVGYX50CrCxiIE= +github.com/jfrog/terraform-provider-shared v1.8.0 h1:kaAN8/F1NgZa+V/LbDYUHk3hzCxa5yISBqak7NHvCmI= +github.com/jfrog/terraform-provider-shared v1.8.0/go.mod h1:oIzDjD2mOlfXymkzwp5kbFG3Bqy3ymVGYX50CrCxiIE= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= diff --git a/pkg/project/resource_project.go b/pkg/project/resource_project.go index c7c6f473..fa302b4b 100644 --- a/pkg/project/resource_project.go +++ b/pkg/project/resource_project.go @@ -455,7 +455,7 @@ func projectResource() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - Schema: projectSchema, + Schema: projectSchema, Description: "Provides an Artifactory project resource. This can be used to create and manage Artifactory project, maintain users/groups/roles/repos.\n\n## Repository Configuration\n\nAfter the project configuration is applied, the repository's attributes `project_key` and `project_environments` would be updated with the project's data. This will generate a state drift in the next Terraform plan/apply for the repository resource. To avoid this, apply `lifecycle.ignore_changes`:\n```hcl\nresource \"artifactory_local_maven_repository\" \"my_maven_releases\" {\n\tkey = \"my-maven-releases\"\n\t...\n\n\tlifecycle {\n\t\tignore_changes = [\n\t\t\tproject_environments,\n\t\t\tproject_key\n\t\t]\n\t}\n}\n```\n~>We strongly recommend using the `repos` attribute to manage the list of repositories. See below for additional details.", } } diff --git a/pkg/project/resource_project_test.go b/pkg/project/resource_project_test.go index 44a6aaa7..4f26e197 100644 --- a/pkg/project/resource_project_test.go +++ b/pkg/project/resource_project_test.go @@ -62,7 +62,7 @@ func makeInvalidProjectKeyTestCase(invalidProjectKey string, t *testing.T) (*tes Steps: []resource.TestStep{ { Config: project, - ExpectError: regexp.MustCompile(".*project_key must be 3 - 10 lowercase alphanumeric and hyphen characters.*"), + ExpectError: regexp.MustCompile(".*project_key must be 2 - 10 lowercase alphanumeric and hyphen characters.*"), }, }, } @@ -77,7 +77,7 @@ func TestAccProjectInvalidProjectKey(t *testing.T) { invalidProjectKeys := []testCase{ { Name: "TooShort", - Value: strings.ToLower(randSeq(2)), + Value: strings.ToLower(randSeq(1)), }, { Name: "TooLong", From 548f3de634103313b145722fc554ac0c5a5e2dcf Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Wed, 21 Dec 2022 11:15:54 -0800 Subject: [PATCH 2/4] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8739481a..118c378d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.1.12 (Dec 22, 2022). + +BUG FIXES: + +* resource/project: Update `key` attribute validation to match Artifactory Project. PR: [#66](https://github.com/jfrog/terraform-provider-project/pull/66) + ## 1.1.11 (Dec 13, 2022). IMPROVEMENTS: From 550f4213a2b8713524040f2d05c047905e125408 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Wed, 21 Dec 2022 11:37:05 -0800 Subject: [PATCH 3/4] Update doc --- docs/resources/project.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/resources/project.md b/docs/resources/project.md index 9892a899..4f03cc9a 100644 --- a/docs/resources/project.md +++ b/docs/resources/project.md @@ -107,7 +107,7 @@ resource "project" "myproject" { - `admin_privileges` (Block Set, Min: 1) (see [below for nested schema](#nestedblock--admin_privileges)) - `display_name` (String) Also known as project name on the UI -- `key` (String) The Project Key is added as a prefix to resources created within a Project. This field is mandatory and supports only 3 - 10 lowercase alphanumeric and hyphen characters. Must begin with a letter. For example: `us1a-test`. +- `key` (String) The Project Key is added as a prefix to resources created within a Project. This field is mandatory and supports only 2 - 10 lowercase alphanumeric and hyphen characters. Must begin with a letter. For example: `us1a-test`. ### Optional @@ -170,3 +170,5 @@ Required: Optional: - `description` (String) + + From c6ccd316f43fe204ae7be6a3bff2ff2f751277ee Mon Sep 17 00:00:00 2001 From: JFrog CI Date: Wed, 21 Dec 2022 19:39:47 +0000 Subject: [PATCH 4/4] JFrog Pipelines - Add Artifactory and Xray versions to CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 118c378d..0deaa4d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.1.12 (Dec 22, 2022). +## 1.1.12 (Dec 22, 2022). Tested on Artifactory 7.47.14 and Xray 3.62.4 BUG FIXES: