appengine 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f375994484124c538890ff34a4e841784b17084f61a7db9f1e47a189cdfbc9d6
-  data.tar.gz: 0e36f8b5ba553b7b7c2d82c1beb2d96dbe5a99374aa5709d2d27d9cf1f809a63
+  metadata.gz: 8985bf9ca824b3567577328e9c844eabcab5691907b0eb8a3385c181c91d2f13
+  data.tar.gz: 04d8e4d73ee85d186798b69748191ec14423aecabfa1cbc5446d6e79e29b438c
 SHA512:
-  metadata.gz: cc71ebe02ab9c6efd9d1d2c57edc03a2c901e167e8828146695d637e54fe8bdec2ee9118360658e79e7eaa81d8ffca6c8450903c0670cb6633671055d653d295
-  data.tar.gz: ab181b1f667cb53f451ee0b2dd54174a3369a2f9ef5d94085742d4cbd3f755441606e24d47552f3d90604d01ba33fb45c246067e3299b0b700b2395fe2e7d993
+  metadata.gz: fa651f55f75abf3d21813891a34c26d9c27ffe0656f7b77e54f440a2bb8d747f751317327cdc250a72fc3e286e4a76b79ac4f44ace1f70f01d8d46d3a27866ec
+  data.tar.gz: a03743e4a99da424fb1c588f83767389c36b82ddcb5271cba0462a5c7433bd113d3db1b668159dad5520eaa7fcb11ffcb88694133a0f46feb557ac69ada0bab2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 This is the change history for the appengine gem.
 
+## v0.6.0 (2020-12-02)
+
+*   Fix failure in the appengine:exec cloud_build strategy when App Engine doesn't provide the image
+*   Fix exception when appengine:exec is provided a shell command rather than a command array (tpbowden)
+*   Update stackdriver dependency to 0.20 and google-cloud-env dependency to 1.4
+
 ## v0.5.0 (2019-07-15)
 
 *   appengine:exec supports the App Engine standard environment.

data/lib/appengine/exec.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 
+require "date"
 require "erb"
 require "json"
 require "net/http"
@@ -175,6 +176,11 @@ module AppEngine
   # accessed only over a private IP, you should use the `deployment` strategy
   # instead.
   #
+  # The Cloud Build log is output to the directory specified by
+  # "CLOUD_BUILD_GCS_LOG_DIR". (ex. "gs://BUCKET-NAME/FOLDER-NAME")
+  # By default, log directory name is
+  # "gs://[PROJECT_NUMBER].cloudbuild-logs.googleusercontent.com/".
+  #
   # ### Specifying the host application
   #
   # The `cloud_build` strategy needs to know exactly which app, service, and
@@ -365,11 +371,13 @@ module AppEngine
       #     standard). Allowed values are `nil`, `"deployment"` (which is the
       #     default for Standard), and `"cloud_build"` (which is the default
       #     for Flexible).
+      # @param gcs_log_dir [String,nil] GCS bucket name of the cloud build log
+      #     when strategy is "cloud_build". (ex. "gs://BUCKET-NAME/FOLDER-NAME")
       #
       def new_rake_task name, args: [], env_args: [],
                         service: nil, config_path: nil, version: nil,
                         timeout: nil, project: nil, wrapper_image: nil,
-                        strategy: nil
+                        strategy: nil, gcs_log_dir: nil
         escaped_args = args.map do |arg|
           arg.gsub(/[,\[\]]/) { |m| "\\#{m}" }
         end
@@ -382,7 +390,7 @@ module AppEngine
         new ["bundle", "exec", "rake", name_with_args] + env_args,
             service: service, config_path: config_path, version: version,
             timeout: timeout, project: project, wrapper_image: wrapper_image,
-            strategy: strategy
+            strategy: strategy, gcs_log_dir: gcs_log_dir
       end
     end
 
@@ -410,10 +418,12 @@ module AppEngine
     #     standard). Allowed values are `nil`, `"deployment"` (which is the
     #     default for Standard), and `"cloud_build"` (which is the default for
     #     Flexible).
+    # @param gcs_log_dir [String,nil] GCS bucket name of the cloud build log
+    #     when strategy is "cloud_build". (ex. "gs://BUCKET-NAME/FOLDER-NAME")
     #
     def initialize command,
                    project: nil, service: nil, config_path: nil, version: nil,
-                   timeout: nil, wrapper_image: nil, strategy: nil
+                   timeout: nil, wrapper_image: nil, strategy: nil, gcs_log_dir: nil
       @command = command
       @service = service
       @config_path = config_path
@@ -422,6 +432,7 @@ module AppEngine
       @project = project
       @wrapper_image = wrapper_image
       @strategy = strategy
+      @gcs_log_dir = gcs_log_dir
 
       yield self if block_given?
     end
@@ -502,7 +513,7 @@ module AppEngine
     #
     def resolve_parameters
       @timestamp_suffix = ::Time.now.strftime "%Y%m%d%H%M%S"
