feat(eventsource): add tls configuration for bitbucketserver (#2674)

Signed-off-by: Robert Deusser <rdeusser@users.noreply.github.com>
argoproj · Jun 23, 2023 · 1b25b50 · 1b25b50
1 parent 2877cf6
commit 1b25b50
Show file tree

Hide file tree

Showing 10 changed files with 555 additions and 425 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
@@ -1185,6 +1185,10 @@
           "description": "DeprecatedRepositorySlug is the slug of the repository for which integration needs to set up Deprecated: use Repositories instead. Will be unsupported in v1.8",
           "type": "string"
         },
+        "tls": {
+          "$ref": "#/definitions/io.argoproj.common.TLSConfig",
+          "description": "TLS configuration for the bitbucketserver client."
+        },
         "webhook": {
           "$ref": "#/definitions/io.argoproj.eventsource.v1alpha1.WebhookContext",
           "description": "Webhook holds configuration to run a http server"

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
@@ -137,6 +137,19 @@ func (router *Router) PostInactivate() error {
 		bitbucketConfig.AddDefaultHeader("x-atlassian-token", "no-check")
 		bitbucketConfig.AddDefaultHeader("x-requested-with", "XMLHttpRequest")
 
+		if bitbucketserverEventSource.TLS != nil {
+			tlsConfig, err := common.GetTLSConfig(router.bitbucketserverEventSource.TLS)
+			if err != nil {
+				return fmt.Errorf("failed to get the tls configuration, %w", err)
+			}
+
+			bitbucketConfig.HTTPClient = &http.Client{
+				Transport: &http.Transport{
+					TLSClientConfig: tlsConfig,
+				},
+			}
+		}
+
 		for _, repo := range bitbucketserverEventSource.GetBitbucketServerRepositories() {
 			id, ok := router.hookIDs[repo.ProjectKey+","+repo.RepositorySlug]
 			if !ok {
@@ -211,6 +224,19 @@ func (el *EventListener) StartListening(ctx context.Context, dispatch func([]byt
 	bitbucketConfig.AddDefaultHeader("x-atlassian-token", "no-check")
 	bitbucketConfig.AddDefaultHeader("x-requested-with", "XMLHttpRequest")
 
+	if bitbucketserverEventSource.TLS != nil {
+		tlsConfig, err := common.GetTLSConfig(router.bitbucketserverEventSource.TLS)
+		if err != nil {
+			return fmt.Errorf("failed to get the tls configuration, %w", err)
+		}
+
+		bitbucketConfig.HTTPClient = &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: tlsConfig,
+			},
+		}
+	}
+
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 

diff --git a/pkg/apis/eventsource/v1alpha1/generated.pb.go b/pkg/apis/eventsource/v1alpha1/generated.pb.go
diff --git a/pkg/apis/eventsource/v1alpha1/generated.proto b/pkg/apis/eventsource/v1alpha1/generated.proto
diff --git a/pkg/apis/eventsource/v1alpha1/openapi_generated.go b/pkg/apis/eventsource/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/eventsource/v1alpha1/types.go b/pkg/apis/eventsource/v1alpha1/types.go
@@ -1023,6 +1023,9 @@ type BitbucketServerEventSource struct {
 	// Filter
 	// +optional
 	Filter *EventSourceFilter `json:"filter,omitempty" protobuf:"bytes,11,opt,name=filter"`
+	// TLS configuration for the bitbucketserver client.
+	// +optional
+	TLS *apicommon.TLSConfig `json:"tls,omitempty" protobuf:"bytes,12,opt,name=tls"`
 }
 
 type BitbucketServerRepository struct {

diff --git a/pkg/apis/eventsource/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/eventsource/v1alpha1/zz_generated.deepcopy.go