diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh index 7df19364..516b386d 100755 --- a/.expeditor/run_linux_tests.sh +++ b/.expeditor/run_linux_tests.sh @@ -7,6 +7,9 @@ set -ue export USER="root" export LANG=C.UTF-8 LANGUAGE=C.UTF-8 +echo "--- Removing Gemfile.lock to generate fresh lock file" +rm -f Gemfile.lock + echo "--- bundle install" bundle config --local path vendor/bundle diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index 63531efd..495ace8d 100755 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,5 +1,8 @@ $ErrorActionPreference="stop" +Write-Host "--- Removing Gemfile.lock to generate fresh lock file" +Remove-Item -Path "Gemfile.lock" -Force -ErrorAction SilentlyContinue + Write-Host "--- bundle install" bundle config --local path vendor/bundle diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 9ebc160f..10112de4 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -7,7 +7,7 @@ expeditor: retry: automatic: limit: 1 - timeout_in_minutes: 30 + timeout_in_minutes: 60 steps: diff --git a/.github/workflows/ci-main-pull-request-stub.yml b/.github/workflows/ci-main-pull-request-stub.yml index c63d99f3..3c9f969d 100644 --- a/.github/workflows/ci-main-pull-request-stub.yml +++ b/.github/workflows/ci-main-pull-request-stub.yml @@ -7,9 +7,9 @@ name: CI Pull Request on Main Branch on: pull_request: - branches: [ main, release/** ] + branches: [ nikhil/checking-scan-with-lock-file, release/** ] push: - branches: [ main, release/** ] + branches: [ nikhil/checking-scan-with-lock-file, release/** ] workflow_dispatch: diff --git a/.gitignore b/.gitignore index ee9ed9f4..0b2e848a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,6 @@ Vagrantfile # some acceptance tests will leave this if they fail my-cookbook results/ -Gemfile.lock .idea/ \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..37333163 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,607 @@ +GIT + remote: https://github.com/chef/chef-test-kitchen-enterprise + revision: 150ee3d3f93e934086c8f994f5b621425aa3596d + branch: main + specs: + chef-test-kitchen-enterprise (1.1.7) + bcrypt_pbkdf (~> 1.0) + berkshelf (~> 8.0) + chef-licensing (~> 1.2) + chef-utils (>= 16.4.35) + csv (~> 3.3) + ed25519 (~> 1.3) + faraday_middleware (~> 1.0) + irb (~> 1.15) + license-acceptance (>= 1.0.11, < 3.0) + mixlib-install (~> 3.6) + mixlib-shellout (>= 1.2, < 4.0) + net-scp (>= 1.1, < 5.0) + net-ssh (>= 2.9, < 8.0) + net-ssh-gateway (>= 1.2, < 3.0) + ostruct (~> 0.1.0) + syslog (~> 0.3) + thor (>= 0.19, < 2.0) + winrm (~> 2.0) + winrm-elevated (~> 1.0) + winrm-fs (~> 1.1) + +PATH + remote: . + specs: + chef-cli (6.1.13) + addressable (>= 2.3.5, < 2.9) + chef (~> 18.0) + chef-licensing (~> 1.0) + cookbook-omnifetch (~> 0.5) + diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) + ffi-yajl (>= 1.0, < 3.0) + license-acceptance (>= 1.0.11, < 3) + minitar (~> 1.0) + mixlib-cli (>= 1.7, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + pastel (~> 0.7) + solve (> 2.0, < 5.0) + syslog (~> 0.3) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + appbundler (0.13.4) + mixlib-cli (>= 1.4, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + ast (2.4.3) + aws-eventstream (1.4.0) + aws-partitions (1.1153.0) + aws-sdk-core (3.232.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + bigdecimal + jmespath (~> 1, >= 1.6.1) + logger + aws-sdk-kms (1.112.0) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.198.0) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sdk-secretsmanager (1.120.0) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.12.1) + aws-eventstream (~> 1, >= 1.0.2) + base64 (0.3.0) + bcrypt_pbkdf (1.1.1) + bcrypt_pbkdf (1.1.1-arm64-darwin) + bcrypt_pbkdf (1.1.1-x86_64-darwin) + benchmark (0.4.1) + berkshelf (8.1.6) + chef (>= 18.0.0) + chef-cleanroom (~> 1.0) + chef-config + concurrent-ruby (~> 1.0) + ffi (>= 1.15.5, <= 1.16.3) + minitar (~> 1.0) + mixlib-archive (>= 1.1.4, < 2.0) + mixlib-config (>= 2.2.5) + mixlib-shellout (>= 2.0, < 4.0) + octokit (>= 4.0, < 6.0) + retryable (>= 2.0, < 4.0) + solve (~> 4.0) + syslog (~> 0.3) + thor (~> 1.4) + better_errors (1.1.0) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + bigdecimal (3.2.2) + builder (3.3.0) + byebug (12.0.0) + chef (18.8.11) + activesupport (>= 4.2.7.1, <= 7.1.3.2) + addressable + aws-sdk-s3 (~> 1.91) + aws-sdk-secretsmanager (~> 1.46) + chef-config (= 18.8.11) + chef-utils (= 18.8.11) + chef-vault + chef-zero (>= 15.0.21) + corefoundation (~> 0.3.4) + diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) + erubis (~> 2.7) + ffi (>= 1.15.5, <= 1.16.3) + ffi-libarchive (~> 1.0, >= 1.0.3) + ffi-yajl (~> 2.2) + iniparse (~> 1.4) + inspec-core (>= 5, < 6) + license-acceptance (>= 1.0.5, < 3) + mixlib-archive (>= 0.4, < 2.0) + mixlib-authentication (>= 2.1, < 4) + mixlib-cli (>= 2.1.1, < 3.0) + mixlib-log (>= 2.0.3, < 3.2) + mixlib-shellout (>= 3.1.1, < 4.0) + net-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) + plist (~> 3.2) + proxifier2 (~> 1.1) + syslog-logger (~> 1.6) + train-core (~> 3.10, <= 3.12.13) + train-rest (>= 0.4.1) + train-winrm (~> 0.2.17) + unf_ext (~> 0.0.8.2) + uri (~> 1.0.3) + uuidtools (>= 2.1.5, < 3.0) + vault (~> 0.18.2) + chef-cleanroom (1.0.5) + chef-config (18.8.11) + addressable + chef-utils (= 18.8.11) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-gyoku (1.5.0) + builder (>= 2.1.2) + rexml (~> 3.4) + chef-licensing (1.3.0) + chef-config (>= 15) + faraday (>= 1, < 2) + faraday-http-cache + faraday_middleware (~> 1.0) + mixlib-log (~> 3.0) + ostruct (~> 0.1.0) + pstore (~> 0.1.1) + tty-prompt (~> 0.23) + tty-spinner (~> 0.9.3) + chef-telemetry (1.1.1) + chef-config + concurrent-ruby (~> 1.0) + chef-utils (18.8.11) + concurrent-ruby + chef-vault (4.1.23) + chef-winrm (2.4.4) + builder (>= 2.1.2) + chef-gyoku (~> 1.5) + erubi (~> 1.8) + gssapi (~> 1.2) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (= 2.7.0) + rexml (~> 3.3) + rubyntlm (~> 0.6.0, >= 0.6.3) + chef-winrm-elevated (1.2.5) + chef-winrm (>= 2.3.11) + chef-winrm-fs (>= 1.3.7) + erubi (~> 1.8) + chef-winrm-fs (1.4.1) + benchmark (~> 0.4.0) + chef-winrm (~> 2.4) + csv (~> 3.3) + erubi (>= 1.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) + chef-zero (15.0.21) + activesupport (>= 7, < 8.1) + ffi-yajl (>= 2.2, < 4.0) + hashie (>= 2.0, < 6.0) + mixlib-log (>= 2.0, < 4.0) + rack (~> 3.1, >= 3.1.16) + rackup (~> 2.2, >= 2.2.1) + unf_ext (~> 0.0.8) + uuidtools (~> 2.1) + webrick + chefspec (9.3.8) + chef (>= 15) + chef-cli + fauxhai-chef (>= 9.3) + logger (< 1.6) + rspec (~> 3.0) + rspec-expectations (<= 3.12.3) + chefstyle (2.2.3) + rubocop (= 1.25.1) + coderay (1.1.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.4) + cookbook-omnifetch (0.12.2) + mixlib-archive (>= 0.4, < 2.0) + cookstyle (7.32.8) + rubocop (= 1.25.1) + corefoundation (0.3.13) + ffi (>= 1.15.0) + csv (3.3.5) + date (3.4.1) + diff-lcs (1.5.1) + docile (1.4.1) + domain_name (0.6.20240107) + drb (2.2.3) + ed25519 (1.4.0) + erb (6.0.0) + erubi (1.13.1) + erubis (2.7.0) + faraday (1.2.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-http-cache (2.5.1) + faraday (>= 0.8) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fauxhai-chef (9.3.26) + net-ssh + ohai (>= 13.0) + ffi (1.16.3) + ffi-libarchive (1.1.14) + ffi (~> 1.0) + ffi-yajl (2.6.0) + libyajl2 (>= 1.2) + fuzzyurl (0.9.0) + gssapi (1.3.1) + ffi (>= 1.0.1) + gyoku (1.4.0) + builder (>= 2.1.2) + rexml (~> 3.0) + haml (5.1.2) + temple (>= 0.8.0) + tilt + hashie (5.0.0) + http-accept (1.7.0) + http-cookie (1.0.8) + domain_name (~> 0.5) + httpclient (2.9.0) + mutex_m + i18n (1.14.7) + concurrent-ruby (~> 1.0) + iniparse (1.5.0) + inspec-core (5.22.95) + addressable (~> 2.4) + chef-telemetry (~> 1.0, >= 1.0.8) + cookstyle + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) + hashie (>= 3.4, < 6.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) + mixlib-log (~> 3.0, < 3.2) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (>= 1.5, < 3.0) + pry (~> 0.13) + rspec (>= 3.9, <= 3.14) + rspec-its (>= 1.2, < 3.0) + rubyzip (>= 1.2.2, < 4.0) + semverse (~> 3.0) + sslshake (~> 1.2) + thor (>= 0.20, < 1.5.0) + tomlrb (>= 1.2, < 2.1) + train-core (~> 3.12.13) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + io-console (0.8.1) + ipaddress (0.8.3) + irb (1.15.3) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jmespath (1.6.2) + json (2.13.2) + libyajl2 (2.1.0) + license-acceptance (2.1.13) + pastel (~> 0.7) + tomlrb (>= 1.2, < 3.0) + tty-box (~> 0.6) + tty-prompt (~> 0.20) + little-plugger (1.1.4) + logger (1.5.3) + logging (2.4.0) + little-plugger (~> 1.1) + multi_json (~> 1.14) + memory_profiler (1.1.0) + method_source (1.1.0) + mime-types (3.7.0) + logger + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2025.0826) + minitar (1.0.2) + minitest (5.25.5) + mixlib-archive (1.1.7) + mixlib-log + mixlib-authentication (3.0.10) + mixlib-cli (2.1.8) + mixlib-config (3.0.27) + tomlrb + mixlib-install (3.12.30) + mixlib-shellout + mixlib-versioning + thor + mixlib-log (3.1.2.1) + ffi (< 1.17.0) + mixlib-shellout (3.3.9) + chef-utils + mixlib-versioning (1.2.12) + molinillo (0.8.0) + multi_json (1.17.0) + multipart-post (2.4.1) + mustermann (3.0.4) + ruby2_keywords (~> 0.0.1) + mutex_m (0.3.0) + net-ftp (0.3.8) + net-protocol + time + net-protocol (0.2.2) + timeout + net-scp (4.1.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-ssh (7.3.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) + netrc (0.11.0) + nori (2.7.0) + bigdecimal + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + ohai (18.2.6) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) + ffi (~> 1.9, <= 1.17.0) + ffi-yajl (~> 2.2) + ipaddress + mixlib-cli (>= 1.7.0) + mixlib-config (>= 2.0, < 4.0) + mixlib-log (>= 2.0.1, < 4.0) + mixlib-shellout (~> 3.2, >= 3.2.5) + plist (~> 3.1) + train-core + wmi-lite (~> 1.0) + ostruct (0.1.0) + parallel (1.27.0) + parser (3.3.9.0) + ast (~> 2.4.1) + racc + parslet (2.0.0) + pastel (0.8.0) + tty-color (~> 0.5) + plist (3.7.2) + pp (0.6.3) + prettyprint + prettyprint (0.2.0) + prism (1.4.0) + proxifier2 (1.1.0) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.11.0) + byebug (~> 12.0) + pry (>= 0.13, < 0.16) + pstore (0.1.4) + psych (5.2.6) + date + stringio + public_suffix (6.0.2) + racc (1.8.1) + rack (3.2.1) + rack-protection (4.0.0) + base64 (>= 0.1.0) + rack (>= 3.0.0, < 4) + rack-session (2.1.1) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rackup (2.2.1) + rack (>= 3) + rainbow (3.1.1) + rake (13.3.0) + rb-readline (0.5.5) + rdoc (6.15.1) + erb + psych (>= 4.0.0) + tsort + regexp_parser (2.11.2) + reline (0.6.3) + io-console (~> 0.5) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + retryable (3.0.5) + rexml (3.4.2) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.3) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-its (1.3.1) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.12.7) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.2) + rubocop (1.25.1) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.15.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.46.0) + parser (>= 3.3.7.2) + prism (~> 1.4) + ruby-graphviz (1.2.5) + rexml + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + rubyntlm (0.6.5) + base64 + rubyzip (2.4.1) + sawyer (0.9.3) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + semverse (3.0.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.2) + simplecov_json_formatter (0.1.4) + sinatra (4.0.0) + mustermann (~> 3.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.0.0) + rack-session (>= 2.0.0, < 3) + tilt (~> 2.0) + sinatra-contrib (4.0.0) + multi_json (>= 0.0.2) + mustermann (~> 3.0) + rack-protection (= 4.0.0) + sinatra (= 4.0.0) + tilt (~> 2.0) + solve (4.0.4) + molinillo (~> 0.6) + semverse (>= 1.1, < 4.0) + sslshake (1.3.1) + stackprof (0.2.27) + stackprof-webnav (1.0.4) + better_errors (~> 1.1.0) + haml (~> 5.1.2) + rackup (>= 1.0.0, < 3.0.0) + ruby-graphviz (~> 1.2.4) + sinatra (>= 2.1.0, < 5.0.0) + sinatra-contrib (>= 2.1.0, < 5.0.0) + stackprof (>= 0.2.13) + webrick (~> 1.7) + stringio (3.1.8) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + syslog (0.3.0) + logger + syslog-logger (1.6.8) + temple (0.10.4) + thor (1.4.0) + tilt (2.6.1) + time (0.4.1) + date + timeout (0.4.3) + tomlrb (1.3.0) + train-core (3.12.13) + addressable (~> 2.5) + ffi (!= 1.13.0) + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) + train-rest (0.5.0) + aws-sigv4 (~> 1.5) + rest-client (~> 2.1) + train-core (~> 3.0) + train-winrm (0.2.17) + chef-winrm (>= 2.3.11) + chef-winrm-elevated (>= 1.2.5) + chef-winrm-fs (>= 1.3.7) + tsort (0.2.0) + tty-box (0.7.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-cursor (~> 0.7) + tty-color (0.6.0) + tty-cursor (0.7.1) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + tty-table (0.12.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-screen (~> 0.8) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unf_ext (0.0.8.2) + unicode-display_width (2.6.0) + unicode_utils (1.4.0) + uri (1.0.3) + uuidtools (2.2.0) + vault (0.18.2) + aws-sigv4 + webrick (1.9.1) + winrm (2.3.8) + builder (>= 2.1.2) + erubi (~> 1.8) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rexml (~> 3.0) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) + erubi (~> 1.8) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.3.5) + erubi (~> 1.8) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) + winrm (~> 2.0) + wisper (2.0.1) + wmi-lite (1.0.7) + +PLATFORMS + arm64-darwin + ruby + x86_64-darwin + +DEPENDENCIES + appbundler + chef-cli! + chef-test-kitchen-enterprise! + chefspec + chefstyle + cookstyle + faraday_middleware + logger (< 1.6) + memory_profiler + pry + pry-byebug + rake + rb-readline + rspec (= 3.12.0) + rspec-expectations (~> 3.8) + rspec-mocks (~> 3.8) + simplecov + stackprof + stackprof-webnav + +BUNDLED WITH + 2.6.9