dpl 1.7.22.travis.1047.4 → 1.7.22.travis.1056.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmZhOTI4NGNmZjFkYmU1NjI5YmY3MzA5NmI5YjhjMmZmZWRmMDFiMQ==
+    OWRmNjMxZWMxZTYyMjljY2NiMjQxNzI5ZTY3MTY4NDNkM2VhMjEyMQ==
   data.tar.gz: !binary |-
-    MThlNTU1MzM1MDM5YTk0NDgyYzVlNDdkNDkzNzNhZTQzODQ3NjIyNg==
+    YWUwOWYyMWMxNGY5NDhjOGNmNmM2NjE1YmJiNjc4Nzc2OWJhZDI1OQ==
 SHA512:
   metadata.gz: !binary |-
-    NzU4NmZhMmQ3NDY2MWQ1YjcxOGUzY2M5YTlkMTQ1YTRlZWM4ZTBhOGFhNzFm
-    NGZlYWU2YzU2MjM2ZDUyNzJjMjdkMjQ1ZDA3NmY4MmZiNDdjNDRiYzY1YmQ4
-    MzZjMjFhOWQ5MmMwN2ExZTc0YTM2ZTIzZTQ5ZDRjYTVjMDU2MmI=
+    NzEwYjJkZWJhODQ1YjU4NzI2NTliNmYzZTI4MDdjOGMyZTczMTQ0MDAwNjEx
+    N2ZiMzM5MDdjZDdkZTgzNjE1Y2I3ZmEyYTg4MWVjOGMzNjY4Njc3ZTc3YThi
+    NTU4YmU0NWVlZmNhMDRkYmVkOWE5MTg2MWU0ODdlY2UzMTMwMmY=
   data.tar.gz: !binary |-
-    NWYxMjQzMzNhNjJjYzllMzZjMjZkMThhZTA3ZGQyMzFlYzZmM2MxODkyOGM2
-    MzA4M2ZjZGQwZWI3NTg3NzFmNGJiYTA5ODNiMGE2OGZiZmMyMWY4YjAzMWYz
-    NmRjNmVkOTk1MGE3OTNkOTQ3MWEzNGI1MDBiNDk4NGY2MzIzYzY=
+    MWVkZmZmYTAzNmY4MmVkNWIxYjhlZWU5MDFjYzk1N2U3MWQxMjBhOTY1N2I3
+    ODdhNTk5YjUxNmM1ZmMzNWU1NWI3ZmZhMjM5NzRkOGZiMDBkNzI1NTFjNjMx
+    MTkzMjM4MmJhYjE0ZmNmYjJlMTg4ZWQ3NGJjOTU2ZjgyZmIyOGE=

data/Gemfile

@@ -53,10 +53,6 @@ group :gcs do
   gem 'mime-types'
 end
 
-group :gae do
-  gem 'rubyzip'
-end
-
 group :elastic_beanstalk do
   gem 'rubyzip'
   gem 'aws-sdk-v1'

data/README.md

