Clean up the way diffs are printed

.github/workflows/ci.yaml

@@ -40,13 +40,12 @@ jobs:
     - name: Run Gosec Security Scanner
       run: |
         export PATH=$PATH:$(go env GOPATH)/bin
-        go get github.com/securego/gosec/cmd/gosec
-        go install github.com/securego/gosec/cmd/gosec
-        gosec ./...
+        go install github.com/securego/gosec/v2/cmd/gosec@latest
+        gosec -exclude-dir images/logscale-dummy -exclude-generated ./...
     - name: Run Staticcheck
       uses: dominikh/[email protected]
       with:
-        version: "2023.1.7"
+        version: "2024.1.1"
         install-go: false
     - name: operator image
       run: make docker-build-operator IMG=humio/humio-operator:${{ github.sha }}

Dockerfile

@@ -17,7 +17,7 @@ RUN go mod download
 COPY main.go main.go
 COPY api/ api/
 COPY controllers/ controllers/
-COPY pkg/ pkg/
+COPY internal/ internal/
 
 # Build
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH GO111MODULE=on go build -ldflags="-s -w -X 'main.version=$RELEASE_VERSION' -X 'main.commit=$RELEASE_COMMIT' -X 'main.date=$RELEASE_DATE'" -a -o manager main.go

Makefile

@@ -1,3 +1,5 @@
+SCHEMA_CLUSTER?=${HUMIO_ENDPOINT}
+SCHEMA_CLUSTER_API_TOKEN?=${HUMIO_TOKEN}
 
 # Image URL to use all building/pushing image targets
 IMG ?= humio/humio-operator:latest
@@ -39,7 +41,12 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	hack/gen-crds.sh # NOTE: This line was custom added for the humio-operator project.
 
+update-schema:
+	go run github.com/suessflorian/gqlfetch/gqlfetch@607d6757018016bba0ba7fd1cb9fed6aefa853b5 --endpoint ${SCHEMA_CLUSTER}/graphql --header "Authorization=Bearer ${SCHEMA_CLUSTER_API_TOKEN}" > internal/api/humiographql/schema/_schema.graphql
+	printf "# Fetched from version %s" $$(curl --silent --location '${SCHEMA_CLUSTER}/api/v1/status' | jq -r ".version") >> internal/api/humiographql/schema/_schema.graphql
+
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
+	go generate ./...
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 fmt: ## Run go fmt against code.

api/v1alpha1/humioaggregatealert_types.go

