Skip to content

Commit 42bfc9e

Browse files
kdubbkdubb
authored
Merge pull request #246 from quarkiverse/task/spicedb-1.49
Upgrade Authzed API to v1.45.4 and SpiceDB v1.49.1
2 parents d5e130d + c3fca76 commit 42bfc9e

File tree

417 files changed

+255103
-102077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+255103
-102077
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ nb-configuration.xml
5353

5454
# Gradle
5555
.gradle/
56-
build/
56+
/build/
5757

5858
# Maven
5959
target/
6060
pom.xml.tag
6161
pom.xml.releaseBackup
6262
pom.xml.versionsBackup
63-
release.properties
63+
release.properties

‎bin/generate.sh‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,26 @@ PROTO_DIR_IN_DOCKER="/workspace/grpc/generator/src/main/proto"
77
GENERATED_DIR="${BASE_DIR}/grpc/generator/target/generated-sources/grpc"
88
TARGET_DIR="${BASE_DIR}/grpc/client/src/main/java"
99

10-
# https://buf.build/authzed/api/activity/commit/v1.30.0
11-
PROTO_SHA=${1:-63d28145265446828dc8270d04472ea8}
10+
# https://buf.build/authzed/api/activity/commit/v1.45.4
11+
PROTO_SHA=${1:-v1.45.4}
1212

1313
pushd $BASE_DIR
1414

15+
DOCKER_USER="--user $(id -u):$(id -g)"
16+
DOCKER_ENV="--env HOME=/tmp --env XDG_CACHE_HOME=/tmp/.cache"
17+
1518
echo "Updating proto files using $PROTO_SHA"
1619
rm -rf $PROTO_DIR
1720
mkdir -p $PROTO_DIR
1821

19-
docker run --volume "$(pwd):/workspace" --workdir /workspace bufbuild/buf export buf.build/envoyproxy/protoc-gen-validate -o $PROTO_DIR_IN_DOCKER
20-
docker run --volume "$(pwd):/workspace" --workdir /workspace bufbuild/buf export buf.build/grpc-ecosystem/grpc-gateway -o $PROTO_DIR_IN_DOCKER
21-
docker run --volume "$(pwd):/workspace" --workdir /workspace bufbuild/buf export buf.build/authzed/api:${PROTO_SHA} -o $PROTO_DIR_IN_DOCKER
22+
docker run $DOCKER_USER $DOCKER_ENV --volume "$(pwd):/workspace" --workdir /workspace bufbuild/buf export buf.build/envoyproxy/protoc-gen-validate -o $PROTO_DIR_IN_DOCKER
23+
docker run $DOCKER_USER $DOCKER_ENV --volume "$(pwd):/workspace" --workdir /workspace bufbuild/buf export buf.build/grpc-ecosystem/grpc-gateway -o $PROTO_DIR_IN_DOCKER
24+
docker run $DOCKER_USER $DOCKER_ENV --volume "$(pwd):/workspace" --workdir /workspace bufbuild/buf export buf.build/authzed/api:${PROTO_SHA} -o $PROTO_DIR_IN_DOCKER
2225

2326
# Need to put _ between watch and resources due to MacOS case sensitive, else maven will fail
24-
sudo mv $PROTO_DIR/authzed/api/v1alpha1/watchresources_service.proto $PROTO_DIR/authzed/api/v1alpha1/watch_resources_service.proto
27+
if [ -f "$PROTO_DIR/authzed/api/v1alpha1/watchresources_service.proto" ]; then
28+
mv $PROTO_DIR/authzed/api/v1alpha1/watchresources_service.proto $PROTO_DIR/authzed/api/v1alpha1/watch_resources_service.proto
29+
fi
2530

2631
echo "Generating gRPC client"
2732
mvn clean package -Pgenerate -pl :quarkus-authzed-grpc-generator

‎cli/src/main/java/io/quarkiverse/authzed/permission/Check.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.time.Duration;
44
import java.util.concurrent.Callable;
55

6-
import com.authzed.api.v1.PermissionService.CheckPermissionRequest;
7-
import com.authzed.api.v1.PermissionService.CheckPermissionResponse;
8-
import com.authzed.api.v1.PermissionService.Consistency;
6+
import com.authzed.api.v1.CheckPermissionRequest;
7+
import com.authzed.api.v1.CheckPermissionResponse;
8+
import com.authzed.api.v1.Consistency;
99

1010
import io.quarkiverse.authzed.client.AuthzedClient;
1111
import io.quarkiverse.authzed.utils.Tuples;