@@ -42,6 +42,7 @@ Dpl supports the following providers:
 * [ExoScale](#exoscale)
 * [AWS CodeDeploy](#aws-codedeploy)
 * [Script](#script)
+* [Google App Engine (experimental)](#google-app-engine)
 
 ## Installation:
 
@@ -719,3 +720,27 @@ Deployment will be marked a failure if the script exits with nonzero status.
 #### Example:
 
     dpl --provider=script --script=./script/deploy.sh
+
+### Google App Engine:
+
+Deploys to Google App Engine and Google App Engine Managed VMs via the Google Cloud SDK and
+it's [`gcloud` tool](https://cloud.google.com/sdk/gcloud/) using a [Service Account](https://developers.google.com/console/help/new/#serviceaccounts).
+
+#### Options:
+
+* **project**: [Project ID](https://developers.google.com/console/help/new/#projectnumber) used to identify the project on Google Cloud.
+* **keyfile**: Path to the JSON file containing your [Service Account](https://developers.google.com/console/help/new/#serviceaccounts) credentials in [JSON Web Token](https://tools.ietf.org/html/rfc7519) format. To be obtained via the [Google Developers Console](https://console.developers.google.com/project/_/apiui/credential). Defaults to `"service-account.json"`. Note that this file should be handled with care as it contains authorization keys.
+* **config**: Path to your module configuration file. Defaults to `"app.yaml"`. This file is runtime dependent ([Go](https://cloud.google.com/appengine/docs/go/config/appconfig), [Java](https://cloud.google.com/appengine/docs/java/configyaml/appconfig_yaml), [PHP](https://developers.google.com/console/help/new/#projectnumber), [Python](https://cloud.google.com/appengine/docs/python/config/appconfig))
+* **version**: The version of the app that will be created or replaced by this deployment. If you do not specify a version, one will be generated for you. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
+* **default**: Flag to set the deployed version to be the default serving version. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
+* **verbosity**: Let's you adjust the verbosity when invoking `"gcloud"`. Defaults to `"warning"`. See [`gcloud`](https://cloud.google.com/sdk/gcloud/reference/).
+* **docker_build**: If deploying a Managed VM, specifies where to build your image. Typical values are `"remote"` to build on Google Cloud Engine and `"local"` which requires Docker to be set up properly (to utilize this on Travis CI, read [Using Docker on Travis CI](http://blog.travis-ci.com/2015-08-19-using-docker-on-travis-ci/)). Defaults to `"remote"`.
+
+#### Environment variables:
+
+ * **GOOGLECLOUDPROJECT** or **CLOUDSDK_CORE_PROJECT**: Can be used instead of the `project` option.
+ * **GOOGLECLOUDKEYFILE**: Can be used instead of the `keyfile` option.
+
+#### Example:
+
+    dpl --provider=gae --project=example --default=true

data/lib/dpl/provider/gae.rb

@@ -1,69 +1,91 @@
-require 'digest/sha1'
-require 'open-uri'
-
 module DPL
   class Provider
     class GAE < Provider
       experimental 'Google App Engine'
 
-      # https://developers.google.com/appengine/downloads
-      GAE_VERSION='1.9.17'
-      GAE_ZIP_FILE="google_appengine_#{GAE_VERSION}.zip"
-      SHA1SUM='eec50aaf922d3b21623fda1b90e199c3ffa9e16e'
-      BASE_DIR=Dir.pwd
-      GAE_DIR=File.join(BASE_DIR, 'google_appengine')
-      APPCFG_BIN=File.join(GAE_DIR, 'appcfg.py')
-
-      def self.install_sdk
-        requires 'rubyzip', :load => 'zip'
-        $stderr.puts "Setting up Google App Engine SDK"
-
-        Dir.chdir(BASE_DIR) do
-          unless File.exists? GAE_ZIP_FILE
-            $stderr.puts "Downloading Google App Engine SDK"
-            File.open(GAE_ZIP_FILE, "wb") do |dest|
-              open("https://storage.googleapis.com/appengine-sdks/featured/#{GAE_ZIP_FILE}", "rb") do |src|
-                dest.write(src.read)
-              end
-            end
-          end
-          sha1sum = Digest::SHA1.hexdigest(File.read(GAE_ZIP_FILE))
-          unless sha1sum == SHA1SUM
-            raise "Checksum did not match for #{GAE_ZIP_FILE}"
-          end
+      BASE='https://dl.google.com/dl/cloudsdk/channels/rapid/'
+      NAME='google-cloud-sdk'
+      EXT='.tar.gz'
+      INSTALL='~'
+      BOOTSTRAP="#{INSTALL}/#{NAME}/bin/bootstrapping/install.py"
+      GCLOUD="#{INSTALL}/#{NAME}/bin/gcloud"
 
-          unless File.directory? 'google_appengine'
-            $stderr.puts "Extracting Google App Engine SDK archive"
-            Zip::File.open(GAE_ZIP_FILE) do |file|
-              file.each do |entry|
-                entry.extract entry.name
-              end
-            end
+      def install_deploy_dependencies
+        # FIXME this is a workaround for https://code.google.com/p/google-cloud-sdk/issues/detail?id=228
+        if docker_build == "remote" && !File.exists?("#{Dir.home}/.ssh/google_compute_engine")
+          unless context.shell('ssh-keygen -f ~/.ssh/google_compute_engine -t rsa -N \'\'')
+            error 'Failed to generate SSH key for remote Docker build.'
           end
         end
-      end
 
-      install_sdk
+        if File.exists? GCLOUD
+          return
+        end
+
+        $stderr.puts 'Downloading Google Cloud SDK ...'
+
+        unless context.shell("curl -L #{BASE + NAME + EXT} | gzip -d | tar -x -C #{INSTALL}")
+          error 'Could not download Google Cloud SDK.'
+        end
+
+        $stderr.puts 'Bootstrapping Google Cloud SDK ...'
+
+        unless context.shell("#{BOOTSTRAP} --usage-reporting=false --command-completion=false --path-update=false --additional-components=preview")
+          error 'Could not bootstrap Google Cloud SDK.'
+        end
+      end
 
       def needs_key?
         false
       end
 
       def check_auth
+        unless context.shell("#{GCLOUD} -q --verbosity debug auth activate-service-account --key-file #{keyfile}")
+          error 'Authentication failed.'
+        end
+      end
+
+      def keyfile
+        options[:keyfile] || context.env['GOOGLECLOUDKEYFILE'] || 'service-account.json'
+      end
+
+      def project
+        options[:project] || context.env['GOOGLECLOUDPROJECT'] || context.env['CLOUDSDK_CORE_PROJECT'] || File.dirname(context.env['TRAVIS_REPO_SLUG'] || '')
+      end
+
+      def version
+        options[:version] || ''
+      end
+
+      def config
+        options[:config] || 'app.yaml'
+      end
+
+      def default
+        options[:default]
+      end
+
+      def verbosity
+        options[:verbosity] || 'warning'
       end
 
-      def app_dir
-        options[:app_dir] || context.env['TRAVIS_BUILD_DIR'] || Dir.pwd
+      def docker_build
+        options[:docker_build] || 'remote'
       end
 
       def push_app
-        puts "About to call push_app in with #{self.class} provider"
-        puts "APPCFG_BIN: #{APPCFG_BIN}"
-        unless File.exist?(APPCFG_BIN)
-          puts "APPCFG_BIN does not exist"
+        command = GCLOUD
+        command << ' --quiet'
+        command << " --verbosity \"#{verbosity}\""
+        command << " --project \"#{project}\""
+        command << " preview app deploy \"#{config}\""
+        command << " --version \"#{version}\""
+        command << " --docker-build \"#{docker_build}\""
+        command << (default ? ' --set-default' : '')
+        unless context.shell(command)
+          error 'Deployment failed.'
         end
-        context.shell "#{APPCFG_BIN} --oauth2_refresh_token=#{options[:oauth_refresh_token]} update #{app_dir}"
       end
     end
   end
-end
+end

data/spec/provider/gae_spec.rb

@@ -1,26 +1,15 @@
-# require 'spec_helper'
-# require 'dpl/provider/gae'
-#
-# describe DPL::Provider::GAE do
-#   subject :provider do
-#     described_class.new(DummyContext.new, :user => 'foo', :password => 'bar')
-#   end
-#
-#   let(:token) { 'deadbeef012345' }
-#
-#   describe '#push_app' do
-#     example 'with default app_dir' do
-#       provider.context.env['TRAVIS_BUILD_DIR'] = Dir.pwd
-#       provider.options.update(:oauth_refresh_token => token)
-#       expect(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::APPCFG_BIN} --oauth2_refresh_token=#{token} update #{Dir.pwd}").and_return(true)
-#       provider.push_app
-#     end
-#
-#     example 'with custom app_dir' do
-#       app_dir='foo'
-#       provider.options.update(:oauth_refresh_token => token, :app_dir => app_dir)
-#       expect(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::APPCFG_BIN} --oauth2_refresh_token=#{token} update #{app_dir}").and_return(true)
-#       provider.push_app
-#     end
-#   end
-# end
+require 'spec_helper'
+require 'dpl/provider/gae'
+
+describe DPL::Provider::GAE do
+  subject :provider do
+    described_class.new(DummyContext.new, project: 'test')
+  end
+
+  describe '#push_app' do
+    example 'with defaults' do
+      expect(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::GCLOUD} --quiet --verbosity \"warning\" --project \"test\" preview app deploy \"app.yaml\" --version \"\" --docker-build \"remote\"").and_return(true)
+      provider.push_app
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.22.travis.1047.4
+  version: 1.7.22.travis.1056.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec