Expose FakeSetup with created bindings

This allows FakeSetup to be passed into functions.

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.0.51 Allow passing of Test Clients
+- Introduces `FakeSetup`, which allows for passing TestClients along.
+
 ## v0.0.47 Fix accessing OrderingKey
 **Bugfixes**
 - Corrects implementation of function `ApplyCloudEventsPubSubOrderingKey`

pkg/gcp/services.go

@@ -7,6 +7,7 @@ import (
 
 	"cloud.google.com/go/errorreporting"
 	"cloud.google.com/go/logging"
+	"cloud.google.com/go/pubsub"
 	texporter "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace"
 	"github.com/otto-de/sherlock-microservice/pkg/gke"
 	"go.opentelemetry.io/otel/sdk/resource"
@@ -16,9 +17,11 @@ import (
 
 // Services contains all Google Cloud Services that
 // we use
+// TODO: Spit non-Services to another struct
 type Services struct {
 	Logging           *logging.Client
 	ErrorReporting    *errorreporting.Client
+	PubSub            *pubsub.Client
 	TracerProvider    *sdktrace.TracerProvider
 	MonitoredResource *monitoredres.MonitoredResource
 }
@@ -146,6 +149,7 @@ func DiscoverServices(project, serviceName string, tracerProviderOptions []sdktr
 // Does **not** handle errors in close since there usually
 // is not much that can be done on Close failure anyway.
 func (s *Services) Close() {
+	s.PubSub.Close()
 	s.TracerProvider.ForceFlush(context.Background()) // flushes any pending spans
 	s.ErrorReporting.Close()
 	s.Logging.Close()

pkg/gcp/test/test.go

@@ -17,10 +17,16 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
+type fakeServers struct {
+	PubSub *pstest.Server
+}
+type FakeSetup struct {
+	Servers  fakeServers
+	Services gcp.Services
+}
+
 type server struct {
-	gcp.Services
-	PubSub       *pubsub.Client
-	PubSubServer *pstest.Server
+	FakeSetup
 
 	listener     net.Listener
 	grpcServer   *grpc.Server
@@ -124,13 +130,17 @@ func MustMakeTestServices(ctx context.Context, project, serviceName string, opts
 	}()
 
 	return &server{
-		Services: gcp.Services{
-			ErrorReporting: errRep,
-			Logging:        lc,
-			TracerProvider: tp,
+		FakeSetup: FakeSetup{
+			Servers: fakeServers{
+				PubSub: psServer,
+			},
+			Services: gcp.Services{
+				TracerProvider: tp,
+				ErrorReporting: errRep,
+				Logging:        lc,
+				PubSub:         pubSub,
+			},
 		},
-		PubSub:       pubSub,
-		PubSubServer: psServer,
 		fes:          fes,
 		grpcServer:   grpcServer,
 		listener:     l,
@@ -141,10 +151,9 @@ func MustMakeTestServices(ctx context.Context, project, serviceName string, opts
 func (s *server) Close() error {
 	// Ignore close errors because usually
 	// we are not that particular about testing
-	s.PubSub.Close()
 	s.Services.Close()
 	s.grpcServer.GracefulStop()
-	s.PubSubServer.Close()
+	s.Servers.PubSub.Close()
 	s.psServerConn.Close()
 	s.listener.Close()
 	return nil