chore: upgrade auth samples to latest format (GoogleCloudPlatform#1375)

Author: bshaffer

auth/README.md

@@ -26,32 +26,24 @@ methods will work on any Google Cloud API.
 4.  **Install dependencies** via [Composer](http://getcomposer.org/doc/00-intro.md).
     Run `php composer.phar install --no-dev` (if composer is installed locally) or `composer install --no-dev`
     (if composer is installed globally).
-5.  Run `php auth.php`. The following commands are available and work on command line:
+5.  **Run the samples** to run the auth samples, run any of the files in `src/` on the CLI:
 ```
-  auth-cloud-implicit                      Authenticate to a cloud client library using a service account implicitly.
-  auth-cloud-explicit                      Authenticate to a cloud client library using a service account explicitly.
-  auth-api-implicit                        Authenticate to a cloud API using a service account implicitly.
-  auth-api-explicit                        Authenticate to a cloud API using a service account explicitly.
-  auth-http-implicit                       Authenticate to a cloud API with HTTP using a service account implicitly.
-  auth-http-explicit                       Authenticate to a cloud API with HTTP using a service account explicitly.
+$ php src/auth_api_explicit.php
+
+Usage: auth_api_explicit.php $projectId $serviceAccountPath
+
+    @param string $projectId           The Google project ID.
+    @param string $serviceAccountPath  Path to service account credentials JSON.
 ```
-6. The following commands are available but will throw a ServiceException when
-run from command-line. The Compute Engine method only works on Compute Engine,
-App Engine Flexible, Cloud Functions, and Container Engine. The App Engine
-method only works on App Engine Standard.
+6. The following files are available but cannot be run from the CLI. The Compute
+methods only work on Compute Engine, App Engine, Cloud Functions,
+and Container Engine.
 ```
-  auth-cloud-explicit-compute-engine       Authenticate to a cloud client library using Compute Engine credentials explicitly.
-  auth-cloud-explicit-app-engine           Authenticate to a cloud client library using App Engine Standard credentials explicitly.
-  auth-api-explicit-compute-engine         Authenticate to a cloud API using Compute Engine credentials explicitly.
-  auth-api-explicit-app-engine             Authenticate to a cloud API using App Engine Standard credentials explicitly.
+  src/auth_cloud_explicit_compute.php
+  src/auth_api_explicit_compute.php
 ```
-7. You can test the samples that use Compute Engine / App Engine credentials by
-deploying to either App Engine Flexible (which allows usage of Compute Engine
-credentials since App Engine Flexible apps run on Compute Engine instances) or
-App Engine Standard. Run either `gcloud app deploy app-standard.yaml` or
-`gcloud app deploy app-flex.yaml`.
-
-8. Run `php auth.php COMMAND --help` to print information about the usage of each command.
+7. You can test the samples that use Compute credentials by deploying to App
+Engine Standard. Run `gcloud app deploy`.
 
 ## Contributing changes
 

auth/app-flex.yaml

@@ -0,0 +1 @@
+runtime: php72

auth/app-standard.yaml

@@ -2,24 +2,20 @@
     "require": {
         "google/apiclient": "^2.1",
         "google/cloud-storage": "^1.3",
-        "symfony/console": " ^3.0",
         "google/auth":"^1.0"
     },
+    "scripts": {
+        "pre-autoload-dump": "Google\\Task\\Composer::cleanup"
+    },
+    "extra": {
+        "google/apiclient-services": [
+            "Storage"
+        ]
+    },
     "autoload": {
-        "psr-4": {
-            "Google\\Cloud\\Samples\\Auth\\": "src/"
-        },
         "files": [
-            "src/auth_cloud_implicit.php",
-            "src/auth_cloud_explicit.php",
-            "src/auth_cloud_explicit_compute_engine.php",
-            "src/auth_cloud_explicit_app_engine.php",
-            "src/auth_api_implicit.php",
-            "src/auth_api_explicit.php",
-            "src/auth_api_explicit_compute_engine.php",
-            "src/auth_api_explicit_app_engine.php",
-            "src/auth_http_implicit.php",
-            "src/auth_http_explicit.php"
+            "src/auth_cloud_explicit_compute.php",
+            "src/auth_api_explicit_compute.php"
         ]
     }
 }

auth/app.yaml

@@ -17,33 +17,20 @@
 
 namespace Google\Cloud\Samples\Auth;
 
-use Google\Auth\Credentials\GCECredentials;
-use google\appengine\api\app_identity\AppIdentityService;
-
 // Install composer dependencies with "composer install --no-dev"
 // @see http://getcomposer.org for more information.
 require __DIR__ . '/vendor/autoload.php';
 
-$onGce = GCECredentials::onGce();
-$projectId = $onGce
-   ? getenv('GCLOUD_PROJECT')
-   : AppIdentityService::getApplicationId();
+$projectId = getenv('GOOGLE_CLOUD_PROJECT')
+
 ?>
 
 Buckets retrieved using the cloud client library:
 
- if ($onGce): ?>
- auth_cloud_explicit_compute_engine($projectId) ?>
- else: ?>
- auth_cloud_explicit_app_engine($projectId) ?>
- endif ?>
+ auth_cloud_explicit_compute($projectId) ?>
 
 
 Buckets retrieved using the api client:
 
- if ($onGce): ?>
- auth_api_explicit_compute_engine($projectId) ?>
- else: ?>
- auth_api_explicit_app_engine($projectId) ?>
- endif ?>
+ auth_api_explicit_compute($projectId) ?>
 

auth/auth.php

@@ -26,6 +26,12 @@
 use Google_Client;
 use Google_Service_Storage;
 
+/**
+ * Authenticate to a cloud API using a service account explicitly.
+ *
+ * @param string $projectId           The Google project ID.
+ * @param string $serviceAccountPath  Path to service account credentials JSON.
+ */
 function auth_api_explicit($projectId, $serviceAccountPath)
 {
     $client = new Google_Client();
@@ -42,3 +48,6 @@ function auth_api_explicit($projectId, $serviceAccountPath)
     }
 }
 # [END auth_api_explicit]
+
+require_once __DIR__ . '/../../testing/sample_helpers.php';
+\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);