Adds support for specifying a custom service account. Updates Dataflow API client to latest version.
Adds ability to skip generated files during lint checks. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6df99b2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6df99b2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6df99b2d Branch: refs/heads/python-sdk Commit: 6df99b2dcfde47885db0116f02a0c7211f2dc4bd Parents: c1964bd Author: Chamikara Jayalath <chamik...@google.com> Authored: Mon Sep 19 15:52:53 2016 -0700 Committer: Robert Bradshaw <rober...@google.com> Committed: Tue Sep 20 14:37:39 2016 -0700 ---------------------------------------------------------------------- sdks/python/apache_beam/internal/apiclient.py | 4 ++++ sdks/python/apache_beam/utils/options.py | 3 +++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6df99b2d/sdks/python/apache_beam/internal/apiclient.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/internal/apiclient.py b/sdks/python/apache_beam/internal/apiclient.py index bc4a4e0..3f82f29 100644 --- a/sdks/python/apache_beam/internal/apiclient.py +++ b/sdks/python/apache_beam/internal/apiclient.py @@ -117,6 +117,10 @@ class Environment(object): self.proto.userAgent = dataflow.Environment.UserAgentValue() self.local = 'localhost' in self.google_cloud_options.dataflow_endpoint + if self.google_cloud_options.service_account_email: + self.proto.serviceAccountEmail = ( + self.google_cloud_options.service_account_email) + sdk_name, version_string = get_sdk_name_and_version() self.proto.userAgent.additionalProperties.extend([ http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6df99b2d/sdks/python/apache_beam/utils/options.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/utils/options.py b/sdks/python/apache_beam/utils/options.py index 794a10d..700c080 100644 --- a/sdks/python/apache_beam/utils/options.py +++ b/sdks/python/apache_beam/utils/options.py @@ -248,6 +248,9 @@ class GoogleCloudOptions(PipelineOptions): default=None, help='Path to a file containing the P12 service ' 'credentials.') + parser.add_argument('--service_account_email', + default=None, + help='Identity to run virtual machines as.') parser.add_argument('--no_auth', dest='no_auth', type=bool, default=False) def validate(self, validator):
