Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .github/workflows/conformance-tests-gax-showcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
gapic-showcase:
runs-on: ubuntu-latest
env:
GAPIC_SHOWCASE_VERSION: 0.36.2
GAPIC_SHOWCASE_VERSION: 0.40.0
OS: linux
ARCH: amd64
name: GAPIC Showcase Conformance Tests
Expand All @@ -21,18 +21,25 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
extensions: grpc

- name: Install and run GAPIC Showcase
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '>=1.26'

- name: Install GAPIC Showcase from Branch
run: |
curl -L https://github.com/googleapis/gapic-showcase/releases/download/v${GAPIC_SHOWCASE_VERSION}/gapic-showcase-${GAPIC_SHOWCASE_VERSION}-${OS}-${ARCH}.tar.gz | tar -zx
./gapic-showcase run &

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You upgraded the showcase version but then removed the lines using it? I assume these will be added back once the feat-pqc-tls branch is merged and tagged?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope so, this is for now as it is what it "works". If it gets merged and tagged, we are updatting this.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused, we did not removed the lines using it, is under the next step:
Run the GAPIC showcase server

go install github.com/googleapis/gapic-showcase@feat-pqc-tls

- name: Run the GAPIC showcase server
run: |
gapic-showcase run --port :7469 --tls --ca-cert-output-file showcase.pem & sleep 5

- name: Install dependencies
run: |
composer update --prefer-dist --no-interaction --no-suggest -d Gax/

- name: Run PHPUnit
run: Gax/vendor/bin/phpunit -c Gax/phpunit-conformance.xml.dist

100 changes: 100 additions & 0 deletions Gax/tests/Conformance/PqcShowcaseTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?php
/*
* Copyright 2021 Google LLC

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Copyright 2021 Google LLC
* Copyright 2026 Google LLC
Image

*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

declare(strict_types=1);

namespace Google\Generator\Tests\Conformance;

use Google\ApiCore\InsecureCredentialsWrapper;
use Google\ApiCore\RequestBuilder;
use Google\ApiCore\Transport\GrpcTransport;
use Google\ApiCore\Transport\RestTransport;
use Google\ApiCore\Transport\TransportInterface;
use Google\Auth\HttpHandler\HttpHandlerFactory;
use Google\Showcase\V1beta1\Client\EchoClient;
use Google\Showcase\V1beta1\EchoRequest;
use Grpc\ChannelCredentials;
use GuzzleHttp\Client;
use PHPUnit\Framework\TestCase;

class PqcShowcaseTest extends TestCase
{
private const TLS_GROUP = 'x-showcase-tls-group';
private const TLS_VERSION = 'x-showcase-tls-version';

public function provideTransport(): array
{
$pemPath = __DIR__ . '/showcase.pem';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing file?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is autogenerated by the showcase server when started.

$host = 'localhost:7469';

// gRPC Configuration
$pemContents = file_get_contents($pemPath);
if (!$pemContents) {
$this->fail('Could not read showcase.pem');
}

$grpcTransport = GrpcTransport::build($host, [
'stubOpts' => [
'credentials' => ChannelCredentials::createSsl($pemContents)
]
]);

// REST Configuration
$restConfigPath = __DIR__ . '/src/V1beta1/resources/echo_rest_client_config.php';

$requestBuilder = new RequestBuilder($host, $restConfigPath);
$guzzleClient = new Client([
'verify' => $pemPath
]);
$httpHandler = HttpHandlerFactory::build($guzzleClient);
$restTransport = new RestTransport($requestBuilder, [$httpHandler, 'async']);

return [[$grpcTransport], [$restTransport]];
}

/** @dataProvider provideTransport */
public function testPqc(TransportInterface $transport): void
{
$expected = 'This is a test';
$expectedGroup = 'X25519MLKEM768';
$expectedVersion = 'TLS 1.3';
$responseHeaders = null;
$metadataCallback = function (array $metadata) use (&$responseHeaders) {
$responseHeaders = $metadata;
};

$echoClient = new EchoClient([
'credentials' => new InsecureCredentialsWrapper(),
'transport' => $transport
]);

$echoRequest = new EchoRequest();
$echoRequest->setContent($expected);
$response = $echoClient->echo($echoRequest, [
'metadataCallback' => $metadataCallback
]);

$this->assertEquals($expected, $response->getContent());
$this->assertNotNull($responseHeaders);

/** @var array<string, array<int, string>> $responseHeaders */
$responseHeaders = array_change_key_case($responseHeaders, CASE_LOWER);

$this->assertEquals($expectedVersion, $responseHeaders[self::TLS_VERSION][0]);
$this->assertEquals($expectedGroup, $responseHeaders[self::TLS_GROUP][0]);
}
}
Loading