Skip to content

Commit 10cb9dc

Browse files
committed
Add namespace option to search attributes operations (temporalio#258)
1 parent 2cbefc8 commit 10cb9dc

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

.buildkite/pipeline.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
steps:
2-
- label: ":java: JDK18 Unit test with in-memory test service"
2+
- label: ":java: [Edge] Unit test with in-memory test service"
33
agents:
44
queue: "default"
55
docker: "*"
66
command: "./gradlew --no-daemon test -x checkLicenseMain -x checkLicenses -x spotlessCheck -x spotlessApply -x spotlessJava -P edgeDepsTest"
77
timeout_in_minutes: 15
88
plugins:
99
- docker-compose#v3.8.0:
10-
run: unit-test-test-service-jdk18
10+
run: unit-test-test-service-edge
1111
config: docker/buildkite/docker-compose.yaml
1212

1313
- label: ":docker: JDK8 Unit test with docker service"

docker/buildkite/Dockerfile-JDK18 docker/buildkite/Dockerfile-JDK19

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:18-focal
1+
FROM eclipse-temurin:19-jdk-focal
22

33
# Git is needed in order to update the dls submodule
44
RUN apt-get update && apt-get install -y protobuf-compiler git

docker/buildkite/docker-compose.yaml

+3-12
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
- 9042
2525

2626
temporal:
27-
image: temporaliotest/auto-setup:sha-cc2e0c0
27+
image: temporaliotest/auto-setup:latest
2828
ports:
2929
- "7233:7233"
3030
- "7234:7234"
@@ -59,10 +59,10 @@ services:
5959
volumes:
6060
- "../../:/temporal-java-client"
6161

62-
unit-test-test-service-jdk18:
62+
unit-test-test-service-edge:
6363
build:
6464
context: ../../
65-
dockerfile: ./docker/buildkite/Dockerfile-JDK18
65+
dockerfile: Dockerfile-JDK19
6666
environment:
6767
- "USER=unittest"
6868
- "USE_DOCKER_SERVICE=false"
@@ -75,14 +75,5 @@ services:
7575
dockerfile: ./docker/buildkite/Dockerfile-JDK11
7676
environment:
7777
- "USER=unittest"
78-
volumes:
79-
- "../../:/temporal-java-client"
80-
81-
jdk18:
82-
build:
83-
context: ../../
84-
dockerfile: ./docker/buildkite/Dockerfile-JDK18
85-
environment:
86-
- "USER=unittest"
8778
volumes:
8879
- "../../:/temporal-java-client"

temporal-serviceclient/src/main/proto

temporal-testing/src/main/java/io/temporal/testing/TestWorkflowEnvironmentInternal.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ public boolean registerSearchAttribute(String name, IndexedValueType type) {
204204
"Class " + type + " can't be used as a search attribute type");
205205
}
206206
AddSearchAttributesRequest request =
207-
AddSearchAttributesRequest.newBuilder().putSearchAttributes(name, type).build();
207+
AddSearchAttributesRequest.newBuilder()
208+
.setNamespace(getNamespace())
209+
.putSearchAttributes(name, type)
210+
.build();
208211
try {
209212
operatorServiceStubs.blockingStub().addSearchAttributes(request);
210213
return true;

0 commit comments

Comments
 (0)