diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18040b9..63410ed 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@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # pin@v1.179.1 with: bundler-cache: true diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0a0d148..2e30a18 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/gem.yml b/.github/workflows/gem.yml index b51e85b..6351ce7 100644 --- a/.github/workflows/gem.yml +++ b/.github/workflows/gem.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@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # pin@v1.179.1 with: bundler-cache: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 427a6c8..8dd8f25 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@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # pin@v1.179.1 with: bundler-cache: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5442404..1527972 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@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # pin@v1.179.1 with: bundler-cache: true ruby-version: ${{ matrix.ruby }} diff --git a/.rubocop.yml b/.rubocop.yml index 8b0b726..d8792cf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,7 +6,7 @@ AllCops: NewCops: disable SuggestExtensions: false DisplayCopNames: true - TargetRubyVersion: 3.3 + TargetRubyVersion: 3.3.1 Exclude: - 'bin/*' - 'spec/acceptance/fixtures/**/*' 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 f42947a..7a6995a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ PATH remote: . specs: - entitlements-gitrepo-auditor-plugin (0.4.1) + entitlements-gitrepo-auditor-plugin (1.0.0) contracts (~> 0.17) - entitlements-app (~> 0.3) + entitlements-app (~> 1.0) GEM remote: https://rubygems.org/ @@ -23,21 +23,24 @@ GEM ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.8) - concurrent-ruby (1.1.9) + concurrent-ruby (1.3.3) connection_pool (2.4.1) contracts (0.17) crack (1.0.0) bigdecimal rexml + debug (1.8.0) + irb (>= 1.5.0) + reline (>= 0.3.1) diff-lcs (1.5.1) docile (1.4.0) drb (2.2.1) - entitlements-app (0.3.4) - concurrent-ruby (= 1.1.9) - faraday (> 2.0, <= 2.7.10) + entitlements-app (1.0.0) + concurrent-ruby (~> 1.3, >= 1.3.1) + faraday (~> 2.0) net-ldap (~> 0.19) octokit (~> 4.18) - optimist (= 3.0.0) + optimist (~> 3.1) faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) @@ -45,6 +48,10 @@ GEM hashdiff (1.1.0) i18n (1.14.5) concurrent-ruby (~> 1.0) + io-console (0.7.2) + irb (1.13.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) json (2.7.2) language_server-protocol (3.17.0.3) minitest (5.23.1) @@ -53,32 +60,38 @@ 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) racc + psych (5.1.2) + stringio public_suffix (5.0.5) racc (1.8.0) rack (3.0.11) rainbow (3.1.1) rake (13.2.1) + rdoc (6.7.0) + psych (>= 4.0.0) regexp_parser (2.9.2) + reline (0.5.8) + io-console (~> 0.5) 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.1) + 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) @@ -118,6 +131,7 @@ GEM simplecov (< 1.0) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + stringio (3.1.0) strscan (3.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -132,18 +146,18 @@ PLATFORMS ruby DEPENDENCIES + debug (<= 1.8.0) entitlements-gitrepo-auditor-plugin! - rake (= 13.2.1) - 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) rugged (~> 1.7, >= 1.7.2) - simplecov (= 0.22.0) - simplecov-erb (= 1.0.1) - vcr (= 6.2.0) - webmock (= 3.23.1) + simplecov (~> 0.22.0) + simplecov-erb (~> 1.0, >= 1.0.1) + vcr (~> 6.2) + webmock (~> 3.23, >= 3.23.1) BUNDLED WITH 2.5.3 diff --git a/entitlements-gitrepo-auditor-plugin.gemspec b/entitlements-gitrepo-auditor-plugin.gemspec index b44bfe5..112397f 100644 --- a/entitlements-gitrepo-auditor-plugin.gemspec +++ b/entitlements-gitrepo-auditor-plugin.gemspec @@ -15,17 +15,17 @@ Gem::Specification.new do |s| s.executables = %w[] s.add_dependency "contracts", "~> 0.17" - s.add_dependency "entitlements-app", "~> 0.3" + s.add_dependency "entitlements-app", "~> 1.0" - s.add_development_dependency "rake", "= 13.2.1" - 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 "debug", "<= 1.8.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 "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 "vcr", "= 6.2.0" - s.add_development_dependency "webmock", "3.23.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", ">= 3.23.1" end diff --git a/lib/version.rb b/lib/version.rb index 9ca6764..de4ecae 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -2,6 +2,6 @@ module Entitlements module Version - VERSION = "0.4.1" + VERSION = "1.0.0" end end diff --git a/spec/acceptance/Dockerfile.entitlements-gitrepo-auditor-plugin b/spec/acceptance/Dockerfile.entitlements-gitrepo-auditor-plugin index 0cd7224..a7d9546 100644 --- a/spec/acceptance/Dockerfile.entitlements-gitrepo-auditor-plugin +++ b/spec/acceptance/Dockerfile.entitlements-gitrepo-auditor-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.3 # Bootstrap files and caching for speed COPY "vendor/cache/" "/data/entitlements/vendor/cache/" 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.3.gem b/vendor/cache/concurrent-ruby-1.3.3.gem new file mode 100644 index 0000000..5e6f393 Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.3.3.gem differ diff --git a/vendor/cache/debug-1.8.0.gem b/vendor/cache/debug-1.8.0.gem new file mode 100644 index 0000000..bf57ad6 Binary files /dev/null and b/vendor/cache/debug-1.8.0.gem differ diff --git a/vendor/cache/entitlements-app-0.3.4.gem b/vendor/cache/entitlements-app-0.3.4.gem deleted file mode 100644 index 0afa5f5..0000000 Binary files a/vendor/cache/entitlements-app-0.3.4.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/io-console-0.7.2.gem b/vendor/cache/io-console-0.7.2.gem new file mode 100644 index 0000000..b680f9d Binary files /dev/null and b/vendor/cache/io-console-0.7.2.gem differ diff --git a/vendor/cache/irb-1.13.1.gem b/vendor/cache/irb-1.13.1.gem new file mode 100644 index 0000000..8ab9aa4 Binary files /dev/null and b/vendor/cache/irb-1.13.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/psych-5.1.2.gem b/vendor/cache/psych-5.1.2.gem new file mode 100644 index 0000000..eeb6f5b Binary files /dev/null and b/vendor/cache/psych-5.1.2.gem differ diff --git a/vendor/cache/rdoc-6.7.0.gem b/vendor/cache/rdoc-6.7.0.gem new file mode 100644 index 0000000..5514db2 Binary files /dev/null and b/vendor/cache/rdoc-6.7.0.gem differ diff --git a/vendor/cache/reline-0.5.8.gem b/vendor/cache/reline-0.5.8.gem new file mode 100644 index 0000000..590fba4 Binary files /dev/null and b/vendor/cache/reline-0.5.8.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.1.gem b/vendor/cache/rspec-mocks-3.13.1.gem deleted file mode 100644 index 6303294..0000000 Binary files a/vendor/cache/rspec-mocks-3.13.1.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/stringio-3.1.0.gem b/vendor/cache/stringio-3.1.0.gem new file mode 100644 index 0000000..d168094 Binary files /dev/null and b/vendor/cache/stringio-3.1.0.gem differ