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 2f50b42 [BEAM-5959] KMS support for BigQuery - build.gradle only - fix
new 1fb4740 Merge pull request #7780 from udim/cmek-bq-gradle
2f50b42 is described below
commit 2f50b42b1e64ea2f5c57882452379101793d40f2
Author: Udi Meiri <eh...@google.com>
AuthorDate: Thu Feb 7 15:11:27 2019 -0800
[BEAM-5959] KMS support for BigQuery - build.gradle only - fix
---
sdks/java/io/google-cloud-platform/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdks/java/io/google-cloud-platform/build.gradle
b/sdks/java/io/google-cloud-platform/build.gradle
index c578150..159ae73 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -87,12 +87,10 @@ 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"
@@ -113,11 +111,13 @@ task integrationTestKms(type: Test) {
def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing'
def gcpTempRoot = project.findProperty('gcpTempRoot') ?:
'gs://temp-storage-for-end-to-end-tests'
def dataflowKmsKey = project.findProperty('dataflowKmsKey') ?:
"projects/apache-beam-testing/locations/global/keyRings/beam-it/cryptoKeys/test"
+ def kmsKey = project.findProperty('kmsKey') ?: dataflowKmsKey
systemProperty "beamTestPipelineOptions", JsonOutput.toJson([
"--runner=DirectRunner",
"--project=${gcpProject}",
"--tempRoot=${gcpTempRoot}",
"--dataflowKmsKey=${dataflowKmsKey}",
+ "--kmsKey=${kmsKey}",
])
// Disable Gradle cache: these ITs interact with live service that should
always be considered "out of date"
