Skip to content

Commit

Permalink
Prepare v0.61.0 (#1018)
Browse files Browse the repository at this point in the history
* Prepare v0.61.0

* Additional releases

* Fix some integration failures
  • Loading branch information
jdpedrie authored Apr 16, 2018
1 parent 008d87a commit 6834308
Show file tree
Hide file tree
Showing 42 changed files with 155 additions and 60 deletions.
2 changes: 1 addition & 1 deletion BigQueryDataTransfer/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.3
0.4.0
2 changes: 1 addition & 1 deletion Bigtable/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.2
0.3.3
2 changes: 1 addition & 1 deletion Container/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.2
0.3.3
2 changes: 1 addition & 1 deletion Core/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.1
1.19.2
2 changes: 1 addition & 1 deletion Dataproc/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.2
0.3.3
2 changes: 1 addition & 1 deletion Debugger/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.2
0.7.0
2 changes: 1 addition & 1 deletion Debugger/src/DebuggerClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class DebuggerClient
{
use ClientTrait;

const VERSION = '0.6.2';
const VERSION = '0.7.0';
const DEFAULT_AGENT_VERSION = 'google.com/gcp-php/v0.1';

const FULL_CONTROL_SCOPE = 'https://www.googleapis.com/auth/cloud-platform';
Expand Down
9 changes: 5 additions & 4 deletions Debugger/tests/Unit/AgentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,12 @@ public function tearDown()

public function testSpecifyStorage()
{
$logger = $this->prophesize(LoggerInterface::class);
$this->storage->load()->willReturn(['debuggeeId', []])->shouldBeCalled();
$agent = new Agent(['storage' => $this->storage->reveal()]);
$agent = new Agent([
'storage' => $this->storage->reveal(),
'logger' => $logger->reveal()
]);
}

public function testSpecifyLogger()
Expand All @@ -79,9 +83,6 @@ public function testSpecifyLogger()
$agent->handleLogpoint('INFO', 'message', ['context' => 'value']);
}

/**
* @group focus
*/
public function testDaemonOptions()
{
putenv('IS_BATCH_DAEMON_RUNNING=true');
Expand Down
1 change: 1 addition & 0 deletions Dialogflow/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.1.0
7 changes: 6 additions & 1 deletion Dialogflow/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"extra": {
"component": {
"id": "cloud-dialogflow",
"path": "src/",
"path": "Dialogflow",
"entry": null,
"target": "GoogleCloudPlatform/google-cloud-php-dialogflow.git"
}
Expand All @@ -20,6 +20,11 @@
"google/proto-client": "^0.37",
"google/gax": "^0.31.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
"google/cloud-core": "^1.14",
"phpdocumentor/reflection": "^3.0"
},
"suggest": {
"ext-grpc": "Enables use of gRPC, a universal high-performance RPC framework created by Google."
}
Expand Down
19 changes: 19 additions & 0 deletions Dialogflow/phpunit-snippets.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
bootstrap="./vendor/google/cloud-core/snippet-bootstrap.php"
colors="true"
printerClass="Google\Cloud\Core\Testing\Snippet\Coverage\ResultPrinter">
<testsuites>
<testsuite>
<directory>tests/Snippet</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src</directory>
<exclude>
<directory suffix=".php">src/V[!a-zA-Z]*</directory>
</exclude>
</whitelist>
</filter>
</phpunit>
16 changes: 16 additions & 0 deletions Dialogflow/phpunit-system.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./vendor/google-cloud/cloud-core/system-bootstrap.php" colors="true">
<testsuites>
<testsuite>
<directory>tests/System</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src</directory>
<exclude>
<directory suffix=".php">src/V[!a-zA-Z]*</directory>
</exclude>
</whitelist>
</filter>
</phpunit>
16 changes: 16 additions & 0 deletions Dialogflow/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit colors="true">
<testsuites>
<testsuite>
<directory>tests/Unit</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src</directory>
<exclude>
<directory suffix=".php">src/V[!a-zA-Z]*</directory>
</exclude>
</whitelist>
</filter>
</phpunit>
5 changes: 5 additions & 0 deletions Dialogflow/tests/System/bootstrap.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

use Google\Cloud\Core\Testing\TestHelpers;

TestHelpers::requireKeyfile('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH');
2 changes: 1 addition & 1 deletion Dlp/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.2
0.8.0
2 changes: 1 addition & 1 deletion ErrorReporting/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.3
0.9.4
2 changes: 1 addition & 1 deletion Firestore/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0
0.8.1
2 changes: 1 addition & 1 deletion Firestore/src/FirestoreClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class FirestoreClient
use SnapshotTrait;
use ValidateTrait;

const VERSION = '0.8.0';
const VERSION = '0.8.1';

const DEFAULT_DATABASE = '(default)';

Expand Down
2 changes: 1 addition & 1 deletion Iot/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.1
0.1.2
2 changes: 1 addition & 1 deletion Language/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13.2
0.13.3
2 changes: 1 addition & 1 deletion Language/src/LanguageClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LanguageClient
use ClientTrait;
use RetryDeciderTrait;

const VERSION = '0.13.2';
const VERSION = '0.13.3';

const FULL_CONTROL_SCOPE = 'https://www.googleapis.com/auth/cloud-platform';

Expand Down
2 changes: 1 addition & 1 deletion Logging/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.2
1.10.3
2 changes: 1 addition & 1 deletion Logging/src/LoggingClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class LoggingClient
use ArrayTrait;
use ClientTrait;

const VERSION = '1.10.2';
const VERSION = '1.10.3';

const FULL_CONTROL_SCOPE = 'https://www.googleapis.com/auth/logging.admin';
const READ_ONLY_SCOPE = 'https://www.googleapis.com/auth/logging.read';
Expand Down
2 changes: 1 addition & 1 deletion Monitoring/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.2
0.9.3
2 changes: 1 addition & 1 deletion OsLogin/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.2
0.3.3
2 changes: 1 addition & 1 deletion PubSub/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.2
1.1.3
2 changes: 1 addition & 1 deletion PubSub/src/PubSubClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class PubSubClient
use IncomingMessageTrait;
use ResourceNameTrait;

const VERSION = '1.1.2';
const VERSION = '1.1.3';

const FULL_CONTROL_SCOPE = 'https://www.googleapis.com/auth/pubsub';

Expand Down
2 changes: 1 addition & 1 deletion Spanner/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.2
1.3.3
2 changes: 1 addition & 1 deletion Spanner/src/SpannerClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SpannerClient
use LROTrait;
use ValidateTrait;

const VERSION = '1.3.2';
const VERSION = '1.3.3';

const FULL_CONTROL_SCOPE = 'https://www.googleapis.com/auth/spanner.data';
const ADMIN_SCOPE = 'https://www.googleapis.com/auth/spanner.admin';
Expand Down
2 changes: 1 addition & 1 deletion Speech/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.2
0.12.3
2 changes: 1 addition & 1 deletion Speech/src/SpeechClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class SpeechClient
{
use ClientTrait;

const VERSION = '0.12.2';
const VERSION = '0.12.3';

const SCOPE = 'https://www.googleapis.com/auth/cloud-platform';

Expand Down
2 changes: 1 addition & 1 deletion Trace/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.2
0.7.3
2 changes: 1 addition & 1 deletion Trace/src/TraceClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class TraceClient
{
use ClientTrait;

const VERSION = '0.7.2';
const VERSION = '0.7.3';

const FULL_CONTROL_SCOPE = 'https://www.googleapis.com/auth/cloud-platform';

Expand Down
2 changes: 1 addition & 1 deletion VideoIntelligence/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.2
0.10.3
2 changes: 1 addition & 1 deletion Vision/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.2
0.11.3
2 changes: 1 addition & 1 deletion Vision/src/VisionClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class VisionClient
use ClientTrait;
use ValidateTrait;

const VERSION = '0.11.2';
const VERSION = '0.11.3';

const FULL_CONTROL_SCOPE = 'https://www.googleapis.com/auth/cloud-platform';

Expand Down
44 changes: 22 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,30 +66,30 @@
},
"replace": {
"google/cloud-bigquery": "1.2.0",
"google/cloud-bigquerydatatransfer": "0.3.3",
"google/cloud-bigtable": "0.3.2",
"google/cloud-container": "0.3.2",
"google/cloud-core": "1.19.1",
"google/cloud-dataproc": "0.3.2",
"google/cloud-bigquerydatatransfer": "0.4.0",
"google/cloud-bigtable": "0.3.3",
"google/cloud-container": "0.3.3",
"google/cloud-core": "1.19.2",
"google/cloud-dataproc": "0.3.3",
"google/cloud-datastore": "1.4.2",
"google/cloud-debugger": "0.6.2",
"google/cloud-dialogflow": "master",
"google/cloud-dlp": "0.7.2",
"google/cloud-error-reporting": "0.9.3",
"google/cloud-firestore": "0.8.0",
"google/cloud-iot": "0.1.1",
"google/cloud-language": "0.13.2",
"google/cloud-logging": "1.10.2",
"google/cloud-monitoring": "0.9.2",
"google/cloud-oslogin": "0.3.2",
"google/cloud-pubsub": "1.1.2",
"google/cloud-spanner": "1.3.2",
"google/cloud-speech": "0.12.2",
"google/cloud-debugger": "0.7.0",
"google/cloud-dialogflow": "0.1.0",
"google/cloud-dlp": "0.8.0",
"google/cloud-error-reporting": "0.9.4",
"google/cloud-firestore": "0.8.1",
"google/cloud-iot": "0.1.2",
"google/cloud-language": "0.13.3",
"google/cloud-logging": "1.10.3",
"google/cloud-monitoring": "0.9.3",
"google/cloud-oslogin": "0.3.3",
"google/cloud-pubsub": "1.1.3",
"google/cloud-spanner": "1.3.3",
"google/cloud-speech": "0.12.3",
"google/cloud-storage": "1.4.0",
"google/cloud-trace": "0.7.2",
"google/cloud-trace": "0.7.3",
"google/cloud-translate": "1.2.0",
"google/cloud-videointelligence": "0.10.2",
"google/cloud-vision": "0.11.2"
"google/cloud-videointelligence": "0.10.3",
"google/cloud-vision": "0.11.3"
},
"suggest": {
"opis/closure": "May be used to serialize closures to process jobs in the batch daemon. Please require version ^3.",
Expand Down Expand Up @@ -176,4 +176,4 @@
]
}
}
}
}
13 changes: 11 additions & 2 deletions dev/src/ComponentIntegration/Command/ComponentIntegration.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

use Google\Cloud\Dev\GetComponentsTrait;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\RequestException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
Expand Down Expand Up @@ -179,7 +180,11 @@ private function getRemoteLatestVersion(Client $guzzle, array $component)
$uri .= '?access_token='. getenv('GH_OAUTH_TOKEN');
}

$res = $guzzle->get($uri);
try {
$res = $guzzle->get($uri);
} catch (RequestException $e) {
return '0.0.0';
}

$release = json_decode((string) $res->getBody(), true);

Expand Down Expand Up @@ -212,7 +217,11 @@ private function updateComposerFiles($tmpDir, array $components)
$composerFile = $component['tmpDir'] . DIRECTORY_SEPARATOR .'composer.json';
$composer = json_decode(file_get_contents($composerFile), true);
if (json_last_error() !== JSON_ERROR_NONE) {
throw new \RuntimeException('Could not decode composer file '. $composerFile);
throw new \RuntimeException(sprintf(
'Could not decode composer file %s. Got error %s',
$composerFile,
json_last_error_msg()
));
}

foreach ($aliases as $alias) {
Expand Down
Loading

0 comments on commit 6834308

Please sign in to comment.