Translate API no longer requires an API key. (#248)

GoogleCloudPlatform · Nov 16, 2016 · 56899a2 · 56899a2
1 parent e375441
commit 56899a2
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 117 deletions.
diff --git a/translate/api/composer.json b/translate/api/composer.json
@@ -2,7 +2,7 @@
     "name": "google/translate-sample",
     "type": "project",
     "require": {
-        "google/cloud": "^0.11.1",
+        "google/cloud": "^0.13",
         "symfony/console": "^3.1"
     },
     "autoload": {

diff --git a/translate/api/composer.lock b/translate/api/composer.lock
diff --git a/translate/api/src/DetectLanguageCommand.php b/translate/api/src/DetectLanguageCommand.php
@@ -20,7 +20,6 @@
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -38,7 +37,7 @@ protected function configure()
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command detects which language text was written in using the Google Cloud Translate API.
 
-    <info>php %command.full_name% -k YOUR-API-KEY "Your text here"</info>
+    <info>php %command.full_name% "Your text here"</info>
 
 EOF
             )
@@ -47,18 +46,11 @@ protected function configure()
                 InputArgument::REQUIRED,
                 'The text to examine.'
             )
-            ->addOption(
-                'api-key',
-                'k',
-                InputOption::VALUE_REQUIRED,
-                'Your API key.'
-            )
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $apiKey = $input->getOption('api-key');
         $text = $input->getArgument('text');
         require(__DIR__ . '/snippets/detect_language.php');
     }

diff --git a/translate/api/src/ListCodesCommand.php b/translate/api/src/ListCodesCommand.php
@@ -20,7 +20,6 @@
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -37,22 +36,15 @@ protected function configure()
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command lists all the language codes in the Google Cloud Translate API.
 
-    <info>php %command.full_name% -k YOUR-API-KEY</info>
+    <info>php %command.full_name%</info>
 
 EOF
             )
-            ->addOption(
-                'api-key',
-                'k',
-                InputOption::VALUE_REQUIRED,
-                'Your API key.'
-            )
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $apiKey = $input->getOption('api-key');
         require(__DIR__ . '/snippets/list_codes.php');
     }
 }
diff --git a/translate/api/src/ListLanguagesCommand.php b/translate/api/src/ListLanguagesCommand.php
@@ -37,16 +37,10 @@ protected function configure()
             ->setHelp(<<<EOF
 The <info>%command.name%</info> lists language codes and names in the Google Cloud Translate API.
 
-    <info>php %command.full_name% -k YOUR-API-KEY -t en</info>
+    <info>php %command.full_name% -t en</info>
 
 EOF
             )
-            ->addOption(
-                'api-key',
-                'k',
-                InputOption::VALUE_REQUIRED,
-                'Your API key.'
-            )
             ->addOption(
                 'target-language',
                 't',
@@ -58,7 +52,6 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $apiKey = $input->getOption('api-key');
         $targetLanguage = $input->getOption('target-language');
         require(__DIR__ . '/snippets/list_languages.php');
     }

diff --git a/translate/api/src/TranslateCommand.php b/translate/api/src/TranslateCommand.php
@@ -37,16 +37,10 @@ protected function configure()
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command transcribes audio using the Google Cloud Translate API.
 
-    <info>php %command.full_name% -k YOUR-API-KEY -t ja "Hello World."</info>
+    <info>php %command.full_name% -t ja "Hello World."</info>
 
 EOF
             )
-            ->addOption(
-                'api-key',
-                'k',
-                InputOption::VALUE_REQUIRED,
-                'Your API key.'
-            )
             ->addArgument(
                 'text',
                 InputArgument::REQUIRED,
@@ -63,7 +57,6 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $apiKey = $input->getOption('api-key');
         $text = $input->getArgument('text');
         $targetLanguage = $input->getOption('target-language');
         require(__DIR__ . '/snippets/translate.php');

diff --git a/translate/api/src/snippets/detect_language.php b/translate/api/src/snippets/detect_language.php
@@ -19,12 +19,9 @@
 // [START translate_detect_language]
 use Google\Cloud\Translate\TranslateClient;
 
-// $apiKey = 'YOUR-API-KEY';
 // $text = 'The text whose language to detect.  This will be detected as en.';
 
-$translate = new TranslateClient([
-    'key' => $apiKey,
-]);
+$translate = new TranslateClient();
 $result = $translate->detectLanguage($text);
 print("Language code: $result[languageCode]\n");
 print("Confidence: $result[confidence]\n");

diff --git a/translate/api/src/snippets/list_codes.php b/translate/api/src/snippets/list_codes.php
@@ -19,11 +19,7 @@
 // [START translate_list_codes]
 use Google\Cloud\Translate\TranslateClient;
 
-// $apiKey = 'YOUR-API-KEY';
-
-$translate = new TranslateClient([
-    'key' => $apiKey,
-]);
+$translate = new TranslateClient();
 foreach ($translate->languages() as $code) {
     print("$code\n");
 }

diff --git a/translate/api/src/snippets/list_languages.php b/translate/api/src/snippets/list_languages.php
@@ -21,12 +21,9 @@
 // [START translate_list_language_names]
 use Google\Cloud\Translate\TranslateClient;
 
-// $apiKey = 'YOUR-API-KEY'
 // $targetLanguage = 'en'; // Print the names of the languages in which language?
 
-$translate = new TranslateClient([
-    'key' => $apiKey,
-]);
+$translate = new TranslateClient();
 $result = $translate->localizedLanguages([
     'target' => $targetLanguage,
 ]);

diff --git a/translate/api/src/snippets/translate.php b/translate/api/src/snippets/translate.php
@@ -21,13 +21,10 @@
 // [START translate_translate_text]
 use Google\Cloud\Translate\TranslateClient;
 
-// $apiKey = 'YOUR-API-KEY'
 // $text = 'The text to translate."
 // $targetLanguage = 'ja';  // Which language to translate to?
 
-$translate = new TranslateClient([
-    'key' => $apiKey
-]);
+$translate = new TranslateClient();
 $result = $translate->translate($text, [
     'target' => $targetLanguage,
 ]);