[go components] Fixed "go test ./..." in various components

Tool: gitpod/catfood.gitpod.cloud

Author: geropl

WORKSPACE.yaml

@@ -38,6 +38,7 @@ defaultVariant:
     - GOARCH=amd64
     - DOCKER_DEFAULT_PLATFORM=linux/amd64
     - NODE_OPTIONS=--max_old_space_size=8192
+    - LEEWAY_BUILD=true
   srcs:
     exclude:
       # Make sure we don't include node_modules/**/*.ts by accident

components/common-go/util/util.go

@@ -0,0 +1,17 @@
+// Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
+package util
+
+import "os"
+
+func InLeewayBuild() bool {
+	for _, ev := range os.Environ() {
+		// env var set in WORKSPACE.yaml
+		if ev == "LEEWAY_BUILD=true" {
+			return true
+		}
+	}
+	return false
+}

components/ide-metrics/pkg/metrics/aggregated-histograms_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 
 	dto "github.com/prometheus/client_model/go"
 )
@@ -54,7 +55,7 @@ func TestAggregatedHistograms(t *testing.T) {
 					{CumulativeCount: &highCount, UpperBound: &highBound},
 				},
 			},
-		}}, actual)
+		}}, actual, cmpopts.IgnoreUnexported(dto.Metric{}, dto.LabelPair{}, dto.Histogram{}, dto.Bucket{}))
 	}
 
 	_ = agg.Add([]string{"foo"}, 1, 0.004, []uint64{1, 1, 1})

components/node-labeler/cmd/run_test.go

@@ -11,8 +11,6 @@ import (
 	"time"
 
 	"github.com/aws/smithy-go/ptr"
-	csapi "github.com/gitpod-io/gitpod/content-service/api"
-	workspacev1 "github.com/gitpod-io/gitpod/ws-manager/api/crd/v1"
 	"github.com/golang/mock/gomock"
 	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
@@ -25,9 +23,12 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"github.com/gitpod-io/gitpod/common-go/util"
+	csapi "github.com/gitpod-io/gitpod/content-service/api"
+	workspacev1 "github.com/gitpod-io/gitpod/ws-manager/api/crd/v1"
 )
 
 const (
@@ -101,11 +102,16 @@ var _ = Describe("NodeScaledownAnnotationController", func() {
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
+	crdPath := filepath.Join("..", "crd")
+	if !util.InLeewayBuild() {
+		crdPath = filepath.Join("..", "..", "ws-manager-mk2", "config", "crd", "bases")
+	}
+
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: 1 * time.Minute,
 		ControlPlaneStopTimeout:  1 * time.Minute,
-		CRDDirectoryPaths:        []string{filepath.Join("..", "crd")},
+		CRDDirectoryPaths:        []string{crdPath},
 		ErrorIfCRDPathMissing:    true,
 	}
 

components/ws-daemon/pkg/controller/suite_test.go

@@ -25,6 +25,7 @@ import (
 
 	//+kubebuilder:scaffold:imports
 
+	"github.com/gitpod-io/gitpod/common-go/util"
 	workspacev1 "github.com/gitpod-io/gitpod/ws-manager/api/crd/v1"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
@@ -50,11 +51,16 @@ func TestAPIs(t *testing.T) {
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
+	crdPath := filepath.Join("..", "..", "crd")
+	if !util.InLeewayBuild() {
+		crdPath = filepath.Join("..", "..", "..", "ws-manager-mk2", "config", "crd", "bases")
+	}
+
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: 1 * time.Minute,
 		ControlPlaneStopTimeout:  1 * time.Minute,
-		CRDDirectoryPaths:        []string{filepath.Join("..", "..", "crd")},
+		CRDDirectoryPaths:        []string{crdPath},
 		ErrorIfCRDPathMissing:    true,
 	}
 

components/ws-manager-api/go/BUILD.yaml

@@ -10,4 +10,3 @@ packages:
       - "go.sum"
     config:
       packaging: library
-      dontTest: true

components/ws-manager-api/go/config/config.go

@@ -254,7 +254,7 @@ func (c *Configuration) Validate() error {
 	}
 
 	if _, ok := c.WorkspaceClasses[DefaultWorkspaceClass]; !ok {
-		return xerrors.Errorf("missing \"%s\" workspace class", DefaultWorkspaceClass)
+		return xerrors.Errorf("missing default workspace class (\"%s\")", DefaultWorkspaceClass)
 	}
 	for name, class := range c.WorkspaceClasses {
 		if errs := validation.IsValidLabelValue(name); len(errs) > 0 {

components/ws-manager-api/go/config/config_test.go

@@ -56,7 +56,7 @@ func TestValidate(t *testing.T) {
 			Cfg: fromValidConfig(func(c *Configuration) {
 				delete(c.WorkspaceClasses, DefaultWorkspaceClass)
 			}),
-			Expectation: `missing "default" workspace class`,
+			Expectation: `missing default workspace class ("g1-standard")`,
 		},
 		{
 			Name: "invalid workspace class name",

components/ws-manager-api/go/crd/v1/webhook_suite_test.go

@@ -13,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gitpod-io/gitpod/common-go/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -48,11 +49,16 @@ var _ = BeforeSuite(func() {
 
 	ctx, cancel = context.WithCancel(context.TODO())
 
+	crdPath := filepath.Join("..", "..", "config", "crd", "bases")
+	if !util.InLeewayBuild() {
+		crdPath = filepath.Join("..", "..", "..", "..", "ws-manager-mk2", "config", "crd", "bases")
+	}
+
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: 1 * time.Minute,
 		ControlPlaneStopTimeout:  1 * time.Minute,
-		CRDDirectoryPaths:        []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:        []string{crdPath},
 		ErrorIfCRDPathMissing:    false,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
 			Paths: []string{filepath.Join("..", "..", "config", "webhook")},