diff options
| author | John McCrae <jmccrae@chef.io> | 2021-04-20 11:09:20 -0700 |
|---|---|---|
| committer | John McCrae <jmccrae@chef.io> | 2021-04-20 11:09:20 -0700 |
| commit | 0596e6f5384746f60ecc2159318f0fc52dc134d7 (patch) | |
| tree | d08bb0e266bde80d4618c4b9d922558c805c2e3d | |
| parent | 876c47d75552cc69a0319aba33ce3f4dcc640f4e (diff) | |
| download | chef-0596e6f5384746f60ecc2159318f0fc52dc134d7.tar.gz | |
rebased on master and updated gems
Signed-off-by: John McCrae <jmccrae@chef.io>
| -rw-r--r-- | Gemfile.lock | 20 | ||||
| -rw-r--r-- | spec/functional/resource/windows_certificate_spec.rb | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7cb34ec42d..1a2117aa43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 6d136684438e8809e703feb84c46c69e90e042a7 + revision: def330761a328caecf463b684c0648dfca582f72 branch: master specs: - chefstyle (1.7.4) - rubocop (= 1.12.0) + chefstyle (1.7.5) + rubocop (= 1.12.1) GIT remote: https://github.com/chef/ohai.git - revision: 967ebf2bc23a941d8a159ae6577f7bfa631820b7 + revision: e48813786a6dbb80d83cb33de3876d48b6518f28 branch: master specs: - ohai (17.0.34) + ohai (17.0.38) chef-config (>= 12.8, < 18) chef-utils (>= 16.0, < 18) ffi (~> 1.9) @@ -20,7 +20,7 @@ GIT mixlib-cli (>= 1.7.0) mixlib-config (>= 2.0, < 4.0) mixlib-log (>= 2.0.1, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) + mixlib-shellout (~> 3.2, >= 3.2.5) plist (~> 3.1) train-core wmi-lite (~> 1.0) @@ -179,10 +179,10 @@ GEM ed25519 (1.2.4) erubi (1.10.0) erubis (2.7.0) - faraday (1.3.0) + faraday (1.3.1) faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) faraday-net_http (1.0.1) faraday_middleware (1.0.0) faraday (~> 1.0) @@ -312,7 +312,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) - rubocop (1.12.0) + rubocop (1.12.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -357,7 +357,7 @@ GEM tty-cursor (~> 0.7) tty-color (0.6.0) tty-cursor (0.7.1) - tty-prompt (0.23.0) + tty-prompt (0.23.1) pastel (~> 0.8) tty-reader (~> 0.8) tty-reader (0.9.0) diff --git a/spec/functional/resource/windows_certificate_spec.rb b/spec/functional/resource/windows_certificate_spec.rb index ef6c5400af..aaa31f0bdd 100644 --- a/spec/functional/resource/windows_certificate_spec.rb +++ b/spec/functional/resource/windows_certificate_spec.rb @@ -56,7 +56,7 @@ describe Chef::Resource::WindowsCertificate, :windows_only do let(:store) { "Chef-Functional-Test" } let(:store_name) { "MY" } let(:store_location) { "LocalMachine" } - let(:download_cert_url) { 'https://testingchef.blob.core.windows.net/files/test.cer?sv=2020-02-10&ss=b&srt=sco&sp=rlax&se=2022-03-20T01:20:15Z&st=2021-03-19T17:20:15Z&spr=https&sig=nMmvTTXp%2Fn0%2FYizBV8BzhjRJ%2Bmk%2BxYZ9529yOfqDxjQ%3D' } + let(:download_cert_url) { "https://testingchef.blob.core.windows.net/files/test.cer?sv=2020-02-10&ss=b&srt=sco&sp=rlax&se=2022-03-20T01:20:15Z&st=2021-03-19T17:20:15Z&spr=https&sig=nMmvTTXp%2Fn0%2FYizBV8BzhjRJ%2Bmk%2BxYZ9529yOfqDxjQ%3D" } let(:cert_output_path) { ::File.join(Chef::Config[:file_cache_path], "output.cer") } let(:pfx_output_path) { ::File.join(Chef::Config[:file_cache_path], "output.pfx") } let(:key_output_path) { ::File.join(Chef::Config[:file_cache_path], "output.key") } |