cutlass 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6108df69ef77042bd071df45a813aafc53d4b48684a6d5348f999da8e641d7ce
-  data.tar.gz: a6b71ca0d84404bed8f8ea12f6eebb01ec2664bd72a5b66d7c16eb76a2bd37e9
+  metadata.gz: 343c9862759141c5feeba0bafbac9aad72a2ea74330ad2868c2fb8cfcdca84a4
+  data.tar.gz: 24f5abe57557982cda38e335311911c3af688dc36cdc42e5436b429cb1fc72bc
 SHA512:
-  metadata.gz: 05f3f9e730c1b20ee833ac67b0c4a18210d5554e66dbc7e892e30cc6275af24c7c40517d1e543f50fc055b405209acba99b2c6e6a18fa7537618211fb065c69e
-  data.tar.gz: 5cc971e2fcf8ff09e815fc46904b23f4f5be348d2ddeb02104a6113715a0ac3ad255cc7332fdf89966d78deb86e7ca5ca732c23da402bca68e8f7d8a824d56e4
+  metadata.gz: 2591d579985513433cb26690d1abadde25ba00914d7fa2b7733f2431d8387e34dc757360982db2b3156a44c20dc7cfa5f74ab969f77b8b9f9c2a63527baa1519
+  data.tar.gz: 0b9ecaf0726b5483f600ef5178baa948ed61be5ea18e8ed52910d13990755889d9f57abab982b1d5e972350919d805070852d8bcf2aaeeeb162b26156b982d17

data/.github/dependabot.yml

@@ -2,8 +2,9 @@ version: 2
 updates:
   - package-ecosystem: "bundler"
     directory: "/"
-    open-pull-requests-limit: 1 # Limit concurrent CI runs from executing
     schedule:
-      interval: "weekly"
-    labels:
-      - "dependencies"
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/check_changelog.yml

@@ -1,16 +1,22 @@
 name: Check Changelog
 
 on:
- pull_request:
-  types: [opened, reopened, edited, synchronize]
+  pull_request:
+    types: [opened, reopened, edited, labeled, unlabeled, synchronize]
+
 jobs:
-  build:
+  check-changelog:
+    runs-on: ubuntu-latest
     if: |
+      !contains(github.event.pull_request.body, '[skip changelog]') &&
+      !contains(github.event.pull_request.body, '[changelog skip]') &&
+      !contains(github.event.pull_request.body, '[skip ci]') &&
+      !contains(github.event.pull_request.labels.*.name, 'skip changelog') &&
       !contains(github.event.pull_request.labels.*.name, 'dependencies') &&
       !contains(github.event.pull_request.labels.*.name, 'automation')
