diff options
| author | John McCrae <jmccrae@chef.io> | 2021-04-20 12:22:59 -0700 |
|---|---|---|
| committer | John McCrae <jmccrae@chef.io> | 2021-04-20 12:22:59 -0700 |
| commit | 1326490849e85e29dff5b091ecf4fde6a5e866dc (patch) | |
| tree | 622d44b49a73fdaa12cea704e8e3b95e439568fb | |
| parent | 13cef4d1be42420ddf436c086cb725bab3f1b564 (diff) | |
| download | chef-1326490849e85e29dff5b091ecf4fde6a5e866dc.tar.gz | |
refactored the url test to remove the Azure SAS from the url itself
Signed-off-by: John McCrae <jmccrae@chef.io>
| -rw-r--r-- | chef-universal-mingw32.gemspec | 4 | ||||
| -rw-r--r-- | spec/functional/resource/windows_certificate_spec.rb | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec index 04289dc0f2..329b4f9d6b 100644 --- a/chef-universal-mingw32.gemspec +++ b/chef-universal-mingw32.gemspec @@ -14,11 +14,7 @@ gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0" gemspec.add_dependency "wmi-lite", "~> 1.0" gemspec.add_dependency "win32-taskscheduler", "~> 2.0" gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out -<<<<<<< HEAD gemspec.add_dependency "win32-certstore", "~> 0.6.2" # 0.5+ required for specifying user vs. system store -======= -gemspec.add_dependency "win32-certstore", "~> 0.6.1" # 0.6+ required for user and system level cert handling ->>>>>>> 152735f981... Update chef-universal-mingw32.gemspec gemspec.extensions << "ext/win32-eventlog/Rakefile" gemspec.files += Dir.glob("{distro,ext}/**/*") diff --git a/spec/functional/resource/windows_certificate_spec.rb b/spec/functional/resource/windows_certificate_spec.rb index aaa31f0bdd..cc889192c4 100644 --- a/spec/functional/resource/windows_certificate_spec.rb +++ b/spec/functional/resource/windows_certificate_spec.rb @@ -56,7 +56,8 @@ 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(:download_cert_url) { "https://testingchef.blob.core.windows.net/files/test.cer" } 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") } |