- Updated API version references to be v1beta14

- Updated URLs pointing to global resources to include '/global' in the URL path
- Added DEFAULT_ZONE_NAME and updated DEFAULT_ZONE to include it
- Updated methods that now require a Zone parameter to use DEFAULT_ZONE_NAME
- Updated DEFAULT_IMAGE to new image name since the old image name referenced an image resource that has been deprecated
- Updated listOperations to be listGlobalOperations
- Removed code referencing API Developer Key
- Updated README.md file to include URL to Google API PHP Client
- Updated README.md file to remove references to developer key
- Updated README.md file to add instructions for Project ID

Author: Jonathan Simon

README.md

@@ -12,6 +12,7 @@ the sample application.
 - PHP Curl extension [http://www.php.net/manual/en/intro.curl.php]
 - PHP JSON extension [http://php.net/manual/en/book.json.php]
 - The google-api-php-client library checked out locally
+  [https://code.google.com/p/google-api-php-client/] 
 
 ## Setup Authentication
 NOTE: This README assumes that you have enabled access to the Google Compute
@@ -26,18 +27,18 @@ generated any client IDs, or "Create another client ID..." if you have
 - Select "Web Application" as the "Application type"
 - Click "Create client ID"
 - Click "Edit settings..." for your new client ID
-- Under the redirect URI, enter the location of your JavaScript application
+- Under the redirect URI, enter the location of your application
 - Click "Update"
+- Click on "Overview" in the left column and note the Project ID
 
-2) Update app.php with the redirect uri, consumer key, secret, and developer
-key obtained in step 1.
+2) Update app.php with the redirect uri, consumer key, secret, and Project ID
+obtained in step 1.
 - Update 'YOUR_CLIENT_ID' with your oauth2 client id.
 - Update 'YOUR_CLIENT_SECRET' with your oauth2 client secret.
 - Update 'YOUR_REDIRECT_URI' with the fully qualified
 redirect URI.
-- Update 'YOUR_DEVELOPER_KEY' with your developer key.
-This is listed under "Simple API Access" at the very bottom of the page,
-in the Google API Console.
+- Update 'YOUR_GOOGLE_COMPUTE_ENGINE_PROJECT' with your Project ID from the 
+API Console.
 
 ## Running the Sample Application
 3) Load app.php on your web server, and visit the appropriate website in

app.php

@@ -35,7 +35,6 @@
 $client->setClientId('YOUR_CLIENT_ID');
 $client->setClientSecret('YOUR_CLIENT_SECRET');
 $client->setRedirectUri('YOUR_REDIRECT_URI');
-$client->setDeveloperKey('YOUR_DEVELOPER_KEY');
 $computeService = new Google_ComputeService($client);
 
 /**
@@ -46,20 +45,21 @@
 /**
  * Constants for sample request parameters.
  */
-define('API_VERSION', 'v1beta13');
+define('API_VERSION', 'v1beta14');
 define('BASE_URL', 'https://www.googleapis.com/compute/'.
   API_VERSION . '/projects/');
 define('GOOGLE_PROJECT', 'google');
 define('DEFAULT_PROJECT', $project);
 define('DEFAULT_NAME', 'new-node');
 define('DEFAULT_NAME_WITH_METADATA', 'new-node-with-metadata');
 define('DEFAULT_MACHINE_TYPE', BASE_URL . DEFAULT_PROJECT .
-  '/machineTypes/n1-standard-1');
-define('DEFAULT_ZONE', BASE_URL . DEFAULT_PROJECT . '/zones/us-central1-a');
+  '/global/machineTypes/n1-standard-1');
+define('DEFAULT_ZONE_NAME', 'us-central1-a');
+define('DEFAULT_ZONE', BASE_URL . DEFAULT_PROJECT . '/zones/' . DEFAULT_ZONE_NAME);
 define('DEFAULT_IMAGE', BASE_URL . GOOGLE_PROJECT .
-  '/images/ubuntu-12-04-v20120912');
+  '/global/images/gcel-12-04-v20130104');
 define('DEFAULT_NETWORK', BASE_URL . DEFAULT_PROJECT .
-  '/networks/default');
+  '/global/networks/default');
 
 /**
  * Generates the markup for a specific Google Compute Engine API request.
@@ -119,7 +119,8 @@ function generateMarkup($apiRequestName, $apiResponse) {
    * Google Compute Engine API request to retrieve the list of instances in your
    * Google Compute Engine project.
    */
-  $instances = $computeService->instances->listInstances(DEFAULT_PROJECT);
+  $instances = $computeService->instances->listInstances(DEFAULT_PROJECT,
+    DEFAULT_ZONE_NAME);
   $instancesListMarkup = generateMarkup('List Instances', $instances);
 
   /**
@@ -164,7 +165,7 @@ function generateMarkup($apiRequestName, $apiResponse) {
    */
   $name = DEFAULT_NAME;
   $machineType = DEFAULT_MACHINE_TYPE;
