Merge pull request #1 from GoogleCloudPlatform/master

New

.travis.yml

@@ -1,7 +1,8 @@
 language: java
 jdk:
-  - oraclejdk7
-env: GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/service-account.json
+  - oraclejdk8
+env:
+  - GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/service-account.json GCLOUD_PROJECT=cloud-samples-tests
 before_install:
   - openssl aes-256-cbc -K $encrypted_99d8b304f94b_key -iv $encrypted_99d8b304f94b_iv -in service-account.json.enc -out service-account.json -d
 

appengine/appidentity/.gitignore

@@ -0,0 +1,7 @@
+# Eclipse files
+.project
+.classpath
+.settings
+
+# Target folders
+target/

appengine/appidentity/README.md

@@ -0,0 +1,28 @@
+# App Identity sample for Google App Engine
+This sample demonstrates how to use the App Identity APIs on Google App Engine
+
+## Running locally
+This example uses the
+[Maven gcloud plugin](https://cloud.google.com/appengine/docs/java/managed-vms/maven).
+To run this sample locally:
+
+    $ mvn gcloud:run
+
+## Deploying
+In the following command, replace YOUR-PROJECT-ID with your
+[Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber).
+
+    $ mvn gcloud:deploy -Dgcloud.gcloud_project=YOUR-PROJECT-ID
+
+## Setup
+To save your project settings so that you don't need to enter the
+`-Dgcloud.gcloud_project=YOUR-CLOUD-PROJECT-ID` parameters, you can:
+
+1. Update the <application> tag in src/main/webapp/WEB-INF/appengine-web.xml
+   with your project name.
+
+You will now be able to run
+
+    $ mvn gcloud:deploy
+
+without the need for any additional parameters.

appengine/appidentity/pom.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2015 Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <groupId>com.example.appengine</groupId>
+  <artifactId>appidentity</artifactId>
+
+  <properties>
+    <appengine.target.version>1.9.30</appengine.target.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>${appengine.target.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>19.0</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>20151123</version>
+    </dependency>
+
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.10.19</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-testing</artifactId>
+      <version>${appengine.target.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-stubs</artifactId>
+      <version>${appengine.target.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-tools-sdk</artifactId>
+      <version>${appengine.target.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.27</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <!-- for hot reload of the web application -->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <version>3.3</version>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.google.appengine</groupId>
+        <artifactId>gcloud-maven-plugin</artifactId>
+        <version>2.0.9.90.v20151210</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>

appengine/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.appengine.appidentity;
+
+import com.google.apphosting.api.ApiProxy;
+import com.google.apphosting.api.ApiProxy.Environment;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+public class IdentityServlet extends HttpServlet {
+
+  // [START versioned_hostnames]
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    resp.setContentType("text/plain");
+    ApiProxy.Environment env = ApiProxy.getCurrentEnvironment();
+    resp.getWriter().print("default_version_hostname: ");
+    resp.getWriter()
+        .println(env.getAttributes().get("com.google.appengine.runtime.default_version_hostname"));
+  }
+  // [END versioned_hostnames]
+}

appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java

@@ -0,0 +1,79 @@
+/**
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.appengine.appidentity;
+
+import com.google.appengine.api.appidentity.AppIdentityService;
+import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
+import com.google.common.io.CharStreams;
+
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+
+@SuppressWarnings("serial")
+class UrlShortener {
+  // [START asserting_identity_to_Google_APIs]
+  /**
+   * Returns a shortened URL by calling the Google URL Shortener API.
+   *
+   * <p>Note: Error handling elided for simplicity.
+   */
+  public String createShortUrl(String longUrl) throws Exception {
+    ArrayList<String> scopes = new ArrayList<String>();
+    scopes.add("https://www.googleapis.com/auth/urlshortener");
+    AppIdentityService appIdentity = AppIdentityServiceFactory.getAppIdentityService();
+    AppIdentityService.GetAccessTokenResult accessToken = appIdentity.getAccessToken(scopes);
+    // The token asserts the identity reported by appIdentity.getServiceAccountName()
+    JSONObject request = new JSONObject();
+    request.put("longUrl", longUrl);
+
+    URL url = new URL("https://www.googleapis.com/urlshortener/v1/url?pp=1");
+    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+    connection.setDoOutput(true);
+    connection.setRequestMethod("POST");
+    connection.addRequestProperty("Content-Type", "application/json");
+    connection.addRequestProperty("Authorization", "Bearer " + accessToken.getAccessToken());
+
+    OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
+    request.write(writer);
+    writer.close();
+
+    if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+      // Note: Should check the content-encoding.
+      //       Any JSON parser can be used; this one is used for illustrative purposes.
+      JSONTokener response_tokens = new JSONTokener(connection.getInputStream());
+      JSONObject response = new JSONObject(response_tokens);
+      return (String) response.get("id");
+    } else {
+      try (InputStream s = connection.getErrorStream();
+          InputStreamReader r = new InputStreamReader(s, StandardCharsets.UTF_8)) {
+        throw new RuntimeException(String.format(
+            "got error (%d) response %s from %s",
+            connection.getResponseCode(),
+            CharStreams.toString(r),
+            connection.toString()));
+      }
+    }
+  }
+  // [END asserting_identity_to_Google_APIs]
+}

appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java

@@ -0,0 +1,75 @@
+/**
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.appengine.appidentity;
+
+import com.google.appengine.api.users.UserService;
+import com.google.appengine.api.users.UserServiceFactory;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLDecoder;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+public class UrlShortenerServlet extends HttpServlet {
+  private final UrlShortener shortener;
+
+  public UrlShortenerServlet() {
+    shortener = new UrlShortener();
+  }
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    PrintWriter w = resp.getWriter();
+    w.println("<!DOCTYPE html>");
+    w.println("<meta charset=\"utf-8\">");
+    w.println("<title>Asserting Identity to Google APIs - App Engine App Identity Example</title>");
+    w.println("<form method=\"post\">");
+    w.println("<label for=\"longUrl\">URL:</label>");
+    w.println("<input id=\"longUrl\" name=\"longUrl\" type=\"text\">");
+    w.println("<input type=\"submit\" value=\"Shorten\">");
+    w.println("</form>");
+  }
+
+  @Override
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    resp.setContentType("text/plain");
+    String longUrl = req.getParameter("longUrl");
+    if (longUrl == null) {
+      resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "missing longUrl parameter");
+      return;
+    }
+
+    String shortUrl;
+    PrintWriter w = resp.getWriter();
+    try {
+      shortUrl = shortener.createShortUrl(longUrl);
+    } catch (Exception e) {
+      resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      w.println("error shortening URL: " + longUrl);
+      e.printStackTrace(w);
+      return;
+    }
+
+    w.print("long URL: ");
+    w.println(longUrl);
+    w.print("short URL: ");
+    w.println(shortUrl);
+  }
+}

appengine/appidentity/src/main/webapp/WEB-INF/appengine-web.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>YOUR-PROJECT-ID</application>
+  <threadsafe>true</threadsafe>
+  <vm>true</vm>
+</appengine-web-app>

appengine/appidentity/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  version="2.5">
+  <servlet>
+    <servlet-name>appidentity</servlet-name>
+    <servlet-class>com.example.appengine.appidentity.IdentityServlet</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>urlshortener</servlet-name>
+    <servlet-class>com.example.appengine.appidentity.UrlShortenerServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>appidentity</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>urlshortener</servlet-name>
+    <url-pattern>/shorten</url-pattern>
+  </servlet-mapping>
+</web-app>