shipit-engine 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71f403cb4167fb521f7a2c190e2d31504dc0dea8
-  data.tar.gz: e1b1a94eefcc449a882ced01fa8036cd9df8e072
+  metadata.gz: 6fc984a73561067126bdfb062310f453acadeda6
+  data.tar.gz: 45bd1783e2aff0f6a17179181070372d9f69737c
 SHA512:
-  metadata.gz: 0a04e776ddb132ab89a89b80ba5f5a78dfb69a53e73e7300b495e38deaa947cf6c69a6fd3b14dd9ca769ed5aa5d18c47d41a6e3a79de6f02ce2655f3cf305293
-  data.tar.gz: 5e71eaea76929fb232b98197018bc029e32d1f8b4d7743b775c72a6c549082fc0bdc7d212f930d66d657322f7fc15a2b0d736ee519bab026ecc18c16f0ae756a
+  metadata.gz: 8a6acb0b4acab4a16a5b143c944f90e8dc628c4464a490ed1b316dce08a91e7d265b99482e3697cb677f420b1ef11d91c89e634c476e116b51760a9fc7fa0734
+  data.tar.gz: db7fcd010f4e2c1403c17b318e4dd241c3a40973842bc614d7141f3f6236dacae155753264c9ff6a43d6b344378c67615ee3775132423d86467850180ebb8309

data/lib/shipit/github_app.rb

@@ -1,11 +1,35 @@
 module Shipit
   class GitHubApp
+    include Mutex_m
+
+    class Token
+      class << self
+        def from_github(github_response)
+          new(github_response.token, github_response.expires_at)
+        end
+      end
+
+      def to_s
+        @token
+      end
+
+      def initialize(token, expires_at)
+        @token = token
+        @expires_at = expires_at
+      end
+
+      def blank?
+        @expires_at.past?
+      end
+    end
+
     DOMAIN = 'github.com'.freeze
     AuthenticationFailed = Class.new(StandardError)
 
     attr_reader :oauth_teams, :domain, :bot_login
 
     def initialize(config)
+      super()
       @config = (config || {}).with_indifferent_access
       @domain = @config[:domain] || DOMAIN
       @webhook_secret = @config[:webhook_secret].presence
@@ -22,9 +46,9 @@ module Shipit
     end
 
     def api
-      client = Thread.current[:github_client]
-      if !client || client.access_token != token
-        client = Thread.current[:github_client] = new_client(access_token: token)
+      client = (Thread.current[:github_client] ||= new_client(access_token: token))
+      if client.access_token != token
+        client.access_token = token
       end
       client
     end
@@ -42,11 +66,17 @@ module Shipit
       return 't0kEn' if Rails.env.test? # TODO: figure out something cleaner
       return unless private_key && app_id && installation_id
 
-      Rails.cache.fetch('github:integration:token', expires_in: 50.minutes, race_condition_ttl: 10.minutes) do
-        token = new_client(bearer_token: authentication_payload).create_app_installation_access_token(
+      @token = @token.presence || synchronize { @token.presence || fetch_new_token }
+      @token.to_s
+    end
+
+    def fetch_new_token
+      Rails.cache.fetch('github:integration:access-token', expires_in: 50.minutes, race_condition_ttl: 10.minutes) do
+        response = new_client(bearer_token: authentication_payload).create_app_installation_access_token(
           installation_id,
           accept: 'application/vnd.github.machine-man-preview+json',
-        ).token
+        )
+        token = Token.from_github(response)
         raise AuthenticationFailed if token.blank?
         token
       end

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.25.0'.freeze
+  VERSION = '0.25.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -894,143 +894,143 @@ signing_key:
 specification_version: 4
 summary: Application deployment software
 test_files:
-- test/helpers/hooks_helper.rb
-- test/helpers/links_helper.rb
-- test/helpers/fixture_aliases_helper.rb
-- test/helpers/json_helper.rb
-- test/helpers/payloads_helper.rb
-- test/helpers/api_helper.rb
-- test/helpers/queries_helper.rb
-- test/models/membership_test.rb
-- test/models/rollbacks_test.rb
-- test/models/output_chunk_test.rb
-- test/models/pull_request_test.rb
-- test/models/team_test.rb
-- test/models/commit_deployment_status_test.rb
-- test/models/deploy_spec_test.rb
-- test/models/task_definitions_test.rb
-- test/models/stacks_test.rb
-- test/models/undeployed_commits_test.rb
-- test/models/github_hook_test.rb
-- test/models/status/group_test.rb
-- test/models/status/missing_test.rb
-- test/models/api_client_test.rb
-- test/models/deploys_test.rb
-- test/models/hook_test.rb
-- test/models/commit_checks_test.rb
-- test/models/status_test.rb
-- test/models/users_test.rb
-- test/models/commit_deployment_test.rb
-- test/models/release_statuses_test.rb
-- test/models/duration_test.rb
-- test/models/tasks_test.rb
-- test/models/delivery_test.rb
-- test/models/commits_test.rb
-- test/fixtures/payloads/push_not_master.json
-- test/fixtures/payloads/status_master.json
-- test/fixtures/payloads/push_master.json
-- test/fixtures/timeout
-- test/fixtures/shipit/users.yml
-- test/fixtures/shipit/output_chunks.yml
-- test/fixtures/shipit/teams.yml
-- test/fixtures/shipit/github_hooks.yml
-- test/fixtures/shipit/hooks.yml
-- test/fixtures/shipit/commits.yml
-- test/fixtures/shipit/commit_deployments.yml
-- test/fixtures/shipit/statuses.yml
-- test/fixtures/shipit/stacks.yml
-- test/fixtures/shipit/pull_requests.yml
-- test/fixtures/shipit/api_clients.yml
-- test/fixtures/shipit/tasks.yml
-- test/fixtures/shipit/release_statuses.yml
-- test/fixtures/shipit/memberships.yml
-- test/fixtures/shipit/commit_deployment_statuses.yml
-- test/fixtures/shipit/deliveries.yml
-- test/dummy/config/secrets.yml
-- test/dummy/config/boot.rb
-- test/dummy/config/database.postgresql.yml
-- test/dummy/config/database.mysql.yml
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/application.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/initializers/0_load_development_secrets.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/database.yml
-- test/dummy/Rakefile
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/404.html
+- test/dummy/db/seeds.rb
+- test/dummy/db/schema.rb
+- test/dummy/bin/rake
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
-- test/dummy/bin/rake
 - test/dummy/bin/setup
-- test/dummy/public/422.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/500.html
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/db/seeds.rb
-- test/dummy/db/schema.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/config.ru
-- test/controllers/deploys_controller_test.rb
+- test/dummy/Rakefile
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/secrets.yml
+- test/dummy/config/boot.rb
+- test/dummy/config/database.mysql.yml
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/0_load_development_secrets.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/database.postgresql.yml
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/controllers/webhooks_controller_test.rb
+- test/controllers/rollbacks_controller_test.rb
+- test/controllers/github_authentication_controller_test.rb
+- test/controllers/merge_status_controller_test.rb
+- test/controllers/commit_checks_controller_test.rb
+- test/controllers/ccmenu_controller_test.rb
 - test/controllers/stacks_controller_test.rb
-- test/controllers/status_controller_test.rb
-- test/controllers/api/deploys_controller_test.rb
-- test/controllers/api/locks_controller_test.rb
-- test/controllers/api/stacks_controller_test.rb
+- test/controllers/deploys_controller_test.rb
+- test/controllers/api/hooks_controller_test.rb
 - test/controllers/api/ccmenu_controller_test.rb
+- test/controllers/api/stacks_controller_test.rb
+- test/controllers/api/base_controller_test.rb
+- test/controllers/api/locks_controller_test.rb
+- test/controllers/api/deploys_controller_test.rb
 - test/controllers/api/commits_controller_test.rb
-- test/controllers/api/outputs_controller_test.rb
-- test/controllers/api/hooks_controller_test.rb
 - test/controllers/api/pull_requests_controller_test.rb
 - test/controllers/api/tasks_controller_test.rb
-- test/controllers/api/base_controller_test.rb
-- test/controllers/commit_checks_controller_test.rb
-- test/controllers/release_statuses_controller_test.rb
-- test/controllers/webhooks_controller_test.rb
-- test/controllers/ccmenu_controller_test.rb
-- test/controllers/rollbacks_controller_test.rb
+- test/controllers/api/outputs_controller_test.rb
+- test/controllers/status_controller_test.rb
 - test/controllers/commits_controller_test.rb
-- test/controllers/github_authentication_controller_test.rb
+- test/controllers/release_statuses_controller_test.rb
 - test/controllers/pull_requests_controller_test.rb
 - test/controllers/tasks_controller_test.rb
