chore: fix the cloud-service-broker build (#954)

- The cloud-service-broker dependency was updated to be a Go 1.24 tool
- This did not work because you can't "go build" a tool, so it's been reverted
- Also "make build" will now build the cloud-service-broker too, as this is typically used as the litmus test of whether everything is working, and in this case we had a miss.

Author: blgm

Makefile

@@ -28,15 +28,15 @@ BROKER_GO_OPTS=PORT=8080 \
  				GSB_PROVISION_DEFAULTS='$(GSB_PROVISION_DEFAULTS)'
 
 PAK_PATH=$(PWD)
-RUN_CSB=$(BROKER_GO_OPTS) go tool cloud-service-broker
+RUN_CSB=$(BROKER_GO_OPTS) go run github.com/cloudfoundry/cloud-service-broker/v2
 
 LDFLAGS="-X github.com/cloudfoundry/cloud-service-broker/v2/utils.Version=$(CSB_VERSION)"
 GET_CSB="env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) github.com/cloudfoundry/cloud-service-broker/v2"
 
 ###### Targets ################################################################
 
 .PHONY: build
-build: $(IAAS)-services-*.brokerpak ## build brokerpak
+build: cloud-service-broker $(IAAS)-services-*.brokerpak ## build brokerpak
 
 $(IAAS)-services-*.brokerpak: *.yml terraform/*/*.tf ./providers/terraform-provider-csbmssqldbrunfailover/cloudfoundry.org/cloud-service-broker/csbmssqldbrunfailover | $(PAK_BUILD_CACHE_PATH)
 	$(RUN_CSB) pak build

go.mod

@@ -141,7 +141,6 @@ require (
 )
 
 tool (
-	github.com/cloudfoundry/cloud-service-broker/v2
 	github.com/onsi/ginkgo/v2/ginkgo
 	golang.org/x/tools/cmd/goimports
 	honnef.co/go/tools/cmd/staticcheck

tools/tools.go

@@ -0,0 +1,11 @@
+//go:build tools
+// +build tools
+
+package tools
+
+import (
+	_ "github.com/cloudfoundry/cloud-service-broker/v2"
+)
+
+// This file imports the Cloud Service Broker in order to pin the version
+// For other tools, use "go get -tool"