heroku_hatchet 7.3.3 → 7.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38e2cd43133aeb405a133834284c026c0e4a1347e33f84e805ed7b9fd2674fc9
-  data.tar.gz: b1f88b0a62250a4cb2d9e22a89fe101356c5360aa37d786a51faebb2fac23824
+  metadata.gz: a45ee1ab2021838074b4f288d70aab769a71961cbae7cd12af67866e5558bb64
+  data.tar.gz: 0c99b826bfc797632924e151b796590f1ddbd07ff50e9eea2dc816b9991fb69d
 SHA512:
-  metadata.gz: b36428d7f0e5288ac434d3fa66c3bf70b067742f4e150ebc4208d2e1e9b23761c7fd94cee0c8713909e07c63845014b7b139dd86f82d0118a53978b0033a83f7
-  data.tar.gz: 3250c42cdd66bfbcfc4b129a0cf4083b30b94308614bf5ae4c765ced438522e814a6205dde298b51132eb6057581329054fde9d7bbd49208dda2d9cf89bd3e8d
+  metadata.gz: 940afbe59938c35c5bee92ac43dabe66e0e68f7cefbc35b662667eaecec343f04cc83e93418e7302a47ce2f955b2d7269073e167614a475dc91d69e6bee94d82
+  data.tar.gz: 204098d3744d64717141ca4d8f754324e761981b3d2d3bc9710e3b18e5532c97a1028813e1d7e2d295d35fb36e1b09ab78761a370af6490849de991ca50045ce

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## HEAD
 
