Migrate to the Google Cloud SDK.

catapult_build/appengine_deploy.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO(qyearsley): Add a step to vulcanize each template HTML file.
 # TODO(qyearsley): Add a step to put static files in a versioned
 # directory and modify app.yaml and request_handler as needed.
 
 import os
 import subprocess
 import sys
 
 from catapult_build import temp_deployment_dir
 
 
-def AppcfgUpdate(paths, app_id, service_name=None):
+def Deploy(paths, args):
   """Deploys a new version of an App Engine app from a temporary directory.
 
   Args:
     paths: List of paths to files and directories that should be linked
         (or copied) in the deployment directory.
-    app_id: The application ID to use.
+    args: Arguments passed to "gcloud app deploy".
   """
   with temp_deployment_dir.TempDeploymentDir(
       paths, use_symlinks=False) as temp_dir:
     print 'Deploying from "%s".' % temp_dir
 
-    script_path = _FindScriptInPath('appcfg.py')
+    script_path = _FindScriptInPath(os.path.join('..', 'lib', 'gcloud.py'))

[perezju, 2017/02/20 10:22:26]

This seems odd. The error message bellow suggests that users are responsible for
making sure that "gcloud.py" is in the PATH; why are we trying to find it in
"../lib/" (and relative to what?)

[dtu, 2017/02/22 01:09:40]

Done. I've changed it to look for 'gcloud.cmd' on Windows and 'gcloud'
otherwise. Originally, I had it call the Python executable
(google-cloud-sdk/lib/gcloud.py instead of google-cloud-sdk/bin/gcloud) to avoid
dealing with the platform differences.

     if not script_path:
-      print 'This script requires the App Engine SDK to be in PATH.'
+      print 'This script requires the Google Cloud SDK to be in PATH.'

[sullivan, 2017/02/20 14:58:36]

Can this also link to instructions for installing Google Cloud SDK?

[dtu, 2017/02/22 01:09:40]

Done.

       sys.exit(1)
 
-    subprocess.call([
-        sys.executable,
-        script_path,
-        '--application=%s' % app_id,
-        '--version=%s' % _VersionName(),
-        'update',
-        os.path.join(temp_dir, service_name) if service_name else temp_dir,
-    ])
+    subprocess.call([sys.executable, script_path, 'app', 'deploy',

[shatch, 2017/02/20 21:31:01]

I forget if we discussed this in last week's sync, should we add --quiet to skip
the prompt?

Also should --no-promote be default? The current deploy script doesn't
auto-promote the deployed version, you typically deploy and then go migrate it.

Lastly, how does "gcloud config set project chromeperf" work with multiple
projects? Like if I wanted to deploy firefighter, do I have to reset the
project? Should we just pass --project=chromeperf by default or set
CLOUDSDK_CORE_PROJECT=chromeperf?

[dtu, 2017/02/22 01:09:40]

--quiet: No, deployment is fast enough that it should be fine with the prompt.
And I like the clarity of seeing exactly what you're deploying.

--no-promote: Done. Sorry, I thought that was the default behavior. They keep
changing it.

--project=chromeperf: gcloud has the ability to have multiple configs and switch
between them, though it is sort of cumbersome. Firefighter is going to go away
eventually, so we won't run into project conflicts often. I think hard-coding
the project ID would be a bad open source practice -- anyone who uses this
project would have to have a local branch with their own project ID.

+                     '--version', _VersionName()] + args)

[shatch, 2017/02/20 21:31:01]

I seemed to need to add cwd=temp_dir otherwise my deployed version was a bit
busted.

[dtu, 2017/02/22 01:09:40]

Done.

 
 
 def _FindScriptInPath(script_name):
   for path in os.environ['PATH'].split(os.pathsep):
     script_path = os.path.join(path, script_name)
     if os.path.exists(script_path):
       return script_path
 
   return None
 
 
 def _VersionName():
   is_synced = not _Run(['git', 'diff', 'master', '--no-ext-diff']).strip()
   deployment_type = 'clean' if is_synced else 'dev'
   email = _Run(['git', 'config', '--get', 'user.email'])
   username = email[0:email.find('@')]
   commit_hash = _Run(['git', 'rev-parse', '--short=8', 'HEAD']).strip()
   return '%s-%s-%s' % (deployment_type, username, commit_hash)
 
 
 def _Run(command):
   proc = subprocess.Popen(command, stdout=subprocess.PIPE)
   output, _ = proc.communicate()
   return output