Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ expeditor:

steps:

- label: run-specs-ruby-3.1
- label: run-specs-ruby-3.3
command:
- .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
image: ruby:3.1-buster
image: ruby:3.3

- label: run-specs-windows
command:
Expand All @@ -29,4 +29,4 @@ steps:
executor:
docker:
host_os: windows
image: rubydistros/windows-2019:3.1
image: rubydistros/windows-2019:3.3
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ gemspec
group :test do
gem "chefstyle"
gem "rake"
gem "rspec", ">= 3.0"
gem "rspec", "~> 3.12"
gem "rspec_junit_formatter"
end
4 changes: 2 additions & 2 deletions lib/chef/knife/helpers/azurerm_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,10 @@ def parse_publish_settings_file(filename)
subscription = profile.at_css("Subscription")
# check given PublishSettings XML file format.Currently PublishSettings file have two different XML format
if profile.attribute("SchemaVersion").nil?
management_cert = OpenSSL::PKCS12.new(Base64.decode64(profile.attribute("ManagementCertificate").value))
management_cert = OpenSSL::PKCS12.new(Base64.decode64(profile.attribute("ManagementCertificate").value) -legacy)
config[:azure_api_host_name] = URI(profile.attribute("Url").value).host
elsif profile.attribute("SchemaVersion").value == "2.0"
management_cert = OpenSSL::PKCS12.new(Base64.decode64(subscription.attribute("ManagementCertificate").value))
management_cert = OpenSSL::PKCS12.new(Base64.decode64(subscription.attribute("ManagementCertificate").value) -legacy)
config[:azure_api_host_name] = URI(subscription.attribute("ServiceManagementUrl").value).host
else
ui.error("Publish settings file Schema not supported - " + filename)
Expand Down
1 change: 1 addition & 0 deletions spec/unit/query_azure_mock.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#

require_relative "../spec_helper"
require "ostruct"

module QueryAzureMock
def create_instance(object)
Expand Down