Merge branch 'master' into workflow-id-conflict-policy

roxblnfk · web-flow · commit cd9964ba058c · 2024-04-12T22:19:47.000+03:00
diff --git a/resources/scripts/generate-client.php b/resources/scripts/generate-client.php
@@ -106,6 +106,14 @@
 );
 $m->setReturnType('static');
 $interface->addMethodFromGenerator($m);
+// withAuthKey(string $key): static
+$m = new MethodGenerator(
+    'withAuthKey',
+    [Generator\ParameterGenerator::fromArray(['type' => '\Stringable|string', 'name' => 'key'])],
+    MethodGenerator::FLAG_PUBLIC,
+);
+$m->setReturnType('static');
+$interface->addMethodFromGenerator($m);
 // public function getConnection(): ConnectionInterface
 $m = new MethodGenerator(
     'getConnection',
diff --git a/src/Client/GRPC/BaseClient.php b/src/Client/GRPC/BaseClient.php
@@ -40,6 +40,7 @@ abstract class BaseClient implements ServiceClientInterface
 
     private Connection $connection;
     private ContextInterface $context;
+    private \Stringable|string $apiKey = '';
 
     /**
      * @param WorkflowServiceClient|Closure(): WorkflowServiceClient $workflowService Service Client or its factory
@@ -74,6 +75,21 @@ public function withContext(ContextInterface $context): static
         return $clone;
     }
 
+    /**
+     * Set the authentication token for the service client.
+     *
+     * This is the equivalent of providing an "Authorization" header with "Bearer " + the given key.
+     * This will overwrite any "Authorization" header that may be on the context before each request to the
+     * Temporal service.
+     * You may pass your own {@see \Stringable} implementation to be able to change the key dynamically.
+     */
+    public function withAuthKey(\Stringable|string $key): static
+    {
+        $clone = clone $this;
+        $clone->apiKey = $key;
+        return $clone;
+    }
+
     /**
      * Close the communication channel associated with this stub.
      */
@@ -157,8 +173,8 @@ final public function withInterceptorPipeline(?Pipeline $pipeline): static
     {
         $clone = clone $this;
         /** @see GrpcClientInterceptor::interceptCall() */
-        $callable = $pipeline?->with(Closure::fromCallable([$clone, 'call']), 'interceptCall');
-        $clone->invokePipeline = $callable === null ? null : Closure::fromCallable($callable);
+        $callable = $pipeline?->with($clone->call(...), 'interceptCall');
+        $clone->invokePipeline = $callable === null ? null : $callable(...);
         return $clone;
     }
 
@@ -224,10 +240,18 @@ public function getConnection(): ConnectionInterface {
      *
      * @throw ClientException
      */
-    protected function invoke(string $method, object $arg, ?ContextInterface $ctx = null)
+    protected function invoke(string $method, object $arg, ?ContextInterface $ctx = null): mixed
     {
         $ctx ??= $this->context;
 
+        // Add the API key to the context
+        $key = (string)$this->apiKey;
+        if ($key !== '') {
+            $ctx = $ctx->withMetadata([
+                'Authorization' => ["Bearer $key"],
+            ]);
+        }
+
         return $this->invokePipeline !== null
             ? ($this->invokePipeline)($method, $arg, $ctx)
             : $this->call($method, $arg, $ctx);
diff --git a/src/Client/GRPC/ServiceClient.php b/src/Client/GRPC/ServiceClient.php
@@ -729,7 +729,11 @@ public function DescribeWorkflowExecution(V1\DescribeWorkflowExecutionRequest $a
     }
 
     /**
-     * DescribeTaskQueue returns information about the target task queue.
+     * DescribeTaskQueue returns the following information about the target task queue,
+     * broken down by Build ID:
+     * - List of pollers
+     * - Workflow Reachability status
+     * - Backlog info for Workflow and/or Activity tasks
      *
      * @param V1\DescribeTaskQueueRequest $arg
      * @param ContextInterface|null $ctx
@@ -873,6 +877,8 @@ public function ListSchedules(V1\ListSchedulesRequest $arg, ContextInterface $ct
     }
 
     /**
+     * Deprecated. Use `UpdateWorkerVersioningRules`.
+     *
      * Allows users to specify sets of worker build id versions on a per task queue
      * basis. Versions
      * are ordered, and may be either compatible with some extant version, or a new
@@ -906,6 +912,7 @@ public function UpdateWorkerBuildIdCompatibility(V1\UpdateWorkerBuildIdCompatibi
     }
 
     /**
+     * Deprecated. Use `GetWorkerVersioningRules`.
      * Fetches the worker build id versioning sets for a task queue.
      *
      * @param V1\GetWorkerBuildIdCompatibilityRequest $arg
@@ -919,6 +926,41 @@ public function GetWorkerBuildIdCompatibility(V1\GetWorkerBuildIdCompatibilityRe
     }
 
     /**
+     * Allows updating the Build ID assignment and redirect rules for a given Task
+     * Queue.
+     * WARNING: Worker Versioning is not yet stable and the API and behavior may change
+     * incompatibly.
+     * (-- api-linter: core::0127::http-annotation=disabled
+     * aip.dev/not-precedent: We do yet expose versioning API to HTTP. --)
+     *
+     * @param V1\UpdateWorkerVersioningRulesRequest $arg
+     * @param ContextInterface|null $ctx
+     * @return V1\UpdateWorkerVersioningRulesResponse
+     * @throws ServiceClientException
+     */
+    public function UpdateWorkerVersioningRules(V1\UpdateWorkerVersioningRulesRequest $arg, ContextInterface $ctx = null) : V1\UpdateWorkerVersioningRulesResponse
+    {
+        return $this->invoke("UpdateWorkerVersioningRules", $arg, $ctx);
+    }
+
+    /**
+     * Fetches the Build ID assignment and redirect rules for a Task Queue.
+     * WARNING: Worker Versioning is not yet stable and the API and behavior may change
+     * incompatibly.
+     *
+     * @param V1\GetWorkerVersioningRulesRequest $arg
+     * @param ContextInterface|null $ctx
+     * @return V1\GetWorkerVersioningRulesResponse
+     * @throws ServiceClientException
+     */
+    public function GetWorkerVersioningRules(V1\GetWorkerVersioningRulesRequest $arg, ContextInterface $ctx = null) : V1\GetWorkerVersioningRulesResponse
+    {
+        return $this->invoke("GetWorkerVersioningRules", $arg, $ctx);
+    }
+
+    /**
+     * Deprecated. Use `DescribeTaskQueue`.
+     *
      * Fetches task reachability to determine whether a worker may be retired.
      * The request may specify task queues to query for or let the server fetch all
      * task queues mapped to the given
diff --git a/src/Client/GRPC/ServiceClientInterface.php b/src/Client/GRPC/ServiceClientInterface.php
@@ -16,6 +16,7 @@ interface ServiceClientInterface
 {
     public function getContext() : ContextInterface;
     public function withContext(ContextInterface $context) : static;
+    public function withAuthKey(\Stringable|string $key) : static;
     public function getConnection() : \Temporal\Client\GRPC\Connection\ConnectionInterface;
     public function getServerCapabilities() : ?\Temporal\Client\Common\ServerCapabilities;
     /**
@@ -585,7 +586,11 @@ public function QueryWorkflow(V1\QueryWorkflowRequest $arg, ContextInterface $ct
      */
     public function DescribeWorkflowExecution(V1\DescribeWorkflowExecutionRequest $arg, ContextInterface $ctx = null) : V1\DescribeWorkflowExecutionResponse;
     /**
-     * DescribeTaskQueue returns information about the target task queue.
+     * DescribeTaskQueue returns the following information about the target task queue,
+     * broken down by Build ID:
+     * - List of pollers
+     * - Workflow Reachability status
+     * - Backlog info for Workflow and/or Activity tasks
      *
      * @param V1\DescribeTaskQueueRequest $arg
      * @param ContextInterface|null $ctx
@@ -685,6 +690,8 @@ public function DeleteSchedule(V1\DeleteScheduleRequest $arg, ContextInterface $
      */
     public function ListSchedules(V1\ListSchedulesRequest $arg, ContextInterface $ctx = null) : V1\ListSchedulesResponse;
     /**
+     * Deprecated. Use `UpdateWorkerVersioningRules`.
+     *
      * Allows users to specify sets of worker build id versions on a per task queue
      * basis. Versions
      * are ordered, and may be either compatible with some extant version, or a new
@@ -714,6 +721,7 @@ public function ListSchedules(V1\ListSchedulesRequest $arg, ContextInterface $ct
      */
     public function UpdateWorkerBuildIdCompatibility(V1\UpdateWorkerBuildIdCompatibilityRequest $arg, ContextInterface $ctx = null) : V1\UpdateWorkerBuildIdCompatibilityResponse;
     /**
+     * Deprecated. Use `GetWorkerVersioningRules`.
      * Fetches the worker build id versioning sets for a task queue.
      *
      * @param V1\GetWorkerBuildIdCompatibilityRequest $arg
@@ -723,6 +731,33 @@ public function UpdateWorkerBuildIdCompatibility(V1\UpdateWorkerBuildIdCompatibi
      */
     public function GetWorkerBuildIdCompatibility(V1\GetWorkerBuildIdCompatibilityRequest $arg, ContextInterface $ctx = null) : V1\GetWorkerBuildIdCompatibilityResponse;
     /**
+     * Allows updating the Build ID assignment and redirect rules for a given Task
+     * Queue.
+     * WARNING: Worker Versioning is not yet stable and the API and behavior may change
+     * incompatibly.
+     * (-- api-linter: core::0127::http-annotation=disabled
+     * aip.dev/not-precedent: We do yet expose versioning API to HTTP. --)
+     *
+     * @param V1\UpdateWorkerVersioningRulesRequest $arg
+     * @param ContextInterface|null $ctx
+     * @return V1\UpdateWorkerVersioningRulesResponse
+     * @throws ServiceClientException
+     */
+    public function UpdateWorkerVersioningRules(V1\UpdateWorkerVersioningRulesRequest $arg, ContextInterface $ctx = null) : V1\UpdateWorkerVersioningRulesResponse;
+    /**
+     * Fetches the Build ID assignment and redirect rules for a Task Queue.
+     * WARNING: Worker Versioning is not yet stable and the API and behavior may change
+     * incompatibly.
+     *
+     * @param V1\GetWorkerVersioningRulesRequest $arg
+     * @param ContextInterface|null $ctx
+     * @return V1\GetWorkerVersioningRulesResponse
+     * @throws ServiceClientException
+     */
+    public function GetWorkerVersioningRules(V1\GetWorkerVersioningRulesRequest $arg, ContextInterface $ctx = null) : V1\GetWorkerVersioningRulesResponse;
+    /**
+     * Deprecated. Use `DescribeTaskQueue`.
+     *
      * Fetches task reachability to determine whether a worker may be retired.
      * The request may specify task queues to query for or let the server fetch all
      * task queues mapped to the given
diff --git a/tests/Unit/Client/GRPC/BaseClientTestCase.php b/tests/Unit/Client/GRPC/BaseClientTestCase.php
@@ -13,6 +13,7 @@
 use Temporal\Client\GRPC\Connection\ConnectionState;
 use Temporal\Client\GRPC\ContextInterface;
 use Temporal\Client\GRPC\ServiceClient;
+use Temporal\Internal\Interceptor\Pipeline;
 
 class BaseClientTestCase extends TestCase
 {
@@ -80,9 +81,55 @@ public function testWithContext(): void
         $this->assertNotSame($client, $client2);
     }
 
+    public function testWithAuthKey(): void
+    {
+        $client = $this->createClientMock();
+        $context = $client->getContext();
+        $client2 = $client->withAuthKey('test-key');
+
+        // Client immutability
+        $this->assertNotSame($client, $client2);
+        // Old context was not modified
+        $this->assertSame($context, $client->getContext());
+        // New context is the same as the old one
+        // because the auth key is added to the context before API method call
+        $this->assertSame($context, $client2->getContext());
+
+        $ctx1 = $client->testCall()->ctx;
+        self::assertInstanceOf(ContextInterface::class, $ctx1);
+        $this->assertArrayNotHasKey('Authorization', $ctx1->getMetadata());
+
+        $ctx2 = $client2->testCall()->ctx;
+        self::assertInstanceOf(ContextInterface::class, $ctx2);
+        $this->assertArrayHasKey('Authorization', $ctx2->getMetadata());
+        $this->assertSame(['Bearer test-key'], $ctx2->getMetadata()['Authorization']);
+    }
+
+    public function testWithDynamicAuthKey(): void
+    {
+        $client = $this->createClientMock()->withAuthKey(new class implements \Stringable {
+            public function __toString(): string
+            {
+                static $counter = 0;
+                $counter++;
+                return "test-key-$counter";
+            }
+        });
+
+        $ctx = $client->testCall()->ctx;
+        self::assertInstanceOf(ContextInterface::class, $ctx);
+        $this->assertArrayHasKey('Authorization', $ctx->getMetadata());
+        $this->assertSame(['Bearer test-key-1'], $ctx->getMetadata()['Authorization']);
+
+        $ctx2 = $client->testCall()->ctx;
+        self::assertInstanceOf(ContextInterface::class, $ctx2);
+        $this->assertArrayHasKey('Authorization', $ctx2->getMetadata());
+        $this->assertSame(['Bearer test-key-2'], $ctx2->getMetadata()['Authorization']);
+    }
+
     private function createClientMock(?callable $serviceClientFactory = null): BaseClient
     {
-        return new class($serviceClientFactory ?? static fn() => new class extends WorkflowServiceClient {
+        return (new class($serviceClientFactory ?? static fn() => new class extends WorkflowServiceClient {
             public function __construct()
             {
             }
@@ -104,6 +151,22 @@ public function getSystemInfo(
                     ->setCapabilities((new Capabilities)->setSupportsSchedules(true))
                     ->setServerVersion('1.2.3');
             }
-        };
+
+            public function testCall(): mixed
+            {
+                return $this->invoke("testCall", (object)[], null);
+            }
+        })->withInterceptorPipeline(
+            Pipeline::prepare([new class implements \Temporal\Interceptor\GrpcClientInterceptor {
+                public function interceptCall(
+                    string $method,
+                    object $arg,
+                    ContextInterface $ctx,
+                    callable $next
+                ): object {
+                    return (object)['method' => $method, 'arg' => $arg, 'ctx' => $ctx, 'next' => $next];
+                }
+            }]),
+        );
     }
 }
diff --git a/tests/Unit/Client/Mapper/WorkflowExecutionInfoMapperTestCase.php b/tests/Unit/Client/Mapper/WorkflowExecutionInfoMapperTestCase.php
@@ -64,7 +64,6 @@ public function testFromPayload(): void
                 'state_transition_count' => 1,
                 'history_size_bytes' => 1,
                 'most_recent_worker_version_stamp' => (new \Temporal\Api\Common\V1\WorkerVersionStamp())
-                    // ->setBundleId('bundleId')
                     ->setBuildId('buildId')
                     ->setUseVersioning(true),
             ]),
