refactor: move constants + fix typo

Author: rkettelerij

cmd/main.go

@@ -22,6 +22,7 @@ import (
 	"os"
 
 	"github.com/PDOK/uptime-operator/internal/service"
+	p "github.com/PDOK/uptime-operator/internal/service/providers"
 	"github.com/PDOK/uptime-operator/internal/service/providers/betterstack"
 	"github.com/PDOK/uptime-operator/internal/service/providers/pingdom"
 	"github.com/PDOK/uptime-operator/internal/util"
@@ -131,10 +132,10 @@ func main() {
 	}
 
 	var uptimeProviderSettings any
-	uptimeProviderID := service.UptimeProviderID(uptimeProvider)
+	uptimeProviderID := p.UptimeProviderID(uptimeProvider)
 
 	// Optional provider specific flag handling
-	if uptimeProviderID == service.ProviderPingdom {
+	if uptimeProviderID == p.ProviderPingdom {
 		alertUserIDs, err := util.StringsToInts(pingdomAlertUserIDs)
 		if err != nil {
 			setupLog.Error(err, "Unable to parse 'pingdom-alert-user-ids' flag")
@@ -150,7 +151,7 @@ func main() {
 			UserIDs:        alertUserIDs,
 			IntegrationIDs: alertIntegrationIDs,
 		}
-	} else if uptimeProviderID == service.ProviderBetterStack {
+	} else if uptimeProviderID == p.ProviderBetterStack {
 		uptimeProviderSettings = betterstack.Settings{
 			APIToken: betterstackAPIToken,
 		}

internal/service/providers/const.go

@@ -7,3 +7,12 @@ const (
 	HeaderAccept        = "Accept"
 	HeaderContentType   = "Content-Type"
 )
+
+// UptimeProviderID enum of supported providers
+type UptimeProviderID string
+
+const (
+	ProviderPingdom     UptimeProviderID = "pingdom"
+	ProviderBetterStack UptimeProviderID = "betterstack"
+	ProviderMock        UptimeProviderID = "mock"
+)

internal/service/providers/pingdom/pingdom.go

@@ -20,7 +20,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-const pingdomURL = "https://api.pingdop.com/api/3.1/checks"
+const pingdomURL = "https://api.pingdom.com/api/3.1/checks"
 const customIDPrefix = "id:"
 
 const headerReqLimitShort = "Req-Limit-Short"
@@ -214,7 +214,7 @@ func (p *Pingdom) checkToJSON(check model.UptimeCheck, includeType bool) ([]byte
 		"tags":       check.Tags,
 	}
 	if includeType {
-		// update messages shouldn't include 'type', since the type of check can't be modified in Pingdop.
+		// update messages shouldn't include 'type', since the type of check can't be modified in Pingdom.
 		message["type"] = "http"
 	}
 	if len(p.settings.UserIDs) > 0 {

internal/service/service.go

@@ -6,20 +6,14 @@ import (
 	classiclog "log"
 
 	m "github.com/PDOK/uptime-operator/internal/model"
+	p "github.com/PDOK/uptime-operator/internal/service/providers"
 	"github.com/PDOK/uptime-operator/internal/service/providers/betterstack"
 	"github.com/PDOK/uptime-operator/internal/service/providers/mock"
 	"github.com/PDOK/uptime-operator/internal/service/providers/pingdom"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-// UptimeProviderID enum of supported providers
-type UptimeProviderID string
 
-const (
-	ProviderPingdom     UptimeProviderID = "pingdom"
-	ProviderBetterStack UptimeProviderID = "betterstack"
-	ProviderMock        UptimeProviderID = "mock"
-)
 
 type UptimeCheckOption func(*UptimeCheckService) *UptimeCheckService
 
@@ -44,14 +38,14 @@ func WithProvider(provider UptimeProvider) UptimeCheckOption {
 	}
 }
 
-func WithProviderAndSettings(provider UptimeProviderID, settings any) UptimeCheckOption {
+func WithProviderAndSettings(provider p.UptimeProviderID, settings any) UptimeCheckOption {
 	return func(service *UptimeCheckService) *UptimeCheckService {
 		switch provider {
-		case ProviderMock:
+		case p.ProviderMock:
 			service.provider = mock.New()
-		case ProviderPingdom:
+		case p.ProviderPingdom:
 			service.provider = pingdom.New(settings.(pingdom.Settings))
-		case ProviderBetterStack:
+		case p.ProviderBetterStack:
 			service.provider = betterstack.New(settings.(betterstack.Settings))
 		default:
 			classiclog.Fatalf("unsupported provider specified: %s", provider)