fix: remove unrelated file and fix broken kube tests

- Remove generated connectruntimeimagespec.go not related to this PR
- Extract isCRDNotFoundError() helper for testability
- Rewrite kube_test.go with working tests for CRD error detection

Author: ian-flores

client-go/applyconfiguration/core/v1beta1/connectruntimeimagespec.go

@@ -111,13 +111,7 @@ func (c *siteClient) Get(name string, namespace string, opts metav1.GetOptions,
 		Into(&result)
 
 	if err != nil {
-		// Check if the error is because Sites CRD doesn't exist
-		// This can happen on clusters without sites
-		// The error will typically be "the server could not find the requested resource"
-		// when the CRD is not installed
-		errStr := err.Error()
-		if strings.Contains(errStr, "the server could not find the requested resource") ||
-			strings.Contains(errStr, "no matches for kind") {
+		if isCRDNotFoundError(err.Error()) {
 			slog.Info("Sites CRD not found on cluster, returning empty site", "name", name, "namespace", namespace)
 			// Return an empty Site with minimal info for display
 			result.Name = name
@@ -131,3 +125,9 @@ func (c *siteClient) Get(name string, namespace string, opts metav1.GetOptions,
 	slog.Debug("site fetched successfully", "name", name, "namespace", namespace)
 	return &result, err
 }
+
+// isCRDNotFoundError checks if an error message indicates the Site CRD is not installed.
+func isCRDNotFoundError(errMsg string) bool {
+	return strings.Contains(errMsg, "the server could not find the requested resource") ||
+		strings.Contains(errMsg, "no matches for kind")
+}

flightdeck/internal/kube.go

@@ -1,109 +1,48 @@
 package internal
 
 import (
-	"context"
-	"errors"
 	"testing"
 
-	positcov1beta1 "github.com/posit-dev/team-operator/api/core/v1beta1"
 	"github.com/stretchr/testify/assert"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/rest/fake"
 )
 
-func TestSiteClient_Get_HandlesNoCRD(t *testing.T) {
+func TestIsCRDNotFoundError(t *testing.T) {
 	tests := []struct {
-		name      string
-		setupREST func() *fake.RESTClient
-		wantError bool
-		wantEmpty bool
-		errMsg    string
+		name        string
+		errMsg      string
+		isCRDAbsent bool
 	}{
 		{
-			name: "CRD not found - returns empty site",
-			setupREST: func() *fake.RESTClient {
-				client := &fake.RESTClient{
-					NegotiatedSerializer: runtime.NewSimpleNegotiatedSerializer(runtime.SerializerInfo{}),
-				}
-				client.Err = errors.New("the server could not find the requested resource")
-				return client
-			},
-			wantError: false,
-			wantEmpty: true,
+			name:        "resource not found indicates missing CRD",
+			errMsg:      "the server could not find the requested resource",
+			isCRDAbsent: true,
 		},
 		{
-			name: "No matches for kind - returns empty site",
-			setupREST: func() *fake.RESTClient {
-				client := &fake.RESTClient{
-					NegotiatedSerializer: runtime.NewSimpleNegotiatedSerializer(runtime.SerializerInfo{}),
-				}
-				client.Err = errors.New("no matches for kind \"Site\" in version \"core.posit.team/v1beta1\"")
-				return client
-			},
-			wantError: false,
-			wantEmpty: true,
+			name:        "no matches for kind indicates missing CRD",
+			errMsg:      "no matches for kind \"Site\" in version \"core.posit.team/v1beta1\"",
+			isCRDAbsent: true,
 		},
 		{
-			name: "Other error - returns error",
-			setupREST: func() *fake.RESTClient {
-				client := &fake.RESTClient{
-					NegotiatedSerializer: runtime.NewSimpleNegotiatedSerializer(runtime.SerializerInfo{}),
-				}
-				client.Err = errors.New("connection refused")
-				return client
-			},
-			wantError: true,
-			wantEmpty: false,
-			errMsg:    "connection refused",
+			name:        "connection refused is not a missing CRD",
+			errMsg:      "connection refused",
+			isCRDAbsent: false,
 		},
 		{
-			name: "Site found - returns site",
-			setupREST: func() *fake.RESTClient {
-				site := &positcov1beta1.Site{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "test-site",
-						Namespace: "posit-team",
-					},
-				}
-				client := &fake.RESTClient{
-					NegotiatedSerializer: runtime.NewSimpleNegotiatedSerializer(runtime.SerializerInfo{}),
-					Resp: &rest.Response{
-						Response: nil,
-					},
-				}
-				// In a real test, we'd properly mock the response
-				// For now, we're testing the error handling logic
-				return client
-			},
-			wantError: false,
-			wantEmpty: false,
+			name:        "timeout is not a missing CRD",
+			errMsg:      "context deadline exceeded",
+			isCRDAbsent: false,
+		},
+		{
+			name:        "empty string is not a missing CRD",
+			errMsg:      "",
+			isCRDAbsent: false,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			client := &siteClient{
-				restClient: tt.setupREST(),
-			}
-
-			ctx := context.Background()
-			result, err := client.Get("test-site", "posit-team", metav1.GetOptions{}, ctx)
-
-			if tt.wantError {
-				assert.Error(t, err)
-				if tt.errMsg != "" {
-					assert.Contains(t, err.Error(), tt.errMsg)
-				}
-			} else {
-				assert.NoError(t, err)
-				if tt.wantEmpty {
-					// When CRD doesn't exist, we return an empty site with just name/namespace
-					assert.Equal(t, "test-site", result.Name)
-					assert.Equal(t, "posit-team", result.Namespace)
-				}
-			}
+			result := isCRDNotFoundError(tt.errMsg)
+			assert.Equal(t, tt.isCRDAbsent, result)
 		})
 	}
-}
+}