chore: updates all dependencies and updates dependency script (GoogleCloudPlatform#1055)

Author: bshaffer

appengine/flexible/logging/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
-        "google/cloud-logging": "^1.16.1",
-        "google/cloud-error-reporting": "^0.15.0",
+        "google/cloud-logging": "^1.20.0",
+        "google/cloud-error-reporting": "^0.16.2",
         "silex/silex": "^2.0",
         "twig/twig": "^1.29"
     },

appengine/php55/grpc/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "google/cloud-spanner": "^1.15.0",
-        "google/cloud-monitoring": "^0.18.0",
+        "google/cloud-monitoring": "^1.0.0",
         "google/appengine-php-sdk": "^1.9"
     }
 }

appengine/php72/errorreporting/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/cloud-error-reporting": "^0.15.0"
+        "google/cloud-error-reporting": "^0.16.2"
     }
 }

appengine/php72/grpc/composer.json

@@ -1,8 +1,8 @@
 {
     "require": {
         "google/cloud-spanner": "^1.15.0",
-        "google/cloud-monitoring": "^0.18.0",
-        "google/cloud-speech": "^0.27.0"
+        "google/cloud-monitoring": "^1.0.0",
+        "google/cloud-speech": "^1.0.0"
     },
     "require-dev": {
         "paragonie/random_compat": "^2.0"

asset/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "google/cloud-storage": "^1.9",
-        "google/cloud-asset": "^0.4.0",
+        "google/cloud-asset": "^1.0.0",
         "symfony/console": " ^3.0"
     },
     "autoload": {

bigquerydatatransfer/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/cloud-bigquerydatatransfer": "^0.14.0"
+        "google/cloud-bigquerydatatransfer": "^1.0"
     }
 }

bigtable/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-bigtable": "^1.0.0",
+        "google/cloud-bigtable": "^1.3.1",
         "psr/cache": "^1.0"
     },
     "autoload-dev": {

debugger/composer.json

@@ -3,7 +3,7 @@
     "type": "project",
     "require": {
         "php": ">= 7.0",
-        "google/cloud-debugger": "^0.19.0",
+        "google/cloud-debugger": "^1.0.0",
         "silex/silex": "~2.0",
         "twig/twig": "^2.3"
     },

dlp/composer.json

@@ -2,7 +2,7 @@
     "name": "google/dlp-sample",
     "type": "project",
     "require": {
-        "google/cloud-dlp": "^0.22.0",
+        "google/cloud-dlp": "^0.26.1",
         "google/cloud-pubsub": "^1.11.1"
     }
 }

endpoints/getting-started/composer.json

@@ -2,7 +2,7 @@
     "require": {
         "silex/silex": " ^2.3",
         "symfony/console": " ^3.0",
-        "google/auth": "^1.5.1"
+        "google/auth": "^1.8.0"
     },
     "require-dev": {
         "symfony/browser-kit": " ^3.0",

error_reporting/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/cloud-error-reporting": "^0.15.0"
+        "google/cloud-error-reporting": "^0.16.2"
     }
 }

error_reporting/test/VerifyReportedErrorTrait.php