‎cli/src/main/java/io/quarkiverse/authzed/relationship/Create.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import java.time.Duration;
44
import java.util.concurrent.Callable;
55

6-
import com.authzed.api.v1.Core.Relationship;
7-
import com.authzed.api.v1.Core.RelationshipUpdate;
8-
import com.authzed.api.v1.Core.RelationshipUpdate.Operation;
9-
import com.authzed.api.v1.PermissionService.WriteRelationshipsRequest;
10-
import com.authzed.api.v1.PermissionService.WriteRelationshipsResponse;
6+
import com.authzed.api.v1.Relationship;
7+
import com.authzed.api.v1.RelationshipUpdate;
8+
import com.authzed.api.v1.RelationshipUpdate.Operation;
9+
import com.authzed.api.v1.WriteRelationshipsRequest;
10+
import com.authzed.api.v1.WriteRelationshipsResponse;
1111

1212
import io.quarkiverse.authzed.client.AuthzedClient;
1313
import io.quarkiverse.authzed.utils.Tuples;

‎cli/src/main/java/io/quarkiverse/authzed/relationship/Delete.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import java.time.Duration;
44
import java.util.concurrent.Callable;
55

6-
import com.authzed.api.v1.Core.Relationship;
7-
import com.authzed.api.v1.Core.RelationshipUpdate;
8-
import com.authzed.api.v1.Core.RelationshipUpdate.Operation;
9-
import com.authzed.api.v1.PermissionService.WriteRelationshipsRequest;
10-
import com.authzed.api.v1.PermissionService.WriteRelationshipsResponse;
6+
import com.authzed.api.v1.Relationship;
7+
import com.authzed.api.v1.RelationshipUpdate;
8+
import com.authzed.api.v1.RelationshipUpdate.Operation;
9+
import com.authzed.api.v1.WriteRelationshipsRequest;
10+
import com.authzed.api.v1.WriteRelationshipsResponse;
1111

1212
import io.quarkiverse.authzed.client.AuthzedClient;
1313
import io.quarkiverse.authzed.utils.Tuples;

‎cli/src/main/java/io/quarkiverse/authzed/schema/Read.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.time.Duration;
44
import java.util.concurrent.Callable;
55

6-
import com.authzed.api.v1.SchemaServiceOuterClass.ReadSchemaRequest;
7-
import com.authzed.api.v1.SchemaServiceOuterClass.ReadSchemaResponse;
6+
import com.authzed.api.v1.ReadSchemaRequest;
7+
import com.authzed.api.v1.ReadSchemaResponse;
88

99
import io.quarkiverse.authzed.client.AuthzedClient;
1010
import picocli.CommandLine.Command;

‎cli/src/main/java/io/quarkiverse/authzed/schema/Write.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import java.util.Optional;
99
import java.util.concurrent.Callable;
1010

11-
import com.authzed.api.v1.SchemaServiceOuterClass.WriteSchemaRequest;
12-
import com.authzed.api.v1.SchemaServiceOuterClass.WriteSchemaResponse;
11+
import com.authzed.api.v1.WriteSchemaRequest;
12+
import com.authzed.api.v1.WriteSchemaResponse;
1313

1414
import io.quarkiverse.authzed.client.AuthzedClient;
1515
import io.quarkus.runtime.util.StringUtil;

‎deployment/src/main/java/io/quarkiverse/authzed/client/deployment/DevServicesAuthzedProcessor.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import org.testcontainers.containers.wait.strategy.Wait;
2424
import org.testcontainers.utility.DockerImageName;
2525

26-
import com.authzed.api.v1.Core.RelationshipUpdate;
27-
import com.authzed.api.v1.Core.RelationshipUpdate.Operation;
28-
import com.authzed.api.v1.PermissionService.WriteRelationshipsRequest;
29-
import com.authzed.api.v1.PermissionService.WriteRelationshipsResponse;
30-
import com.authzed.api.v1.SchemaServiceOuterClass;
31-
import com.authzed.api.v1.SchemaServiceOuterClass.WriteSchemaResponse;
26+
import com.authzed.api.v1.RelationshipUpdate;
27+
import com.authzed.api.v1.RelationshipUpdate.Operation;
28+
import com.authzed.api.v1.WriteRelationshipsRequest;
29+
import com.authzed.api.v1.WriteRelationshipsResponse;
30+
import com.authzed.api.v1.WriteSchemaRequest;
31+
import com.authzed.api.v1.WriteSchemaResponse;
3232

