Skip to content

Commit 72727f8

Browse files
frankynfrankyn
authored
Merge branch 'master' into endpoints-region-tags
2 parents 0d5d0b1 + 0ab44c6 commit 72727f8

File tree

51 files changed

+1476
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1476
-142
lines changed

‎appengine-java8/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<maven.compiler.source>1.8</maven.compiler.source>
34-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
34+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
3535
</properties>
3636

3737
<dependencies>

‎appengine-java8/appidentity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<properties>
3131
<maven.compiler.target>1.8</maven.compiler.target>
3232
<maven.compiler.source>1.8</maven.compiler.source>
33-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
3434
</properties>
3535

3636
<dependencies>

‎appengine-java8/cloudsql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.appengine</groupId>
5151
<artifactId>appengine-api-1.0-sdk</artifactId>
52-
<version>1.9.57</version>
52+
<version>1.9.58</version>
5353
</dependency>
5454

5555
<dependency>

‎appengine-java8/endpoints-v2-backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.google.appengine</groupId>
5757
<artifactId>appengine-api-1.0-sdk</artifactId>
58-
<version>1.9.57</version>
58+
<version>1.9.58</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>javax.servlet</groupId>

‎appengine-java8/endpoints-v2-guice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-1.0-sdk</artifactId>
63-
<version>1.9.57</version>
63+
<version>1.9.58</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>javax.servlet</groupId>

‎appengine-java8/endpoints-v2-migration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ limitations under the License.
4747
<dependency>
4848
<groupId>com.google.appengine</groupId>
4949
<artifactId>appengine-api-1.0-sdk</artifactId>
50-
<version>1.9.57</version>
50+
<version>1.9.58</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>javax.servlet</groupId>

‎appengine-java8/images/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
2121
<artifactId>appengine-images-j8</artifactId>
2222

2323
<properties>
24-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
24+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
2525
</properties>
2626

2727
<parent>

‎appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.appengine.api.images.Image;
2323
import com.google.appengine.api.images.ImagesService;
2424
import com.google.appengine.api.images.ImagesServiceFactory;
25+
import com.google.appengine.api.images.ServingUrlOptions;
2526
import com.google.appengine.api.images.Transform;
2627
import com.google.appengine.tools.cloudstorage.GcsFileOptions;
2728
import com.google.appengine.tools.cloudstorage.GcsFilename;
@@ -108,6 +109,16 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
108109
ByteBuffer.wrap(rotatedImage.getImageData()));
109110
//[END rotate]
110111

112+
// [START servingUrl]
113+
// Create a fixed dedicated URL that points to the GCS hosted file
114+
ServingUrlOptions options = ServingUrlOptions.Builder
115+
.withGoogleStorageFileName("/gs/" + bucket + "/image.jpeg")
116+
.imageSize(150)
117+
.crop(true)
118+
.secureUrl(true);
119+
String url = imagesService.getServingUrl(options);
120+
// [END servingUrl]
121+
111122
// Output some simple HTML to display the images we wrote to Cloud Storage
112123
// in the browser.
113124
PrintWriter out = resp.getWriter();
@@ -118,6 +129,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
118129
+ "/resizedImage.jpeg' alt='AppEngine logo resized' />");
119130
out.println("<img src='//storage.cloud.google.com/" + bucket
120131
+ "/rotatedImage.jpeg' alt='AppEngine logo rotated' />");
132+
out.println("<img src='" + url + "' alt='Hosted logo' />");
121133
out.println("</body></html>\n");
122134
}
123135
}

‎appengine-java8/postgres/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.appengine</groupId>
5151
<artifactId>appengine-api-1.0-sdk</artifactId>
52-
<version>1.9.57</version>
52+
<version>1.9.58</version>
5353
</dependency>
5454

5555
<dependency>

‎appengine-java8/spanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>com.google.appengine</groupId>
5050
<artifactId>appengine-api-1.0-sdk</artifactId>
51-
<version>1.9.57</version>
51+
<version>1.9.58</version>
5252
</dependency>
5353
</dependencies>
5454

‎appengine-java8/taskqueues-deferred/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<maven.compiler.source>1.8</maven.compiler.source>
34-
<appengine.sdk.version>1.9.57</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
34+
<appengine.sdk.version>1.9.58</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
3535
</properties>
3636

3737
<dependencies>

‎appengine/appidentity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</parent>
2929

3030
<properties>
31-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
31+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
3232
</properties>
3333

3434
<dependencies>

‎appengine/endpoints-frameworks-v2/backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>com.google.appengine</groupId>
6363
<artifactId>appengine-api-1.0-sdk</artifactId>
64-
<version>1.9.57</version>
64+
<version>1.9.58</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>javax.servlet</groupId>

