Skip to content

Commit a9700a3

Browse files
committed
Fix java bdd for cluster and update refs
1 parent 0292221 commit a9700a3

4 files changed

Lines changed: 19 additions & 10 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
[workspace.dependencies.typedb-protocol]
5959
features = []
60-
rev = "da3e316cb0022cb284083996f0659ad22db13aca"
60+
rev = "c2e8fbbb3c67360630d4c331b5077ab21271285a"
6161
git = "https://github.com/typedb/typedb-protocol"
6262
default-features = false
6363

MODULE.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,28 @@ bazel_dep(name = "typedb_bazel_distribution", version = "0.0.0")
5151
git_override(
5252
module_name = "typedb_bazel_distribution",
5353
remote = "https://github.com/typedb/bazel-distribution",
54-
commit = "fb0b9bb27109762b1c275b0ad98c8bcd3fbf5860",
54+
commit = "6c81a5180ed94a11c989e06a4ff8215df6da163e",
5555
)
5656

5757
bazel_dep(name = "typedb_dependencies", version = "0.0.0")
5858
git_override(
5959
module_name = "typedb_dependencies",
6060
remote = "https://github.com/typedb/dependencies",
61-
commit = "12f5bc1a983e64ba7602a965eb36019dcd64bdd7",
61+
commit = "48ef6e41f9f0deadc0d59bb0e9d4a58efd0099af",
6262
)
6363

6464
bazel_dep(name = "typedb_protocol", version = "0.0.0")
6565
git_override(
6666
module_name = "typedb_protocol",
6767
remote = "https://github.com/typedb/typedb-protocol",
68-
commit = "df650449170365979f6deaafc32e002f5e4ce29c",
68+
commit = "c2e8fbbb3c67360630d4c331b5077ab21271285a",
6969
)
7070

7171
bazel_dep(name = "typedb_behaviour", version = "0.0.0")
7272
git_override(
7373
module_name = "typedb_behaviour",
7474
remote = "https://github.com/typedb/typedb-behaviour",
75-
commit = "8a69b7f646b78702bd48f02109c69a88ad6d6367",
75+
commit = "4a2cba4a84e8b90b361ec2501b90de3d85578787",
7676
)
7777

7878
# Rust rules need typedb_dependencies for patching
@@ -196,7 +196,7 @@ workspace_refs = use_repo_rule("@typedb_bazel_distribution//common/workspace_ref
196196
workspace_refs(
197197
name = "typedb_driver_workspace_refs",
198198
workspace_commit_dict = {
199-
"typedb_protocol+": "da3e316cb0022cb284083996f0659ad22db13aca",
199+
"typedb_protocol+": "c2e8fbbb3c67360630d4c331b5077ab21271285a",
200200
},
201201
workspace_tag_dict = {
202202
},
@@ -209,13 +209,13 @@ native_artifact_files.artifact(
209209
name = "typedb_artifact",
210210
group_name = "typedb-all-{platform}",
211211
artifact_name = "typedb-all-{platform}-{version}.{ext}",
212-
commit = "1e4fe6c41b2c90ca3aced97c3c575fb2cad9747d",
212+
commit = "15ebe70f428d610134e6d1d2f79671cad514d79b",
213213
)
214214
native_artifact_files.artifact(
215215
name = "typedb_cluster_artifact",
216216
group_name = "typedb-cluster-all-{platform}",
217217
artifact_name = "typedb-cluster-all-{platform}-{version}.{ext}",
218-
commit = "68385c55d92cd0a71e1da3496ec9459ba58af197",
218+
commit = "287db324b982c79002a026039c0865cdd3bdd700",
219219
private = True,
220220
)
221221

java/test/behaviour/connection/ConnectionStepsBase.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ public static Optional<Transaction> txOpt() {
9494
void beforeAll() {
9595
} // Can add "before all" setup steps here
9696

97+
DriverOptions defaultDriverOptions() {
98+
return new DriverOptions(DriverTlsConfig.disabled());
99+
}
100+
97101
void before() {
98102
try {
99103
// Sleep between scenarios to let the driver close completely
@@ -129,7 +133,7 @@ void after() {
129133
driver.close();
130134
}
131135
backgroundDriver.close();
132-
driverOptions = new DriverOptions(DriverTlsConfig.disabled());
136+
driverOptions = defaultDriverOptions();
133137
driver = createDefaultTypeDBDriver();
134138
driver.users().all().stream().filter(user -> !user.name().equals(ADMIN_USERNAME)).forEach(user -> driver.users().get(user.name()).delete());
135139
driver.users().get(ADMIN_USERNAME).updatePassword(ADMIN_PASSWORD);

java/test/behaviour/connection/ConnectionStepsCluster.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@ public void beforeAll() {
4646
@Before
4747
public synchronized void before() {
4848
Parameters.setClusterMode(true);
49-
driverOptions = driverOptions.tlsConfig(DriverTlsConfig.enabledWithRootCA(System.getenv("ROOT_CA")));
49+
driverOptions = defaultDriverOptions();
5050
super.before();
5151
}
5252

53+
@Override
54+
DriverOptions defaultDriverOptions() {
55+
return new DriverOptions(DriverTlsConfig.enabledWithRootCA(System.getenv("ROOT_CA")));
56+
}
57+
5358
@After
5459
public synchronized void after() {
5560
super.after();

0 commit comments

Comments
 (0)