move to correct struct

argoproj · Feb 16, 2024 · 4a7608b · 4a7608b
1 parent d352072
commit 4a7608b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
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)
 		}
 	}

diff --git a/pkg/apis/eventsource/v1alpha1/types.go b/pkg/apis/eventsource/v1alpha1/types.go
@@ -1103,6 +1103,9 @@ type BitbucketServerEventSource struct {
 	// TLS configuration for the bitbucketserver client.
 	// +optional
 	TLS *apicommon.TLSConfig `json:"tls,omitempty" protobuf:"bytes,14,opt,name=tls"`
+	// CheckInterval is a duration in which to wait before checking that the webhooks exist, e.g. 1s, 30m, 2h... (defaults to 1m)
+	// +optional
+	CheckInterval string `json:"checkInterval" protobuf:"bytes,15,opt,name=checkInterval"`
 }
 
 type BitbucketServerRepository struct {

diff --git a/pkg/apis/eventsource/v1alpha1/webhook_context.go b/pkg/apis/eventsource/v1alpha1/webhook_context.go
@@ -32,9 +32,6 @@ type WebhookContext struct {
 	// Default value: 1048576 (1MB).
 	// +optional
 	MaxPayloadSize *int64 `json:"maxPayloadSize,omitempty" protobuf:"bytes,9,opt,name=maxPayloadSize"`
-	// CheckInterval is a duration in which to wait before checking that the webhooks exist, e.g. 1s, 30m, 2h... (defaults to 1m)
-	// +optional
-	CheckInterval string `json:"checkInterval" protobuf:"bytes,10,opt,name=checkInterval"`
 }
 
 func (wc *WebhookContext) GetMaxPayloadSize() int64 {