Fix region config not set at eventsapi compiletime

rafusel · rafusel · commit 6a0298539172 · 2021-07-12T14:38:43.000-04:00
diff --git a/pkg/eventsapi/v1.go b/pkg/eventsapi/v1.go
@@ -2,13 +2,12 @@ package eventsapi
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 
 	"github.com/PagerDuty/go-pdagent/pkg/common"
 )
 
-var endpointV1 = fmt.Sprintf("%v/generic/2010-04-15/create_event.json", common.PdEventsUrl())
+const endpointV1 = "/generic/2010-04-15/create_event.json"
 
 // EventV1 corresponds to a V1 event object.
 type EventV1 struct {
@@ -76,6 +75,7 @@ type ResponseV1 struct {
 // service's own.
 func CreateV1(context context.Context, client *http.Client, event *EventV1) (*ResponseV1, error) {
 	var response ResponseV1
-	err := enqueueEvent(context, client, endpointV1, event, &response)
+	requestUrl := common.PdEventsUrl() + endpointV1
+	err := enqueueEvent(context, client, requestUrl, event, &response)
 	return &response, err
 }
diff --git a/pkg/eventsapi/v2.go b/pkg/eventsapi/v2.go
@@ -2,13 +2,12 @@ package eventsapi
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 
 	"github.com/PagerDuty/go-pdagent/pkg/common"
 )
 
-var endpointV2 = fmt.Sprintf("%v/v2/enqueue", common.PdEventsUrl())
+var endpointV2 = "/v2/enqueue"
 
 // EventV2 corresponds to a V2 event object.
 type EventV2 struct {
@@ -81,6 +80,7 @@ type ResponseV2 struct {
 // EnqueueV2 sends an event explicitly to the Events API V2.
 func EnqueueV2(context context.Context, client *http.Client, event *EventV2) (*ResponseV2, error) {
 	var response ResponseV2
-	err := enqueueEvent(context, client, endpointV2, event, &response)
+	requestUrl := common.PdEventsUrl() + endpointV2
+	err := enqueueEvent(context, client, requestUrl, event, &response)
 	return &response, err
 }
