Skip to content

Commit 1f7dc27

Browse files
alexhungalexhung
authored
Merge pull request #1212 from jfrog/GH-1200-fix-repo-id-diff-issue
Fix local and remote repo 'id' diff issue
2 parents b3dad14 + f519d35 commit 1f7dc27

File tree

51 files changed

+455
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+455
-408
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 12.9.1 (Februry 25, 2025). Tested on Artifactory 7.104.9 with Terraform 1.10.5 and OpenTofu 1.9.0
2+
3+
BUG FIXES:
4+
5+
* 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)
6+
* resource/artifactory_\*\_webhook: Improve state drift handling. PR: [#1212](https://github.com/jfrog/terraform-provider-artifactory/pull/1212)
7+
18
## 12.9.0 (Februry 20, 2025). Tested on Artifactory 7.104.7 with Terraform 1.10.5 and OpenTofu 1.9.0
29

310
IMPROVEMENTS:

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/hashicorp/terraform-plugin-mux v0.18.0
1818
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
1919
github.com/hashicorp/terraform-plugin-testing v1.11.0
20-
github.com/jfrog/terraform-provider-shared v1.28.0
20+
github.com/jfrog/terraform-provider-shared v1.29.0
2121
github.com/samber/lo v1.49.1
2222
github.com/sethvargo/go-password v0.3.1
2323
github.com/stretchr/testify v1.10.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
138138
github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
139139
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
140140
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
141-
github.com/jfrog/terraform-provider-shared v1.28.0 h1:WKsqc13p0RdaR4yjzr2T4OEtAvGpR62hTpnUAV1Obh4=
142-
github.com/jfrog/terraform-provider-shared v1.28.0/go.mod h1:0snzhXJR++SKRxpCtZnIFEIeP/Ud5zuF3Lm6OZncb4k=
141+
github.com/jfrog/terraform-provider-shared v1.29.0 h1:cVv1/6GgGceo6CFYac+VfYYmnXfKBFTjaBePADE6ysU=
142+
github.com/jfrog/terraform-provider-shared v1.29.0/go.mod h1:0snzhXJR++SKRxpCtZnIFEIeP/Ud5zuF3Lm6OZncb4k=
143143
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
144144
github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
145145
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

‎pkg/artifactory/datasource/repository/federated/datasource_artifactory_federated_repository_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ EOF
148148
PreCheck: func() { acctest.PreCheck(t) },
149149
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
150150
CheckDestroy: acctest.CompositeCheckDestroy(
151-
acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
151+
acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
152152
acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
153153
),
154154
Steps: []resource.TestStep{
@@ -217,7 +217,7 @@ EOF
217217
PreCheck: func() { acctest.PreCheck(t) },
218218
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
219219
CheckDestroy: acctest.CompositeCheckDestroy(
220-
acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
220+
acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
221221
acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
222222
),
223223
Steps: []resource.TestStep{
@@ -278,7 +278,7 @@ func TestAccDataSourceFederatedCargoRepository(t *testing.T) {
278278
resource.Test(t, resource.TestCase{
279279
PreCheck: func() { acctest.PreCheck(t) },
280280
ProviderFactories: acctest.ProviderFactories,
281-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
281+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
282282
Steps: []resource.TestStep{
283283
{
284284
Config: federatedRepositoryBasic,
@@ -345,7 +345,7 @@ func TestAccDataSourceFederatedConanRepository(t *testing.T) {
345345
resource.Test(t, resource.TestCase{
346346
PreCheck: func() { acctest.PreCheck(t) },
347347
ProviderFactories: acctest.ProviderFactories,
348-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
348+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
349349
Steps: []resource.TestStep{
350350
{
351351
Config: federatedRepositoryBasic,
@@ -462,7 +462,7 @@ EOF
462462
PreCheck: func() { acctest.PreCheck(t) },
463463
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
464464
CheckDestroy: acctest.CompositeCheckDestroy(
465-
acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
465+
acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
466466
acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
467467
acctest.VerifyDeleted(t, kpFqrn2, "", security.VerifyKeyPair),
468468
),
@@ -541,7 +541,7 @@ func TestAccDataSourceFederatedDockerV2Repository(t *testing.T) {
541541
resource.Test(t, resource.TestCase{
542542
PreCheck: func() { acctest.PreCheck(t) },
543543
ProviderFactories: acctest.ProviderFactories,
544-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
544+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
545545
Steps: []resource.TestStep{
546546
{
547547
Config: federatedRepositoryBasic,
@@ -610,7 +610,7 @@ func TestAccDataSourceFederatedDockerRepository(t *testing.T) {
610610
resource.Test(t, resource.TestCase{
611611
PreCheck: func() { acctest.PreCheck(t) },
612612
ProviderFactories: acctest.ProviderFactories,
613-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
613+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
614614
Steps: []resource.TestStep{
615615
{
616616
Config: federatedRepositoryBasic,
@@ -663,7 +663,7 @@ func TestAccDataSourceFederatedDockerV1Repository(t *testing.T) {
663663
resource.Test(t, resource.TestCase{
664664
PreCheck: func() { acctest.PreCheck(t) },
665665
ProviderFactories: acctest.ProviderFactories,
666-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
666+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
667667
Steps: []resource.TestStep{
668668
{
669669
Config: federatedRepositoryBasic,
@@ -728,7 +728,7 @@ func TestAccDataSourceFederatedMavenRepository(t *testing.T) {
728728
resource.Test(t, resource.TestCase{
729729
PreCheck: func() { acctest.PreCheck(t) },
730730
ProviderFactories: acctest.ProviderFactories,
731-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
731+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
732732
Steps: []resource.TestStep{
733733
{
734734
Config: util.ExecuteTemplate(fqrn, federatedJavaRepositoryBasic, tempStruct),
@@ -859,7 +859,7 @@ func TestAccDataSourceFederatedHelmOciRepository(t *testing.T) {
859859
resource.Test(t, resource.TestCase{
860860
PreCheck: func() { acctest.PreCheck(t) },
861861
ProviderFactories: acctest.ProviderFactories,
862-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
862+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
863863
Steps: []resource.TestStep{
864864
{
865865
Config: federatedRepositoryBasic,
@@ -986,7 +986,7 @@ func TestAccDataSourceFederatedOciRepository(t *testing.T) {
986986
resource.Test(t, resource.TestCase{
987987
PreCheck: func() { acctest.PreCheck(t) },
988988
ProviderFactories: acctest.ProviderFactories,
989-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
989+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
990990
Steps: []resource.TestStep{
991991
{
992992
Config: federatedRepositoryBasic,

‎pkg/artifactory/datasource/repository/local/datasource_artifactory_local_repository_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func mkTestCase(packageType string, t *testing.T) (*testing.T, resource.TestCase
4242
}
4343
4444
data "artifactory_local_{{ .packageType }}_repository" "{{ .name }}" {
45-
key = artifactory_local_{{ .packageType }}_repository.{{ .name }}.id
45+
key = artifactory_local_{{ .packageType }}_repository.{{ .name }}.key
4646
}
4747
`, params)
4848

@@ -93,7 +93,7 @@ EOF
9393
}
9494
9595
data "artifactory_local_alpine_repository" "{{ .repo_name }}" {
96-
key = artifactory_local_alpine_repository.{{ .repo_name }}.id
96+
key = artifactory_local_alpine_repository.{{ .repo_name }}.key
9797
}
9898
`, map[string]interface{}{
9999
"kp_id": kpId,
@@ -148,7 +148,7 @@ EOF
148148
}
149149
150150
data "artifactory_local_ansible_repository" "{{ .repo_name }}" {
151-
key = artifactory_local_ansible_repository.{{ .repo_name }}.id
151+
key = artifactory_local_ansible_repository.{{ .repo_name }}.key
152152
}
153153
`, map[string]interface{}{
154154
"kp_id": kpId,
@@ -188,7 +188,7 @@ func TestAccDataSourceLocalCargoRepository(t *testing.T) {
188188
}
189189
190190
data "artifactory_local_cargo_repository" "{{ .name }}" {
191-
key = artifactory_local_cargo_repository.{{ .name }}.id
191+
key = artifactory_local_cargo_repository.{{ .name }}.key
192192
}
193193
`, params)
194194

@@ -221,7 +221,7 @@ func TestAccDataSourceLocalConanRepository(t *testing.T) {
221221
}
222222
223223
data "artifactory_local_conan_repository" "{{ .name }}" {
224-
key = artifactory_local_conan_repository.{{ .name }}.id
224+
key = artifactory_local_conan_repository.{{ .name }}.key
225225
}
226226
`, params)
227227

@@ -290,7 +290,7 @@ EOF
290290
}
291291
292292
data "artifactory_local_debian_repository" "{{ .repo_name }}" {
293-
key = artifactory_local_debian_repository.{{ .repo_name }}.id
293+
key = artifactory_local_debian_repository.{{ .repo_name }}.key
294294
}
295295
`, map[string]interface{}{
296296
"kp_id": kpId,
@@ -340,7 +340,7 @@ func TestAccDataSourceLocalDockerV2Repository(t *testing.T) {
340340
}
341341
342342
data "artifactory_local_docker_v2_repository" "{{ .name }}" {
343-
key = artifactory_local_docker_v2_repository.{{ .name }}.id
343+
key = artifactory_local_docker_v2_repository.{{ .name }}.key
344344
}
345345
`, params)
346346

@@ -371,7 +371,7 @@ func TestAccDataSourceLocalDockerV1Repository(t *testing.T) {
371371
key = "{{ .name }}"
372372
}
373373
data "artifactory_local_docker_v1_repository" "{{ .name }}" {
374-
key = artifactory_local_docker_v1_repository.{{ .name }}.id
374+
key = artifactory_local_docker_v1_repository.{{ .name }}.key
375375
}
376376
`, params)
377377

@@ -414,7 +414,7 @@ const localJavaRepositoryBasic = `
414414
}
415415
416416
data "{{ .resource_name }}" "{{ .name }}" {
417-
key = {{ .resource_name }}.{{ .name }}.id
417+
key = {{ .resource_name }}.{{ .name }}.key
418418
}
419419
`
420420

@@ -460,7 +460,7 @@ func makeDataSourceLocalGradleLikeRepoTestCase(repoType string, t *testing.T) (*
460460

461461
return t, resource.TestCase{
462462
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
463-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
463+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
464464
Steps: []resource.TestStep{
465465
{
466466
Config: util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct),
@@ -493,7 +493,7 @@ func TestAccDataSourceLocalHelmOciRepository(t *testing.T) {
493493
}
494494
495495
data "artifactory_local_helmoci_repository" "{{ .name }}" {
496-
key = artifactory_local_helmoci_repository.{{ .name }}.id
496+
key = artifactory_local_helmoci_repository.{{ .name }}.key
497497
}
498498
`, params)
499499

@@ -535,13 +535,13 @@ func TestAccDataSourceLocalNugetRepository(t *testing.T) {
535535
force_nuget_authentication = {{ .force_nuget_authentication }}
536536
}
537537
data "artifactory_local_nuget_repository" "{{ .name }}" {
538-
key = artifactory_local_nuget_repository.{{ .name }}.id
538+
key = artifactory_local_nuget_repository.{{ .name }}.key
539539
}
540540
`, params)
541541

542542
resource.Test(t, resource.TestCase{
543543
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
544-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
544+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
545545
Steps: []resource.TestStep{
546546
{
547547
Config: localRepositoryBasic,
@@ -571,7 +571,7 @@ func TestAccDataSourceLocalOciRepository(t *testing.T) {
571571
}
572572
573573
data "artifactory_local_oci_repository" "{{ .name }}" {
574-
key = artifactory_local_oci_repository.{{ .name }}.id
574+
key = artifactory_local_oci_repository.{{ .name }}.key
575575
}
576576
`, params)
577577

@@ -646,7 +646,7 @@ EOF
646646
}
647647
648648
data "artifactory_local_rpm_repository" "{{ .repo_name }}" {
649-
key = artifactory_local_rpm_repository.{{ .repo_name }}.id
649+
key = artifactory_local_rpm_repository.{{ .repo_name }}.key
650650
}
651651
`, map[string]interface{}{
652652
"kp_id": kpId,
@@ -661,7 +661,7 @@ EOF
661661
resource.Test(t, resource.TestCase{
662662
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
663663
CheckDestroy: acctest.CompositeCheckDestroy(
664-
acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
664+
acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
665665
acctest.VerifyDeleted(t, kpFqrn, "", security.VerifyKeyPair),
666666
acctest.VerifyDeleted(t, kpFqrn2, "", security.VerifyKeyPair),
667667
),
@@ -694,15 +694,15 @@ func TestAccDataSourceLocalTerraformModuleRepository(t *testing.T) {
694694
key = "{{ .name }}"
695695
}
696696
data "artifactory_local_terraform_module_repository" "{{ .name }}" {
697-
key = artifactory_local_terraform_module_repository.{{ .name }}.id
697+
key = artifactory_local_terraform_module_repository.{{ .name }}.key
698698
}
699699
`,
700700
params,
701701
)
702702

703703
resource.Test(t, resource.TestCase{
704704
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
705-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
705+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
706706
Steps: []resource.TestStep{
707707
{
708708
Config: localRepositoryBasic,
@@ -727,15 +727,15 @@ func TestAccDataSourceLocalTerraformProviderRepository(t *testing.T) {
727727
key = "{{ .name }}"
728728
}
729729
data "artifactory_local_terraform_provider_repository" "{{ .name }}" {
730-
key = artifactory_local_terraform_provider_repository.{{ .name }}.id
730+
key = artifactory_local_terraform_provider_repository.{{ .name }}.key
731731
}
732732
`,
733733
params,
734734
)
735735

736736
resource.Test(t, resource.TestCase{
737737
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
738-
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
738+
CheckDestroy: acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
739739
Steps: []resource.TestStep{
740740
{
741741
Config: localRepositoryBasic,

0 commit comments

Comments
 (0)