Merge pull request #871 from jfrog/migrate-proxy-resource-to-framework

Migrate 'artifactory_proxy' resource to plugin-framework
jfrog · Jan 17, 2024 · 5f5e377 · 5f5e377
2 parents 81bb9ad + 6d90129
commit 5f5e377
Show file tree

Hide file tree

Showing 6 changed files with 378 additions and 234 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 10.1.1 (Jan 12, 2024)
+
+IMPROVEMENTS:
+
+* resource/artifactory_proxy is migrated to Plugin Framework. PR: [#871](https://github.com/jfrog/terraform-provider-artifactory/pull/871)
+
 ## 10.1.0 (Jan 12, 2024)
 
 FEATURES:

diff --git a/pkg/artifactory/provider/framework.go b/pkg/artifactory/provider/framework.go
@@ -182,6 +182,7 @@ func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.R
 		configuration.NewLdapGroupSettingResource,
 		configuration.NewBackupResource,
 		configuration.NewMailServerResource,
+		configuration.NewProxyResource,
 	}
 }
 

diff --git a/pkg/artifactory/provider/resources.go b/pkg/artifactory/provider/resources.go
@@ -87,7 +87,6 @@ func resourcesMap() map[string]*schema.Resource {
 		"artifactory_ldap_group_setting":                      configuration.ResourceArtifactoryLdapGroupSetting(),
 		"artifactory_repository_layout":                       configuration.ResourceArtifactoryRepositoryLayout(),
 		"artifactory_property_set":                            configuration.ResourceArtifactoryPropertySet(),
-		"artifactory_proxy":                                   configuration.ResourceArtifactoryProxy(),
 	}
 
 	for _, repoType := range local.PackageTypesLikeGeneric {