-      @command = ::Shellwords.parse @command.to_s unless @command.is_a? Array
+      @command = ::Shellwords.split @command.to_s unless @command.is_a? Array
       @project ||= default_project
       @service ||= service_from_config || Exec.default_service
       @version ||= latest_version @service
@@ -751,7 +762,8 @@ module AppEngine
       env_variables = app_info["envVariables"] || {}
       beta_settings = app_info["betaSettings"] || {}
       cloud_sql_instances = beta_settings["cloud_sql_instances"] || []
-      image = app_info["deployment"]["container"]["image"]
+      container = app_info["deployment"]["container"]
+      image = container ? container["image"] : image_from_build(app_info)
 
       describe_build_strategy
 
@@ -760,18 +772,45 @@ module AppEngine
       begin
         ::JSON.dump config, file
         file.flush
-        Util::Gcloud.execute [
+        execute_command = [
           "builds", "submit",
           "--project", @project,
           "--no-source",
           "--config", file.path,
           "--timeout", @timeout
         ]
+        execute_command.concat ["--gcs-log-dir", @gcs_log_dir] unless @gcs_log_dir.nil?
+        Util::Gcloud.execute execute_command
       ensure
         file.close!
       end
     end
 
+    ##
+    # @private
+    # Workaround for https://github.com/GoogleCloudPlatform/appengine-ruby/issues/33
+    # Determines the image by looking it up in Cloud Build
+    #
+    def image_from_build app_info
+      create_time = ::DateTime.parse(app_info["createTime"]).to_time.utc
+      after_time = (create_time - 3600).strftime "%Y-%m-%dT%H:%M:%SZ"
+      before_time = (create_time + 3600).strftime "%Y-%m-%dT%H:%M:%SZ"
+      partial_uri = "gcr.io/#{@project}/appengine/#{@service}.#{@version}"
+      filter = "createTime>#{after_time} createTime<#{before_time} images[]:#{partial_uri}"
+      result = Util::Gcloud.execute \
+        [
+          "builds", "list",
+          "--project", @project,
+          "--filter", filter,
+          "--format", "json"
+        ],
+        capture: true, assert: false
+      result.strip!
+      raise NoSuchVersion.new(@service, @version) if result.empty?
+      build_info = ::JSON.parse(result).first
+      build_info["images"].first
+    end
+
     def describe_build_strategy
       puts "\nUsing the `cloud_build` strategy for appengine:exec"
       puts "(i.e. running your app image in Cloud Build)"

data/lib/appengine/tasks.rb

@@ -113,6 +113,10 @@ module AppEngine
   # the "cloud_build" strategy, and applies only to that strategy.) Normally,
   # you should not override this unless you are testing a new wrapper.
   #
+  # #### CLOUD_BUILD_GCS_LOG_DIR
+  #
+  # GCS bucket name of the cloud build log when GAE_STRATEGY is "cloud_build".
+  # (ex. "gs://BUCKET-NAME/FOLDER-NAME")
   module Tasks
     ## @private
     PROJECT_ENV = "GAE_PROJECT"
@@ -128,6 +132,8 @@ module AppEngine
     TIMEOUT_ENV = "GAE_TIMEOUT"
     ## @private
     WRAPPER_IMAGE_ENV = "GAE_EXEC_WRAPPER_IMAGE"
+    ## @private
+    GCS_LOG_DIR = "CLOUD_BUILD_GCS_LOG_DIR"
 
     @defined = false
 
@@ -161,7 +167,8 @@ module AppEngine
                               version:       ::ENV[VERSION_ENV],
                               timeout:       ::ENV[TIMEOUT_ENV],
                               wrapper_image: ::ENV[WRAPPER_IMAGE_ENV],
-                              strategy:      ::ENV[STRATEGY_ENV]
+                              strategy:      ::ENV[STRATEGY_ENV],
+                              gcs_log_dir:   ::ENV[GCS_LOG_DIR]
           start_and_report_errors app_exec
           exit
         end
@@ -274,6 +281,11 @@ module AppEngine
             the "cloud_build" strategy, and applies only to that strategy.) Normally,
             you should not override this unless you are testing a new wrapper.
 
+          CLOUD_BUILD_GCS_LOG_DIR
+
+            GCS bucket name of the cloud build log when GAE_STRATEGY is "cloud_build".
+            (ex. "gs://BUCKET-NAME/FOLDER-NAME")
+
           This rake task is provided by the "appengine" gem. To make these tasks
           available, add the following line to your Rakefile:
 

data/lib/appengine/version.rb

@@ -17,5 +17,5 @@
 
 module AppEngine
   # The current version of this gem, as a string.
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appengine
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-env
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: stackdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -150,34 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.64.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.64.0
 - !ruby/object:Gem::Dependency
   name: toys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -229,15 +221,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Google App Engine integration tools