[WEB-4618] more config options (#221)

* WEB-4618

* err check

* lint

* lint

* updated go version

* updated go in docker image

Author: molnarm

Dockerfile.internal-platform

@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.18 AS builder
+FROM golang:1.24-alpine3.21 AS builder
 
 WORKDIR /src/bitrise-webhooks
 
@@ -12,7 +12,7 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /go/bin/bitrise-webhooks
 
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add -u ca-certificates && rm -rf /var/cache/apk/*
 

bitrise.yml

@@ -3,7 +3,7 @@ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
 app:
   envs:
     - GO_PROJECT_PATH: github.com/bitrise-io/bitrise-webhooks
-    - GO_VERSION: 1.21.2
+    - GO_VERSION: 1.24.1
     - PORT: "4000"
     - IS_USE_GIN: "yes"
       opts:

bitriseapi/bitriseapi.go

@@ -146,17 +146,12 @@ func (triggerParams TriggerAPIParamsModel) Validate() error {
 }
 
 // BuildTriggerURL ...
-func BuildTriggerURL(apiRootURL string, appSlug string) (*url.URL, error) {
-	baseURL, err := url.Parse(apiRootURL)
-	if err != nil {
-		return nil, errors.Wrapf(err, "BuildTriggerURL: Failed to parse (%s)", apiRootURL)
-	}
-
+func BuildTriggerURL(apiRootURL *url.URL, appSlug string) (*url.URL, error) {
 	pathURL, err := url.Parse(fmt.Sprintf("/app/%s/build/start.json", appSlug))
 	if err != nil {
 		return nil, errors.Wrap(err, "BuildTriggerURL: Failed to parse PATH")
 	}
-	return baseURL.ResolveReference(pathURL), nil
+	return apiRootURL.ResolveReference(pathURL), nil
 }
 
 // TriggerBuild ...

bitriseapi/bitriseapi_test.go

@@ -1,22 +1,26 @@
 package bitriseapi
 
 import (
+	"net/url"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
 func TestBuildTriggerURL(t *testing.T) {
+	rootURL, err := url.Parse("https://app.bitrise.io")
+	require.NoError(t, err)
+
 	t.Log("Endpoint URL doesn't end with /")
 	{
-		url, err := BuildTriggerURL("https://app.bitrise.io", "a..............b")
+		url, err := BuildTriggerURL(rootURL, "a..............b")
 		require.NoError(t, err)
 		require.Equal(t, "https://app.bitrise.io/app/a..............b/build/start.json", url.String())
 	}
 
 	t.Log("Endpoint URL ends with /")
 	{
-		url, err := BuildTriggerURL("https://app.bitrise.io/", "a..............b")
+		url, err := BuildTriggerURL(rootURL, "a..............b")
 		require.NoError(t, err)
 		require.Equal(t, "https://app.bitrise.io/app/a..............b/build/start.json", url.String())
 	}
@@ -87,7 +91,9 @@ func Test_TriggerAPIParamsModel_Validate(t *testing.T) {
 }
 
 func TestTriggerBuild(t *testing.T) {
-	url, err := BuildTriggerURL("https://app.bitrise.io", "app-slug")
+	rootURL, err := url.Parse("https://app.bitrise.io")
+	require.NoError(t, err)
+	url, err := BuildTriggerURL(rootURL, "app-slug")
 	require.NoError(t, err)
 
 	t.Log("Empty trigger api params (invalid)")

config/config.go

@@ -17,6 +17,12 @@ var (
 
 	// SendRequestToURL ...
 	SendRequestToURL *url.URL
+
+	// BuildTriggerURL URL to trigger builds (Website)
+	BuildTriggerURL *url.URL
+
+	// LogOnlyMode when set to true, no requests are sent to trigger builds
+	LogOnlyMode = false
 )
 
 // GetServerEnvMode ...

main.go

@@ -16,8 +16,10 @@ func main() {
 	tracer.Start(tracer.WithServiceName("webhooks"))
 	defer tracer.Stop()
 	var (
-		portFlag          = flag.String("port", "", `Use port [$PORT]`)
-		sendRequestToFlag = flag.String("send-request-to", "", `Send requests to this URL. If set, every request will be sent to this URL and not to bitrise.io. You can use this to debug/test, e.g. with http://requestb.in [$SEND_REQUEST_TO]`)
+		portFlag            = flag.String("port", "", `Use port [$PORT]`)
+		sendRequestToFlag   = flag.String("send-request-to", "", `Send requests to this URL. If set, every request will be sent to this URL and not to bitrise.io. You can use this to debug/test, e.g. with http://requestb.in [$SEND_REQUEST_TO]`)
+		logOnlyModeFlag     = flag.Bool("log-only-mode", false, `Only print log messages without triggering builds [$LOG_ONLY_MODE]`)
+		buildTriggerURLFlag = flag.String("build-trigger-url", "", "URL to send build trigger requests to [$BUILD_TRIGGER_URL]")
 	)
 	flag.Parse()
 
@@ -37,6 +39,22 @@ func main() {
 		log.Printf(" (!) Send-Request-To specified, every request will be sent to: %s", config.SendRequestToURL)
 	}
 
+	logOnlyMode := boolFlagOrEnv(logOnlyModeFlag, "LOG_ONLY_MODE")
+
+	buildTriggerURL := stringFlagOrEnv(buildTriggerURLFlag, "BUILD_TRIGGER_URL")
+	if requestToStr == "" && buildTriggerURL == "" {
+		log.Printf("No send-request-to or build-trigger-url specified, will only log requests")
+		logOnlyMode = true
+	} else if buildTriggerURL != "" {
+		url, err := url.Parse(buildTriggerURL)
+		if err != nil {
+			log.Fatalf("Failed to parse build-trigger-url (%s) as a URL, error: %s", buildTriggerURL, err)
+		}
+		config.BuildTriggerURL = url
+	}
+
+	config.LogOnlyMode = logOnlyMode
+
 	var (
 		pubsubServiceAccountJSON = os.Getenv("METRICS_PUBSUB_SERVICE_ACCOUNT_JSON")
 		pubsubTopicID            = os.Getenv("METRICS_PUBSUB_TOPIC_ID")
@@ -73,3 +91,10 @@ func stringFlagOrEnv(flagValue *string, envKey string) string {
 	}
 	return os.Getenv(envKey)
 }
+
+func boolFlagOrEnv(flagValue *bool, envKey string) bool {
+	if flagValue != nil {
+		return *flagValue
+	}
+	return os.Getenv(envKey) == "true"
+}

service/hook/endpoint.go

@@ -112,7 +112,7 @@ func triggerBuild(triggerURL *url.URL, apiToken string, triggerAPIParams bitrise
 	logger := logging.WithContext(nil)
 
 	logger.Info(" ===> trigger build", zap.String("triggerURL", triggerURL.String()))
-	isOnlyLog := !(config.SendRequestToURL != nil || config.GetServerEnvMode() == config.ServerEnvModeProd)
+	isOnlyLog := config.LogOnlyMode
 	if isOnlyLog {
 		logger.Debug(" \\x1b[33;1m(debug) isOnlyLog: true\\x1b[0m")
 	}
@@ -246,7 +246,7 @@ func (c *Client) HTTPHandler(w http.ResponseWriter, r *http.Request) {
 	// Let's Trigger a build / some builds!
 	triggerURL := config.SendRequestToURL
 	if triggerURL == nil {
-		u, err := bitriseapi.BuildTriggerURL("http://web-monolith.web-monolith:3000", appSlug)
+		u, err := bitriseapi.BuildTriggerURL(config.BuildTriggerURL, appSlug)
 		if err != nil {
 			logger.Error(" [!] Exception: hookHandler: failed to create Build Trigger URL", zap.Error(err))
 			respondWithErrorString(w, &hookProvider, fmt.Sprintf("Failed to create Build Trigger URL: %s", err))