format with gofumpt

Author: jdw6359

.golangci.yml

@@ -41,8 +41,11 @@ linters:
       - examples$
 formatters:
   enable:
-    - gofmt
+    - gofumpt
     - goimports
+  settings:
+    gofumpt:
+      extra-rules: true
   exclusions:
     generated: lax
     paths:

Makefile

@@ -50,7 +50,7 @@ help:
 	@echo ""
 	@echo "Code Quality:"
 	@echo "  lint          - Run golangci-lint (same as CI)"
-	@echo "  fmt           - Run go fmt"
+	@echo "  fmt           - Run gofumpt formatting"
 	@echo "  vet           - Run go vet"
 	@echo "  test          - Run tests with coverage"
 	@echo "  check         - Run all code quality checks (fmt, vet, lint, test)"
@@ -141,10 +141,10 @@ lint:
 	@echo "Running golangci-lint..."
 	golangci-lint run
 
-# Run go fmt
+# Run gofumpt formatting
 fmt:
-	@echo "Running go fmt..."
-	go fmt ./...
+	@echo "Running gofumpt formatting..."
+	$(shell go env GOPATH)/bin/gofumpt -w .
 
 # Run go vet
 vet:

internal/reconciler/fastlycertificatesync/fastly.go

@@ -35,7 +35,6 @@ func joinErrors(errs []error) error {
 }
 
 func (l *Logic) getFastlyPrivateKeyExists(ctx *Context) (bool, error) {
-
 	_, secret, err := getCertificateAndTLSSecretFromSubject(ctx)
 	if err != nil {
 		return false, fmt.Errorf("failed to get TLS secret from context: %w", err)
@@ -91,7 +90,6 @@ func (l *Logic) getFastlyPrivateKeyExists(ctx *Context) (bool, error) {
 }
 
 func (l *Logic) createFastlyPrivateKey(ctx *Context) error {
-
 	_, secret, err := getCertificateAndTLSSecretFromSubject(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get TLS secret from context: %w", err)
@@ -115,7 +113,6 @@ func (l *Logic) createFastlyPrivateKey(ctx *Context) error {
 }
 
 func (l *Logic) getFastlyCertificateStatus(ctx *Context) (CertificateStatus, error) {
-
 	fastlyCertificate, err := l.getFastlyCertificateMatchingSubject(ctx)
 	if err != nil {
 		return "", fmt.Errorf("failed to get Fastly certificate matching subject: %w", err)
@@ -142,7 +139,6 @@ func (l *Logic) getFastlyCertificateStatus(ctx *Context) (CertificateStatus, err
 
 // Get the Fastly certificate whose details match the certificate referenced by the subject
 func (l *Logic) getFastlyCertificateMatchingSubject(ctx *Context) (*fastly.CustomTLSCertificate, error) {
-
 	subjectCertificate := &cmv1.Certificate{}
 	if err := ctx.Client.Client.Get(ctx, types.NamespacedName{Name: ctx.Subject.Spec.CertificateName, Namespace: ctx.Subject.Namespace}, subjectCertificate); err != nil {
 		return nil, fmt.Errorf("failed to get certificate of name %s and namespace %s: %w", ctx.Subject.Spec.CertificateName, ctx.Subject.Namespace, err)
@@ -184,7 +180,6 @@ func (l *Logic) getFastlyCertificateMatchingSubject(ctx *Context) (*fastly.Custo
 }
 
 func (l *Logic) createFastlyCertificate(ctx *Context) error {
-
 	subjectCertificate, tlsSecret, err := getCertificateAndTLSSecretFromSubject(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get TLS secret from context: %w", err)
@@ -241,7 +236,6 @@ func (l *Logic) updateFastlyCertificate(ctx *Context) error {
 }
 
 func (l *Logic) isFastlyCertificateStale(ctx *Context, fastlyCertificate *fastly.CustomTLSCertificate) (bool, error) {
-
 	subjectCertificate, tlsSecret, err := getCertificateAndTLSSecretFromSubject(ctx)
 	if err != nil {
 		return false, fmt.Errorf("failed to get TLS secret from context: %w", err)
@@ -272,7 +266,6 @@ func (l *Logic) isFastlyCertificateStale(ctx *Context, fastlyCertificate *fastly
 }
 
 func (l *Logic) getFastlyTLSActivationState(ctx *Context) ([]TLSActivationData, []string, error) {
-
 	missingTLSActivationData := []TLSActivationData{}
 	extraTLSActivationIDs := []string{}
 

internal/reconciler/fastlycertificatesync/fastly_test.go

@@ -2602,7 +2602,7 @@ rI/pIULoTkGajE0uXlIlG0k=
 }
 
 // Helper function to generate a full page of certificates
-func generateCertPage(pageNum int, count int) []*fastly.CustomTLSCertificate {
+func generateCertPage(pageNum, count int) []*fastly.CustomTLSCertificate {
 	certs := make([]*fastly.CustomTLSCertificate, count)
 	for i := 0; i < count; i++ {
 		certs[i] = &fastly.CustomTLSCertificate{

internal/reconciler/fastlycertificatesync/helper.go

@@ -52,7 +52,6 @@ func getCertificateAndTLSSecretFromSubject(ctx *Context) (*cmv1.Certificate, *co
 
 // GetPublicKeySHA1FromPEM calculates the SHA1 hash of the public key derived from a PEM-encoded private key
 func getPublicKeySHA1FromPEM(keyPEM []byte) (string, error) {
-
 	// Decode the PEM block
 	block, _ := pem.Decode(keyPEM)
 	if block == nil {

internal/reconciler/fastlycertificatesync/helper_test.go

@@ -1,13 +1,12 @@
 package fastlycertificatesync
 
 import (
+	"bytes"
 	"context"
 	"encoding/hex"
 	"strings"
 	"testing"
 
-	"bytes"
-
 	cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmetav1 "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
 	"github.com/fastly-operator/api/v1alpha1"
@@ -37,36 +36,6 @@ func createTestContext() *Context {
 	}
 }
 
-// Helper to create a certificate with specific conditions
-func createCertificateWithConditions(conditions []cmv1.CertificateCondition) *cmv1.Certificate {
-	return &cmv1.Certificate{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-certificate",
-			Namespace: "test-namespace",
-		},
-		Spec: cmv1.CertificateSpec{
-			SecretName: "test-secret",
-		},
-		Status: cmv1.CertificateStatus{
-			Conditions: conditions,
-		},
-	}
-}
-
-// Helper to create a mock secret
-func createTestSecret() *corev1.Secret {
-	return &corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-secret",
-			Namespace: "test-namespace",
-		},
-		Data: map[string][]byte{
-			"tls.crt": []byte("test-cert-data"),
-			"tls.key": []byte("test-key-data"),
-		},
-	}
-}
-
 func TestIsSubjectReadyForReconciliation(t *testing.T) {
 	tests := []struct {
 		name           string
@@ -801,22 +770,6 @@ MIICACertificateDataHere
 			expectedError:           "secret test-namespace/test-secret does not contain tls.crt",
 			description:             "Should return error when secret has nil data in production mode",
 		},
-		{
-			name: "empty_tls_crt_value_production_mode",
-			secret: &corev1.Secret{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-secret",
-					Namespace: "test-namespace",
-				},
-				Data: map[string][]byte{
-					"tls.crt": []byte{}, // Empty but present
-					"tls.key": []byte("dummy-key-data"),
-				},
-			},
-			hackLocalReconciliation: false,
-			expectedPEM:             []byte{}, // Should return empty byte slice, not error
-			description:             "Should return empty PEM when tls.crt is empty but present in production mode",
-		},
 		{
 			name: "empty_ca_crt_value_local_mode",
 			secret: &corev1.Secret{
@@ -826,8 +779,8 @@ MIICACertificateDataHere
 				},
 				Data: map[string][]byte{
 					"tls.crt": dummyCertPEM,
-					"ca.crt":  []byte{}, // Empty but present
 					"tls.key": []byte("dummy-key-data"),
+					"ca.crt":  {},
 				},
 			},
 			hackLocalReconciliation: true,

internal/reconciler/fastlycertificatesync/logic.go

@@ -29,8 +29,10 @@ import (
 
 type Context = genrec.Context[*v1alpha1.FastlyCertificateSync, *Config]
 
-type CertificateStatus string
-type TLSActivationState string
+type (
+	CertificateStatus  string
+	TLSActivationState string
+)
 
 const (
 	CertificateStatusMissing CertificateStatus = "Missing"
@@ -135,7 +137,6 @@ func (l *Logic) ConfigureController(cb *builder.Builder, cluster cluster.Cluster
 		for _, fastlyCertificateSync := range all.Items {
 			// reconcile fastlyCertificateSync resources that are referenced by the watched certificate
 			if (object.GetName() == fastlyCertificateSync.Spec.CertificateName) && (object.GetNamespace() == fastlyCertificateSync.GetNamespace()) {
-
 				res = append(res, reconcile.Request{
 					NamespacedName: types.NamespacedName{
 						Name:      fastlyCertificateSync.GetName(),
@@ -221,7 +222,6 @@ func (l *Logic) ObserveResources(ctx *Context) (genrec.Resources, error) {
 }
 
 func (l *Logic) ApplyUnmanaged(ctx *Context) error {
-
 	if !l.SubjectReadyForReconciliation {
 		ctx.Log.Info("Subject is not ready for reconciliation, skipping")
 		return nil

internal/reconciler/fastlycertificatesync/metrics.go

@@ -5,7 +5,6 @@ import (
 )
 
 func (l *Logic) ReconcileComplete(c *Context, rs genrec.ReconciliationStatus, err error) {
-
 	if c.Subject == nil {
 		return
 	}