-    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Check that CHANGELOG is touched
-      run: |
-        cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md
+      - uses: actions/checkout@v2.3.4
+      - name: Check that CHANGELOG is touched
+        run: |
+          git fetch origin ${{ github.base_ref }} --depth 1 && \
+          git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## 0.2.2
+
+- Support :memory option for start_container https://github.com/heroku/cutlass/pull/27
+- Add debug log when a function query fails https://github.com/heroku/cutlass/pull/17
+
 ## 0.2.1
 
 - Fix incorrect conversion of a ProcessStatus into an exit code https://github.com/heroku/cutlass/pull/16

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    cutlass (0.2.1)
+    cutlass (0.2.2)
       docker-api (>= 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     crack (0.4.5)
       rexml
     dead_end (1.1.6)
     diff-lcs (1.4.4)
-    docker-api (2.1.0)
+    docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
-    excon (0.81.0)
+    excon (0.85.0)
     hashdiff (1.0.1)
     multi_json (1.15.0)
     parallel (1.20.1)
-    parallel_split_test (0.9.1)
+    parallel_split_test (0.10.0)
       parallel (>= 0.5.13)
       rspec-core (>= 3.9.0)
     parser (3.0.1.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -63,8 +63,8 @@ GEM
       rubocop (= 1.12.1)
       rubocop-performance (= 1.10.1)
     unicode-display_width (2.0.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.26)
@@ -85,4 +85,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.15
+   2.2.22

data/README.md

@@ -92,7 +92,7 @@ Cutlass::App.new("ruby-getting-started").transaction do |app|
   #
   # Basically there's a ton of caveats to using this feature. Tread lightly.
   app.start_container(expose_ports: [8080]) do |container|
-    response = Excon.get("http://localhost:#{container.port(8080)}/", :idempotent => true, :retry_limit => 5, :retry_interval => 1)
+    response = Excon.get("http://localhost:#{container.get_host_port(8080)}/", :idempotent => true, :retry_limit => 5, :retry_interval => 1)
     expect(response.body).to eq("Welcome to rails")
 
     # Warning, this does not use the CNB entrypoint so it's in a different dir
@@ -169,7 +169,7 @@ An instance of BashResult is returned whenever Cutlass interacts with the shell
 
 Once built an app can `app.start_container` to yield a ContainerControl object.
 
-- `container.port(<port>)` Returns the port on the host machine (your computer, not docker) that docker is bound to
+- `container.get_host_port(<port>)` Returns the port on the host machine (your computer, not docker) that docker is bound to
 - Warning: These following commands do not use the CNB entry point so CNB env vars are not loaded and it my be a different dir than you're expecting
   - `container.bash_exec(<command>)` Executes a bash command inside of a running container. Returns a BashResult object. By default this will raise an exception if the command returns non-zero exit code. Use kwarg `container.bash_exec(<command>, exception_on_failure: false)` to disable. Returns a BashResult object.
   - `container.contains_file?(<file path>)` Checks to see if a given file exists on disk. Returns a BashResult object

data/lib/cutlass/app.rb

@@ -90,10 +90,10 @@ module Cutlass
       on_teardown { thread.join }
     end
 
-    def start_container(expose_ports: [])
+    def start_container(opts = {})
       raise "No block given" unless block_given?
 
-      ContainerBoot.new(image_id: last_build.image_id, expose_ports: expose_ports).call do |container|
+      ContainerBoot.new(opts.merge(image_id: last_build.image_id)).call do |container|
         yield container
       end
     end

data/lib/cutlass/container_boot.rb

@@ -33,7 +33,7 @@ module Cutlass
   # container. It does not execute the container's entrypoint. That means if you're running
   # inside of a CNB image, that env vars won't be set and the directory might be different.
   class ContainerBoot
-    def initialize(image_id:, expose_ports: [])
+    def initialize(image_id:, expose_ports: [], memory: nil)
       @expose_ports = Array(expose_ports)
       config = {
         "Image" => image_id,
@@ -52,6 +52,7 @@ module Cutlass
         port_bindings["#{port}/tcp"] = [{"HostPort" => ""}]
       end
 
+      config["Memory"] = memory.to_i if memory
       @container = Docker::Container.create(config)
     end
 

data/lib/cutlass/function_query.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require "json"
 require "base64"
+require "cgi"
 
 module Cutlass
   # The purpose of this class is to trigger "Salesforce Functions"
@@ -13,11 +16,14 @@ module Cutlass
   #     end
   #
   class FunctionQuery
-    def initialize(port:, spec_version: nil, body: {})
+    attr_reader :io
+
+    def initialize(port:, spec_version: nil, body: {}, io: Kernel)
       @send_body = body
       @port = port
       @response = nil
       @spec_version = spec_version || "1.0"
+      @io = io
     end
 
     def call
@@ -48,6 +54,12 @@ module Cutlass
 
     def as_json
       JSON.parse(body || "")
+    rescue JSON::ParserError => e
+      io.warn "Body: #{body}"
+      io.warn "Code: #{response&.status}"
+      io.warn "Headers: #{response&.headers.inspect}"
+      io.warn "x-extra-info: #{CGI.unescape(response&.headers&.[]("x-extra-info") || "")}"
+      raise e
     end
 
     def body

data/lib/cutlass/version.rb

@@ -2,5 +2,5 @@
 
 module Cutlass
   # Version
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutlass
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - schneems
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Write CNB integration tests for Pack in Ruby with cutlass