@@ -56,7 +56,8 @@ private function verifyReportedError($projectId, $message)
         // Iterate through all elements
         $testFunc = function () use ($errorStats, $projectName, $timeRange, $message) {
             $messages = [];
-            $response = $errorStats->listGroupStats($projectName, $timeRange, [
+            $response = $errorStats->listGroupStats($projectName, [
+                'timeRange' => $timeRange,
                 'pageSize' => 100,
             ]);
             foreach ($response->iterateAllElements() as $groupStat) {

firestore/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-firestore": "^1.4.1",
+        "google/cloud-firestore": "^1.12.1",
         "symfony/console": "^3.0"
     },
     "autoload": {

iap/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "symfony/console": "^2.8",
-        "google/auth":"^1.7.1",
+        "google/auth":"^1.8.0",
         "guzzlehttp/guzzle": "~6.3.3",
         "kelvinmo/simplejwt": "^0.2.4"
     },

iot/composer.json

@@ -2,7 +2,7 @@
     "name": "google/iot-sample",
     "type": "project",
     "require": {
-        "google/cloud-iot": "^0.9.0",
+        "google/cloud-iot": "^1.0.0",
         "symfony/console": "^3.3"
     },
     "autoload": {

iot/src/list_gateways.php

@@ -43,12 +43,12 @@ function list_gateways(
     $registryName = $deviceManager->registryName($projectId, $location, $registryId);
 
     // Pass field mask to retrieve the gateway configuration fields
-    $fieldMask = (new FieldMask())->setPaths(['config', 'gatewayConfig']);
+    $fieldMask = (new FieldMask())->setPaths(['config', 'gateway_config']);
 
     // Call the API
-    $devices = $deviceManager->listDevices($registryName,
-      ['fieldMask' => $fieldMask]
-    );
+    $devices = $deviceManager->listDevices($registryName, [
+        'fieldMask' => $fieldMask
+    ]);
 
     // Print the result
     $foundGateway = false;

language/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-language": "~0.18",
-        "google/cloud-storage": "^1.3"
+        "google/cloud-language": "^0.22.2",
+        "google/cloud-storage": "^1.20.1"
     }
 }

logging/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-logging": "^1.9.0",
+        "google/cloud-logging": "^1.20.0",
         "symfony/console": "^3.0",
         "monolog/monolog": "^1.23"
     },

monitoring/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "symfony/console": "^3.3",
-        "google/cloud-monitoring": "^0.18.0"
+        "google/cloud-monitoring": "^1.0.0"
     },
     "autoload": {
         "files": [

pubsub/app/composer.json

@@ -1,8 +1,8 @@
 {
   "require": {
     "php": ">=5.4",
-    "google/cloud-pubsub": "^1.5",
-    "google/cloud-datastore": "^1.2",
+    "google/cloud-pubsub": "^1.23.0",
+    "google/cloud-datastore": "^1.11.2",
     "silex/silex": "^2.3",
     "twig/twig": "^2.12",
     "symfony/twig-bridge": "^4.4"

secretmanager/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/cloud-secret-manager": "^0.3.0"
+        "google/cloud-secret-manager": "^1.0.0"
     }
 }

securitycenter/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-security-center": "^0.5.0",
-        "google/cloud-pubsub": "^1.21"
+        "google/cloud-security-center": "^0.6.0",
+        "google/cloud-pubsub": "^1.23.0"
     }
 }

spanner/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-spanner": "^1.27",
+        "google/cloud-spanner": "^1.27.1",
         "symfony/console": "^3.2"
     },
     "autoload": {

spanner/test/spannerBackupTest.php

@@ -17,6 +17,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
+use Google\Cloud\Core\ExponentialBackoff;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Backup;
 use Google\Cloud\Spanner\SpannerClient;
@@ -198,40 +199,28 @@ private function runCommand($commandName, $params = [])
 
     public static function tearDownAfterClass()
     {
-        if (!self::$instance->exists()) {
-            return;
-        }
-
-        self::waitForOperations();
+        if (self::$instance->exists()) {
+            self::waitForOperations();
 
-        $exceptions = [];
+            $backoff = new ExponentialBackoff(3);
 
-        $dbs = self::$instance->databases();
-        /** @var Database $db */
-        foreach ($dbs as $db) {
-            if (strstr($db->name(), self::$databaseId) !== false) {
-                try {
-                    $db->drop();
-                } catch (\Exception $e) {
-                    $exceptions[] = $e;
+            /** @var Database $db */
+            foreach (self::$instance->databases() as $db) {
+                if (false !== strpos($db->name(), self::$databaseId)) {
+                    $backoff->execute(function () use ($db) {
+                        $db->drop();
+                    });
                 }
             }
-        }
 
-        $backups = self::$instance->backups();
-        /** @var Backup $backup */
-        foreach ($backups as $backup) {
-            if (strstr($backup->name(), self::$databaseId) !== false) {
-                try {
-                    $backup->delete();
-                } catch (\Exception $e) {
-                    $exceptions[] = $e;
+            /** @var Backup $backup */
+            foreach (self::$instance->backups() as $backup) {
+                if (false !== strpos($backup->name(), self::$databaseId)) {
+                    $backoff->execute(function () use ($backup) {
+                        $backup->delete();
+                    });
                 }
             }
         }
-
-        if ($exceptions) {
-            throw new \RuntimeException(PHP_EOL . implode(PHP_EOL, $exceptions));
-        }
     }
 }

speech/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-speech": "^0.27.0",
-        "google/cloud-storage": "^1.3.1"
+        "google/cloud-speech": "^1.0.0",
+        "google/cloud-storage": "^1.20.1"
     }
 }

storage/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-storage": "^1.18.0",
+        "google/cloud-storage": "^1.20.1",
         "paragonie/random_compat": "^2.0",
         "symfony/console": " ^3.0"
     },

testing/run_dependency_update.sh

@@ -1,5 +1,6 @@
-#!/bin/bash
-# Copyright 2016 Google Inc.
+#!/usr/bin/env bash
+
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,36 @@
 
 set -ex
 
-# Loop through all directories containing "composer.json".
-# Update composer if a sample has a new major version that matches our requirements.
-find * -name "phpunit.xml*" -not -path '*vendor/*' -exec dirname {} \; | while read DIR; do
-    pushd $DIR
-    composer install
-    if composer outdated --direct -m | grep -q 'google/' ||
-        ! composer validate --no-check-publish ; then
-        composer update
+# Find all directories containing composer.json.
+directories=$(find . -name "composer.json" -not -path "**/vendor/*" -exec dirname {} \;)
+
+# Update dependencies in all directories containing composer.json.
+for SAMPLE_DIR in $directories; do
+  printf '\n### Checking dependencies in %s ###\n', "$SAMPLE_DIR"
+  pushd "$SAMPLE_DIR"
+  composer install --ignore-platform-reqs --no-dev
+
+  updatePackages=()
+  outdatedPackages=$(echo \
+    "$(composer outdated 'google/*' --direct --format=json | jq '.installed' 2>/dev/null) $(composer outdated 'firebase/*' --direct --format=json | jq '.installed' 2>/dev/null)" \
+    | jq -s add)
+
+  if [[ "$outdatedPackages" != "null" ]] && [[ "$outdatedPackages" != "[]" ]] ; then
+    count=$(echo "$outdatedPackages" | jq length)
+
+    for (( i = 0; i < count; i++ ))
+    do
+      name=$(echo "$outdatedPackages" | jq -r --arg i "$i" '.[$i | tonumber].name')
+      version=$(echo "$outdatedPackages" | jq -r --arg i "$i" '.[$i | tonumber].latest' | sed -e 's/^v//')
+      if [[ "${version:0:4}" != dev- ]]; then
+        updatePackages+=( "$name:^$version" )
+      fi
+    done
+
+    if [ ${#updatePackages[@]} -gt 0 ]; then
+      composer require --ignore-platform-reqs --update-no-dev --update-with-dependencies "${updatePackages[@]}"
     fi
-    popd
+  fi
+
+  popd
 done

texttospeech/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/cloud-text-to-speech": "^0.5.0"
+        "google/cloud-text-to-speech": "^1.0.0"
     }
 }

trace/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
         "opencensus/opencensus": "^0.2.1",
-        "google/cloud-trace": "^0.15.0"
+        "google/cloud-trace": "^1.0.0"
     }
 }

translate/composer.json

@@ -2,7 +2,7 @@
     "name": "google/translate-sample",
     "type": "project",
     "require": {
-        "google/cloud-translate": "^1.5"
+        "google/cloud-translate": "^1.7.2"
     },
     "require-dev": {
         "google/cloud-storage": "^1.14"

vision/composer.json

@@ -2,8 +2,8 @@
     "name": "google/vision",
     "type": "project",
     "require": {
-        "google/cloud-vision": "^0.24.0",
-        "google/cloud-storage": "^1.3",
+        "google/cloud-vision": "^1.0.0",
+        "google/cloud-storage": "^1.20.1",
         "symfony/console": "^3.1"
     },
     "autoload": {