Remove "Project ID" from Speech Veneer Samples (GoogleCloudPlatform#162)

Author: bshaffer

speech/api/README.md

@@ -16,9 +16,9 @@ Install the dependencies for this library via [composer](https://getcomposer.org
     $ cd /path/to/php-docs-samples/speech/api
     $ composer install
 
-Configure your project using [gcloud](https://cloud.google.com/sdk/gcloud/)
+Configure your project using [Application Default Credentials][adc]
 
-    $ gcloud config set project YOUR_PROJECT_ID
+    $ export GOOGLE_APPLICATION_CREDENTIALS=/path/to/credentials.json
 
 ## Audio Format
 
@@ -44,3 +44,4 @@ php speech.php transcribe YourAudio.raw --encoding LINEAR16 --sample-rate 16000
 [choose-encoding]: https://cloud.google.com/speech/docs/best-practices#choosing_an_audio_encoding
 [sox]: http://sox.sourceforge.net/
 [grpc]: http://grpc.io
+[adc]: https://developers.google.com/identity/protocols/application-default-credentials

speech/api/src/ProjectIdTrait.php

@@ -30,8 +30,6 @@
  */
 class TranscribeCommand extends Command
 {
-    use ProjectIdTrait;
-
     protected function configure()
     {
         $this
@@ -49,13 +47,6 @@ protected function configure()
                 InputArgument::REQUIRED,
                 'The audio file to transcribe'
             )
-            ->addOption(
-                'project',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'The Google Cloud Platform project name to use for this invocation. ' .
-                'If omitted then the current gcloud project is assumed. '
-            )
             ->addOption(
                 'encoding',
                 null,
@@ -81,9 +72,6 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if (!$projectId = $input->getOption('project')) {
-            $projectId = $this->getProjectIdFromGcloud();
-        }
         $encoding = $input->getOption('encoding');
         $sampleRate = $input->getOption('sample-rate');
         $audioFile = $input->getArgument('audio-file');
@@ -93,9 +81,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         ];
 
         if ($input->getOption('sync')) {
-            transcribe_sync($projectId, $audioFile, $options);
+            transcribe_sync($audioFile, $options);
         } else {
-            transcribe_async($projectId, $audioFile, $options);
+            transcribe_async($audioFile, $options);
         }
     }
 }

speech/api/src/TranscribeCommand.php

@@ -32,19 +32,16 @@
  * Transcribe an audio file using Google Cloud Speech API
  * Example:
  * ```
- * transcribe_async($projectId, '/path/to/audiofile.wav');
+ * transcribe_async('/path/to/audiofile.wav');
  * ```.
  *
- * @param string $projectId The Google project ID.
  * @param string $audioFile path to an audio file.
  *
  * @return string the text transcription
  */
-function transcribe_async($projectId, $audioFile, $options = [])
+function transcribe_async($audioFile, $options = [])
 {
-    $builder = new ServiceBuilder([
-        'projectId' => $projectId,
-    ]);
+    $builder = new ServiceBuilder();
     $speech = $builder->speech();
     $operation = $speech->beginRecognizeOperation(
         fopen($audioFile, 'r'),

speech/api/src/functions/transcribe_async.php

@@ -30,19 +30,16 @@
  * Transcribe an audio file using Google Cloud Speech API
  * Example:
  * ```
- * transcribe_sync($projectId, '/path/to/audiofile.wav');
+ * transcribe_sync('/path/to/audiofile.wav');
  * ```.
  *
- * @param string $projectId The Google project ID.
  * @param string $audioFile path to an audio file.
  *
  * @return string the text transcription
  */
-function transcribe_sync($projectId, $audioFile, $options = [])
+function transcribe_sync($audioFile, $options = [])
 {
-    $builder = new ServiceBuilder([
-        'projectId' => $projectId,
-    ]);
+    $builder = new ServiceBuilder();
     $speech = $builder->speech();
     $results = $speech->recognize(
         fopen($audioFile, 'r'),

speech/api/src/functions/transcribe_sync.php

@@ -41,9 +41,6 @@ public function testTranscribe($audioFile, $encoding, $sampleRate)
         if (!self::$hasCredentials) {
             $this->markTestSkipped('No application credentials were found.');
         }
-        if (!$projectId = getenv('GOOGLE_PROJECT_ID')) {
-            $this->markTestSkipped('No project ID');
-        }
 
         $application = new Application();
         $application->add(new TranscribeCommand());
@@ -53,7 +50,6 @@ public function testTranscribe($audioFile, $encoding, $sampleRate)
                 'audio-file' => $audioFile,
                 '--encoding' => $encoding,
                 '--sample-rate' => $sampleRate,
-                '--project' => $projectId
             ],
             ['interactive' => false]
         );