move to correct struct

Signed-off-by: Ryan Currah <[email protected]>
argoproj · Feb 16, 2024 · 7886c94 · 7886c94
1 parent d352072
commit 7886c94
Show file tree

Hide file tree

Showing 11 changed files with 548 additions and 564 deletions.
diff --git a/api/event-source.html b/api/event-source.html
diff --git a/api/event-source.md b/api/event-source.md
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
@@ -1160,6 +1160,10 @@
           "description": "BitbucketServerBaseURL is the base URL for API requests to a custom endpoint.",
           "type": "string"
         },
+        "checkInterval": {
+          "description": "CheckInterval is a duration in which to wait before checking that the webhooks exist, e.g. 1s, 30m, 2h... (defaults to 1m)",
+          "type": "string"
+        },
         "deleteHookOnFinish": {
           "description": "DeleteHookOnFinish determines whether to delete the Bitbucket Server hook for the project once the event source is stopped.",
           "type": "boolean"
@@ -3114,10 +3118,6 @@
           "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector",
           "description": "AuthSecret holds a secret selector that contains a bearer token for authentication"
         },
-        "checkInterval": {
-          "description": "CheckInterval is a duration in which to wait before checking that the webhooks exist, e.g. 1s, 30m, 2h... (defaults to 1m)",
-          "type": "string"
-        },
         "endpoint": {
           "description": "REST API endpoint",
           "type": "string"
@@ -3170,10 +3170,6 @@
           "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector",
           "description": "AuthSecret holds a secret selector that contains a bearer token for authentication"
         },
-        "checkInterval": {
-          "description": "CheckInterval is a duration in which to wait before checking that the webhooks exist, e.g. 1s, 30m, 2h... (defaults to 1m)",
-          "type": "string"
-        },
         "endpoint": {
           "description": "REST API endpoint",
           "type": "string"

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/eventsources/sources/bitbucketserver/start.go b/eventsources/sources/bitbucketserver/start.go
@@ -302,10 +302,10 @@ func (el *EventListener) StartListening(ctx context.Context, dispatch func([]byt
 	applyWebhooks()
 
 	var checkInterval time.Duration
-	if bitbucketserverEventSource.Webhook.CheckInterval == "" {
+	if bitbucketserverEventSource.CheckInterval == "" {
 		checkInterval = 60 * time.Second
 	} else {
-		checkInterval, err = time.ParseDuration(bitbucketserverEventSource.Webhook.CheckInterval)
+		checkInterval, err = time.ParseDuration(bitbucketserverEventSource.CheckInterval)
 		if err != nil {
 			return err
 		}

diff --git a/eventsources/sources/bitbucketserver/validate.go b/eventsources/sources/bitbucketserver/validate.go
@@ -43,8 +43,8 @@ func validate(eventSource *v1alpha1.BitbucketServerEventSource) error {
 	if eventSource.BitbucketServerBaseURL == "" {
 		return fmt.Errorf("bitbucket server base url can't be empty")
 	}
-	if eventSource.Webhook.CheckInterval != "" {
-		if _, err := time.ParseDuration(eventSource.Webhook.CheckInterval); err != nil {
+	if eventSource.CheckInterval != "" {
+		if _, err := time.ParseDuration(eventSource.CheckInterval); err != nil {
 			return fmt.Errorf("failed to parse webhook check interval duration: %w", err)
 		}
 	}