-  $zone = DEFAULT_ZONE;
+  $zone = DEFAULT_ZONE_NAME;
   $image = DEFAULT_IMAGE;
 
   $googleNetworkInterfaceObj = new Google_NetworkInterface();
@@ -174,12 +175,11 @@ function generateMarkup($apiRequestName, $apiResponse) {
   $new_instance = new Google_Instance();
   $new_instance->setName($name);
   $new_instance->setImage($image);
-  $new_instance->setZone($zone);
   $new_instance->setMachineType($machineType);
   $new_instance->setNetworkInterfaces(array($googleNetworkInterfaceObj));
 
   $insertInstance = $computeService->instances->insert(DEFAULT_PROJECT,
-    $new_instance);
+    $zone, $new_instance);
   $insertInstanceMarkup = generateMarkup('Insert Instance', $insertInstance);
 
   /**
@@ -188,7 +188,7 @@ function generateMarkup($apiRequestName, $apiResponse) {
    */
   $name = DEFAULT_NAME_WITH_METADATA;
   $machineType = DEFAULT_MACHINE_TYPE;
-  $zone = DEFAULT_ZONE;
+  $zone = DEFAULT_ZONE_NAME;
   $image = DEFAULT_IMAGE;
 
   $googleNetworkInterfaceObj = new Google_NetworkInterface();
@@ -205,54 +205,55 @@ function generateMarkup($apiRequestName, $apiResponse) {
   $new_instance = new Google_Instance();
   $new_instance->setName($name);
   $new_instance->setImage($image);
-  $new_instance->setZone($zone);
   $new_instance->setMachineType($machineType);
   $new_instance->setNetworkInterfaces(array($googleNetworkInterfaceObj));
   $new_instance->setMetadata($metadata);
 
   $insertInstanceWithMetadata = $computeService->instances->insert(
-    DEFAULT_PROJECT, $new_instance);
+    DEFAULT_PROJECT, $zone, $new_instance);
   $insertInstanceWithMetadataMarkup = generateMarkup(
     'Insert Instance With Metadata', $insertInstanceWithMetadata);
 
   /**
    * Google Compute Engine API request to get an instance matching the outlined
    * parameters from your Google Compute Engine project.
    */
-  $getInstance = $computeService->instances->get(DEFAULT_PROJECT, DEFAULT_NAME);
+  $getInstance = $computeService->instances->get(DEFAULT_PROJECT,
+    DEFAULT_ZONE_NAME, DEFAULT_NAME);
   $getInstanceMarkup = generateMarkup('Get Instance', $getInstance);
 
   /**
    * Google Compute Engine API request to get an instance matching the outlined
    * parameters from your Google Compute Engine project.
    */
   $getInstanceWithMetadata = $computeService->instances->get(DEFAULT_PROJECT,
-    DEFAULT_NAME_WITH_METADATA);
+    DEFAULT_ZONE_NAME, DEFAULT_NAME_WITH_METADATA);
   $getInstanceWithMetadataMarkup = generateMarkup('Get Instance With Metadata',
     $getInstanceWithMetadata);
 
   /**
    * Google Compute Engine API request to delete an instance matching the
    * outlined parameters from your Google Compute Engine project.
    */
-  $deleteInstance = $computeService->instances->delete(DEFAULT_PROJECT, DEFAULT_NAME);
+  $deleteInstance = $computeService->instances->delete(DEFAULT_PROJECT,
+    DEFAULT_ZONE_NAME, DEFAULT_NAME);
   $deleteInstanceMarkup = generateMarkup('Delete Instance', $deleteInstance);
 
   /**
    * Google Compute Engine API request to delete an instance matching the
    * outlined parameters from your Google Compute Engine project.
    */
   $deleteInstanceWithMetadata = $computeService->instances->delete(DEFAULT_PROJECT,
-    DEFAULT_NAME_WITH_METADATA);
+    DEFAULT_ZONE_NAME, DEFAULT_NAME_WITH_METADATA);
   $deleteInstanceWithMetadataMarkup = generateMarkup(
     'Delete Instance With Metadata', $deleteInstanceWithMetadata);
 
   /**
-   * Google Compute Engine API request to retrieve the list of all operations
-   * associated with your Google Compute Engine project.
+   * Google Compute Engine API request to retrieve the list of all global
+   * operations associated with your Google Compute Engine project.
    */
-  $operations = $computeService->operations->listOperations(DEFAULT_PROJECT);
-  $operationsListMarkup = generateMarkup('List Operations', $operations);
+  $globalOperations = $computeService->globalOperations->listGlobalOperations(DEFAULT_PROJECT);
+  $operationsListMarkup = generateMarkup('List Global Operations', $globalOperations);
 
   // The access token may have been updated lazily.
   $_SESSION['access_token'] = $client->getAccessToken();
@@ -323,7 +324,7 @@ function generateMarkup($apiRequestName, $apiResponse) {
        endif ?>
 
        if(isset($operationsListMarkup)): ?>
-        listOperations"> print $operationsListMarkup ?>
+        listGlobalOperations"> print $operationsListMarkup ?>
        endif ?>