@@ -60,7 +60,7 @@ type HumioAggregateAlertSpec struct {
 	// ThrottleTimeSeconds is the throttle time in seconds. An aggregate alert is triggered at most once per the throttle time
 	ThrottleTimeSeconds int `json:"throttleTimeSeconds,omitempty"`
 	// ThrottleField is the field on which to throttle
-	ThrottleField string `json:"throttleField,omitempty"`
+	ThrottleField *string `json:"throttleField,omitempty"`
 	// Aggregate Alert trigger mode
 	TriggerMode string `json:"triggerMode,omitempty"`
 	// Enabled will set the AggregateAlert to enabled when set to true

api/v1alpha1/humioalert_types.go

@@ -63,14 +63,15 @@ type HumioAlertSpec struct {
 	//+required
 	ViewName string `json:"viewName"`
 	// Query defines the desired state of the Humio query
+	//+required
 	Query HumioQuery `json:"query"`
 	// Description is the description of the Alert
 	//+optional
 	Description string `json:"description,omitempty"`
 	// ThrottleTimeMillis is the throttle time in milliseconds. An Alert is triggered at most once per the throttle time
 	ThrottleTimeMillis int `json:"throttleTimeMillis,omitempty"`
 	// ThrottleField is the field on which to throttle
-	ThrottleField string `json:"throttleField,omitempty"`
+	ThrottleField *string `json:"throttleField,omitempty"`
 	// Silenced will set the Alert to enabled when set to false
 	Silenced bool `json:"silenced,omitempty"`
 	// Actions is the list of Humio Actions by name that will be triggered by this Alert

api/v1alpha1/humiofilteralert_types.go

@@ -54,9 +54,13 @@ type HumioFilterAlertSpec struct {
 	//+optional
 	Description string `json:"description,omitempty"`
 	// ThrottleTimeSeconds is the throttle time in seconds. A filter alert is triggered at most once per the throttle time
+	//+kubebuilder:validation:Minimum=60
+	//+required
 	ThrottleTimeSeconds int `json:"throttleTimeSeconds,omitempty"`
 	// ThrottleField is the field on which to throttle
-	ThrottleField string `json:"throttleField,omitempty"`
+	//+kubebuilder:validation:MinLength=1
+	//+required
+	ThrottleField *string `json:"throttleField,omitempty"`
 	// Enabled will set the FilterAlert to enabled when set to true
 	Enabled bool `json:"enabled,omitempty"`
 	// Actions is the list of Humio Actions by name that will be triggered by this filter alert

api/v1alpha1/humioingesttoken_types.go

@@ -47,7 +47,7 @@ type HumioIngestTokenSpec struct {
 	// ParserName is the name of the parser which will be assigned to the ingest token.
 	//+kubebuilder:validation:MinLength=1
 	//+required
-	ParserName string `json:"parserName,omitempty"`
+	ParserName *string `json:"parserName,omitempty"`
 	// RepositoryName is the name of the Humio repository under which the ingest token will be created
 	//+kubebuilder:validation:MinLength=1
 	//+required

api/v1alpha1/humiorepository_types.go

@@ -35,9 +35,15 @@ const (
 type HumioRetention struct {
 	// perhaps we should migrate to resource.Quantity? the Humio API needs float64, but that is not supported here, see more here:
 	// https://github.com/kubernetes-sigs/controller-tools/issues/245
-	IngestSizeInGB  int32 `json:"ingestSizeInGB,omitempty"`
-	StorageSizeInGB int32 `json:"storageSizeInGB,omitempty"`
-	TimeInDays      int32 `json:"timeInDays,omitempty"`
+	//+kubebuilder:validation:Minimum=1
+	//+optional
+	IngestSizeInGB *int32 `json:"ingestSizeInGB,omitempty"`
+	//+kubebuilder:validation:Minimum=1
+	//+optional
+	StorageSizeInGB *int32 `json:"storageSizeInGB,omitempty"`
+	//+kubebuilder:validation:Minimum=1
+	//+optional
+	TimeInDays *int32 `json:"timeInDays,omitempty"`
 }
 
 // HumioRepositorySpec defines the desired state of HumioRepository

api/v1alpha1/humioview_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	humioapi "github.com/humio/cli/api"
+	"github.com/humio/humio-operator/internal/api/humiographql"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -97,13 +97,14 @@ func init() {
 	SchemeBuilder.Register(&HumioView{}, &HumioViewList{})
 }
 
-func (hv *HumioView) GetViewConnections() []humioapi.ViewConnection {
-	viewConnections := make([]humioapi.ViewConnection, 0)
-
+func (hv *HumioView) GetViewConnections() []humiographql.GetSearchDomainSearchDomainViewConnectionsViewConnection {
+	viewConnections := make([]humiographql.GetSearchDomainSearchDomainViewConnectionsViewConnection, 0)
 	for _, connection := range hv.Spec.Connections {
-		viewConnections = append(viewConnections, humioapi.ViewConnection{
-			RepoName: connection.RepositoryName,
-			Filter:   connection.Filter,
+		viewConnections = append(viewConnections, humiographql.GetSearchDomainSearchDomainViewConnectionsViewConnection{
+			Repository: humiographql.GetSearchDomainSearchDomainViewConnectionsViewConnectionRepository{
+				Name: connection.RepositoryName,
+			},
+			Filter: connection.Filter,
 		})
 	}
 	return viewConnections

charts/humio-operator/crds/core.humio.com_humiofilteralerts.yaml

@@ -83,10 +83,12 @@ spec:
                 type: string
               throttleField:
                 description: ThrottleField is the field on which to throttle
+                minLength: 1
                 type: string
               throttleTimeSeconds:
                 description: ThrottleTimeSeconds is the throttle time in seconds.
                   A filter alert is triggered at most once per the throttle time
+                minimum: 60
                 type: integer
               viewName:
                 description: ViewName is the name of the Humio View under which the

charts/humio-operator/crds/core.humio.com_humiorepositories.yaml

@@ -87,12 +87,15 @@ spec:
                       perhaps we should migrate to resource.Quantity? the Humio API needs float64, but that is not supported here, see more here:
                       https://github.com/kubernetes-sigs/controller-tools/issues/245
                     format: int32
+                    minimum: 1
                     type: integer
                   storageSizeInGB:
                     format: int32
+                    minimum: 1
                     type: integer
                   timeInDays:
                     format: int32
+                    minimum: 1
                     type: integer
                 type: object
             required:

config/crd/bases/core.humio.com_humiofilteralerts.yaml

@@ -83,10 +83,12 @@ spec:
                 type: string
               throttleField:
                 description: ThrottleField is the field on which to throttle
+                minLength: 1
                 type: string
               throttleTimeSeconds:
                 description: ThrottleTimeSeconds is the throttle time in seconds.
                   A filter alert is triggered at most once per the throttle time
+                minimum: 60
                 type: integer
               viewName:
                 description: ViewName is the name of the Humio View under which the

config/crd/bases/core.humio.com_humiorepositories.yaml

@@ -87,12 +87,15 @@ spec:
                       perhaps we should migrate to resource.Quantity? the Humio API needs float64, but that is not supported here, see more here:
                       https://github.com/kubernetes-sigs/controller-tools/issues/245
                     format: int32
+                    minimum: 1
                     type: integer
                   storageSizeInGB:
                     format: int32
+                    minimum: 1
                     type: integer
                   timeInDays:
                     format: int32
+                    minimum: 1
                     type: integer
                 type: object
             required: