Merge pull request #118 from pheckenlWork/boilerplate-update-1-6c37c92165ab2c46308a1c6a5b11d3cffd8a373d

Boilerplate update 1 6c37c92165ab2c46308a1c6a5b11d3cffd8a373d

Author: openshift-merge-bot[bot]

.golangci.yaml

@@ -0,0 +1,53 @@
+linters:
+  enable:
+    - errcheck
+    - govet
+    - staticcheck
+    - gosec
+    - bodyclose
+    - sqlclosecheck
+    - gofmt
+    - goimports
+    - revive
+    - ineffassign
+    - unconvert
+    - unparam
+    - prealloc
+    - nolintlint
+    - misspell
+    - gocritic
+    - gocyclo
+    - dupl
+    - gosimple
+    - unused
+
+linters-settings:
+  revive:
+    rules:
+      # Disable package comment requirement
+      - name: package-comments
+        disabled: true
+  errcheck:
+    # Report type assertions that don't check for errors
+    check-type-assertions: true
+    # Allow assignment to blank identifier: _ = resp.Body.Close()
+    check-blank: false
+    # Disable the built-in exclude list to catch Close() errors
+    disable-default-exclusions: true
+
+run:
+  # Timeout for analysis
+  timeout: 5m
+
+issues:
+  # Which dirs to exclude: issues from them won't be reported
+  exclude-dirs:
+    - vendor
+  # Don't use default exclude patterns
+  exclude-use-default: false
+
+# Output configuration options
+output:
+  # Format: colored-line-number|line-number|json|tab|checkstyle|code-climate
+  formats:
+    - format: colored-line-number

OWNERS_ALIASES

@@ -5,7 +5,9 @@
 aliases:
   srep-functional-team-aurora:
     - abyrne55
+    - AlexSmithGH
     - dakotalongRH
+    - eth1030
     - joshbranham
     - luis-falcon
     - reedcort
@@ -65,7 +67,6 @@ aliases:
     - feichashao
     - samanthajayasinghe
     - xiaoyu74
-    - Dee-6777
     - Tessg22
     - smarthall
   srep-infra-cicd:

boilerplate/_data/last-boilerplate-commit

@@ -1 +1 @@
-d7285a904eda6cf842ddff8c648dedb223934a75
+6c37c92165ab2c46308a1c6a5b11d3cffd8a373d

boilerplate/_lib/container-make

@@ -4,6 +4,7 @@ if [[ "$1" == "-h"* ]] || [[ "$1" == "--h"* ]]; then
   echo "Usage: $0 {arguments to the real 'make'}"
   echo "Runs 'make' in the boilerplate backing container."
   echo "If the command fails, starts a shell in the container so you can debug."
+  echo "Set NONINTERACTIVE=true (or TRUE) to skip the debug shell and exit with the make return code."
   exit -1
 fi
 
@@ -40,12 +41,20 @@ banner "Running: make $@"
 $CONTAINER_ENGINE $args make "$@"
 rc=$?
 
-# If it failed, drop into the container in a shell
+# If it failed, check if we should drop into a shell or exit
 if [[ $rc -ne 0 ]]; then
-  banner "The 'make' command failed! Starting a shell in the container for debugging. Just 'exit' when done."
-  $CONTAINER_ENGINE $args /bin/bash
+  # Case-insensitive check for NONINTERACTIVE (true, TRUE, True all work)
+  if [[ "${NONINTERACTIVE,,}" == "true" ]]; then
+    banner "The 'make' command failed with exit code $rc. Skipping debug shell (NONINTERACTIVE=${NONINTERACTIVE})."
+  else
+    banner "The 'make' command failed! Starting a shell in the container for debugging. Just 'exit' when done."
+    $CONTAINER_ENGINE $args /bin/bash
+  fi
 fi
 
 # Finally, remove the container
 banner "Cleaning up the container"
 $CONTAINER_ENGINE rm -f $container_id >/dev/null
+
+# Exit with the return code from make
+exit $rc

boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES

@@ -5,7 +5,9 @@
 aliases:
   srep-functional-team-aurora:
     - abyrne55
+    - AlexSmithGH
     - dakotalongRH
+    - eth1030
     - joshbranham
     - luis-falcon
     - reedcort
@@ -65,7 +67,6 @@ aliases:
     - feichashao
     - samanthajayasinghe
     - xiaoyu74
-    - Dee-6777
     - Tessg22
     - smarthall
   srep-infra-cicd:

boilerplate/openshift/golang-osd-operator/standard.mk

@@ -364,6 +364,7 @@ endif
 # Boilerplate container-make targets.
 # Runs 'make' in the boilerplate backing container.
 # If the command fails, starts a shell in the container so you can debug.
+# Set NONINTERACTIVE=true to skip the debug shell for CI/automation.
 .PHONY: container-test
 container-test:
 	${BOILERPLATE_CONTAINER_MAKE} test
@@ -384,6 +385,11 @@ container-validate:
 container-coverage:
 	${BOILERPLATE_CONTAINER_MAKE} coverage
 
+# Run all container-* validation targets in sequence.
+# Set NONINTERACTIVE=true to skip debug shells and fail fast for CI/automation.
+.PHONY: container-all
+container-all: container-lint container-generate container-coverage container-test container-validate
+
 .PHONY: rvmo-bundle
 rvmo-bundle:
 	RELEASE_BRANCH=$(RELEASE_BRANCH) \

build/Dockerfile

@@ -8,7 +8,7 @@ COPY . .
 RUN make go-build
 
 ####
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1760515502
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1763362218
 
 ENV USER_UID=1001 \
     USER_NAME=configure-goalert-operator

build/Dockerfile.olm-registry

@@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests
 RUN initializer --permissive
 
 # ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1760515502
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1763362218
 
 COPY --from=builder /bin/registry-server /bin/registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe

controllers/goalertintegration/clusterdeployment_created.go

@@ -3,9 +3,10 @@ package goalertintegration
 //goland:noinspection SpellCheckingInspection
 import (
 	"context"
-	"github.com/openshift/configure-goalert-operator/pkg/localmetrics"
 	"strings"
 
+	"github.com/openshift/configure-goalert-operator/pkg/localmetrics"
+
 	goalertv1alpha1 "github.com/openshift/configure-goalert-operator/api/v1alpha1"
 	"github.com/openshift/configure-goalert-operator/config"
 	"github.com/openshift/configure-goalert-operator/pkg/goalert"
@@ -130,10 +131,10 @@ func (r *GoalertIntegrationReconciler) handleCreate(ctx context.Context, gclient
 		}
 	}
 
-	//add secret part
+	// add secret part
 	secret := kube.GenerateGoalertSecret(cd.Namespace, secretName, highIntKey, lowIntKey, heartbeatMonitorKey)
 	r.reqLogger.Info("creating goalert secret", "ClusterDeployment.Namespace", cd.Namespace)
-	//add reference
+	// add reference
 	if err := controllerutil.SetControllerReference(cd, secret, r.Scheme); err != nil {
 		r.reqLogger.Error(err, "Error setting controller reference on secret", "ClusterDeployment.Namespace", cd.Namespace)
 		return err

controllers/goalertintegration/goalertintegration_controller.go

@@ -78,6 +78,8 @@ var log = logf.Log.WithName("controller_goalertintegration")
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
+
+//nolint:gocyclo // This is a marker that we should think about a refactor here.
 func (r *GoalertIntegrationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	start := time.Now()
 
@@ -142,6 +144,11 @@ func (r *GoalertIntegrationReconciler) Reconcile(ctx context.Context, req ctrl.R
 	if err != nil {
 		r.reqLogger.Error(err, "Failed to auth to Goalert")
 	}
+	defer func() {
+		if err := authenticateGoalert.Body.Close(); err != nil {
+			r.reqLogger.Error(err, "Error closing http.Response Body")
+		}
+	}()
 
 	// Read session cookie from authentication response headers
 	sessionCookie, err := r.fetchSessionCookie(authenticateGoalert)
@@ -163,7 +170,7 @@ func (r *GoalertIntegrationReconciler) Reconcile(ctx context.Context, req ctrl.R
 		}
 	}
 
-	//If the GI is being deleted, clean up all ClusterDeployments with matching finalizers
+	// If the GI is being deleted, clean up all ClusterDeployments with matching finalizers
 	if gi.DeletionTimestamp != nil {
 		if controllerutil.ContainsFinalizer(gi, goalertFinalizer) {
 			for i := range matchingClusterDeployments.Items {
@@ -185,7 +192,7 @@ func (r *GoalertIntegrationReconciler) Reconcile(ctx context.Context, req ctrl.R
 		return r.doNotRequeue()
 	}
 
-	//Make sure there's a finalizer on the GoalertIntegration
+	// Make sure there's a finalizer on the GoalertIntegration
 	if !controllerutil.ContainsFinalizer(gi, goalertFinalizer) {
 		if !controllerutil.AddFinalizer(gi, goalertFinalizer) {
 			if err := r.Update(ctx, gi); err != nil {
@@ -266,8 +273,12 @@ func (r *GoalertIntegrationReconciler) authGoalert(ctx context.Context, username
 	if err != nil {
 		r.reqLogger.Error(err, "Error sending HTTP request")
 	}
+	defer func() {
+		if err := authResp.Body.Close(); err != nil {
+			r.reqLogger.Error(err, "Error closing http.Response Body")
+		}
+	}()
 
-	defer authResp.Body.Close()
 	return authResp.Request.Response, nil
 }