feat: add privateLocation field to operator and crd

fixes #60
fixes #43

Author: fluktuid

api/checkly/v1alpha1/group_types.go

@@ -31,6 +31,9 @@ type GroupSpec struct {
 	// Locations determines the locations where the checks are run from, see https://www.checklyhq.com/docs/monitoring/global-locations/ for a list, use AWS Region codes, ex. eu-west-1 for Ireland
 	Locations []string `json:"locations,omitempty"`
 
+	// Locations determines the locations where the checks are run from, see https://www.checklyhq.com/docs/monitoring/global-locations/ for a list, use AWS Region codes, ex. eu-west-1 for Ireland
+	PrivateLocations []string `json:"privateLocations,omitempty"`
+
 	// Activated determines if the created group is muted or not, default false
 	Activated bool `json:"muted,omitempty"`
 

config/crd/bases/k8s.checklyhq.com_groups.yaml

@@ -55,6 +55,13 @@ spec:
                 description: Activated determines if the created group is muted or
                   not, default false
                 type: boolean
+              privateLocations:
+                description: Locations determines the locations where the checks are
+                  run from, see https://www.checklyhq.com/docs/monitoring/global-locations/
+                  for a list, use AWS Region codes, ex. eu-west-1 for Ireland
+                items:
+                  type: string
+                type: array
             type: object
           status:
             description: GroupStatus defines the observed state of Group

external/checkly/group.go

@@ -24,12 +24,13 @@ import (
 )
 
 type Group struct {
-	Name          string
-	ID            int64
-	Locations     []string
-	Activated     bool
-	AlertChannels []checkly.AlertChannelSubscription
-	Labels        map[string]string
+	Name             string
+	ID               int64
+	Locations        []string
+	PrivateLocations []string
+	Activated        bool
+	AlertChannels    []checkly.AlertChannelSubscription
+	Labels           map[string]string
 }
 
 func checklyGroup(group Group) (check checkly.Group) {
@@ -54,6 +55,12 @@ func checklyGroup(group Group) (check checkly.Group) {
 		},
 	}
 
+	locations := []string{}
+
+	if len(group.PrivateLocations) != 0 {
+		checkValueArray(group.Locations, []string{"eu-west-1"})
+	}
+
 	check = checkly.Group{
 		Name:                      group.Name,
 		Activated:                 true,
@@ -62,7 +69,8 @@ func checklyGroup(group Group) (check checkly.Group) {
 		LocalSetupScript:          "",
 		LocalTearDownScript:       "",
 		Concurrency:               2,
-		Locations:                 checkValueArray(group.Locations, []string{"eu-west-1"}),
+		Locations:                 locations,
+		PrivateLocations:          &group.PrivateLocations,
 		Tags:                      tags,
 		AlertSettings:             alertSettings,
 		UseGlobalAlertSettings:    false,

internal/controller/checkly/group_controller.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/checkly/checkly-go-sdk"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -28,7 +29,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/checkly/checkly-go-sdk"
 	checklyv1alpha1 "github.com/checkly/checkly-operator/api/checkly/v1alpha1"
 	external "github.com/checkly/checkly-operator/external/checkly"
 )
@@ -141,12 +141,13 @@ func (r *GroupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 
 	// Create internal Check type
 	internalCheck := external.Group{
-		Name:          group.Name,
-		Activated:     group.Spec.Activated,
-		Locations:     group.Spec.Locations,
-		AlertChannels: alertChannels,
-		ID:            group.Status.ID,
-		Labels:        group.Labels,
+		Name:             group.Name,
+		Activated:        group.Spec.Activated,
+		Locations:        group.Spec.Locations,
+		PrivateLocations: group.Spec.PrivateLocations,
+		AlertChannels:    alertChannels,
+		ID:               group.Status.ID,
+		Labels:           group.Labels,
 	}
 
 	// /////////////////////////////