Merge pull request #1212 from jfrog/GH-1200-fix-repo-id-diff-issue

Fix local and remote repo 'id' diff issue
jfrog · Feb 25, 2025 · 1f7dc27 · 1f7dc27
2 parents b3dad14 + f519d35
commit 1f7dc27
Show file tree

Hide file tree

Showing 51 changed files with 455 additions and 408 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 12.9.1 (Februry 25, 2025). Tested on Artifactory 7.104.9 with Terraform 1.10.5 and OpenTofu 1.9.0
+
+BUG FIXES:
+
+* resource/artifactory_\*\_repository: Improve state drift handling. Issue: [#1200](https://github.com/jfrog/terraform-provider-artifactory/issues/1200) PR: [#1212](https://github.com/jfrog/terraform-provider-artifactory/pull/1212)
+* resource/artifactory_\*\_webhook: Improve state drift handling. PR: [#1212](https://github.com/jfrog/terraform-provider-artifactory/pull/1212)
+
 ## 12.9.0 (Februry 20, 2025). Tested on Artifactory 7.104.7 with Terraform 1.10.5 and OpenTofu 1.9.0
 
 IMPROVEMENTS:

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/hashicorp/terraform-plugin-mux v0.18.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
 	github.com/hashicorp/terraform-plugin-testing v1.11.0
-	github.com/jfrog/terraform-provider-shared v1.28.0
+	github.com/jfrog/terraform-provider-shared v1.29.0
 	github.com/samber/lo v1.49.1
 	github.com/sethvargo/go-password v0.3.1
 	github.com/stretchr/testify v1.10.0

diff --git a/go.sum b/go.sum
@@ -138,8 +138,8 @@ github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
 github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 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/jfrog/terraform-provider-shared v1.28.0 h1:WKsqc13p0RdaR4yjzr2T4OEtAvGpR62hTpnUAV1Obh4=
-github.com/jfrog/terraform-provider-shared v1.28.0/go.mod h1:0snzhXJR++SKRxpCtZnIFEIeP/Ud5zuF3Lm6OZncb4k=
+github.com/jfrog/terraform-provider-shared v1.29.0 h1:cVv1/6GgGceo6CFYac+VfYYmnXfKBFTjaBePADE6ysU=
+github.com/jfrog/terraform-provider-shared v1.29.0/go.mod h1:0snzhXJR++SKRxpCtZnIFEIeP/Ud5zuF3Lm6OZncb4k=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

diff --git a/...ctory/datasource/repository/federated/datasource_artifactory_federated_repository_test.go b/...ctory/datasource/repository/federated/datasource_artifactory_federated_repository_test.go
@@ -148,7 +148,7 @@ EOF
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
 		CheckDestroy: acctest.CompositeCheckDestroy(
-			acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+			acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 			acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
 		),
 		Steps: []resource.TestStep{
@@ -217,7 +217,7 @@ EOF
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
 		CheckDestroy: acctest.CompositeCheckDestroy(
-			acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+			acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 			acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
 		),
 		Steps: []resource.TestStep{
@@ -278,7 +278,7 @@ func TestAccDataSourceFederatedCargoRepository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: federatedRepositoryBasic,
@@ -345,7 +345,7 @@ func TestAccDataSourceFederatedConanRepository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: federatedRepositoryBasic,
@@ -462,7 +462,7 @@ EOF
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
 		CheckDestroy: acctest.CompositeCheckDestroy(
-			acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+			acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 			acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
 			acctest.VerifyDeleted(t, kpFqrn2, "", security.VerifyKeyPair),
 		),
@@ -541,7 +541,7 @@ func TestAccDataSourceFederatedDockerV2Repository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: federatedRepositoryBasic,
@@ -610,7 +610,7 @@ func TestAccDataSourceFederatedDockerRepository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: federatedRepositoryBasic,
@@ -663,7 +663,7 @@ func TestAccDataSourceFederatedDockerV1Repository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: federatedRepositoryBasic,
@@ -728,7 +728,7 @@ func TestAccDataSourceFederatedMavenRepository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: util.ExecuteTemplate(fqrn, federatedJavaRepositoryBasic, tempStruct),
@@ -859,7 +859,7 @@ func TestAccDataSourceFederatedHelmOciRepository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: federatedRepositoryBasic,
@@ -986,7 +986,7 @@ func TestAccDataSourceFederatedOciRepository(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: federatedRepositoryBasic,

diff --git a/pkg/artifactory/datasource/repository/local/datasource_artifactory_local_repository_test.go b/pkg/artifactory/datasource/repository/local/datasource_artifactory_local_repository_test.go
@@ -42,7 +42,7 @@ func mkTestCase(packageType string, t *testing.T) (*testing.T, resource.TestCase
 		}
 
 		data "artifactory_local_{{ .packageType }}_repository" "{{ .name }}" {
-			key = artifactory_local_{{ .packageType }}_repository.{{ .name }}.id
+			key = artifactory_local_{{ .packageType }}_repository.{{ .name }}.key
 		}
 	`, params)
 
@@ -93,7 +93,7 @@ EOF
 		}
 
 		data "artifactory_local_alpine_repository" "{{ .repo_name }}" {
-			key = artifactory_local_alpine_repository.{{ .repo_name }}.id
+			key = artifactory_local_alpine_repository.{{ .repo_name }}.key
 		}
 	`, map[string]interface{}{
 		"kp_id":       kpId,
@@ -148,7 +148,7 @@ EOF
 		}
 
 		data "artifactory_local_ansible_repository" "{{ .repo_name }}" {
-			key = artifactory_local_ansible_repository.{{ .repo_name }}.id
+			key = artifactory_local_ansible_repository.{{ .repo_name }}.key
 		}
 	`, map[string]interface{}{
 		"kp_id":       kpId,
@@ -188,7 +188,7 @@ func TestAccDataSourceLocalCargoRepository(t *testing.T) {
 		}
 
 		data "artifactory_local_cargo_repository" "{{ .name }}" {
-		  key = artifactory_local_cargo_repository.{{ .name }}.id
+		  key = artifactory_local_cargo_repository.{{ .name }}.key
 		}
 	`, params)
 
@@ -221,7 +221,7 @@ func TestAccDataSourceLocalConanRepository(t *testing.T) {
 		}
 
 		data "artifactory_local_conan_repository" "{{ .name }}" {
-			key = artifactory_local_conan_repository.{{ .name }}.id
+			key = artifactory_local_conan_repository.{{ .name }}.key
 		}
 	`, params)
 
@@ -290,7 +290,7 @@ EOF
 		}
 
 		data "artifactory_local_debian_repository" "{{ .repo_name }}" {
-			key = artifactory_local_debian_repository.{{ .repo_name }}.id
+			key = artifactory_local_debian_repository.{{ .repo_name }}.key
 		}
 	`, map[string]interface{}{
 		"kp_id":       kpId,
@@ -340,7 +340,7 @@ func TestAccDataSourceLocalDockerV2Repository(t *testing.T) {
 	}
 
 	data "artifactory_local_docker_v2_repository" "{{ .name }}" {
-	  key = artifactory_local_docker_v2_repository.{{ .name }}.id
+	  key = artifactory_local_docker_v2_repository.{{ .name }}.key
 	}
 	`, params)
 
@@ -371,7 +371,7 @@ func TestAccDataSourceLocalDockerV1Repository(t *testing.T) {
 		key = "{{ .name }}"
 	}
 	data "artifactory_local_docker_v1_repository" "{{ .name }}" {
-		key = artifactory_local_docker_v1_repository.{{ .name }}.id
+		key = artifactory_local_docker_v1_repository.{{ .name }}.key
 	}
 	`, params)
 
@@ -414,7 +414,7 @@ const localJavaRepositoryBasic = `
 	}
 
 	data "{{ .resource_name }}" "{{ .name }}" {
-		key = {{ .resource_name }}.{{ .name }}.id
+		key = {{ .resource_name }}.{{ .name }}.key
 	}
 `
 
@@ -460,7 +460,7 @@ func makeDataSourceLocalGradleLikeRepoTestCase(repoType string, t *testing.T) (*
 
 	return t, resource.TestCase{
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
-		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct),
@@ -493,7 +493,7 @@ func TestAccDataSourceLocalHelmOciRepository(t *testing.T) {
 	}
 
 	data "artifactory_local_helmoci_repository" "{{ .name }}" {
-		key = artifactory_local_helmoci_repository.{{ .name }}.id
+		key = artifactory_local_helmoci_repository.{{ .name }}.key
 	}
 	`, params)
 
@@ -535,13 +535,13 @@ func TestAccDataSourceLocalNugetRepository(t *testing.T) {
 		force_nuget_authentication = {{ .force_nuget_authentication }}
 	}
 	data "artifactory_local_nuget_repository" "{{ .name }}" {
-		key = artifactory_local_nuget_repository.{{ .name }}.id
+		key = artifactory_local_nuget_repository.{{ .name }}.key
 	}
 	`, params)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
-		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: localRepositoryBasic,
@@ -571,7 +571,7 @@ func TestAccDataSourceLocalOciRepository(t *testing.T) {
 	}
 
 	data "artifactory_local_oci_repository" "{{ .name }}" {
-		key = artifactory_local_oci_repository.{{ .name }}.id
+		key = artifactory_local_oci_repository.{{ .name }}.key
 	}
 	`, params)
 
@@ -646,7 +646,7 @@ EOF
 		}
 
 		data "artifactory_local_rpm_repository" "{{ .repo_name }}" {
-			key = artifactory_local_rpm_repository.{{ .repo_name }}.id
+			key = artifactory_local_rpm_repository.{{ .repo_name }}.key
 		}
 	`, map[string]interface{}{
 		"kp_id":       kpId,
@@ -661,7 +661,7 @@ EOF
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
 		CheckDestroy: acctest.CompositeCheckDestroy(
-			acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+			acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 			acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
 			acctest.VerifyDeleted(t, kpFqrn2, "", security.VerifyKeyPair),
 		),
@@ -694,15 +694,15 @@ func TestAccDataSourceLocalTerraformModuleRepository(t *testing.T) {
 			key            = "{{ .name }}"
 		}
 		data "artifactory_local_terraform_module_repository" "{{ .name }}" {
-			key = artifactory_local_terraform_module_repository.{{ .name }}.id
+			key = artifactory_local_terraform_module_repository.{{ .name }}.key
 		}
 		`,
 		params,
 	)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
-		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: localRepositoryBasic,
@@ -727,15 +727,15 @@ func TestAccDataSourceLocalTerraformProviderRepository(t *testing.T) {
 			key = "{{ .name }}"
 		}
 		data "artifactory_local_terraform_provider_repository" "{{ .name }}" {
-			key = artifactory_local_terraform_provider_repository.{{ .name }}.id
+			key = artifactory_local_terraform_provider_repository.{{ .name }}.key
 		}
 	`,
 		params,
 	)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
-		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{
 				Config: localRepositoryBasic,