+## 7.3.4
+
+- Memoize `Hatchet::App.default_buildpack` (https://github.com/heroku/hatchet/pull/183)
+- Fix repository path lookup when custom Hatchet directory set (https://github.com/heroku/hatchet/issues/181)
+- Handle additional variations of rate limit error messages (https://github.com/heroku/hatchet/pull/182)
+- Add `HATCHET_DEFAULT_STACK` for configuring the default stack (https://github.com/heroku/hatchet/pull/184)
+- Fix typo in the reaper `"Duplicate destroy attempted"` message (https://github.com/heroku/hatchet/pull/175)
+- Set `init.defaultBranch` in ci:setup to suppress `git init` warning in Git 2.30+ (https://github.com/heroku/hatchet/issues/172)
+- Switch `heroku ci:install_heroku` to the Heroku CLI standalone installer rather than the APT install method (https://github.com/heroku/hatchet/issues/171)
+
 ## 7.3.3
 
 - Quiet personal tokens (https://github.com/heroku/hatchet/pull/148)
@@ -344,7 +354,6 @@
 
     after_script: bundle exec rake hatchet:teardown_travis
 
-
 ## 0.1.1
 
 - Allow auto retries of pushes by setting environment variable `HATCHET_RETRIES=3`

data/README.md

@@ -504,7 +504,7 @@ The `Hatchet::Runner.new` takes several arguments.
 
 ### Init options
 
-- stack (String): The stack you want to deploy to on Heroku.
+- stack (String): The Heroku [stack](https://devcenter.heroku.com/articles/stack) to use for the app. If this is not set, the stack will be determined from `HATCHET_DEFAULT_STACK`, or else the Heroku platform's [default stack](https://devcenter.heroku.com/articles/stack#default-stack).
 
 ```ruby
 Hatchet::Runner.new("default_ruby", stack: "heroku-16").deploy do |app|
@@ -598,6 +598,7 @@ app.get_config("DEPLOY_TASKS") # => "run:bloop"
 
 - `app.set_lab()`: Enables the specified lab/feature on the app
 - `app.add_database()`: adds a database to the app, defaults to the "dev" database
+- `app.update_stack()`: Change the app's stack to that specified (for example `"heroku-20"`). Will take effect on the next build.
 - `app.run()`: Runs a `heroku run bash` session with the arguments, covered above.
 - `app.run_multi()`: Runs a `heroku run bash` session in the background and yields the results. This requires the `run_multi` flag of the app to be set to `true`, which will charge your application (the `HATCHET_EXPENSIVE_MODE` env var must also be set to use this feature). Example above.
 - `app.create_app`: Can be used to manually create the app without deploying it (You probably want `setup!` though)
@@ -727,6 +728,7 @@ HATCHET_ALIVE_TTL_MINUTES=7
 - `HATCHET_APP_LIMIT`: The maximum number of **hatchet** apps that Hatchet will allow in the given account before running the reaper. For local execution, keep this low as you don't want your account dominated by hatchet apps. For CI, you want it to be much larger, 80-100 since it's not competing with non-hatchet apps. Your test runner account needs to be a dedicated account.
 - `HEROKU_API_KEY`: The API key of your test account user. If you run locally without this set, it will use your personal credentials.
 - `HEROKU_API_USER`: The email address of your user account. If you run locally without this set, it will use your personal credentials.
+- `HATCHET_DEFAULT_STACK`: The default Heroku stack to be used when an explicit `stack` is not passed to `App.new`. If this is not set, apps will instead use Heroku platform's [default stack](https://devcenter.heroku.com/articles/stack#default-stack).
 - `HATCHET_RUN_MULTI`: If enabled, this will scale up deployed apps to "standard-1x" once deployed instead of running on the free tier. This enables the `run_multi` method capability, however scaling up is not free. WARNING: Setting this env var will incur charges to your Heroku account. We recommended never to enable this setting unless you work for Heroku. To use this you must also set `HATCHET_EXPENSIVE_MODE=1`
 - `HATCHET_EXPENSIVE_MODE`: This is intended to be a "safety" environment variable. If it is not set, Hatchet will prevent you from using the `run_multi: true` setting or the `HATCHET_RUN_MULTI` environment variables. There are still ways to incur charges without this feature, but unless you're absolutely confident your test setup will not leave "orphan" apps that are billing you, do not enable this setting. Even then, only set this value if you work for Heroku. To recap WARNING: setting this is expensive.
 

data/etc/ci_setup.rb

@@ -30,6 +30,8 @@ run_cmd "bundle exec hatchet ci:install_heroku"
 run_cmd "bundle exec hatchet install"
 run_cmd "git config --get user.email > /dev/null || git config --global user.email #{ENV.fetch('HEROKU_API_USER').shellescape}"
 run_cmd "git config --get user.name > /dev/null || git config --global user.name 'BuildpackTester'"
+# Suppress the `git init` warning in Git 2.30+ when no default branch name is set.
+run_cmd "git config --global init.defaultBranch main"
 
 puts "== Done =="
 

data/etc/setup_heroku.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 set -euo pipefail
-curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh
+curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install.sh | sh

data/lib/hatchet/app.rb

@@ -49,7 +49,7 @@ module Hatchet
     DEFAULT_REPO_NAME = Object.new
 
     def initialize(repo_name = DEFAULT_REPO_NAME,
-                   stack: "",
+                   stack: ENV["HATCHET_DEFAULT_STACK"],
                    name: default_name,
                    debug: nil,
                    debugging: nil,
@@ -112,8 +112,9 @@ module Hatchet
       @directory
     end
 
+    @default_buildpack = nil
     def self.default_buildpack
-      [HATCHET_BUILDPACK_BASE.call, HATCHET_BUILDPACK_BRANCH.call].join("#")
+      @default_buildpack ||= [HATCHET_BUILDPACK_BASE.call, HATCHET_BUILDPACK_BRANCH.call].join("#")
     end
 
     def allow_failure?

data/lib/hatchet/config.rb

@@ -44,7 +44,7 @@ module Hatchet
 
     # use this method to turn "codetriage" into repos/rails3/codetriage
     def path_for_name(name)
-      possible_paths = [repos[name.to_s], "repos/#{name}", name].compact
+      possible_paths = [repos[name.to_s], "#{repo_directory_path}/#{name}", name].compact
       path = possible_paths.detect do |path|
         !(Dir[path] && Dir[path].empty?)
       end

data/lib/hatchet/git_app.rb

@@ -13,7 +13,7 @@ module Hatchet
           output = git_push_heroku_yall
         rescue FailedDeploy => e
           case e.output
-          when /reached the API rate limit/, /429 Too Many Requests/
+          when /reached the API rate limit/, /429 Too Many Requests/, /HTTP 429/, /HTTP code = 429/
             throw(:throttle)
           else
             raise e unless @allow_failure

data/lib/hatchet/reaper.rb

@@ -170,14 +170,14 @@ module Hatchet
       body = e.response.body
       request_id = e.response.headers["Request-Id"]
       if body =~ /Couldn\'t find that app./
-        io.puts "Duplicate destoy attempted #{name.inspect}: #{id}, status: 404, request_id: #{request_id}"
+        io.puts "Duplicate destroy attempted #{name.inspect}: #{id}, status: 404, request_id: #{request_id}"
         raise AlreadyDeletedError.new
       else
         raise e
       end
     rescue Excon::Error::Forbidden => e
       request_id = e.response.headers["Request-Id"]
-      io.puts "Duplicate destoy attempted #{name.inspect}: #{id}, status: 403, request_id: #{request_id}"
+      io.puts "Duplicate destroy attempted #{name.inspect}: #{id}, status: 403, request_id: #{request_id}"
       raise AlreadyDeletedError.new
     end
 

data/lib/hatchet/templates/dependabot.erb

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 updates:
   - package-ecosystem: "bundler"
     directory: "/"

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "7.3.3"
+  VERSION = "7.3.4"
 end

data/spec/hatchet/app_spec.rb

@@ -58,6 +58,10 @@ describe "AppTest" do
     expect(app.buildpacks.first).to match("https://github.com/heroku/heroku-buildpack-ruby")
   end
 
+  it "default_buildpack is only computed once" do
+    expect(Hatchet::App.default_buildpack.object_id).to eq(Hatchet::App.default_buildpack.object_id)
+  end
+
   it "create app with stack" do
     stack = "heroku-16"
     app = Hatchet::App.new("default_ruby", stack: stack)
@@ -65,6 +69,19 @@ describe "AppTest" do
     expect(app.platform_api.app.info(app.name)["build_stack"]["name"]).to eq(stack)
   end
 
+  it "create app with HATCHET_DEFAULT_STACK set" do
+    begin
+      original_default_stack = ENV["HATCHET_DEFAULT_STACK"]
+      default_stack = "heroku-18"
+      ENV["HATCHET_DEFAULT_STACK"] = default_stack
+      app = Hatchet::App.new("default_ruby")
+      app.create_app
+      expect(app.platform_api.app.info(app.name)["build_stack"]["name"]).to eq(default_stack)
+    ensure
+      ENV["HATCHET_DEFAULT_STACK"] = original_default_stack
+    end
+  end
+
   it "marks itself 'finished' when done in block mode" do
     app = Hatchet::Runner.new("default_ruby")
 

data/spec/hatchet/ci_spec.rb

@@ -28,7 +28,7 @@ describe "CIFourTest" do
 
   it "error with bad app" do
     expect {
-      Hatchet::GitApp.new("rails5_ci_fails_no_database").run_ci { }
+      Hatchet::GitApp.new("rails5_ci_fails_no_database", stack: "heroku-18").run_ci { }
     }.to raise_error(/PG::ConnectionBad: could not connect to server/)
   end
 
@@ -41,7 +41,7 @@ describe "CIFourTest" do
       @before_deploy_dir_pwd = Dir.pwd
     end
 
-    Hatchet::GitApp.new("rails5_ci_fails_no_database", allow_failure: true, before_deploy: before_deploy).run_ci do |test_run|
+    Hatchet::GitApp.new("rails5_ci_fails_no_database", stack: "heroku-18", allow_failure: true, before_deploy: before_deploy).run_ci do |test_run|
       expect(test_run.status).to eq(:errored)
       expect(@before_deploy_dir_pwd).to eq(Dir.pwd)
       expect(@before_deploy_called).to be_truthy

data/spec/hatchet/config_spec.rb

@@ -6,6 +6,10 @@ describe "ConfigTest" do
     expect(@config.path_for_name("rails3_mri_193")).to(eq("repo_fixtures/repos/rails3/rails3_mri_193"))
   end
 
+  it("config path for name with full repo name") do
+    expect(@config.path_for_name("rails3/rails3_mri_193")).to(eq("repo_fixtures/repos/rails3/rails3_mri_193"))
+  end
+
   it("config dirs") do
     { "repo_fixtures/repos/bundler/no_lockfile" => "https://github.com/sharpstone/no_lockfile.git", "repo_fixtures/repos/default/default_ruby" => "https://github.com/sharpstone/default_ruby.git", "repo_fixtures/repos/rails2/rails2blog" => "https://github.com/sharpstone/rails2blog.git", "repo_fixtures/repos/rails3/rails3_mri_193" => "https://github.com/sharpstone/rails3_mri_193.git" }.each do |key, value|
       assert_include(key, value, @config.dirs)

data/spec/unit/shell_throttle_spec.rb

@@ -43,7 +43,7 @@ describe "ShellThrottle" do
   end
 
   describe "git push throttle" do
-    it "rate throttles `git push` " do
+    it "rate throttles `git push` with output variation 1" do
       app = Hatchet::GitApp.new("default_ruby")
       def app.git_push_heroku_yall
         @_git_push_heroku_yall_call_count ||= 0
@@ -67,7 +67,7 @@ describe "ShellThrottle" do
       expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
     end
 
-    it "rate throttles `git push` with different output" do
+    it "rate throttles `git push` with output variation 2" do
       app = Hatchet::GitApp.new("default_ruby")
       def app.git_push_heroku_yall
         @_git_push_heroku_yall_call_count ||= 0
@@ -90,5 +90,53 @@ describe "ShellThrottle" do
 
       expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
     end
+
+    it "rate throttles `git push` with output variation 3" do
+      app = Hatchet::GitApp.new("default_ruby")
+      def app.git_push_heroku_yall
+        @_git_push_heroku_yall_call_count ||= 0
+        @_git_push_heroku_yall_call_count += 1
+        if @_git_push_heroku_yall_call_count >= 2
+          "Success"
+        else
+          raise Hatchet::App::FailedDeployError.new(
+            self,
+            "message",
+            output: "error: RPC failed; HTTP 429 curl 22 The requested URL returned error: 429"
+          )
+        end
+      end
+
+      def app.sleep_called?; @sleep_called; end
+      def app.what_is_git_push_heroku_yall_call_count; @_git_push_heroku_yall_call_count; end
+
+      app.push_without_retry!
+
+      expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
+    end
+
+    it "rate throttles `git push` with output variation 4" do
+      app = Hatchet::GitApp.new("default_ruby")
+      def app.git_push_heroku_yall
+        @_git_push_heroku_yall_call_count ||= 0
+        @_git_push_heroku_yall_call_count += 1
+        if @_git_push_heroku_yall_call_count >= 2
+          "Success"
+        else
+          raise Hatchet::App::FailedDeployError.new(
+            self,
+            "message",
+            output: "error: RPC failed; result=22, HTTP code = 429"
+          )
+        end
+      end
+
+      def app.sleep_called?; @sleep_called; end
+      def app.what_is_git_push_heroku_yall_call_count; @_git_push_heroku_yall_call_count; end
+
+      app.push_without_retry!
+
+      expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 7.3.3
+  version: 7.3.4
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.