Skip to content

Commit 652bcc0

Browse files
Fix gcloud module
1 parent 44a17d3 commit 652bcc0

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

packages/modules/azurecosmosdb/tsconfig.build.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"extends": "./tsconfig.json",
33
"exclude": [
44
"build",
5-
"jest.config.ts",
65
"src/**/*.test.ts"
76
],
87
"references": [

packages/modules/azurecosmosdb/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
}
1111
},
1212
"exclude": [
13-
"build",
14-
"jest.config.ts"
13+
"build"
1514
],
1615
"references": [
1716
{

packages/modules/gcloud/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:517.0.0-emulators
2+
FROM fsouza/fake-gcs-server:1.52.2
3+
FROM ghcr.io/goccy/bigquery-emulator:0.6.6

packages/modules/gcloud/src/bigquery-emulator-container.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { BigQuery, TableSchema } from "@google-cloud/bigquery";
22
import { getImage } from "../../../testcontainers/src/utils/test-helper";
33
import { BigQueryEmulatorContainer, StartedBigQueryEmulatorContainer } from "./bigquery-emulator-container";
44

5-
const IMAGE = getImage(__dirname);
5+
const IMAGE = getImage(__dirname, 2);
66

77
describe("BigQueryEmulatorContainer", { timeout: 240_000 }, () => {
88
it("should work using default version", async () => {

packages/modules/gcloud/src/cloudstorage-emulator-container.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ReadableStream } from "node:stream/web";
44
import { getImage } from "../../../testcontainers/src/utils/test-helper";
55
import { CloudStorageEmulatorContainer, StartedCloudStorageEmulatorContainer } from "./cloudstorage-emulator-container";
66

7-
const IMAGE = getImage(__dirname);
7+
const IMAGE = getImage(__dirname, 1);
88

99
async function getRequestBodyFromReadableStream(stream: ReadableStream<Uint8Array>): Promise<string> {
1010
const decoder = new TextDecoder();

packages/testcontainers/src/utils/test-helper.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import { StartedDockerComposeEnvironment } from "../docker-compose-environment/s
1010
import { GenericContainer } from "../generic-container/generic-container";
1111
import { StartedTestContainer } from "../test-container";
1212

13-
export const getImage = (dirname: string): string => {
13+
export const getImage = (dirname: string, index = 0): string => {
1414
return fs
1515
.readFileSync(path.resolve(dirname, "..", "Dockerfile"), "utf-8")
16-
.split("\n")[0]
17-
.split(" ")[1];
16+
.split("\n")
17+
[index].split(" ")[1];
1818
};
1919

2020
export const checkContainerIsHealthy = async (container: StartedTestContainer): Promise<void> => {

0 commit comments

Comments
 (0)