Skip to content

Commit 13b586d

Browse files
Merge branch 'main' into codex/security-opt-841
2 parents 92d134c + 06ae2f1 commit 13b586d

28 files changed

Lines changed: 111 additions & 44 deletions

File tree

AGENTS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ It captures practical rules that prevent avoidable CI and PR churn.
88
## Development Expectations
99

1010
- If a public API changes, update the relevant docs in the same PR.
11+
- If new types are made part of the public API, export them from the package's `index.ts` in the same PR.
12+
- If new learnings or misunderstandings are discovered, propose an `AGENTS.md` update in the same PR.
1113
- Tests should verify observable behavior changes, not only internal/config state.
1214
- Example: for a security option, assert a real secure/insecure behavior difference.
1315

@@ -28,7 +30,7 @@ It captures practical rules that prevent avoidable CI and PR churn.
2830
3. Implement scoped changes only.
2931
4. Run required checks: `npm run format`, `npm run lint`, and targeted tests.
3032
5. Verify git diff only contains intended files.
31-
6. Commit with focused message(s).
33+
6. Commit with focused message(s), using `git commit --no-verify`.
3234
7. Push branch.
3335
8. Open PR against `main` using a human-readable title (no `feat(...)` / `fix(...)` prefixes).
3436
9. Add labels for both change type and semantic version impact.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
1+
FROM mcr.microsoft.com/azure-messaging/servicebus-emulator:2.0.0
22
FROM mcr.microsoft.com/mssql/server:2025-latest
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM chromadb/chroma:1.4.0
2-
FROM ollama/ollama:0.13.5
1+
FROM chromadb/chroma:1.5.0
2+
FROM ollama/ollama:0.16.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM clickhouse/clickhouse-server:25.12-alpine
1+
FROM clickhouse/clickhouse-server:26.1-alpine
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM cockroachdb/cockroach:v25.4.2
1+
FROM cockroachdb/cockroach:v25.4.4
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM couchbase/server:enterprise-7.0.2
2-
FROM couchbase/server:community-7.0.2
1+
FROM couchbase/server:enterprise-8.0.0
2+
FROM couchbase/server:community-8.0.0

packages/modules/couchbase/src/couchbase-container.ts

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -301,33 +301,46 @@ export class CouchbaseContainer extends GenericContainer {
301301

302302
body.set("hostname", container.getHost());
303303
body.set("mgmt", container.getMappedPort(PORTS.MGMT_PORT).toString());
304-
body.set("mgmtSSL", container.getMappedPort(PORTS.MGMT_SSL_PORT).toString());
304+
if (this.isEnterprise) {
305+
body.set("mgmtSSL", container.getMappedPort(PORTS.MGMT_SSL_PORT).toString());
306+
}
305307

306308
if (this.enabledServices.has(CouchbaseService.KV)) {
307309
body.set("kv", container.getMappedPort(PORTS.KV_PORT).toString());
308-
body.set("kvSSL", container.getMappedPort(PORTS.KV_SSL_PORT).toString());
309310
body.set("capi", container.getMappedPort(PORTS.VIEW_PORT).toString());
310-
body.set("capiSSL", container.getMappedPort(PORTS.VIEW_SSL_PORT).toString());
311+
312+
if (this.isEnterprise) {
313+
body.set("kvSSL", container.getMappedPort(PORTS.KV_SSL_PORT).toString());
314+
body.set("capiSSL", container.getMappedPort(PORTS.VIEW_SSL_PORT).toString());
315+
}
311316
}
312317

313318
if (this.enabledServices.has(CouchbaseService.QUERY)) {
314319
body.set("n1ql", container.getMappedPort(PORTS.QUERY_PORT).toString());
315-
body.set("n1qlSSL", container.getMappedPort(PORTS.QUERY_SSL_PORT).toString());
320+
if (this.isEnterprise) {
321+
body.set("n1qlSSL", container.getMappedPort(PORTS.QUERY_SSL_PORT).toString());
322+
}
316323
}
317324

318325
if (this.enabledServices.has(CouchbaseService.SEARCH)) {
319326
body.set("fts", container.getMappedPort(PORTS.SEARCH_PORT).toString());
320-
body.set("ftsSSL", container.getMappedPort(PORTS.SEARCH_SSL_PORT).toString());
327+
if (this.isEnterprise) {
328+
body.set("ftsSSL", container.getMappedPort(PORTS.SEARCH_SSL_PORT).toString());
329+
}
321330
}
322331

323332
if (this.enabledServices.has(CouchbaseService.ANALYTICS)) {
324333
body.set("cbas", container.getMappedPort(PORTS.ANALYTICS_PORT).toString());
325-
body.set("cbasSSL", container.getMappedPort(PORTS.ANALYTICS_SSL_PORT).toString());
334+
if (this.isEnterprise) {
335+
body.set("cbasSSL", container.getMappedPort(PORTS.ANALYTICS_SSL_PORT).toString());
336+
}
326337
}
327338

328339
if (this.enabledServices.has(CouchbaseService.EVENTING)) {
329340
body.set("eventingAdminPort", container.getMappedPort(PORTS.EVENTING_PORT).toString());
330-
body.set("eventingSSL", container.getMappedPort(PORTS.EVENTING_SSL_PORT).toString());
341+
if (this.isEnterprise) {
342+
body.set("eventingSSL", container.getMappedPort(PORTS.EVENTING_SSL_PORT).toString());
343+
}
331344
}
332345

333346
const response = await this.doHttpRequest(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM elasticsearch:9.2.3
1+
FROM elasticsearch:9.3.0

packages/modules/etcd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM quay.io/coreos/etcd:v3.6.7
1+
FROM quay.io/coreos/etcd:v3.6.8

packages/modules/gcloud/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:555.0.0-emulators
2-
FROM fsouza/fake-gcs-server:1.53.1
1+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:556.0.0-emulators
2+
FROM fsouza/fake-gcs-server:1.54.0
33
FROM ghcr.io/goccy/bigquery-emulator:0.6.6
4-
FROM gcr.io/cloud-spanner-emulator/emulator:1.5.48
4+
FROM gcr.io/cloud-spanner-emulator/emulator:1.5.49

0 commit comments

Comments
 (0)