Removed publish settings file approach.

2013-08-09 16:57:36 +05:30 · 2013-08-09 16:57:36 +05:30 · a4113e3d0d
--- a/README.md
+++ b/README.md
@ -334,8 +334,9 @@ require 'azure'

 Azure.configure do |config|
  # Configure these 2 properties to use Storage
-  config.publish_settings_file = 'c:/my.publishsettings'
-  config.subscription_id      = "your subscription id" #optional
+  config.management_certificate = "c:/my_cert.pem"
+  config.subscription_id        = "your subscription id"
+  config.management_endpoint    = "https://management.core.windows.net"
 end

 #Create a virtual machine service object
@ -367,8 +368,8 @@ options = {
  :cloud_service_name => 'cloud_service_name',
  :deployment_name =>'mydeployment',
  :tcp_endpoints => '80,3889:3889',
-  :ssh_private_key_file => 'c:/private_key.key', #required for ssh or winrm(https) certificate.
-  :ssh_certificate_file => 'c:/certificate.pem', #required for ssh or winrm(https) certificate.
+  :private_key_file => 'c:/private_key.key', #required for ssh or winrm(https) certificate.
+  :certificate_file => 'c:/certificate.pem', #required for ssh or winrm(https) certificate.
  :ssh_port => 2222,
  :vm_size => 'Large' #valid choices are (ExtraSmall, Small, Medium, Large, ExtraLarge, A6, A7)
 }
--- a/7
+++ b/7
@ -32,7 +32,9 @@ namespace :test do
      ENV.fetch("AZURE_SERVICEBUS_NAMESPACE", nil),
      ENV.fetch("AZURE_SERVICEBUS_ACCESS_KEY", nil),
      # ENV.fetch("AZURE_SERVICEBUS_ISSUER",     nil)
-      ENV.fetch('AZURE_PUBLISH_SETTINGS_FILE', nil)
+      ENV.fetch('AZURE_MANAGEMENT_CERTIFICATE', nil),
+      ENV.fetch('AZURE_SUBSCRIPTION_ID', nil),
+      ENV.fetch('AZURE_MANAGEMENT_ENDPOINT', nil)
    ].include?(nil)

    abort "[ABORTING] Configure your environment to run the integration tests" if unset_environment
@ -102,6 +104,9 @@ namespace :test do
      config.acs_namespace  = ENV.fetch("AZURE_SERVICEBUS_NAMESPACE")
      config.sb_access_key  = ENV.fetch("AZURE_SERVICEBUS_ACCESS_KEY")
      # config.sb_issuer      = ENV.fetch("AZURE_SERVICEBUS_ISSUER")
+      config.management_certificate  = ENV.fetch('AZURE_MANAGEMENT_CERTIFICATE')
+      config.management_endpoint  = ENV.fetch("AZURE_MANAGEMENT_ENDPOINT")
+      config.subscription_id  = ENV.fetch("AZURE_SUBSCRIPTION_ID")
    end
  end
 end
--- a/lib/azure/base_management/base_management_service.rb
+++ b/lib/azure/base_management/base_management_service.rb
@ -27,15 +27,34 @@ module Azure
  module BaseManagement
    class BaseManagementService

-      def initialize(options={})
-        publish_settings_file = options[:publish_settings_file] || Azure.config.publish_settings_file
-        certificate = Certificate.new(:publish_settings_file=> publish_settings_file)
-        Azure.configure do |config|
-          config.http_certificate_key = certificate.cert
-          config.http_private_key = certificate.key
-          config.api_url ||= certificate.api_url
-          config.subscription_id = certificate.subscription_id
+      def initialize
+        validate_configuration
+        cert_file = File.read (Azure.config.management_certificate)
+        begin
+          if Azure.config.management_certificate =~ /(pem)$/
+            certificate_key = OpenSSL::X509::Certificate.new(cert_file)
+            private_key = OpenSSL::PKey::RSA.new(cert_file)
+          else
+            #Parse pfx content
+            cert_content = OpenSSL::PKCS12.new(Base64.decode64(cert_file))
+            certificate_key = OpenSSL::X509::Certificate.new(cert_content.certificate.to_pem)
+            private_key = OpenSSL::PKey::RSA.new(cert_content.key.to_pem)
+          end
+        rescue Exception => e
+          raise RuntimeError, "Management certificate not valid. Error: #{e.message}"
        end
