Standardize ResourceBuilder parameter naming to 'rb'

Updated all ResourceBuilder parameters from 'b' to 'rb' for consistency
across investigation implementations. Resources references already use 'r'
consistently.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: bergmannf

cadctl/cmd/investigate/investigate.go

@@ -148,13 +148,22 @@ func run(cmd *cobra.Command, _ []string) error {
 	return updateIncidentTitle(pdClient)
 }
 
-func handleCADFailure(err error, builder *investigation.ResourceBuilderT, pdClient *pagerduty.SdkClient) {
+// handleClusterNotFound centralizes the logic for this specific error case.
+func handleClusterNotFound(clusterID string, pdClient *pagerduty.SdkClient, investigationErr error) error {
+	if investigationErr != nil && strings.Contains(investigationErr.Error(), "no cluster found") {
+		logging.Warnf("No cluster found with ID '%s'. Escalating and exiting.", clusterID)
+		return pdClient.EscalateIncidentWithNote("CAD was unable to find the incident cluster in OCM. An alert for a non-existing cluster is unexpected. Please investigate manually.")
+	}
+	return investigationErr
+}
+
+func handleCADFailure(err error, rb *investigation.ResourceBuilderT, pdClient *pagerduty.SdkClient) {
 	logging.Errorf("CAD investigation failed: %v", err)
 
 	var notes string
 	// The builder caches resources, so we can access them here even if a later step failed.
 	// We ignore the error here because we just want to get any notes that were created.
-	resources, _ := builder.Build()
+	resources, _ := rb.Build()
 	if resources != nil && resources.Notes != nil {
 		resources.Notes.AppendWarning("🚨 CAD investigation failed, CAD team has been notified. Please investigate manually. 🚨")
 		notes = resources.Notes.String()

pkg/investigations/cannotretrieveupdatessre/cannotretrieveupdatessre.go

@@ -18,9 +18,9 @@ import (
 type Investigation struct{}
 
 // Run executes the investigation for the CannotRetrieveUpdatesSRE alert
-func (c *Investigation) Run(b investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
+func (c *Investigation) Run(rb investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
 	result := investigation.InvestigationResult{}
-	r, err := b.WithAwsClient().Build()
+	r, err := rb.WithAwsClient().Build()
 	if err != nil {
 		return result, err
 	}

pkg/investigations/chgm/chgm.go

@@ -36,9 +36,9 @@ var (
 type Investiation struct{}
 
 // Run runs the investigation for a triggered chgm pagerduty event
-func (c *Investiation) Run(b investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
+func (c *Investiation) Run(rb investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
 	result := investigation.InvestigationResult{}
-	r, err := b.WithClusterDeployment().Build()
+	r, err := rb.WithClusterDeployment().Build()
 	if err != nil {
 		return result, err
 	}

pkg/investigations/clustermonitoringerrorbudgetburn/clustermonitoringerrorbudgetburn.go

@@ -45,8 +45,8 @@ const available = "Available"
 
 type Investigation struct{}
 
-func (c *Investigation) Run(b investigation.ResourceBuilder) (result investigation.InvestigationResult, err error) {
-	r, err := b.Build()
+func (c *Investigation) Run(rb investigation.ResourceBuilder) (result investigation.InvestigationResult, err error) {
+	r, err := rb.Build()
 	if err != nil {
 		return investigation.InvestigationResult{}, err
 	}

pkg/investigations/cpd/cpd.go

@@ -27,9 +27,9 @@ var byovpcRoutingSL = &ocm.ServiceLog{Severity: "Major", Summary: "Installation
 // - always escalate the alert to primary
 // The reasoning for this is that we don't fully trust network verifier yet.
 // In the future, we want to automate service logs based on the network verifier output.
-func (c *Investigation) Run(b investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
+func (c *Investigation) Run(rb investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
 	result := investigation.InvestigationResult{}
-	r, err := b.Build()
+	r, err := rb.Build()
 	if err != nil {
 		return result, err
 	}

pkg/investigations/insightsoperatordown/insightsoperatordown.go

@@ -19,9 +19,9 @@ import (
 
 type Investigation struct{}
 
-func (c *Investigation) Run(b investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
+func (c *Investigation) Run(rb investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
 	result := investigation.InvestigationResult{}
-	r, err := b.WithAwsClient().Build()
+	r, err := rb.WithAwsClient().Build()
 	if err != nil {
 		return result, err
 	}

pkg/investigations/machinehealthcheckunterminatedshortcircuitsre/machinehealthcheckunterminatedshortcircuitsre.go

@@ -60,10 +60,10 @@ func (i *Investigation) teardown() error {
 // The machine object is evaluated first, as it represents a lower-level object that could affect the health of the node.
 // If the investigation determines that the breakage is occurring at the machine-level, the corresponding node is *not* investigated.
 // After investigating all affected machines, potentially affected nodes are investigated.
-func (i *Investigation) Run(b investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
+func (i *Investigation) Run(rb investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
 	ctx := context.Background()
 	result := investigation.InvestigationResult{}
-	r, err := b.Build()
+	r, err := rb.Build()
 	if err != nil {
 		return result, err
 	}

pkg/investigations/upgradeconfigsyncfailureover4hr/upgradeconfigsyncfailureover4hr.go

@@ -26,9 +26,9 @@ const (
 	remediationName = "upgradeconfigsyncfailureover4hr"
 )
 
-func (c *Investigation) Run(b investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
+func (c *Investigation) Run(rb investigation.ResourceBuilder) (investigation.InvestigationResult, error) {
 	result := investigation.InvestigationResult{}
-	r, err := b.Build()
+	r, err := rb.Build()
 	if err != nil {
 		return result, err
 	}