[beam] branch master updated: [BEAM-5959] KMS support for BigQuery - build.gradle only

[altay]

This is an automated email from the ASF dual-hosted git repository.

altay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 36457f6  [BEAM-5959] KMS support for BigQuery - build.gradle only
     new 9799b7d  Merge pull request #7779 from udim/cmek-bq-gradle
36457f6 is described below

commit 36457f6e6f60525c51af97f016e00f6db7b127ff
Author: Udi Meiri <eh...@google.com>
AuthorDate: Thu Feb 7 14:49:52 2019 -0800

    [BEAM-5959] KMS support for BigQuery - build.gradle only
---
 runners/google-cloud-dataflow-java/build.gradle | 1 +
 sdks/java/io/google-cloud-platform/build.gradle | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/runners/google-cloud-dataflow-java/build.gradle 
b/runners/google-cloud-dataflow-java/build.gradle
index 3613f9b..5d765e7 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -321,6 +321,7 @@ task 
googleCloudPlatformLegacyWorkerKmsIntegrationTest(type: Test) {
     ])
 
     include '**/*KmsKeyIT.class'
+    exclude '**/BigQueryKmsKeyIT.java'  // Only needs to run on direct runner.
     maxParallelForks 4
     classpath = configurations.googleCloudPlatformIntegrationTest
     testClassesDirs = 
files(project(":beam-sdks-java-io-google-cloud-platform").sourceSets.test.output.classesDirs)
diff --git a/sdks/java/io/google-cloud-platform/build.gradle 
b/sdks/java/io/google-cloud-platform/build.gradle
index 532d3b8..c578150 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -87,10 +87,12 @@ task integrationTest(type: Test) {
   group = "Verification"
   def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing'
   def gcpTempRoot = project.findProperty('gcpTempRoot') ?: 
'gs://temp-storage-for-end-to-end-tests'
+  def kmsKey = project.findProperty('kmsKey') ?: 
"projects/apache-beam-testing/locations/global/keyRings/beam-it/cryptoKeys/test"
   systemProperty "beamTestPipelineOptions", JsonOutput.toJson([
           "--runner=DirectRunner",
           "--project=${gcpProject}",
           "--tempRoot=${gcpTempRoot}",
+          "--kmsKey=${kmsKey}",
   ])
 
   // Disable Gradle cache: these ITs interact with live service that should 
always be considered "out of date"