@zukhruf/testing 0.3.45 → 0.3.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +54 -46
- package/dist/databases/clickhouse.d.ts +2 -2
- package/dist/databases/clickhouse.d.ts.map +1 -1
- package/dist/databases/clickhouse.js +6 -5
- package/dist/databases/clickhouse.js.map +1 -1
- package/dist/databases/collector.d.ts +1 -2
- package/dist/databases/collector.d.ts.map +1 -1
- package/dist/databases/collector.js +2 -2
- package/dist/databases/collector.js.map +1 -1
- package/dist/databases/database.d.ts +2 -2
- package/dist/databases/database.d.ts.map +1 -1
- package/dist/databases/mysql-family-server.d.ts.map +1 -1
- package/dist/databases/mysql-family-server.js +14 -14
- package/dist/databases/mysql-family-server.js.map +1 -1
- package/dist/databases/postgres.d.ts.map +1 -1
- package/dist/databases/postgres.js +18 -15
- package/dist/databases/postgres.js.map +1 -1
- package/dist/databases/sqlserver.d.ts.map +1 -1
- package/dist/databases/sqlserver.js +19 -16
- package/dist/databases/sqlserver.js.map +1 -1
- package/dist/docker/directory.d.ts +2 -2
- package/dist/docker/directory.d.ts.map +1 -1
- package/dist/docker/directory.js +3 -3
- package/dist/docker/directory.js.map +1 -1
- package/dist/docker/host.d.ts +2 -2
- package/dist/docker/host.d.ts.map +1 -1
- package/dist/docker/host.js +5 -5
- package/dist/docker/host.js.map +1 -1
- package/dist/docker/index.d.ts +1 -2
- package/dist/docker/index.d.ts.map +1 -1
- package/dist/docker/index.js +1 -2
- package/dist/docker/index.js.map +1 -1
- package/dist/docker/{test-run.d.ts → run-records.d.ts} +22 -16
- package/dist/docker/run-records.d.ts.map +1 -0
- package/dist/docker/{test-run.js → run-records.js} +22 -27
- package/dist/docker/run-records.js.map +1 -0
- package/dist/docker/{fixtures.d.ts → testbed.d.ts} +26 -42
- package/dist/docker/testbed.d.ts.map +1 -0
- package/dist/docker/{fixtures.js → testbed.js} +75 -107
- package/dist/docker/testbed.js.map +1 -0
- package/dist/scripts/docker-global-setup.js +11 -10
- package/dist/scripts/docker-global-setup.js.map +1 -1
- package/dist/scripts/run-cleanup.d.ts.map +1 -1
- package/dist/scripts/run-cleanup.js +6 -5
- package/dist/scripts/run-cleanup.js.map +1 -1
- package/package.json +2 -2
- package/dist/docker/fixtures.d.ts.map +0 -1
- package/dist/docker/fixtures.js.map +0 -1
- package/dist/docker/test-run.d.ts.map +0 -1
- package/dist/docker/test-run.js.map +0 -1
package/README.md
CHANGED
|
@@ -8,23 +8,23 @@ The words in these documents have one meaning each. See the glossary in [CONTEXT
|
|
|
8
8
|
|
|
9
9
|
Each area has its own import path, so a test loads only the drivers it uses. The four drivers are optional peer dependencies: install the one an area names.
|
|
10
10
|
|
|
11
|
-
| Import | Gives
|
|
12
|
-
| ----------------------------- |
|
|
13
|
-
| `@zukhruf/testing/node` | Native `test`, `it`, `suite`, `describe` with `.each`
|
|
14
|
-
| `@zukhruf/testing/async` | `timebox`, `settleWithin`
|
|
15
|
-
| `@zukhruf/testing/docker` | `
|
|
16
|
-
| `@zukhruf/testing/postgres` | `Postgres`
|
|
17
|
-
| `@zukhruf/testing/mysql` | `Mysql`
|
|
18
|
-
| `@zukhruf/testing/mariadb` | `Mariadb`
|
|
19
|
-
| `@zukhruf/testing/sqlserver` | `SqlServer`, `SQL_SERVER_FULL_IMAGE`, `SQL_SERVER_EDGE_IMAGE`
|
|
20
|
-
| `@zukhruf/testing/clickhouse` | `ClickHouse`
|
|
21
|
-
| `@zukhruf/testing/sqlite` | `Sqlite`
|
|
22
|
-
| `@zukhruf/testing/duckdb` | `DuckDB`
|
|
23
|
-
| `@zukhruf/testing/bigquery` | `BigQuery`
|
|
24
|
-
| `@zukhruf/testing/http` | `HttpServer`
|
|
25
|
-
| `@zukhruf/testing/streams` | `StreamHarness`
|
|
26
|
-
| `@zukhruf/testing/fs` | `TemporaryFiles`
|
|
27
|
-
| `@zukhruf/testing/msw` | `Msw`
|
|
11
|
+
| Import | Gives | Needs |
|
|
12
|
+
| ----------------------------- | ------------------------------------------------------------- | ------------------------ |
|
|
13
|
+
| `@zukhruf/testing/node` | Native `test`, `it`, `suite`, `describe` with `.each` | |
|
|
14
|
+
| `@zukhruf/testing/async` | `timebox`, `settleWithin` | |
|
|
15
|
+
| `@zukhruf/testing/docker` | `DockerTestbed`, `ServiceContainer`, `DockerDirectory` | a Docker engine |
|
|
16
|
+
| `@zukhruf/testing/postgres` | `Postgres` | a Docker engine |
|
|
17
|
+
| `@zukhruf/testing/mysql` | `Mysql` | a Docker engine |
|
|
18
|
+
| `@zukhruf/testing/mariadb` | `Mariadb` | a Docker engine |
|
|
19
|
+
| `@zukhruf/testing/sqlserver` | `SqlServer`, `SQL_SERVER_FULL_IMAGE`, `SQL_SERVER_EDGE_IMAGE` | a Docker engine, `mssql` |
|
|
20
|
+
| `@zukhruf/testing/clickhouse` | `ClickHouse` | a Docker engine |
|
|
21
|
+
| `@zukhruf/testing/sqlite` | `Sqlite` | |
|
|
22
|
+
| `@zukhruf/testing/duckdb` | `DuckDB` | `@duckdb/node-api` |
|
|
23
|
+
| `@zukhruf/testing/bigquery` | `BigQuery` | `@google-cloud/bigquery` |
|
|
24
|
+
| `@zukhruf/testing/http` | `HttpServer` | |
|
|
25
|
+
| `@zukhruf/testing/streams` | `StreamHarness` | |
|
|
26
|
+
| `@zukhruf/testing/fs` | `TemporaryFiles` | |
|
|
27
|
+
| `@zukhruf/testing/msw` | `Msw` | `msw` |
|
|
28
28
|
|
|
29
29
|
## Parameterized tests
|
|
30
30
|
|
|
@@ -68,56 +68,64 @@ TAP, spec, simultaneous JUnit output, name filtering, skip/TODO reasons, failure
|
|
|
68
68
|
|
|
69
69
|
## Docker
|
|
70
70
|
|
|
71
|
-
A `
|
|
71
|
+
A `DockerTestbed` acquires containers, volumes and directories on one engine. The `environment` that you give it, such as `process.env`, selects the engine as the Docker CLI does: `DOCKER_HOST`, `DOCKER_CONTEXT`, or the current context in the Docker config directory. The environment also carries the run (see [A killed run](#a-killed-run)). The `@zukhruf/docker` client sends the requests to the Engine API, so no Docker CLI is necessary. The engine is connected on the first acquisition, and every handle keeps that engine. It can be a local Unix socket, the named pipe of Docker Desktop on Windows (`npipe://`), or an SSH engine (`ssh://`).
|
|
72
72
|
|
|
73
73
|
A test that needs Docker has no skip option. When the engine does not answer, the first acquisition fails with "Docker is required for container-backed tests" and the connection failure as the cause. Start Docker to run these tests.
|
|
74
74
|
|
|
75
75
|
```ts
|
|
76
|
-
import {
|
|
76
|
+
import { DockerTestbed } from '@zukhruf/testing/docker';
|
|
77
77
|
|
|
78
|
-
const
|
|
78
|
+
const testbed = new DockerTestbed({ environment: process.env });
|
|
79
79
|
|
|
80
80
|
test('a holder in another container', async () => {
|
|
81
|
-
await using volume = await
|
|
82
|
-
await using holder = await
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
await using volume = await testbed.volume();
|
|
82
|
+
await using holder = await testbed.start({
|
|
83
|
+
Image: 'node:lts-alpine',
|
|
84
|
+
Hostname: 'app',
|
|
85
|
+
Cmd: ['node', '--eval', 'setInterval(() => {}, 1000)'],
|
|
86
|
+
HostConfig: { Binds: [`${volume.name}:/locks`] },
|
|
87
87
|
});
|
|
88
88
|
await holder.kill();
|
|
89
|
-
const { exitCode, stdout } = await
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
89
|
+
const { exitCode, stdout } = await testbed.run({
|
|
90
|
+
Image: 'node:lts-alpine',
|
|
91
|
+
Cmd: ['ls', '/locks'],
|
|
92
|
+
HostConfig: { Binds: [`${volume.name}:/locks:ro`] },
|
|
93
93
|
});
|
|
94
94
|
});
|
|
95
95
|
```
|
|
96
96
|
|
|
97
|
-
| Member
|
|
98
|
-
|
|
|
99
|
-
| `start(
|
|
100
|
-
| `serve(
|
|
101
|
-
| `reuse(
|
|
102
|
-
| `run(
|
|
103
|
-
| `volume()`
|
|
104
|
-
| `directory()`
|
|
105
|
-
| `client()`
|
|
106
|
-
| `defaults`
|
|
97
|
+
| Member | Gives | Returns |
|
|
98
|
+
| ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------- |
|
|
99
|
+
| `start(body, { name? })` | A container this process owns. It stays after it stops, so its logs remain, until disposal removes it. | `OwnedContainer` |
|
|
100
|
+
| `serve(body, { internalPort, name?, healthy? })` | A dedicated server whose `internalPort` answers on `127.0.0.1` of this machine. Failure or disposal removes it. | `ServiceContainer` |
|
|
101
|
+
| `reuse(body, { internalPort, name?, healthy? })` | One server per configuration and package version on the engine, shared across processes and runs. | `ServiceContainer` |
|
|
102
|
+
| `run(body, { name? })` | A container that runs to completion. It gives the output and the exit code, and removes the container. A non-zero exit code does not throw. | `ExecResult` |
|
|
103
|
+
| `volume()` | A named volume. | `OwnedVolume` |
|
|
104
|
+
| `directory()` | A directory on the engine's host, for bind mounts. It has `mkdir`, `writeFile`, `readFile`, `chmod` and `symlink`. | `DockerDirectory` |
|
|
105
|
+
| `client()` | The `@zukhruf/docker` client of the engine, for each other Engine API call, such as `info()` or `containers.find(id)`. | `Docker` (from `@zukhruf/docker`) |
|
|
106
|
+
| `defaults` | The run's labels and the default resources, in the shape of a body: `{ Labels, HostConfig: { Memory, NanoCpus } }`. | |
|
|
107
107
|
|
|
108
|
-
|
|
108
|
+
The `body` is the body of a container create in the Engine API: `EngineApi.ContainerCreateRequest` of `@zukhruf/docker`. Write it with the fields of the Engine API, for example `Image`, `Cmd`, `Entrypoint`, `Env` (strings `KEY=value`), `Hostname`, `Labels`, and in `HostConfig`: `Binds`, `Tmpfs`, `Memory`, `NanoCpus`, `IpcMode` and `MemorySwappiness`. The testbed adds these values to each body before it creates the container:
|
|
109
|
+
|
|
110
|
+
- The run's labels, in `Labels`. A run label replaces a label of the body with the same name. `reuse` does not add the run's labels, because a shared server outlives runs.
|
|
111
|
+
- `HostConfig.Memory` of 1 GiB and `HostConfig.NanoCpus` of 1 CPU, when the body does not set them. These limits protect a shared engine from a test container, for example an SSH engine that also runs real applications.
|
|
112
|
+
- For `serve` and `reuse`: `internalPort`, published on `127.0.0.1` of the engine's host.
|
|
113
|
+
|
|
114
|
+
Without `name`, the engine gives the container a name. `reuse` without `name` uses the name `zukhruf-testing-<fingerprint>` (see [Shared servers](#shared-servers)). `healthy` is a function that throws until the server is ready; it runs on every acquisition. Use `timebox` for polling inside it. When the engine does not have the image, the acquisition pulls it, as `docker run` does.
|
|
109
115
|
|
|
110
116
|
`OwnedContainer`, `OwnedVolume`, `ExecResult` and `Docker` are types of `@zukhruf/docker`. A container has `id`, `exec({ Cmd })`, `logs()`, `kill(signal)` and `inspect()`. `exec` gives `exitCode`, `stdout`, `stderr` and `output`, and it does not throw for a non-zero exit code. The text keeps its last newline. Disposal removes the container with its anonymous volumes.
|
|
111
117
|
|
|
112
118
|
A `ServiceContainer` has `container`, `host` and `port`. On an SSH engine, the port is a local forward that belongs to the acquiring process. `disconnect()` closes that forward and leaves the container running for its other users. If the forward ended before, for example because the SSH connection died, `disconnect()` rejects with what ssh printed. `cleanup()` and disposal also remove the container of a dedicated server. When the removal fails too, `cleanup()` rejects with a `SuppressedError` that holds both errors. Nothing is written to stderr. A probe in `healthy` gets the `ServiceContainer`: call `container.exec(...)` on it, and do not destructure `exec`.
|
|
113
119
|
|
|
120
|
+
A dedicated server is not ready when `healthy` throws, or when its container exits first. Then `serve` reads the output of the container, removes the container, and rejects. The message of the error has that output. Its `cause` is the readiness error.
|
|
121
|
+
|
|
114
122
|
### Shared servers
|
|
115
123
|
|
|
116
|
-
`reuse(options)` finds the server for this configuration, or creates it. Docker reserves the name atomically, so concurrent processes attach to the same container. Different images, passwords, environments or labels select separate servers. A readiness failure leaves the shared server running for diagnosis. Dispose a reused server only after all its users finish: disposal stops it for every caller.
|
|
124
|
+
`reuse(body, options)` finds the server for this configuration, or creates it. The configuration is the body after the testbed adds its defaults, the `internalPort` and the package version. The order of the keys and the order of the `Env` entries do not select a different server. Docker reserves the name atomically, so concurrent processes attach to the same container. Different images, passwords, environments or labels select separate servers. A readiness failure leaves the shared server running for diagnosis. Dispose a reused server only after all its users finish: disposal stops it for every caller.
|
|
117
125
|
|
|
118
126
|
A shared server belongs to one version of `@zukhruf/testing`. Its label `dev.zukhruf.testing.version` holds that version, and the version is part of its name. At the end of a run that used Docker, the global teardown removes each shared server on its engine whose version is not this version, and each shared server that has no version label ([ADR 0012](./docs/adr/0012-a-shared-server-belongs-to-one-version-of-the-package-and-the-global-teardown-removes-the-servers-of-every-other-version.md)). Thus a project on an older version breaks when it uses the same engine: move it to the latest release.
|
|
119
127
|
|
|
120
|
-
When you change your own
|
|
128
|
+
When you change your own body in one version, for example the image tag, the old server stays. Stop it:
|
|
121
129
|
|
|
122
130
|
```sh
|
|
123
131
|
docker ps -a --filter label=dev.zukhruf.testing.shared=1
|
|
@@ -144,7 +152,7 @@ Then give the file to `node --test`. The value is a path relative to the working
|
|
|
144
152
|
node --test --test-force-exit --test-global-setup=src/testing/docker-global-setup.ts "src/**/*.test.ts"
|
|
145
153
|
```
|
|
146
154
|
|
|
147
|
-
The global setup sets `ZUKHRUF_TESTING_RUN_ID` and `ZUKHRUF_TESTING_RUN_DIR` for the test processes. A `
|
|
155
|
+
The global setup sets `ZUKHRUF_TESTING_RUN_ID` and `ZUKHRUF_TESTING_RUN_DIR` for the test processes. A `DockerTestbed` reads them from its `environment` and labels what it creates with the run. It records SSH forwards and host directories in the run's directory. It also writes a process record for its test process, and for each SSH command that it starts, while that command runs. While it asks the engine to create a container, it writes a creating record. In a run, `database()` puts the run's id in the name of each database that it creates on a shared server: `test_<run id>_<16 hex>`.
|
|
148
156
|
|
|
149
157
|
The global teardown removes the labeled containers with their anonymous volumes, the labeled volumes and the recorded paths. On each running shared server of `Postgres`, `Mysql`, `Mariadb` and `SqlServer`, it drops the databases whose name has the run's id ([ADR 0011](./docs/adr/0011-the-run-id-in-a-databases-name-is-its-owner-reference-and-one-collector-for-each-kind-drops-a-dead-runs-databases.md)). It skips a kind whose driver the project did not install. It never removes a shared server of this version. It removes the shared servers of other versions (see [Shared servers](#shared-servers)). The teardown is synchronous, because Node does not wait for an asynchronous teardown under `--test-force-exit`. When every recorded process has ended, the teardown deletes the run's records. A recorded process that still runs can still create a container. The engine can also finish a create after the test process that sent it was killed. Then the teardown keeps the records, and a later run removes what is left after that process ends.
|
|
150
158
|
|
|
@@ -154,11 +162,11 @@ The global setup selects the engine as the Docker CLI does, through `@zukhruf/do
|
|
|
154
162
|
|
|
155
163
|
On an SSH engine, run one test file at a time with `--test-concurrency=1` if the engine cannot take more. An SSH forward runs `cat` in a remote shell, so the SSH user needs a shell on the engine's host. The forward ends when the process that opened it ends, also when that process is killed.
|
|
156
164
|
|
|
157
|
-
|
|
165
|
+
Another Docker client can create containers for the run, for example a sandbox launcher. Give it `testbed.defaults`: its `Labels` are the run's labels, and its `HostConfig` has the default `Memory` and `NanoCpus`. A client that takes the Engine API body uses them as they are. Map them to the options of a client that has its own options. Reading `defaults` writes a process record for this process, so the global teardown keeps the run's records while this process lives.
|
|
158
166
|
|
|
159
167
|
## Databases
|
|
160
168
|
|
|
161
|
-
`Postgres`, `Mysql`, `Mariadb`, `SqlServer` and `ClickHouse` take the `environment`, such as `process.env`. The environment selects the engine and the run. Each instance makes its own `
|
|
169
|
+
`Postgres`, `Mysql`, `Mariadb`, `SqlServer` and `ClickHouse` take the `environment`, such as `process.env`. The environment selects the engine and the run. Each instance makes its own `DockerTestbed` from it. Each `database()` call creates a fresh database on a shared server; disposal drops it. In a run, the name of the database has the run's id. When a test process is killed before its disposal, or a drop in disposal fails, the global teardown drops the database (see [A killed run](#a-killed-run)). Outside a run, only disposal drops it. `start()` creates a dedicated server; disposal stops it.
|
|
162
170
|
|
|
163
171
|
```ts
|
|
164
172
|
import { Postgres } from '@zukhruf/testing/postgres';
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { type DockerFixturesOptions } from '../docker/fixtures.ts';
|
|
2
1
|
import type { ServiceContainer } from '../docker/service-container.ts';
|
|
2
|
+
import { type DockerTestbedOptions } from '../docker/testbed.ts';
|
|
3
3
|
/** Each start owns a dedicated ClickHouse server and its disposable container. */
|
|
4
4
|
export declare class ClickHouse {
|
|
5
5
|
#private;
|
|
6
|
-
constructor({ environment, image, }:
|
|
6
|
+
constructor({ environment, image, }: DockerTestbedOptions & {
|
|
7
7
|
image: string;
|
|
8
8
|
});
|
|
9
9
|
start(): Promise<ServiceContainer>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../src/databases/clickhouse.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../src/databases/clickhouse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAGhF,kFAAkF;AAClF,qBAAa,UAAU;;gBAIT,EACV,WAAW,EACX,KAAK,GACN,EAAE,oBAAoB,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;IAK3C,KAAK,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAsBnC"}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
import { timebox } from "../async/timebox.js";
|
|
2
|
-
import {
|
|
2
|
+
import { DockerTestbed } from "../docker/testbed.js";
|
|
3
3
|
import { succeeded } from "./succeeded.js";
|
|
4
4
|
/** Each start owns a dedicated ClickHouse server and its disposable container. */
|
|
5
5
|
export class ClickHouse {
|
|
6
6
|
#docker;
|
|
7
7
|
#image;
|
|
8
8
|
constructor({ environment, image, }) {
|
|
9
|
-
this.#docker = new
|
|
9
|
+
this.#docker = new DockerTestbed({ environment });
|
|
10
10
|
this.#image = image;
|
|
11
11
|
}
|
|
12
12
|
start() {
|
|
13
13
|
return this.#docker.serve({
|
|
14
|
-
|
|
14
|
+
Image: this.#image,
|
|
15
|
+
Env: ['CLICKHOUSE_SKIP_USER_SETUP=1'],
|
|
16
|
+
HostConfig: { Memory: 2 * 1024 ** 3 },
|
|
17
|
+
}, {
|
|
15
18
|
internalPort: 8123,
|
|
16
|
-
memory: '2g',
|
|
17
|
-
env: { CLICKHOUSE_SKIP_USER_SETUP: '1' },
|
|
18
19
|
healthy: (service) => timebox(() => succeeded(service.container, [
|
|
19
20
|
'clickhouse-client',
|
|
20
21
|
'--query',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clickhouse.js","sourceRoot":"","sources":["../../src/databases/clickhouse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"clickhouse.js","sourceRoot":"","sources":["../../src/databases/clickhouse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAA6B,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,kFAAkF;AAClF,MAAM,OAAO,UAAU;IACZ,OAAO,CAAgB;IACvB,MAAM,CAAS;IAExB,YAAY,EACV,WAAW,EACX,KAAK,GACoC;QACzC,IAAI,CAAC,OAAO,GAAG,IAAI,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CACvB;YACE,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,GAAG,EAAE,CAAC,8BAA8B,CAAC;YACrC,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE;SACtC,EACD;YACE,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CACnB,OAAO,CACL,GAAG,EAAE,CACH,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC3B,mBAAmB;gBACnB,SAAS;gBACT,UAAU;aACX,CAAC,EACJ,EAAE,YAAY,EAAE,MAAM,EAAE,CACzB;SACJ,CACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { Container } from '@zukhruf/docker';
|
|
2
2
|
import type { DockerHost } from '../docker/host.ts';
|
|
3
|
-
import type { TestRun } from '../docker/test-run.ts';
|
|
4
3
|
/** The kind of a database fixture's shared server: it names the collector of the server. */
|
|
5
4
|
export declare const KIND_LABEL = "dev.zukhruf.testing.kind";
|
|
6
5
|
export type Kind = 'postgres' | 'mysql' | 'mariadb' | 'sqlserver';
|
|
@@ -8,7 +7,7 @@ export type Kind = 'postgres' | 'mysql' | 'mariadb' | 'sqlserver';
|
|
|
8
7
|
* The name of a database that `database()` creates. In a run, the name holds
|
|
9
8
|
* the run's id, its owner reference (ADR 0011).
|
|
10
9
|
*/
|
|
11
|
-
export declare const databaseName: (
|
|
10
|
+
export declare const databaseName: (id: string | undefined) => string;
|
|
12
11
|
/**
|
|
13
12
|
* The databases of one server kind: `list` gives the names of the server's
|
|
14
13
|
* test databases, and `drop` drops one. Disposal and the run's cleanup both
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/databases/collector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/databases/collector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,4FAA4F;AAC5F,eAAO,MAAM,UAAU,6BAA6B,CAAC;AAErD,MAAM,MAAM,IAAI,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;AAIlE;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,IAAI,MAAM,GAAG,SAAS,KAAG,MAGrB,CAAC;AAElC;;;;GAIG;AACH,MAAM,WAAW,SAAS,CAAC,MAAM;IAC/B,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB;;;OAGG;IACH,IAAI,CACF,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC;IACrC,0EAA0E;IAC1E,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxC,8CAA8C;IAC9C,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,GACjB,OAAO,MAAM,MACb,MAAM,MAAM,KAAG,OAKf,CAAC"}
|
|
@@ -6,8 +6,8 @@ const hex = (runId) => runId.replaceAll('-', '');
|
|
|
6
6
|
* The name of a database that `database()` creates. In a run, the name holds
|
|
7
7
|
* the run's id, its owner reference (ADR 0011).
|
|
8
8
|
*/
|
|
9
|
-
export const databaseName = (
|
|
10
|
-
? `test_${hex(
|
|
9
|
+
export const databaseName = (id) => id
|
|
10
|
+
? `test_${hex(id)}_${randomBytes(8).toString('hex')}`
|
|
11
11
|
: `test_${hex(randomUUID())}`;
|
|
12
12
|
/**
|
|
13
13
|
* Whether `name` is a database of the run `runId`. `_` is a wildcard of
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/databases/collector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/databases/collector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMtD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,UAAU,GAAG,0BAA0B,CAAC;AAIrD,MAAM,GAAG,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAEjE;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAsB,EAAU,EAAE,CAC7D,EAAE;IACA,CAAC,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;IACrD,CAAC,CAAC,QAAQ,GAAG,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;AAwBlC;;;GAGG;AACH,MAAM,CAAC,MAAM,OAAO,GAClB,CAAC,KAAa,EAAE,EAAE,CAClB,CAAC,IAAY,EAAW,EAAE;IACxB,MAAM,MAAM,GAAG,QAAQ,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;IACrC,OAAO,CACL,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAC3E,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { DockerTestbedOptions } from '../docker/testbed.ts';
|
|
2
2
|
/** Connection and disposal for one server-backed database. */
|
|
3
3
|
export interface Database extends AsyncDisposable {
|
|
4
4
|
connectionString: string;
|
|
@@ -12,7 +12,7 @@ export interface Database extends AsyncDisposable {
|
|
|
12
12
|
/** A database() handle drops its database; a start() handle stops its container. */
|
|
13
13
|
cleanup: () => Promise<void>;
|
|
14
14
|
}
|
|
15
|
-
export interface DatabaseOptions extends
|
|
15
|
+
export interface DatabaseOptions extends DockerTestbedOptions {
|
|
16
16
|
labels?: Record<string, string>;
|
|
17
17
|
image?: string;
|
|
18
18
|
password?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/databases/database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/databases/database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,8DAA8D;AAC9D,MAAM,WAAW,QAAS,SAAQ,eAAe;IAC/C,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-family-server.d.ts","sourceRoot":"","sources":["../../src/databases/mysql-family-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,KAAK,oBAAoB,EAAQ,MAAM,6BAA6B,CAAC;AAG9E,MAAM,WAAW,mBAAoB,SAAQ,QAAQ;IACnD,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;CAClE;AAED;;;;;;GAMG;AACH,8BAAsB,iBAAiB;;IAKrC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAC5D,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,WAAW,CAC5B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEb,EACV,WAAW,EACX,KAAK,EACL,QAAyB,EACzB,QAAgB,EAChB,MAAM,GACP,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;IAMtC,mEAAmE;IAC7D,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAqB9C,wEAAwE;IAClE,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"mysql-family-server.d.ts","sourceRoot":"","sources":["../../src/databases/mysql-family-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,KAAK,oBAAoB,EAAQ,MAAM,6BAA6B,CAAC;AAG9E,MAAM,WAAW,mBAAoB,SAAQ,QAAQ;IACnD,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;CAClE;AAED;;;;;;GAMG;AACH,8BAAsB,iBAAiB;;IAKrC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAC5D,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,WAAW,CAC5B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEb,EACV,WAAW,EACX,KAAK,EACL,QAAyB,EACzB,QAAgB,EAChB,MAAM,GACP,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;IAMtC,mEAAmE;IAC7D,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAqB9C,wEAAwE;IAClE,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAkH5C"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { timebox } from "../async/timebox.js";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { readRun } from "../docker/run-records.js";
|
|
3
|
+
import { DockerTestbed } from "../docker/testbed.js";
|
|
4
4
|
import { KIND_LABEL, databaseName } from "./collector.js";
|
|
5
5
|
import { user } from "./mysql-family-collector.js";
|
|
6
6
|
import { succeeded } from "./succeeded.js";
|
|
@@ -13,17 +13,17 @@ import { succeeded } from "./succeeded.js";
|
|
|
13
13
|
*/
|
|
14
14
|
export class MysqlFamilyServer {
|
|
15
15
|
#docker;
|
|
16
|
-
#
|
|
16
|
+
#runId;
|
|
17
17
|
#options;
|
|
18
18
|
constructor({ environment, image, password = 'testpassword', database = 'app', labels, }) {
|
|
19
|
-
this.#docker = new
|
|
20
|
-
this.#
|
|
19
|
+
this.#docker = new DockerTestbed({ environment });
|
|
20
|
+
this.#runId = readRun(environment)?.id;
|
|
21
21
|
this.#options = { image, password, database, labels };
|
|
22
22
|
}
|
|
23
23
|
/** Create an isolated database on the persistent shared server. */
|
|
24
24
|
async database() {
|
|
25
25
|
const container = await this.#acquire('app', 'reuse');
|
|
26
|
-
const database = databaseName(this.#
|
|
26
|
+
const database = databaseName(this.#runId);
|
|
27
27
|
const server = {
|
|
28
28
|
container: container.container,
|
|
29
29
|
password: this.#options.password,
|
|
@@ -92,14 +92,14 @@ export class MysqlFamilyServer {
|
|
|
92
92
|
#acquire(database, mode) {
|
|
93
93
|
const { image, password, labels } = this.#options;
|
|
94
94
|
return this.#docker[mode]({
|
|
95
|
-
image,
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
});
|
|
95
|
+
Image: image,
|
|
96
|
+
Labels: { ...labels, [KIND_LABEL]: this.collector.kind },
|
|
97
|
+
Env: Object.entries(this.environment(password, database)).map(([key, value]) => `${key}=${value}`),
|
|
98
|
+
HostConfig: {
|
|
99
|
+
Tmpfs: { '/var/lib/mysql': 'rw,size=512m' },
|
|
100
|
+
MemorySwappiness: 0,
|
|
101
|
+
},
|
|
102
|
+
}, { internalPort: 3306, healthy: (container) => this.#ready(container) });
|
|
103
103
|
}
|
|
104
104
|
#ready(container) {
|
|
105
105
|
const { password } = this.#options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-family-server.js","sourceRoot":"","sources":["../../src/databases/mysql-family-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mysql-family-server.js","sourceRoot":"","sources":["../../src/databases/mysql-family-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/databases/postgres.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAI/D,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qFAAqF;AACrF,qBAAa,QAAQ;;gBAKP,EACV,WAAW,EACX,KAA4B,EAC5B,QAAyB,EACzB,QAAmB,EACnB,IAAiB,EACjB,MAAM,GACP,EAAE,eAAe;IAMlB,mEAAmE;IAC7D,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAkBnC,wEAAwE;IAClE,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/databases/postgres.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAI/D,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qFAAqF;AACrF,qBAAa,QAAQ;;gBAKP,EACV,WAAW,EACX,KAA4B,EAC5B,QAAyB,EACzB,QAAmB,EACnB,IAAiB,EACjB,MAAM,GACP,EAAE,eAAe;IAMlB,mEAAmE;IAC7D,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAkBnC,wEAAwE;IAClE,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC;CA2FjC"}
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import { timebox } from "../async/timebox.js";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { readRun } from "../docker/run-records.js";
|
|
3
|
+
import { DockerTestbed } from "../docker/testbed.js";
|
|
4
4
|
import { KIND_LABEL, databaseName } from "./collector.js";
|
|
5
5
|
import { postgres } from "./postgres-collector.js";
|
|
6
6
|
import { succeeded } from "./succeeded.js";
|
|
7
7
|
/** PostgreSQL test configuration. Each acquisition returns an independent handle. */
|
|
8
8
|
export class Postgres {
|
|
9
9
|
#docker;
|
|
10
|
-
#
|
|
10
|
+
#runId;
|
|
11
11
|
#options;
|
|
12
12
|
constructor({ environment, image = 'postgres:18-alpine', password = 'testpassword', database = 'testdb', user = 'postgres', labels, }) {
|
|
13
|
-
this.#docker = new
|
|
14
|
-
this.#
|
|
13
|
+
this.#docker = new DockerTestbed({ environment });
|
|
14
|
+
this.#runId = readRun(environment)?.id;
|
|
15
15
|
this.#options = { image, password, database, user, labels };
|
|
16
16
|
}
|
|
17
17
|
/** Create an isolated database on the persistent shared server. */
|
|
18
18
|
async database() {
|
|
19
19
|
const container = await this.#acquire('postgres', 'reuse');
|
|
20
|
-
const database = databaseName(this.#
|
|
20
|
+
const database = databaseName(this.#runId);
|
|
21
21
|
const server = { container: container.container, user: this.#options.user };
|
|
22
22
|
try {
|
|
23
23
|
await this.#sql(container, `CREATE DATABASE ${database}`);
|
|
@@ -53,16 +53,19 @@ export class Postgres {
|
|
|
53
53
|
#acquire(database, mode) {
|
|
54
54
|
const { image, password, user, labels } = this.#options;
|
|
55
55
|
return this.#docker[mode]({
|
|
56
|
-
image,
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
56
|
+
Image: image,
|
|
57
|
+
Labels: { ...labels, [KIND_LABEL]: postgres.kind },
|
|
58
|
+
Env: [
|
|
59
|
+
`POSTGRES_PASSWORD=${password}`,
|
|
60
|
+
`POSTGRES_DB=${database}`,
|
|
61
|
+
`POSTGRES_USER=${user}`,
|
|
62
|
+
],
|
|
63
|
+
HostConfig: {
|
|
64
|
+
Tmpfs: { '/var/lib/postgresql': 'rw,size=512m' },
|
|
65
|
+
MemorySwappiness: 0,
|
|
63
66
|
},
|
|
64
|
-
|
|
65
|
-
|
|
67
|
+
}, {
|
|
68
|
+
internalPort: 5432,
|
|
66
69
|
healthy: (container) => this.#ready(container, database),
|
|
67
70
|
});
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../src/databases/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../src/databases/postgres.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlserver.d.ts","sourceRoot":"","sources":["../../src/databases/sqlserver.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAO/D,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE/D,eAAO,MAAM,qBAAqB,+CACY,CAAC;AAC/C,eAAO,MAAM,qBAAqB,4CAA4C,CAAC;AAE/E,4FAA4F;AAC5F,qBAAa,SAAS;;gBAYR,EACV,WAAW,EACX,KAAK,EACL,QAA+B,EAC/B,QAAmB,EACnB,MAAM,GACP,EAAE,eAAe;IAMlB,mEAAmE;IAC7D,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAqBnC,wEAAwE;IAClE,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlserver.d.ts","sourceRoot":"","sources":["../../src/databases/sqlserver.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAO/D,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE/D,eAAO,MAAM,qBAAqB,+CACY,CAAC;AAC/C,eAAO,MAAM,qBAAqB,4CAA4C,CAAC;AAE/E,4FAA4F;AAC5F,qBAAa,SAAS;;gBAYR,EACV,WAAW,EACX,KAAK,EACL,QAA+B,EAC/B,QAAmB,EACnB,MAAM,GACP,EAAE,eAAe;IAMlB,mEAAmE;IAC7D,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAqBnC,wEAAwE;IAClE,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC;CAoGjC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import sql from 'mssql';
|
|
2
2
|
import pMemoize from 'p-memoize';
|
|
3
3
|
import { timebox } from "../async/timebox.js";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { readRun } from "../docker/run-records.js";
|
|
5
|
+
import { DockerTestbed } from "../docker/testbed.js";
|
|
6
6
|
import { KIND_LABEL, databaseName } from "./collector.js";
|
|
7
7
|
import { connectionString, sqlserver, } from "./sqlserver-collector.js";
|
|
8
8
|
export const SQL_SERVER_FULL_IMAGE = 'mcr.microsoft.com/mssql/server:2022-latest';
|
|
@@ -10,7 +10,7 @@ export const SQL_SERVER_EDGE_IMAGE = 'mcr.microsoft.com/azure-sql-edge:latest';
|
|
|
10
10
|
/** SQL Server test configuration. Without an image, the engine's architecture picks one. */
|
|
11
11
|
export class SqlServer {
|
|
12
12
|
#docker;
|
|
13
|
-
#
|
|
13
|
+
#runId;
|
|
14
14
|
#options;
|
|
15
15
|
#image = pMemoize(async () => {
|
|
16
16
|
if (this.#options.image)
|
|
@@ -21,15 +21,15 @@ export class SqlServer {
|
|
|
21
21
|
: SQL_SERVER_FULL_IMAGE;
|
|
22
22
|
});
|
|
23
23
|
constructor({ environment, image, password = 'StrongP@ssw0rd123!', database = 'testdb', labels, }) {
|
|
24
|
-
this.#docker = new
|
|
25
|
-
this.#
|
|
24
|
+
this.#docker = new DockerTestbed({ environment });
|
|
25
|
+
this.#runId = readRun(environment)?.id;
|
|
26
26
|
this.#options = { image, password, database, labels };
|
|
27
27
|
}
|
|
28
28
|
/** Create an isolated database on the persistent shared server. */
|
|
29
29
|
async database() {
|
|
30
30
|
const image = await this.#image();
|
|
31
31
|
const container = await this.#acquire(image, 'reuse');
|
|
32
|
-
const database = databaseName(this.#
|
|
32
|
+
const database = databaseName(this.#runId);
|
|
33
33
|
try {
|
|
34
34
|
await this.#createDatabase(container, database);
|
|
35
35
|
return this.#handle(container, image, database, async () => {
|
|
@@ -94,18 +94,21 @@ export class SqlServer {
|
|
|
94
94
|
#acquire(image, mode) {
|
|
95
95
|
const { password, labels } = this.#options;
|
|
96
96
|
return this.#docker[mode]({
|
|
97
|
-
image,
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
ACCEPT_EULA
|
|
101
|
-
MSSQL_SA_PASSWORD
|
|
102
|
-
MSSQL_MEMORY_LIMIT_MB
|
|
103
|
-
...(image.includes('azure-sql-edge') ?
|
|
97
|
+
Image: image,
|
|
98
|
+
Labels: { ...labels, [KIND_LABEL]: sqlserver.kind },
|
|
99
|
+
Env: [
|
|
100
|
+
'ACCEPT_EULA=Y',
|
|
101
|
+
`MSSQL_SA_PASSWORD=${password}`,
|
|
102
|
+
'MSSQL_MEMORY_LIMIT_MB=2048',
|
|
103
|
+
...(image.includes('azure-sql-edge') ? [] : ['MSSQL_PID=Express']),
|
|
104
|
+
],
|
|
105
|
+
HostConfig: {
|
|
106
|
+
Tmpfs: { '/var/opt/mssql': 'rw,size=2g,mode=1777' },
|
|
107
|
+
Memory: 3 * 1024 ** 3,
|
|
108
|
+
MemorySwappiness: 0,
|
|
104
109
|
},
|
|
110
|
+
}, {
|
|
105
111
|
internalPort: 1433,
|
|
106
|
-
tmpfs: ['/var/opt/mssql:rw,size=2g,mode=1777'],
|
|
107
|
-
memory: '3g',
|
|
108
|
-
memorySwappiness: 0,
|
|
109
112
|
healthy: (container) => timebox(() => this.#ping(container), { maxRetryTime: 180_000 }),
|
|
110
113
|
});
|
|
111
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlserver.js","sourceRoot":"","sources":["../../src/databases/sqlserver.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,OAAO,CAAC;AACxB,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sqlserver.js","sourceRoot":"","sources":["../../src/databases/sqlserver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DockerHost } from './host.ts';
|
|
2
|
-
import { type
|
|
2
|
+
import { type ProcessRun } from './run-records.ts';
|
|
3
3
|
/** A disposable fixture directory on the selected daemon's host filesystem. */
|
|
4
4
|
export declare class DockerDirectory implements AsyncDisposable {
|
|
5
5
|
#private;
|
|
6
6
|
readonly path: string;
|
|
7
7
|
readonly host: DockerHost;
|
|
8
8
|
private constructor();
|
|
9
|
-
static create(host: DockerHost, run:
|
|
9
|
+
static create(host: DockerHost, run: ProcessRun | undefined): Promise<DockerDirectory>;
|
|
10
10
|
private resolve;
|
|
11
11
|
mkdir(name: string): Promise<void>;
|
|
12
12
|
writeFile(name: string, content: string, mode?: number): Promise<void>;
|