fix: return webhook invoke URL in API

Signed-off-by: Donnie Adams <[email protected]>
obot-platform · Nov 20, 2024 · 9d30f07 · 9d30f07
1 parent 9fe9d65
commit 9d30f07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/pkg/api/handlers/webhooks.go b/pkg/api/handlers/webhooks.go
@@ -132,8 +132,12 @@ func (a *WebhookHandler) Create(req api.Context) error {
 
 func convertWebhook(webhook v1.Webhook, urlPrefix string) *types.Webhook {
 	var links []string
-	if urlPrefix != "" && webhook.Status.Alias != "" {
-		links = []string{"invoke", fmt.Sprintf("%s/webhooks/%s", urlPrefix, webhook.Status.Alias)}
+	if urlPrefix != "" {
+		path := webhook.Name
+		if webhook.Status.AliasAssigned {
+			path = webhook.Spec.Alias
+		}
+		links = []string{"invoke", fmt.Sprintf("%s/webhooks/%s", urlPrefix, path)}
 	}
 
 	manifest := webhook.Spec.WebhookManifest

diff --git a/pkg/storage/apis/otto.otto8.ai/v1/webhook.go b/pkg/storage/apis/otto.otto8.ai/v1/webhook.go
@@ -58,7 +58,6 @@ type WebhookSpec struct {
 }
 
 type WebhookStatus struct {
-	Alias                      string       `json:"alias,omitempty"`
 	AliasAssigned              bool         `json:"aliasAssigned,omitempty"`
 	LastSuccessfulRunCompleted *metav1.Time `json:"lastSuccessfulRunCompleted,omitempty"`
 }

diff --git a/pkg/storage/openapi/generated/openapi_generated.go b/pkg/storage/openapi/generated/openapi_generated.go