-- test/controllers/merge_status_controller_test.rb
-- test/test_command_integration.rb
-- test/test_helper.rb
-- test/jobs/destroy_stack_job_test.rb
-- test/jobs/fetch_deployed_revision_job_test.rb
-- test/jobs/fetch_commit_stats_job_test.rb
-- test/jobs/merge_pull_requests_job_test.rb
-- test/jobs/cache_deploy_spec_job_test.rb
-- test/jobs/emit_event_job_test.rb
-- test/jobs/refresh_github_user_job_test.rb
-- test/jobs/chunk_rollup_job_test.rb
-- test/jobs/refresh_status_job_test.rb
-- test/jobs/purge_old_deliveries_job_test.rb
-- test/jobs/deliver_hook_job_test.rb
-- test/jobs/github_sync_job_test.rb
-- test/jobs/perform_task_job_test.rb
-- test/jobs/append_delayed_release_status_job_test.rb
-- test/jobs/unique_job_test.rb
-- test/unit/environment_variables_test.rb
-- test/unit/commands_test.rb
-- test/unit/github_app_test.rb
-- test/unit/rollback_commands_test.rb
 - test/unit/command_test.rb
+- test/unit/commands_test.rb
+- test/unit/deploy_commands_test.rb
 - test/unit/shipit_test.rb
+- test/unit/rollback_commands_test.rb
 - test/unit/csv_serializer_test.rb
-- test/unit/deploy_commands_test.rb
 - test/unit/variable_definition_test.rb
 - test/unit/github_url_helper_test.rb
+- test/unit/environment_variables_test.rb
+- test/unit/github_app_test.rb
+- test/models/release_statuses_test.rb
+- test/models/deploys_test.rb
+- test/models/undeployed_commits_test.rb
+- test/models/team_test.rb
+- test/models/rollbacks_test.rb
+- test/models/commit_checks_test.rb
+- test/models/github_hook_test.rb
+- test/models/task_definitions_test.rb
+- test/models/tasks_test.rb
+- test/models/output_chunk_test.rb
+- test/models/commit_deployment_status_test.rb
+- test/models/delivery_test.rb
+- test/models/users_test.rb
+- test/models/commit_deployment_test.rb
+- test/models/duration_test.rb
+- test/models/api_client_test.rb
+- test/models/commits_test.rb
+- test/models/status/group_test.rb
+- test/models/status/missing_test.rb
+- test/models/deploy_spec_test.rb
+- test/models/stacks_test.rb
+- test/models/hook_test.rb
+- test/models/membership_test.rb
+- test/models/status_test.rb
+- test/models/pull_request_test.rb
+- test/test_command_integration.rb
+- test/helpers/hooks_helper.rb
+- test/helpers/queries_helper.rb
+- test/helpers/json_helper.rb
+- test/helpers/fixture_aliases_helper.rb
+- test/helpers/payloads_helper.rb
+- test/helpers/links_helper.rb
+- test/helpers/api_helper.rb
+- test/jobs/emit_event_job_test.rb
+- test/jobs/unique_job_test.rb
+- test/jobs/merge_pull_requests_job_test.rb
+- test/jobs/append_delayed_release_status_job_test.rb
+- test/jobs/deliver_hook_job_test.rb
+- test/jobs/refresh_status_job_test.rb
+- test/jobs/fetch_deployed_revision_job_test.rb
+- test/jobs/purge_old_deliveries_job_test.rb
+- test/jobs/refresh_github_user_job_test.rb
+- test/jobs/chunk_rollup_job_test.rb
+- test/jobs/fetch_commit_stats_job_test.rb
+- test/jobs/cache_deploy_spec_job_test.rb
+- test/jobs/perform_task_job_test.rb
+- test/jobs/github_sync_job_test.rb
+- test/jobs/destroy_stack_job_test.rb
+- test/fixtures/timeout
+- test/fixtures/shipit/release_statuses.yml
+- test/fixtures/shipit/users.yml
+- test/fixtures/shipit/output_chunks.yml
+- test/fixtures/shipit/deliveries.yml
+- test/fixtures/shipit/hooks.yml
+- test/fixtures/shipit/github_hooks.yml
+- test/fixtures/shipit/statuses.yml
+- test/fixtures/shipit/memberships.yml
+- test/fixtures/shipit/teams.yml
+- test/fixtures/shipit/tasks.yml
+- test/fixtures/shipit/api_clients.yml
+- test/fixtures/shipit/stacks.yml
+- test/fixtures/shipit/commits.yml
+- test/fixtures/shipit/pull_requests.yml
+- test/fixtures/shipit/commit_deployments.yml
+- test/fixtures/shipit/commit_deployment_statuses.yml
+- test/fixtures/payloads/status_master.json
+- test/fixtures/payloads/push_master.json
+- test/fixtures/payloads/push_not_master.json
+- test/test_helper.rb