‎appengine/endpoints-frameworks-v2/guice-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>com.google.appengine</groupId>
6161
<artifactId>appengine-api-1.0-sdk</artifactId>
62-
<version>1.9.57</version>
62+
<version>1.9.58</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>javax.servlet</groupId>

‎appengine/endpoints-frameworks-v2/migration-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ limitations under the License.
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-1.0-sdk</artifactId>
63-
<version>1.9.57</version>
63+
<version>1.9.58</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>javax.servlet</groupId>

‎appengine/endpoints-v1-helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<appengine.app.version>1</appengine.app.version>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434

35-
<appengine.plugin.version>1.9.57</appengine.plugin.version>
35+
<appengine.plugin.version>1.9.58</appengine.plugin.version>
3636
<maven.compiler.source>1.7</maven.compiler.source>
3737
<maven.compiler.target>1.7</maven.compiler.target>
3838
</properties>

‎appengine/firebase-tictactoe/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>com.google.appengine</groupId>
3636
<artifactId>appengine-api-1.0-sdk</artifactId>
37-
<version>1.9.57</version>
37+
<version>1.9.58</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.google.api-client</groupId>
@@ -60,13 +60,13 @@
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-stubs</artifactId>
63-
<version>1.9.57</version>
63+
<version>1.9.58</version>
6464
<scope>test</scope>
6565
</dependency>
6666
<dependency>
6767
<groupId>com.google.appengine</groupId>
6868
<artifactId>appengine-testing</artifactId>
69-
<version>1.9.57</version>
69+
<version>1.9.58</version>
7070
</dependency>
7171
</dependencies>
7272
<build>

‎appengine/gaeinfo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Copyright 2017 Google Inc.
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.57</version>
42+
<version>1.9.58</version>
4343
</dependency>
4444

4545
<dependency>

‎appengine/images/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
2121
<artifactId>appengine-images</artifactId>
2222

2323
<properties>
24-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
24+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
2525
</properties>
2626

2727
<parent>

‎appengine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</parent>
3131

3232
<properties>
33-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
3434
<appengine.app.version>1</appengine.app.version>
3535

3636
<project.http.version>1.19.0</project.http.version>

‎appengine/pusher-chat/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Copyright 2017 Google Inc.
5757
<dependency>
5858
<groupId>com.google.appengine</groupId>
5959
<artifactId>appengine-api-1.0-sdk</artifactId>
60-
<version>1.9.57</version>
60+
<version>1.9.58</version>
6161
</dependency>
6262
</dependencies>
6363

‎bigquery/cloud-client/src/main/java/com/example/bigquery/SimpleApp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void main(String... args) throws Exception {
4343
"SELECT "
4444
+ "APPROX_TOP_COUNT(corpus, 10) as title, "
4545
+ "COUNT(*) as unique_words "
46-
+ "FROM `publicdata.samples.shakespeare`;")
46+
+ "FROM `bigquery-public-data.samples.shakespeare`;")
4747
// Use standard SQL syntax for queries.
4848
// See: https://cloud.google.com/bigquery/sql-reference/
4949
.setUseLegacySql(false)

‎dlp/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ a powerful detection engine for personally identifiable information and other pr
66
## Setup
77
- A Google Cloud project with billing enabled
88
- [Enable](https://console.cloud.google.com/launcher/details/google/dlp.googleapis.com) the DLP API.
9-
- (Local testing)[Create a service account](https://cloud.google.com/docs/authentication/getting-started)
9+
- (Local testing) [Create a service account](https://cloud.google.com/docs/authentication/getting-started)
1010
and set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable pointing to the downloaded credentials file.
11+
- (Local testing) Set the `DLP_DEID_WRAPPED_KEY` environment variable to an AES-256 key encrypted ('wrapped') [with a Cloud Key Management Service (KMS) key](https://cloud.google.com/kms/docs/encrypt-decrypt).
12+
- (Local testing) Set the `DLP_DEID_KEY_NAME` environment variable to the path-name of the Cloud KMS key you wrapped `DLP_DEID_WRAPPED_KEY` with.
1113

1214
## Build
1315
This project uses the [Assembly Plugin](https://maven.apache.org/plugins/maven-assembly-plugin/usage.html) to build an uber jar.

‎dlp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.cloud</groupId>
4444
<artifactId>google-cloud-dlp</artifactId>
45-
<version>0.25.0-alpha</version>
45+
<version>0.26.0-alpha</version>
4646
</dependency>
4747
<!-- [END dlp_maven] -->
4848
<dependency>

0 commit comments

Comments
 (0)