+
+        Azure.configure do |config|
+          config.http_certificate_key = certificate_key
+          config.http_private_key = private_key
+        end
+      end
+
+      def validate_configuration
+        raise RuntimeError, "Subscription ID not valid." if Azure.config.subscription_id.nil? or Azure.config.subscription_id.empty?
+        raise RuntimeError, "Management endpoint not valid." if Azure.config.management_endpoint.nil? or Azure.config.management_endpoint.empty?
+        raise RuntimeError, "Could not read from file '#{Azure.config.management_certificate}'." unless (test 'r', Azure.config.management_certificate)
+        raise RuntimeError, "Management certificate expects a .pem or .pfx file." unless(Azure.config.management_certificate =~ /(pem|pfx)$/)
      end

      # Public: Gets a list of regional data center locations from the server
--- a/lib/azure/base_management/certificate.rb
+++ b/lib/azure/base_management/certificate.rb
@ -1,57 +0,0 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require 'openssl'
-require 'fileutils'
-require 'uri'
-
-module Azure
-  module BaseManagement
-    class Certificate
-      attr_accessor :key, :cert, :api_url, :subscription_id
-
-      def initialize(options={})
-        publish_settings_file = options[:publish_settings_file] || Azure.config.publish_settings_file
-        begin
-          doc = Nokogiri::XML(File.open(locate_file(publish_settings_file)))
-          @subscription_id = Azure.config.subscription_id || doc.at_css("Subscription").attribute("Id").value
-          profile = doc.css("PublishProfile Subscription")
-          subscription_ids = profile.collect {|pf| pf.attribute("Id").value}
-          if doc.at_css("PublishProfile").attribute("SchemaVersion").nil?
-            if subscription_ids.include?(@subscription_id)
-              cert_content = OpenSSL::PKCS12.new(Base64.decode64(doc.at_css("PublishProfile").attribute("ManagementCertificate").value))
-            end
-            @api_url = URI(doc.at_css("PublishProfile").attribute("Url").value).host
-          elsif doc.at_css("PublishProfile").attribute("SchemaVersion").value == "2.0"
-            profile.each do |pf|
-              if pf.attribute("Id").value == @subscription_id
-                cert_content = OpenSSL::PKCS12.new(Base64.decode64(pf.attribute("ManagementCertificate").value))
-                @api_url = URI(pf.attribute("ServiceManagementUrl").value).host
-              end
-            end
-          else
-            Loggerx.error_with_exit "Publish Settings file schema not supported - #{publish_settings_file}"
-          end
-          if cert_content && @subscription_id
-            @cert = OpenSSL::X509::Certificate.new(cert_content.certificate.to_pem)
-            @key = OpenSSL::PKey::RSA.new(cert_content.key.to_pem)
-          else
-            raise RuntimeError, "Subscription ID not valid."
-          end
-        end
-      end
-
-    end
-  end
-end
--- a/lib/azure/base_management/management_http_request.rb
+++ b/lib/azure/base_management/management_http_request.rb
@ -14,7 +14,6 @@
 #--------------------------------------------------------------------------
 require "azure/core/http/http_response"
 require "azure/core/http/http_request"
-require "azure/base_management/certificate"
 include Azure::Core::Http

 # Represents an HTTP request that can perform synchronous queries to
@ -36,7 +35,7 @@ module Azure
        super
        @warn = false
        @headers = {"x-ms-version" => "2013-06-01", "Content-Type"=> 'application/xml' }
-        @uri = URI.parse(Azure.config.api_url + Azure.config.subscription_id + path)
+        @uri = URI.parse(Azure.config.management_endpoint + Azure.config.subscription_id + path)
        @key = Azure.config.http_private_key
        @cert = Azure.config.http_certificate_key
      end
--- a/lib/azure/core.rb
+++ b/lib/azure/core.rb
@ -30,7 +30,7 @@ Azure.configure do |config|
  config.sb_access_key  = ENV["AZURE_SERVICEBUS_ACCESS_KEY"]
  config.sb_issuer      = ENV["AZURE_SERVICEBUS_ISSUER"]

-  config.publish_settings_file = ENV["AZURE_PUBLISH_SETTINGS_FILE"]
-  config.subscription_id      = ENV["AZURE_SUBSCRIPTION_ID"]
-  config.api_url              = ENV["AZURE_API_URL"]
+  config.management_certificate  = ENV["AZURE_MANAGEMENT_CERTIFICATE"]
+  config.subscription_id         = ENV["AZURE_SUBSCRIPTION_ID"]
+  config.management_endpoint     = ENV["AZURE_MANAGEMENT_ENDPOINT"]
 end
--- a/lib/azure/core/configuration.rb
+++ b/lib/azure/core/configuration.rb
@ -153,13 +153,13 @@ module Azure
      #===================================================================

      # Public: Get the Subscription Id and certificate key for the management API.
-      attr_accessor :publish_settings_file
+      attr_accessor :management_certificate

      # Public: Get/Set the Subscription Id  for the management API.
      attr_accessor :subscription_id

      # Public: Set the host  for the management API.
-      attr_writer :api_url
+      attr_writer :management_endpoint

      #Public: Set the  private key for SSL/HTTPS request with PEM certificate
      attr_accessor :http_private_key
@ -167,8 +167,14 @@ module Azure
      #Public: Set the  certificate key for SSL/HTTPS request with PEM certificate
      attr_accessor :http_certificate_key

-      def api_url
-        "https://#{@api_url}/" if @api_url
+      def management_endpoint
+        if !@management_endpoint.end_with?('/')
+          @management_endpoint += '/'
+        elsif URI(@management_endpoint).scheme.nil?
+          "https://#{@management_endpoint}"
+        else
+          @management_endpoint
+        end
      end

    end
--- a/test/fixtures/azure.publishsettings
+++ b/test/fixtures/azure.publishsettings
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PublishData>
-  <PublishProfile
-    PublishMethod="AzureServiceManagementAPI"
-    Url="https://management.core.windows.net/"
-    ManagementCertificate="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">
-    <Subscription
-      Id="test-id-3"
-      Name="Ruby Tests" />
-    <Subscription
-      Id="test-id-4"
-      Name="Java Tests" />
-  </PublishProfile>
-</PublishData>
--- a/test/fixtures/azure_new_format.publishsettings
+++ b/test/fixtures/azure_new_format.publishsettings
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PublishData>
-  <PublishProfile
-    SchemaVersion="2.0"
-    PublishMethod="AzureServiceManagementAPI">
-    <Subscription
-      ServiceManagementUrl="https://test-id-1.core.windows.net"
-      Id="test-id-1"
-      Name="test-1"
-      ManagementCertificate="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" />
-    <Subscription
-      ServiceManagementUrl="https://test-id-2.core.windows.net"
-      Id="test-id-2"
-      Name="test-2"
-      ManagementCertificate="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" />
-  </PublishProfile>
-</PublishData>
--- a/test/fixtures/management_certificate.pem
+++ b/test/fixtures/management_certificate.pem
@ -0,0 +1,55 @@
+Bag Attributes
+    localKeyID: 01 00 00 00 
+    friendlyName: {D4417DE0-CB19-4947-B5B4-DE6D7F72171D}
+    Microsoft CSP Name: Microsoft Software Key Storage Provider
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDlVqp43jiBkO2M
+YOpCqofHsFHaooZCmYSAxyZGyxQLPEc4Zvft0uzIdQy6QnzN+MQkQ8hWrL+BNp2S
+NYPFIXY9HYz5BZBMomM/lTsZltLgJSQENE6jTomznCgRy4GNg0hkaGkuhSSbWmBC
+jmlfJXkbZgfGuc5Lz8BZYPWO5hvP23XIRnVIW44oKcQfvkS80qyyzFNa0vdp3rov
+WdKV3QfScDIgTr0FQDANYTYWBV/r4xnXndjLOxgVwU3Kp0WPUkCz3uloMRGWs974
+bpWGwnOblJb4j0X7Q46rTZ4f4HGZlKbeRV/MtPcrZJ+V6ovQ9tz1sUbbCbn4ABag
+m+6NCcqRAgMBAAECggEAHHRMidsOeTrlUke7AQL9/j9o5H7KOCyqdTzgSaPMLJmx
+v3R9GeeT48osBlcV+4a8MMCtNF3SE+LWGYwkuXptnGcUdNglH3D9befi0Ym2R8Or
+7I6d3CK0MJH1IcIVZJyviG+w7ynrURAdRdy8A6dXV5go6lXm296co3ZFeVGhDUCR
+838zthk0Ltf347nLerhJUhJAIOX7Ct21xMOrbT5KfOVThgTxrZKmP29ORMoqnXN8
+8SdpHsdqdNro8uSEARyG80g4ZZVPVqZqRLr+cX080lJ4p8GPf/nPOWGGrtGCCEgI
+1FCX8aWH3PGOSLqo3boSiZfrLHT5BhJsXD/OXJZPzQKBgQD9vl+jiZSHPoo63/JO
+uKS0kGos6ZZc4WvjXx6JBrtnsOdw9YBAPKEY9VYyKi3fnv1v1gIB65e9rfeF+PmI
+KXKLwLcZWFRbaaB3xs3Bxo0Yn1tRRvANDAKR8Xfl77B06j2kKrPmfdEbmd3hHJqN
+ZYG4hj+PR1SQ+0jvwSg7cPtwrQKBgQDnYLxxoejm+JrEVGebvKv3AWDshBN+91dX
+iM4u5zke4qzocp0RYpjIjkUIb6Y/jwxscZmgetu9keDBAFCPU2ReTjFGmHZiip72
+xxQLF2dxlqgcSzURW9SjbstB0LUyxbTwIYTTOavHBrvnkw9S4rgLVHTVWzzInWag
+iw4lbfBp9QKBgC7KTS6F7zqlQK4sn6z+hXi6bKnNhSmpc9CguKvB7wrm5zbAPp8Z
+zwcgLn3fo0fqNIfL6eDaxcd3bf5pc/I02meE6P6meB/HMY0Fe72w1FHnCNrK/vcY
+8Nxir55Z/asBis5cBYKKTuYNEIozURij0DDrqIrON3zoqYF0l+umIOedAoGAYiTn
+ai/qkeaMB5Fh7W6HZxvfmBOiDW4vT0MJal3MHey6uVK8iz5OXmvynlR1qWotM+av
+6qGSigPR2Swf/9u4rEPwpOhQ9xWjvjvNpbLEvyrPnkjMdtOEC9sYPo+f/KxeRqmB
+JPPGiIKzu9PmYRsoRC4L7OBplRMnEBxL4NaUbu0CgYEA2z7BuOzuE3QmxaNzbP7+
+PWkRg0JEFksN/8bRo6fuVMaosEs4jZunCyPk0ne//p+dcKE8cInC9/jGJs5XutUi
+L8KuTu3ljFOLE/y+8FHR/Hxpvzp8k6iDPl7mvvZJ7gt2aO9IZq3XHoRLbgSUPo2X
+YlXoh+vo+SQVRQtbxpuk1gM=
+-----END PRIVATE KEY-----
+Bag Attributes
+    localKeyID: 01 00 00 00 
+    friendlyName: Ruby SDK
+subject=/CN=Windows Azure Tools
+issuer=/CN=Windows Azure Tools
+-----BEGIN CERTIFICATE-----
+MIICxDCCAaygAwIBAgIQQ86pQDjNkolP6pILfxFhITANBgkqhkiG9w0BAQUFADAe
+MRwwGgYDVQQDExNXaW5kb3dzIEF6dXJlIFRvb2xzMB4XDTEzMDUxNjA0NDgzNloX
+DTE0MDUxNjA0NDgzNlowHjEcMBoGA1UEAxMTV2luZG93cyBBenVyZSBUb29sczCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOVWqnjeOIGQ7Yxg6kKqh8ew
+UdqihkKZhIDHJkbLFAs8Rzhm9+3S7Mh1DLpCfM34xCRDyFasv4E2nZJ1g8Uhdj0d
+jPkFkEyiYz+VOxmW0uAlJCQ0TqNOibOcKBHLgY2DSGRoaS6FJJtaYEKOaV8leRtm
+B8a5zkvPsFlg9Y7mG8/bdchGdUhbjigpxB++RLzSrLLMU1rS92neui9Z0pXdB9Jw
+MiBOvQVAMA1hNhYFX+vjGded2Ms7GBXBTcqnRY9SQLPe6WgxEZaz3vaulYbCc5uU
+lviPRftDjqtNnh/gcZmUpt5FX8y09ytkn5Xqi9D23PWxRtsJufgAFqCb7o0JypEC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAFkhTUWZN3xvh50zvDBRJgvc83kx61Npl
+J1G6F98aa+mdZmkbXLdNt+dHR+aGg/0RAs97yPoSc9km5uedEpQQD0xDh9X84jSv
+GnrGTsmjBMJvE8jhT0P/zGfTKfncQOx00cVcNm5F1GdWsni7OcVuOLQ+0se8VHsR
+JSQBBWQVZOXJp2zYs935jrI47bCCNSNFQ1sAvxFdMeBZKwtmvhp1c6Zl3j/KVbvL
+S0Izpu1vXvozNDo6HmJPhpONU6qlMfU2iSzUQN21PRt82vMOVx4xyBzbm6vPc50g
+PR10SWXaXL/UmBlxfJ3nhD1YgqIQtWMdbSQ81j3MzrGrrlIdjPUFOw==
+-----END CERTIFICATE-----
--- a/test/integration/test_helper.rb
+++ b/test/integration/test_helper.rb
@ -25,7 +25,9 @@ Azure::Core.configure do |config|
  config.sb_namespace  = ENV.fetch("AZURE_SERVICEBUS_NAMESPACE")
  config.sb_access_key  = ENV.fetch("AZURE_SERVICEBUS_ACCESS_KEY")
  # config.sb_issuer      = ENV.fetch("AZURE_SERVICEBUS_ISSUER")
-  config.publish_settings_file = ENV.fetch('AZURE_PUBLISH_SETTINGS_FILE')
+  config.management_certificate  = ENV.fetch('AZURE_MANAGEMENT_CERTIFICATE')
+  config.management_endpoint  = ENV.fetch("AZURE_MANAGEMENT_ENDPOINT")
+  config.subscription_id  = ENV.fetch("AZURE_SUBSCRIPTION_ID")
 end

 StorageAccountName = random_string('storagetest',10)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@ -42,7 +42,9 @@ require 'azure'

 Azure.config.storage_account_name     = "accountname"
 Azure.config.storage_access_key       = "YWNjZXNzLWtleQ=="
-Azure.config.publish_settings_file    = File.expand_path("test/fixtures/azure.publishsettings")
+Azure.config.management_certificate   = File.expand_path("test/fixtures/management_certificate.pem")
+Azure.config.management_endpoint      = "https://management.core.windows.net"
+Azure.config.subscription_id          = "subscription-id"
 # Azure.config.storage_table_host     = 
 # Azure.config.storage_blob_host      = 
 # Azure.config.storage_queue_host     = 
--- a/test/unit/base_management/certificate_test.rb
+++ b/test/unit/base_management/certificate_test.rb
@ -1,116 +0,0 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require "test_helper"
-
-describe Azure::BaseManagement::Certificate do
-
-  subject do
-    Azure::BaseManagement::Certificate
-  end
-  after do
-    Azure.config.subscription_id = nil
-  end
-
-  describe "#new" do
-
-    let(:old_format_publicsettings_file) { Fixtures['azure.publishsettings'] }
-    let(:new_format_publicsettings_file) { Fixtures['azure_new_format.publishsettings'] }
-    let(:invalid_publishsettings_file) { Fixtures['invalid.publishsettings'] }
-
-    it "should set properties of old publishsettings file" do
-      Azure.config.subscription_id = nil
-      certificate = subject.new(:publish_settings_file => old_format_publicsettings_file)
-      certificate.subscription_id.must_equal "test-id-3"
-      certificate.api_url.must_equal "management.core.windows.net"
-      certificate.key.wont_be_nil
-      certificate.cert.wont_be_nil
-    end
-
-    it "should set properties of given subscription id for old publishsettings file" do
-      Azure.config.subscription_id = 'test-id-4'
-      certificate = subject.new(:publish_settings_file => old_format_publicsettings_file)
-      certificate.subscription_id.must_equal "test-id-4"
-      certificate.api_url.must_equal "management.core.windows.net"
-      certificate.key.wont_be_nil
-      certificate.cert.wont_be_nil
-    end
-
-    it "should raise error when invalid subscription is given for old publishsettings file." do
-      Azure.configure do |config|
-        config.subscription_id = 'wrong_id'
-      end
-
-      exception = assert_raises(RuntimeError) do
-        subject.new(:publish_settings_file => old_format_publicsettings_file)
-      end
-      assert_match(/Subscription ID not valid./i, exception.message)
-    end
-
-    it "should set properties of given subscription id for new publishsettings file" do
-      Azure.configure do |config|
-        config.subscription_id = "test-id-1"
-        config.publish_settings_file = new_format_publicsettings_file
-      end
-      certificate1 = subject.new
-      certificate1.subscription_id.must_equal "test-id-1"
-      certificate1.api_url.must_equal "test-id-1.core.windows.net"
-      certificate1.key.wont_be_nil
-      certificate1.cert.wont_be_nil
-
-      Azure.configure do |config|
-        config.subscription_id = "test-id-2"
-        config.publish_settings_file = new_format_publicsettings_file
-      end
-      certificate2 = subject.new
-      certificate2.subscription_id.must_equal "test-id-2"
-      certificate2.api_url.must_equal "test-id-2.core.windows.net"
-      certificate2.key.wont_be_nil
-      certificate2.cert.wont_be_nil
-      refute_equal(certificate2.cert, certificate1.cert)
-      refute_equal(certificate2.key, certificate1.key)
-    end
-
-    it "should set use first subscription when no subscription is given for new publishsettings file." do
-      Azure.configure do |config|
-        config.subscription_id = nil
-      end
-      certificate = subject.new(:publish_settings_file => new_format_publicsettings_file)
-      certificate.subscription_id.must_equal "test-id-1"
-      certificate.api_url.must_equal "test-id-1.core.windows.net"
-      certificate.key.wont_be_nil
-      certificate.cert.wont_be_nil
-    end
-
-    it "should raise error when invalid subscription is given for new publishsettings file." do
-      Azure.configure do |config|
-        config.subscription_id = 'wrong_id'
-      end
-
-      exception = assert_raises(RuntimeError) do
-        subject.new(:publish_settings_file => new_format_publicsettings_file)
-      end
-      assert_match(/Subscription ID not valid./i, exception.message)
-    end
-
-    it "should raise error when invalid publishsettings file is given." do
-      Azure.config.subscription_id = nil
-      exception = assert_raises(OpenSSL::PKCS12::PKCS12Error) do
-        subject.new(:publish_settings_file => invalid_publishsettings_file)
-      end
-      assert_match(/PKCS12_parse: mac verify failure/i, exception.message)
-    end
-  end
-
-end