From 6a2a8b8deca5e1c2a5af758b33b2289e8a8a1997 Mon Sep 17 00:00:00 2001
From: JR Boyens <jboyens@fooninja.org>
Date: Mon, 8 Jan 2024 04:36:24 -0800
Subject: [PATCH] fix(modules.gcloud): pass as ptr to allow request
 customization (#1972)

---
 modules/gcloud/bigquery.go  | 2 +-
 modules/gcloud/bigtable.go  | 2 +-
 modules/gcloud/datastore.go | 2 +-
 modules/gcloud/firestore.go | 2 +-
 modules/gcloud/gcloud.go    | 4 ++--
 modules/gcloud/pubsub.go    | 2 +-
 modules/gcloud/spanner.go   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/gcloud/bigquery.go b/modules/gcloud/bigquery.go
index d9a4409249..b9672d56b8 100644
--- a/modules/gcloud/bigquery.go
+++ b/modules/gcloud/bigquery.go
@@ -20,7 +20,7 @@ func RunBigQueryContainer(ctx context.Context, opts ...testcontainers.ContainerC
 		Started: true,
 	}
 
-	settings := applyOptions(req, opts)
+	settings := applyOptions(&req, opts)
 
 	req.Cmd = []string{"--project", settings.ProjectID}
 
diff --git a/modules/gcloud/bigtable.go b/modules/gcloud/bigtable.go
index c3f8ad489a..664d01dccc 100644
--- a/modules/gcloud/bigtable.go
+++ b/modules/gcloud/bigtable.go
@@ -19,7 +19,7 @@ func RunBigTableContainer(ctx context.Context, opts ...testcontainers.ContainerC
 		Started: true,
 	}
 
-	settings := applyOptions(req, opts)
+	settings := applyOptions(&req, opts)
 
 	req.Cmd = []string{
 		"/bin/sh",
diff --git a/modules/gcloud/datastore.go b/modules/gcloud/datastore.go
index 40f3da42e0..b4f0c38735 100644
--- a/modules/gcloud/datastore.go
+++ b/modules/gcloud/datastore.go
@@ -19,7 +19,7 @@ func RunDatastoreContainer(ctx context.Context, opts ...testcontainers.Container
 		Started: true,
 	}
 
-	settings := applyOptions(req, opts)
+	settings := applyOptions(&req, opts)
 
 	req.Cmd = []string{
 		"/bin/sh",
diff --git a/modules/gcloud/firestore.go b/modules/gcloud/firestore.go
index 27175b789c..413ce14a5c 100644
--- a/modules/gcloud/firestore.go
+++ b/modules/gcloud/firestore.go
@@ -19,7 +19,7 @@ func RunFirestoreContainer(ctx context.Context, opts ...testcontainers.Container
 		Started: true,
 	}
 
-	settings := applyOptions(req, opts)
+	settings := applyOptions(&req, opts)
 
 	req.Cmd = []string{
 		"/bin/sh",
diff --git a/modules/gcloud/gcloud.go b/modules/gcloud/gcloud.go
index ea28c68936..83ff0f0854 100644
--- a/modules/gcloud/gcloud.go
+++ b/modules/gcloud/gcloud.go
@@ -69,13 +69,13 @@ func WithProjectID(projectID string) Option {
 }
 
 // applyOptions applies the options to the container request and returns the settings.
-func applyOptions(req testcontainers.GenericContainerRequest, opts []testcontainers.ContainerCustomizer) options {
+func applyOptions(req *testcontainers.GenericContainerRequest, opts []testcontainers.ContainerCustomizer) options {
 	settings := defaultOptions()
 	for _, opt := range opts {
 		if apply, ok := opt.(Option); ok {
 			apply(&settings)
 		}
-		opt.Customize(&req)
+		opt.Customize(req)
 	}
 
 	return settings
diff --git a/modules/gcloud/pubsub.go b/modules/gcloud/pubsub.go
index 96a66175ad..65d87ae1ad 100644
--- a/modules/gcloud/pubsub.go
+++ b/modules/gcloud/pubsub.go
@@ -19,7 +19,7 @@ func RunPubsubContainer(ctx context.Context, opts ...testcontainers.ContainerCus
 		Started: true,
 	}
 
-	settings := applyOptions(req, opts)
+	settings := applyOptions(&req, opts)
 
 	req.Cmd = []string{
 		"/bin/sh",
diff --git a/modules/gcloud/spanner.go b/modules/gcloud/spanner.go
index c407ddaa58..12420eae14 100644
--- a/modules/gcloud/spanner.go
+++ b/modules/gcloud/spanner.go
@@ -18,7 +18,7 @@ func RunSpannerContainer(ctx context.Context, opts ...testcontainers.ContainerCu
 		Started: true,
 	}
 
-	settings := applyOptions(req, opts)
+	settings := applyOptions(&req, opts)
 
 	container, err := testcontainers.GenericContainer(ctx, req)
 	if err != nil {