You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/11/10 20:44:20 UTC
[1/2] incubator-beam git commit: Update BigtableWriteIT to set
Credentials
Repository: incubator-beam
Updated Branches:
refs/heads/master aec7a0a76 -> cd3f61cf8
Update BigtableWriteIT to set Credentials
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/97c883de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/97c883de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/97c883de
Branch: refs/heads/master
Commit: 97c883de70cb8eea16c437fc64c6411de7daeea8
Parents: aec7a0a
Author: Thomas Groh <tg...@google.com>
Authored: Thu Nov 10 11:32:55 2016 -0800
Committer: Thomas Groh <tg...@google.com>
Committed: Thu Nov 10 11:33:36 2016 -0800
----------------------------------------------------------------------
.../beam/sdk/io/gcp/bigtable/BigtableWriteIT.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/97c883de/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableWriteIT.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableWriteIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableWriteIT.java
index 9afcd60..cae19cf 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableWriteIT.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableWriteIT.java
@@ -30,6 +30,7 @@ import com.google.bigtable.v2.Row;
import com.google.bigtable.v2.RowRange;
import com.google.bigtable.v2.RowSet;
import com.google.cloud.bigtable.config.BigtableOptions;
+import com.google.cloud.bigtable.config.CredentialOptions;
import com.google.cloud.bigtable.config.RetryOptions;
import com.google.cloud.bigtable.grpc.BigtableSession;
import com.google.cloud.bigtable.grpc.BigtableTableAdminClient;
@@ -44,6 +45,7 @@ import java.util.List;
import java.util.Map;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.CountingInput;
+import org.apache.beam.sdk.options.GcpOptions;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.transforms.DoFn;
@@ -83,11 +85,14 @@ public class BigtableWriteIT implements Serializable {
retryOptionsBuilder.setStreamingBatchSize(
retryOptionsBuilder.build().getStreamingBufferSize() / 2);
- BigtableOptions.Builder bigtableOptionsBuilder = new BigtableOptions.Builder()
- .setProjectId(options.getProjectId())
- .setInstanceId(options.getInstanceId())
- .setUserAgent("apache-beam-test")
- .setRetryOptions(retryOptionsBuilder.build());
+ BigtableOptions.Builder bigtableOptionsBuilder =
+ new BigtableOptions.Builder()
+ .setProjectId(options.getProjectId())
+ .setInstanceId(options.getInstanceId())
+ .setUserAgent("apache-beam-test")
+ .setRetryOptions(retryOptionsBuilder.build())
+ .setCredentialOptions(
+ CredentialOptions.credential(options.as(GcpOptions.class).getGcpCredential()));
bigtableOptions = bigtableOptionsBuilder.build();
session = new BigtableSession(bigtableOptions);
[2/2] incubator-beam git commit: This closes #1336
Posted by da...@apache.org.
This closes #1336
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/cd3f61cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/cd3f61cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/cd3f61cf
Branch: refs/heads/master
Commit: cd3f61cf81208cf84f3f66209e2cd3ade5f4c3ea
Parents: aec7a0a 97c883d
Author: Davor Bonaci <da...@google.com>
Authored: Thu Nov 10 12:44:07 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Thu Nov 10 12:44:07 2016 -0800
----------------------------------------------------------------------
.../beam/sdk/io/gcp/bigtable/BigtableWriteIT.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------