review: cmp.Or for zero-value fallbacks

cmd/sandbox-operator/tls.go

@@ -15,6 +15,7 @@
 package main
 
 import (
+	"cmp"
 	"context"
 	"crypto/ecdsa"
 	"crypto/elliptic"
@@ -235,21 +236,15 @@ func patchCRDs(ctx context.Context, c client.Client, caPEM []byte, serviceName,
 		original := crd.DeepCopy()
 
 		webhook := crd.Spec.Conversion.Webhook
-		if webhook == nil {
-			webhook = &apiextensionsv1.WebhookConversion{}
-		}
+		webhook = cmp.Or(webhook, &apiextensionsv1.WebhookConversion{})
 
 		if len(webhook.ConversionReviewVersions) == 0 {
 			webhook.ConversionReviewVersions = []string{"v1", "v1beta1"}
 		}
 
-		if webhook.ClientConfig == nil {
-			webhook.ClientConfig = &apiextensionsv1.WebhookClientConfig{}
-		}
+		webhook.ClientConfig = cmp.Or(webhook.ClientConfig, &apiextensionsv1.WebhookClientConfig{})
 
-		if webhook.ClientConfig.Service == nil {
-			webhook.ClientConfig.Service = &apiextensionsv1.ServiceReference{}
-		}
+		webhook.ClientConfig.Service = cmp.Or(webhook.ClientConfig.Service, &apiextensionsv1.ServiceReference{})
 
 		webhook.ClientConfig.Service.Name = serviceName
 		webhook.ClientConfig.Service.Namespace = namespace

extensions/controllers/sandboxtemplate_controller.go

@@ -15,6 +15,7 @@
 package controllers
 
 import (
+	"cmp"
 	"context"
 	"fmt"
 
@@ -82,9 +83,7 @@ func (r *SandboxTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	npNamespace := template.Namespace
 
 	management := template.Spec.NetworkPolicyManagement
-	if management == "" {
-		management = extensionsv1beta1.NetworkPolicyManagementManaged
-	}
+	management = cmp.Or(management, extensionsv1beta1.NetworkPolicyManagementManaged)
 
 	if management == extensionsv1beta1.NetworkPolicyManagementUnmanaged {
 		return ctrl.Result{}, r.dropManagedNetworkPolicy(ctx, template, npName, npNamespace)
@@ -209,9 +208,7 @@ func (r *SandboxTemplateReconciler) dropManagedNetworkPolicy(ctx context.Context
 // routerNamespace is the namespace the sandbox-router runs in (the operator
 // install namespace); ingress is admitted only from that namespace.
 func buildDefaultNetworkPolicySpec(templateName, routerNamespace string) networkingv1.NetworkPolicySpec {
-	if routerNamespace == "" {
-		routerNamespace = defaultRouterNamespace
-	}
+	routerNamespace = cmp.Or(routerNamespace, defaultRouterNamespace)
 	peers := []networkingv1.NetworkPolicyPeer{
 		{
 			NamespaceSelector: &metav1.LabelSelector{

pkg/e2bcompat/server.go

@@ -20,6 +20,7 @@
 package e2bcompat
 
 import (
+	"cmp"
 	"crypto/subtle"
 	"errors"
 	"fmt"
@@ -106,15 +107,9 @@ func NewServer(store scale.SandboxStore, opts Options) (*Server, error) {
 	if !ok {
 		return nil, errors.New("e2bcompat: store does not implement scale.ClaimIDResolver")
 	}
-	if opts.Namespace == "" {
-		opts.Namespace = "default"
-	}
-	if opts.EnvdVersion == "" {
-		opts.EnvdVersion = DefaultEnvdVersion
-	}
-	if opts.SizeClass == "" {
-		opts.SizeClass = scale.SizeClassSmall
-	}
+	opts.Namespace = cmp.Or(opts.Namespace, "default")
+	opts.EnvdVersion = cmp.Or(opts.EnvdVersion, DefaultEnvdVersion)
+	opts.SizeClass = cmp.Or(opts.SizeClass, scale.SizeClassSmall)
 	keys := make(map[string]struct{}, len(opts.APIKeys))
 	for _, k := range opts.APIKeys {
 		if k = strings.TrimSpace(k); k != "" {

pkg/podruntime/cocoon.go

@@ -2,6 +2,7 @@
 package podruntime
 
 import (
+	"cmp"
 	"context"
 	"crypto/sha256"
 	"fmt"
@@ -207,9 +208,7 @@ func stableVMName(namespace, name string) string {
 		}
 	}
 	prefix := strings.Trim(normalized.String(), "-")
-	if prefix == "" {
-		prefix = "sandbox"
-	}
+	prefix = cmp.Or(prefix, "sandbox")
 	digest := fmt.Sprintf("%x", sha256.Sum256([]byte(namespace+"/"+name)))[:8]
 	const maxPrefix = 63 - 1 - 8
 	if len(prefix) > maxPrefix {

pkg/scale/apiserver/lifecycle_storage.go

@@ -1,6 +1,7 @@
 package apiserver
 
 import (
+	"cmp"
 	"context"
 	"fmt"
 
@@ -121,9 +122,7 @@ func NewSandboxForkREST(store scale.SandboxStore) rest.Storage {
 				return nil, apierrors.NewBadRequest(fmt.Sprintf("expected SandboxForkOptions, got %T", obj))
 			}
 			count := int(opts.Count)
-			if count == 0 {
-				count = 1
-			}
+			count = cmp.Or(count, 1)
 			if count < 0 {
 				return nil, apierrors.NewBadRequest(fmt.Sprintf("count must be >= 1, got %d", count))
 			}

pkg/scale/apiserver/storage.go

@@ -1,6 +1,7 @@
 package apiserver
 
 import (
+	"cmp"
 	"context"
 	"fmt"
 	"math"
@@ -114,9 +115,7 @@ func (r *sandboxREST) Create(ctx context.Context, obj runtime.Object, createVali
 	// Identity: namespace from the request path, name (honoring generateName) from
 	// the submitted object.
 	namespace := genericapirequest.NamespaceValue(ctx)
-	if namespace == "" {
-		namespace = sb.Namespace
-	}
+	namespace = cmp.Or(namespace, sb.Namespace)
 	name := sb.Name
 	if name == "" && sb.GenerateName != "" {
 		name = names.SimpleNameGenerator.GenerateName(sb.GenerateName)

pkg/scale/poolkey.go

@@ -39,9 +39,7 @@ func PoolKeyFor(containers []corev1.Container, net string) PoolKey {
 	if len(containers) > 0 {
 		template = containers[0].Image
 	}
-	if net == "" {
-		net = NetDefault
-	}
+	net = cmp.Or(net, NetDefault)
 	return PoolKey{Template: template, Net: net, Size: SizeClassForContainers(containers)}
 }
 

pkg/scale/sandboxstore_impl.go

@@ -656,9 +656,7 @@ type ssaInventoryApplier struct {
 
 // NewSSAInventoryApplier returns the default server-side-apply InventoryApplier.
 func NewSSAInventoryApplier(c client.Client, fieldOwner string) InventoryApplier {
-	if fieldOwner == "" {
-		fieldOwner = "cocoon-node-inventory-publisher"
-	}
+	fieldOwner = cmp.Or(fieldOwner, "cocoon-node-inventory-publisher")
 	return &ssaInventoryApplier{c: c, fieldOwner: fieldOwner}
 }
 
@@ -980,10 +978,7 @@ func readyStatus(phase string) metav1.ConditionStatus {
 }
 
 func readyReason(phase string) string {
-	if phase == "" {
-		return "Unknown"
-	}
-	return phase
+	return cmp.Or(phase, "Unknown")
 }
 
 // resourceVersionFor derives a deterministic, content-sensitive ResourceVersion