chore(deps): Bump grpc from 1.57.0 to 1.58.0

Gemfile.lock

@@ -12,18 +12,18 @@ GEM
     coderay (1.1.3)
     commonmarker (0.23.10)
     diff-lcs (1.5.0)
-    google-protobuf (3.24.0-arm64-darwin)
-    google-protobuf (3.24.0-x86_64-darwin)
-    google-protobuf (3.24.0-x86_64-linux)
+    google-protobuf (3.24.3-arm64-darwin)
+    google-protobuf (3.24.3-x86_64-darwin)
+    google-protobuf (3.24.3-x86_64-linux)
     googleapis-common-protos-types (1.8.0)
       google-protobuf (~> 3.18)
-    grpc (1.57.0)
+    grpc (1.58.0)
       google-protobuf (~> 3.23)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.57.0-x86_64-darwin)
+    grpc (1.58.0-x86_64-darwin)
       google-protobuf (~> 3.23)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.57.0-x86_64-linux)
+    grpc (1.58.0-x86_64-linux)
       google-protobuf (~> 3.23)
       googleapis-common-protos-types (~> 1.0)
     json (2.6.3)
@@ -119,4 +119,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.13
+   2.4.19

spec/servers/docker-compose.yml → spec/servers/docker-compose.yaml

@@ -4,15 +4,15 @@ services:
   plaintext:
     image: ghcr.io/cerbos/cerbos:${CERBOS_IMAGE_TAG:-$CERBOS_VERSION}
     environment:
-      - CERBOS_CONFIG=/config/plaintext.cerbos.yaml
+      - CERBOS_CONFIG=/config/plaintext.yaml
     healthcheck:
       interval: 2s
     ports:
       - 3593
     user: ${USER}
     volumes:
       - type: bind
-        source: config
+        source: config/cerbos
         target: /config
         read_only: true
       - type: bind
@@ -21,9 +21,11 @@ services:
         read_only: true
 
   socket:
+    profiles:
+      - linux
     extends: plaintext
     environment:
-      - CERBOS_CONFIG=/config/socket.cerbos.yaml
+      - CERBOS_CONFIG=/config/socket.yaml
     volumes:
       - type: bind
         source: ../../tmp/socket
@@ -32,19 +34,19 @@ services:
   tls:
     extends: plaintext
     environment:
-      - CERBOS_CONFIG=/config/tls.cerbos.yaml
+      - CERBOS_CONFIG=/config/tls.yaml
     volumes:
       - type: bind
         source: ../../tmp/certificates
         target: /certificates
         read_only: true
 
   mtls:
-    image: traefik:2.6
+    image: traefik:2.10
     command:
       - --entrypoints.grpc.address=:3593
       - --ping
-      - --providers.file.filename=/config/mtls.traefik.yaml
+      - --providers.file.filename=/config/mtls.yaml
     healthcheck:
       interval: 2s
       timeout: 1s
@@ -61,6 +63,6 @@ services:
         target: /certificates
         read_only: true
       - type: bind
-        source: config
+        source: config/traefik
         target: /config
         read_only: true

tasks/test/servers.rb

@@ -36,20 +36,22 @@ def export_ports
           output, status = Open3.capture2(*command)
           raise "`#{command.join(" ")}` exited with status #{status.exitstatus}" unless status.success?
 
-          ports(JSON.parse(output)).each do |service, port|
+          ports(output).each do |service, port|
             ENV["CERBOS_PORT_#{service.upcase}"] = port.to_s
           end
         end
 
         def stop
           ENV["POLICIES_VERSION"] = ""
-          sh(*docker_compose_command("down"))
+          sh(*docker_compose_command("down", "--remove-orphans"))
         end
 
         private
 
-        def ports(containers)
-          containers
+        def ports(output)
+          output
+            .each_line
+            .flat_map { |line| JSON.parse(line) }
             .map { |container| [container.fetch("Service"), port(container)] }
             .to_h
             .compact
@@ -66,7 +68,8 @@ def docker_compose_command(*args)
           [
             {"USER" => "#{Process.uid}:#{Process.gid}"},
             "docker", "compose",
-            "--file", File.expand_path("../../spec/servers/docker-compose.yml", __dir__),
+            "--file", File.expand_path("../../spec/servers/docker-compose.yaml", __dir__),
+            "--profile", Gem::Platform.local.os,
             *args
           ]
         end