3333
import io.quarkiverse.authzed.client.AuthzedClient;
3434
import io.quarkiverse.authzed.utils.Tuples;
@@ -50,7 +50,7 @@ public class DevServicesAuthzedProcessor {
5050

5151
private static final Logger log = Logger.getLogger(DevServicesAuthzedProcessor.class);
5252

53-
static final String DEFAULT_IMAGE_TAG = "v1.35.2";
53+
static final String DEFAULT_IMAGE_TAG = "v1.49.1";
5454
static final String DEFAULT_IMAGE_NAME = "authzed/spicedb";
5555
static final String DEFAULT_IMAGE = DEFAULT_IMAGE_NAME + ":" + DEFAULT_IMAGE_TAG;
5656

@@ -132,7 +132,7 @@ public void startContainers(AuthzedBuildTimeConfig config,
132132
log.info("Initializing authorization schema ...");
133133
Uni<WriteSchemaResponse> writeSchemaResponse = client.v1().schemaService()
134134
.writeSchema(
135-
SchemaServiceOuterClass.WriteSchemaRequest.newBuilder().setSchema(schema)
135+
WriteSchemaRequest.newBuilder().setSchema(schema)
136136
.build());
137137
writeSchemaResponse.await().indefinitely();
138138

‎deployment/src/test/java/io/quarkiverse/quarkus/authzed/client/test/DevServicesAuthzedClientTLSTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
import org.junit.jupiter.api.Test;
1818
import org.junit.jupiter.api.extension.RegisterExtension;
1919

20-
import com.authzed.api.v1.SchemaServiceOuterClass;
20+
import com.authzed.api.v1.ReadSchemaRequest;
21+
import com.authzed.api.v1.ReadSchemaResponse;
22+
import com.authzed.api.v1.WriteSchemaRequest;
2123

2224
import io.quarkiverse.authzed.client.AuthzedClient;
2325
import io.quarkus.test.QuarkusUnitTest;
@@ -72,12 +74,12 @@ public void shouldAccessMetrics() {
7274
public void shouldCreateSchema() {
7375
client.v1()
7476
.schemaService()
75-
.writeSchema(SchemaServiceOuterClass.WriteSchemaRequest.newBuilder().setSchema(readSchema()).build())
77+
.writeSchema(WriteSchemaRequest.newBuilder().setSchema(readSchema()).build())
7678
.await().atMost(Duration.ofSeconds(10));
7779

78-
SchemaServiceOuterClass.ReadSchemaResponse response = client.v1()
80+
ReadSchemaResponse response = client.v1()
7981
.schemaService()
80-
.readSchema(SchemaServiceOuterClass.ReadSchemaRequest.newBuilder().build())
82+
.readSchema(ReadSchemaRequest.newBuilder().build())
8183
.await().atMost(Duration.ofSeconds(10));
8284

8385
assertNotNull(response);

‎deployment/src/test/java/io/quarkiverse/quarkus/authzed/client/test/DevServicesAuthzedClientTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
import org.junit.jupiter.api.Test;
1717
import org.junit.jupiter.api.extension.RegisterExtension;
1818

19-
import com.authzed.api.v1.SchemaServiceOuterClass;
19+
import com.authzed.api.v1.ReadSchemaRequest;
20+
import com.authzed.api.v1.ReadSchemaResponse;
21+
import com.authzed.api.v1.WriteSchemaRequest;
2022

2123
import io.quarkiverse.authzed.client.AuthzedClient;
2224
import io.quarkus.test.QuarkusUnitTest;
@@ -65,12 +67,12 @@ public void shouldAccessMetrics() {
6567
public void shouldCreateSchema() {
6668
client.v1()
6769
.schemaService()
68-
.writeSchema(SchemaServiceOuterClass.WriteSchemaRequest.newBuilder().setSchema(readSchema()).build())
70+
.writeSchema(WriteSchemaRequest.newBuilder().setSchema(readSchema()).build())
6971
.await().atMost(Duration.ofSeconds(10));
7072

71-
SchemaServiceOuterClass.ReadSchemaResponse response = client.v1()
73+
ReadSchemaResponse response = client.v1()
7274
.schemaService()
73-
.readSchema(SchemaServiceOuterClass.ReadSchemaRequest.newBuilder().build())
75+
.readSchema(ReadSchemaRequest.newBuilder().build())
7476
.await().atMost(Duration.ofSeconds(10));
7577

7678
assertNotNull(response);
@@ -85,4 +87,4 @@ private String readSchema() {
8587
throw new RuntimeException(e);
8688
}
8789
}
88-
}
90+
}

0 commit comments

Comments
 (0)