Migrate user custom webhook resource to Plugin Framework

jfrog · Oct 1, 2024 · 08f5600 · 08f5600
1 parent c4ed3b4
commit 08f5600
Show file tree

Hide file tree

Showing 8 changed files with 304 additions and 776 deletions.
diff --git a/pkg/artifactory/provider/framework.go b/pkg/artifactory/provider/framework.go
@@ -245,6 +245,7 @@ func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.R
 		webhook.NewReleaseBundleV2PromotionWebhookResource,
 		webhook.NewReleaseBundleV2PromotionCustomWebhookResource,
 		webhook.NewUserWebhookResource,
+		webhook.NewUserCustomWebhookResource,
 	}
 }
 

diff --git a/pkg/artifactory/provider/resources.go b/pkg/artifactory/provider/resources.go
@@ -12,7 +12,6 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/remote"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/virtual"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
-	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/webhook"
 	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 )
 
@@ -124,10 +123,5 @@ func resourcesMap() map[string]*schema.Resource {
 		resourcesMap[federatedResourceName] = federated.ResourceArtifactoryFederatedGenericRepository(repoType)
 	}
 
-	for _, webhookType := range webhook.DomainSupported {
-		webhookCustomResourceName := fmt.Sprintf("artifactory_%s_custom_webhook", webhookType)
-		resourcesMap[webhookCustomResourceName] = webhook.ResourceArtifactoryCustomWebhook(webhookType)
-	}
-
 	return utilsdk.AddTelemetry(productId, resourcesMap)
 }