Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9D0DF200B99 for ; Tue, 20 Sep 2016 23:38:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9BCE4160AC0; Tue, 20 Sep 2016 21:38:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E51B6160AC5 for ; Tue, 20 Sep 2016 23:38:49 +0200 (CEST) Received: (qmail 83703 invoked by uid 500); 20 Sep 2016 21:38:49 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 83694 invoked by uid 99); 20 Sep 2016 21:38:49 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2016 21:38:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id A1849CAD98 for ; Tue, 20 Sep 2016 21:38:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.344 X-Spam-Level: X-Spam-Status: No, score=-4.344 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.124] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id wCK5iCv_pKFA for ; Tue, 20 Sep 2016 21:38:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id B0DE85FE43 for ; Tue, 20 Sep 2016 21:38:45 +0000 (UTC) Received: (qmail 83565 invoked by uid 99); 20 Sep 2016 21:38:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2016 21:38:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C254DE0252; Tue, 20 Sep 2016 21:38:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertwb@apache.org To: commits@beam.incubator.apache.org Date: Tue, 20 Sep 2016 21:38:45 -0000 Message-Id: In-Reply-To: <0273ad7e9a8b4c598412afe4f98a0bc1@git.apache.org> References: <0273ad7e9a8b4c598412afe4f98a0bc1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-beam git commit: Adds support for specifying a custom service account. archived-at: Tue, 20 Sep 2016 21:38:50 -0000 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 Authored: Mon Sep 19 15:52:53 2016 -0700 Committer: Robert Bradshaw 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):