diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18040b9..b844eb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - - uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # pin@v1.177.1 + - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # pin@v1.178.0 with: bundler-cache: true diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a690681..f7e1bb2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,12 +29,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # pin@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # pin@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # pin@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 427a6c8..4cb8abe 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - - uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # pin@v1.177.1 + - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # pin@v1.178.0 with: bundler-cache: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b51e85b..d56e31d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - - uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # pin@v1.177.1 + - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # pin@v1.178.0 with: bundler-cache: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35db293..39c84be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,13 +16,13 @@ jobs: strategy: matrix: - ruby: [ '3.1.2', '3.1.4', '3.2.2', '3.2.3', '3.3.0' ] + ruby: [ '3.1.2', '3.1.4', '3.2.2', '3.2.3', '3.3.0', '3.3.1' ] steps: - name: checkout uses: actions/checkout@v4 - - uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # pin@v1.177.1 + - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # pin@v1.178.0 with: bundler-cache: true ruby-version: ${{ matrix.ruby }} diff --git a/.ruby-version b/.ruby-version index 15a2799..bea438e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.0 +3.3.1 diff --git a/Gemfile.lock b/Gemfile.lock index 0c3145a..8a7f021 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - entitlements-github-plugin (0.7.0) + entitlements-github-plugin (1.0.0) contracts (~> 0.17.0) faraday (~> 2.0) faraday-retry (~> 2.0) @@ -10,7 +10,7 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -25,7 +25,7 @@ GEM ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.8) - concurrent-ruby (1.1.9) + concurrent-ruby (1.3.1) connection_pool (2.4.1) contracts (0.17) crack (1.0.0) @@ -34,12 +34,12 @@ GEM diff-lcs (1.5.1) docile (1.4.0) drb (2.2.1) - entitlements-app (0.3.3) - concurrent-ruby (= 1.1.9) + entitlements-app (1.0.0) + concurrent-ruby (~> 1.3, >= 1.3.1) faraday (~> 2.0) - net-ldap (~> 0.17) + net-ldap (~> 0.19) octokit (~> 4.18) - optimist (= 3.0.0) + optimist (~> 3.1) faraday (2.9.0) faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) @@ -47,11 +47,11 @@ GEM faraday-retry (2.2.1) faraday (~> 2.0) hashdiff (1.1.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.7.2) language_server-protocol (3.17.0.3) - minitest (5.22.3) + minitest (5.23.1) mutex_m (0.2.0) net-http (0.4.1) uri @@ -59,7 +59,7 @@ GEM octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) - optimist (3.0.0) + optimist (3.1.0) parallel (1.24.0) parser (3.3.1.0) ast (~> 2.4.1) @@ -67,25 +67,25 @@ GEM prism (0.29.0) public_suffix (5.0.5) racc (1.8.0) - rack (3.0.10) + rack (3.0.11) rainbow (3.1.1) rake (13.2.1) regexp_parser (2.9.2) rexml (3.2.8) strscan (>= 3.0.9) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.1) + rspec-support (~> 3.8.0) + rspec-support (3.8.3) rubocop (1.64.0) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -106,7 +106,7 @@ GEM rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -128,7 +128,7 @@ GEM simplecov (< 1.0) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sorbet-runtime (0.5.11388) + sorbet-runtime (0.5.11394) strscan (3.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -142,22 +142,22 @@ GEM PLATFORMS ruby + x86_64-linux DEPENDENCIES - entitlements-app (~> 0.3) + entitlements-app (~> 1.0) entitlements-github-plugin! - rake (~> 13.2.0) - rspec (= 3.13.0) - rspec-core (= 3.13.0) - rubocop (= 1.64.0) - rubocop-github (= 0.20.0) - rubocop-performance (= 1.21.0) + rake (~> 13.2, >= 13.2.1) + rspec (= 3.8.0) + rubocop (~> 1.64) + rubocop-github (~> 0.20) + rubocop-performance (~> 1.21) ruby-lsp (~> 0.16.7) rugged (~> 1.7, >= 1.7.2) - simplecov (= 0.22.0) - simplecov-erb (= 1.0.1) + simplecov (~> 0.22.0) + simplecov-erb (~> 1.0, >= 1.0.1) vcr (~> 6.2) - webmock (~> 3.23) + webmock (~> 3.23, >= 3.23.1) BUNDLED WITH - 2.3.19 + 2.5.9 diff --git a/entitlements-github-plugin.gemspec b/entitlements-github-plugin.gemspec index 3c4f932..6e5f224 100644 --- a/entitlements-github-plugin.gemspec +++ b/entitlements-github-plugin.gemspec @@ -14,22 +14,23 @@ Gem::Specification.new do |s| s.homepage = "https://github.com/github/entitlements-github-plugin" s.executables = %w[] + s.required_ruby_version = ">= 3.0.0" + s.add_dependency "contracts", "~> 0.17.0" s.add_dependency "faraday", "~> 2.0" s.add_dependency "faraday-retry", "~> 2.0" s.add_dependency "octokit", "~> 4.25" - s.add_development_dependency "entitlements-app", "~> 0.3" - s.add_development_dependency "rake", "~> 13.2.0" - s.add_development_dependency "rspec", "= 3.13.0" - s.add_development_dependency "rspec-core", "= 3.13.0" - s.add_development_dependency "rubocop", "= 1.64.0" - s.add_development_dependency "rubocop-github", "= 0.20.0" - s.add_development_dependency "rubocop-performance", "= 1.21.0" + s.add_development_dependency "entitlements-app", "~> 1.0" + s.add_development_dependency "rake", "~> 13.2", ">= 13.2.1" + s.add_development_dependency "rspec", "= 3.8.0" + s.add_development_dependency "rubocop", "~> 1.64" + s.add_development_dependency "rubocop-github", "~> 0.20" + s.add_development_dependency "rubocop-performance", "~> 1.21" s.add_development_dependency "ruby-lsp", "~> 0.16.7" s.add_development_dependency "rugged", "~> 1.7", ">= 1.7.2" - s.add_development_dependency "simplecov", "= 0.22.0" - s.add_development_dependency "simplecov-erb", "= 1.0.1" + s.add_development_dependency "simplecov", "~> 0.22.0" + s.add_development_dependency "simplecov-erb", "~> 1.0", ">= 1.0.1" s.add_development_dependency "vcr", "~> 6.2" - s.add_development_dependency "webmock", "~> 3.23" + s.add_development_dependency "webmock", "~> 3.23", ">= 3.23.1" end diff --git a/lib/version.rb b/lib/version.rb index 947d556..de4ecae 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -2,6 +2,6 @@ module Entitlements module Version - VERSION = "0.7.0" + VERSION = "1.0.0" end end diff --git a/spec/acceptance/Dockerfile.entitlements-github-plugin b/spec/acceptance/Dockerfile.entitlements-github-plugin index 3540461..1479c75 100644 --- a/spec/acceptance/Dockerfile.entitlements-github-plugin +++ b/spec/acceptance/Dockerfile.entitlements-github-plugin @@ -1,4 +1,4 @@ -FROM ruby:3.3-slim +FROM ruby:3.3.1-slim LABEL maintainer="GitHub Security Ops " ENV HOME /root ENV RELEASE=buster @@ -17,7 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ pkg-config # Install bundler -RUN gem install bundler -v 2.3.19 +RUN gem install bundler -v 2.5.9 # Bootstrap files and caching for speed COPY "vendor/cache/" "/data/entitlements/vendor/cache/" diff --git a/vendor/cache/activesupport-7.1.3.2.gem b/vendor/cache/activesupport-7.1.3.2.gem deleted file mode 100644 index 219df77..0000000 Binary files a/vendor/cache/activesupport-7.1.3.2.gem and /dev/null differ diff --git a/vendor/cache/activesupport-7.1.3.3.gem b/vendor/cache/activesupport-7.1.3.3.gem new file mode 100644 index 0000000..1fb5db3 Binary files /dev/null and b/vendor/cache/activesupport-7.1.3.3.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.9.gem b/vendor/cache/concurrent-ruby-1.1.9.gem deleted file mode 100644 index 9ed64f2..0000000 Binary files a/vendor/cache/concurrent-ruby-1.1.9.gem and /dev/null differ diff --git a/vendor/cache/concurrent-ruby-1.3.1.gem b/vendor/cache/concurrent-ruby-1.3.1.gem new file mode 100644 index 0000000..ddb7100 Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.3.1.gem differ diff --git a/vendor/cache/entitlements-app-0.3.3.gem b/vendor/cache/entitlements-app-0.3.3.gem deleted file mode 100644 index 3867eee..0000000 Binary files a/vendor/cache/entitlements-app-0.3.3.gem and /dev/null differ diff --git a/vendor/cache/entitlements-app-1.0.0.gem b/vendor/cache/entitlements-app-1.0.0.gem new file mode 100644 index 0000000..4b84ff6 Binary files /dev/null and b/vendor/cache/entitlements-app-1.0.0.gem differ diff --git a/vendor/cache/i18n-1.14.4.gem b/vendor/cache/i18n-1.14.4.gem deleted file mode 100644 index 5dc8323..0000000 Binary files a/vendor/cache/i18n-1.14.4.gem and /dev/null differ diff --git a/vendor/cache/i18n-1.14.5.gem b/vendor/cache/i18n-1.14.5.gem new file mode 100644 index 0000000..904ea78 Binary files /dev/null and b/vendor/cache/i18n-1.14.5.gem differ diff --git a/vendor/cache/minitest-5.22.3.gem b/vendor/cache/minitest-5.22.3.gem deleted file mode 100644 index 033e2e1..0000000 Binary files a/vendor/cache/minitest-5.22.3.gem and /dev/null differ diff --git a/vendor/cache/minitest-5.23.1.gem b/vendor/cache/minitest-5.23.1.gem new file mode 100644 index 0000000..0ce5d71 Binary files /dev/null and b/vendor/cache/minitest-5.23.1.gem differ diff --git a/vendor/cache/optimist-3.0.0.gem b/vendor/cache/optimist-3.0.0.gem deleted file mode 100644 index 7ee0e70..0000000 Binary files a/vendor/cache/optimist-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/optimist-3.1.0.gem b/vendor/cache/optimist-3.1.0.gem new file mode 100644 index 0000000..214e4ee Binary files /dev/null and b/vendor/cache/optimist-3.1.0.gem differ diff --git a/vendor/cache/rack-3.0.10.gem b/vendor/cache/rack-3.0.10.gem deleted file mode 100644 index 2290c55..0000000 Binary files a/vendor/cache/rack-3.0.10.gem and /dev/null differ diff --git a/vendor/cache/rack-3.0.11.gem b/vendor/cache/rack-3.0.11.gem new file mode 100644 index 0000000..d57497b Binary files /dev/null and b/vendor/cache/rack-3.0.11.gem differ diff --git a/vendor/cache/rspec-3.13.0.gem b/vendor/cache/rspec-3.13.0.gem deleted file mode 100644 index f05ea78..0000000 Binary files a/vendor/cache/rspec-3.13.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-3.8.0.gem b/vendor/cache/rspec-3.8.0.gem new file mode 100644 index 0000000..dfd0934 Binary files /dev/null and b/vendor/cache/rspec-3.8.0.gem differ diff --git a/vendor/cache/rspec-core-3.13.0.gem b/vendor/cache/rspec-core-3.13.0.gem deleted file mode 100644 index e4d0efb..0000000 Binary files a/vendor/cache/rspec-core-3.13.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-core-3.8.2.gem b/vendor/cache/rspec-core-3.8.2.gem new file mode 100644 index 0000000..3b7422e Binary files /dev/null and b/vendor/cache/rspec-core-3.8.2.gem differ diff --git a/vendor/cache/rspec-expectations-3.13.0.gem b/vendor/cache/rspec-expectations-3.13.0.gem deleted file mode 100644 index 352f4f0..0000000 Binary files a/vendor/cache/rspec-expectations-3.13.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-expectations-3.8.6.gem b/vendor/cache/rspec-expectations-3.8.6.gem new file mode 100644 index 0000000..c34ee0a Binary files /dev/null and b/vendor/cache/rspec-expectations-3.8.6.gem differ diff --git a/vendor/cache/rspec-mocks-3.13.0.gem b/vendor/cache/rspec-mocks-3.13.0.gem deleted file mode 100644 index 72f5dbf..0000000 Binary files a/vendor/cache/rspec-mocks-3.13.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-mocks-3.8.2.gem b/vendor/cache/rspec-mocks-3.8.2.gem new file mode 100644 index 0000000..44015e4 Binary files /dev/null and b/vendor/cache/rspec-mocks-3.8.2.gem differ diff --git a/vendor/cache/rspec-support-3.13.1.gem b/vendor/cache/rspec-support-3.13.1.gem deleted file mode 100644 index bb660f2..0000000 Binary files a/vendor/cache/rspec-support-3.13.1.gem and /dev/null differ diff --git a/vendor/cache/rspec-support-3.8.3.gem b/vendor/cache/rspec-support-3.8.3.gem new file mode 100644 index 0000000..d52de34 Binary files /dev/null and b/vendor/cache/rspec-support-3.8.3.gem differ diff --git a/vendor/cache/rubocop-rails-2.24.1.gem b/vendor/cache/rubocop-rails-2.24.1.gem deleted file mode 100644 index 7706a0b..0000000 Binary files a/vendor/cache/rubocop-rails-2.24.1.gem and /dev/null differ diff --git a/vendor/cache/rubocop-rails-2.25.0.gem b/vendor/cache/rubocop-rails-2.25.0.gem new file mode 100644 index 0000000..f5261d2 Binary files /dev/null and b/vendor/cache/rubocop-rails-2.25.0.gem differ diff --git a/vendor/cache/sorbet-runtime-0.5.11388.gem b/vendor/cache/sorbet-runtime-0.5.11388.gem deleted file mode 100644 index 0ede2e7..0000000 Binary files a/vendor/cache/sorbet-runtime-0.5.11388.gem and /dev/null differ diff --git a/vendor/cache/sorbet-runtime-0.5.11394.gem b/vendor/cache/sorbet-runtime-0.5.11394.gem new file mode 100644 index 0000000..f328b41 Binary files /dev/null and b/vendor/cache/sorbet-runtime-0.5.11394.gem differ