fix(modules.gcloud): pass as ptr to allow request customization

jboyens · jboyens · commit a06c441a2cef · 2023-12-05T16:20:11.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func RunBigQueryContainer(ctx context.Context, opts ...testcontainers.ContainerC`
`20`	`20`	`Started: true,`
`21`	`21`	`}`
`22`	`22`
`23`		`- settings := applyOptions(req, opts)`
	`23`	`+ settings := applyOptions(&req, opts)`
`24`	`24`
`25`	`25`	`req.Cmd = []string{"--project", settings.ProjectID}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ func RunBigTableContainer(ctx context.Context, opts ...testcontainers.ContainerC`
`19`	`19`	`Started: true,`
`20`	`20`	`}`
`21`	`21`
`22`		`- settings := applyOptions(req, opts)`
	`22`	`+ settings := applyOptions(&req, opts)`
`23`	`23`
`24`	`24`	`req.Cmd = []string{`
`25`	`25`	`"/bin/sh",`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ func RunDatastoreContainer(ctx context.Context, opts ...testcontainers.Container`
`19`	`19`	`Started: true,`
`20`	`20`	`}`
`21`	`21`
`22`		`- settings := applyOptions(req, opts)`
	`22`	`+ settings := applyOptions(&req, opts)`
`23`	`23`
`24`	`24`	`req.Cmd = []string{`
`25`	`25`	`"/bin/sh",`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ func RunFirestoreContainer(ctx context.Context, opts ...testcontainers.Container`
`19`	`19`	`Started: true,`
`20`	`20`	`}`
`21`	`21`
`22`		`- settings := applyOptions(req, opts)`
	`22`	`+ settings := applyOptions(&req, opts)`
`23`	`23`
`24`	`24`	`req.Cmd = []string{`
`25`	`25`	`"/bin/sh",`
Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,13 @@ func WithProjectID(projectID string) Option {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// applyOptions applies the options to the container request and returns the settings.`
`72`		`-func applyOptions(req testcontainers.GenericContainerRequest, opts []testcontainers.ContainerCustomizer) options {`
	`72`	`+func applyOptions(req *testcontainers.GenericContainerRequest, opts []testcontainers.ContainerCustomizer) options {`
`73`	`73`	`settings := defaultOptions()`
`74`	`74`	`for _, opt := range opts {`
`75`	`75`	`if apply, ok := opt.(Option); ok {`
`76`	`76`	`apply(&settings)`
`77`	`77`	`}`
`78`		`- opt.Customize(&req)`
	`78`	`+ opt.Customize(req)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`return settings`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ func RunPubsubContainer(ctx context.Context, opts ...testcontainers.ContainerCus`
`19`	`19`	`Started: true,`
`20`	`20`	`}`
`21`	`21`
`22`		`- settings := applyOptions(req, opts)`
	`22`	`+ settings := applyOptions(&req, opts)`
`23`	`23`
`24`	`24`	`req.Cmd = []string{`
`25`	`25`	`"/bin/sh",`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func RunSpannerContainer(ctx context.Context, opts ...testcontainers.ContainerCu`
`18`	`18`	`Started: true,`
`19`	`19`	`}`
`20`	`20`
`21`		`- settings := applyOptions(req, opts)`
	`21`	`+ settings := applyOptions(&req, opts)`
`22`	`22`
`23`	`23`	`container, err := testcontainers.GenericContainer(ctx, req)`
`24`	`24`	`if err != nil {`