Merge pull request #210 from jfrog/migrate-watch-to-framework

Migrate xray_watch resource to Plugin Framework

CHANGELOG.md

@@ -1,7 +1,8 @@
-## 2.8.2 (June 19, 2024). Tested on Artifactory 7.84.15 and Xray 3.96.1 with Terraform 1.8.5 and OpenTofu 1.7.2
+## 2.8.2 (June 21, 2024). Tested on Artifactory 7.84.15 and Xray 3.96.1 with Terraform 1.8.5 and OpenTofu 1.7.2
 
 * resource/xray_custom_issue: Migrate from SDKv2 to Plugin Framework. PR: [#207](https://github.com/jfrog/terraform-provider-xray/pull/207)
 * resource/xray_ignore_rule: Migrate from SDKv2 to Plugin Framework. PR: [#209](https://github.com/jfrog/terraform-provider-xray/pull/209)
+* resource/xray_watch: Migrate from SDKv2 to Plugin Framework. PR: [#210](https://github.com/jfrog/terraform-provider-xray/pull/210)
 
 ## 2.8.1 (June 14, 2024). Tested on Artifactory 7.84.14 and Xray 3.96.1 with Terraform 1.8.5 and OpenTofu 1.7.2
 

pkg/xray/provider/framework.go

@@ -189,6 +189,7 @@ func (p *XrayProvider) Resources(ctx context.Context) []func() resource.Resource
 		xray_resource.NewCustomIssueResource,
 		xray_resource.NewIgnoreRuleResource,
 		xray_resource.NewSettingsResource,
+		xray_resource.NewWatchResource,
 		xray_resource.NewWebhookResource,
 		xray_resource.NewWorkersCountResource,
 	}

pkg/xray/provider/sdkv2.go

@@ -58,7 +58,6 @@ func SdkV2() *schema.Provider {
 				"xray_security_policy":          xray.ResourceXraySecurityPolicyV2(),
 				"xray_license_policy":           xray.ResourceXrayLicensePolicyV2(),
 				"xray_operational_risk_policy":  xray.ResourceXrayOperationalRiskPolicy(),
-				"xray_watch":                    xray.ResourceXrayWatch(),
 				"xray_repository_config":        xray.ResourceXrayRepositoryConfig(),
 				"xray_vulnerabilities_report":   xray.ResourceXrayVulnerabilitiesReport(),
 				"xray_licenses_report":          xray.ResourceXrayLicensesReport(),