miasma-azure 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930c7bce022b9900264a5edeeffead952cc6cb89
-  data.tar.gz: 3bab0bcf17dbce4f268e9b21ce326ac28d17c92c
+  metadata.gz: 54845db70434630e69c25a63e10818cb14511585
+  data.tar.gz: 4374a9268fb417fc67a7e900af2860b57aa66b60
 SHA512:
-  metadata.gz: 4003382c4e7203a3c86b86c2210b7f06db6c20f79a0c1e694681a256c3994a4dabc7509e9c5e3e03b5a74359d6473d94c12cafef22ad1e55af39c1de394e3152
-  data.tar.gz: e8ac70debf8ac21c16ccebaa421e7533c31f6a6e84f11a192875ba1b9f1732f3ec628bd467cf11a9551d583a980696b9b3f35c748e2a246f6566b4940433fcd1
+  metadata.gz: 95eeefb4dda75bf05d4a39e6da9a8cba99fc4b0b4c4d85c973896da6fec1cfadde130409e08fcd2daa0871032bfdd749e45c9910594187f2f4d513a0969535ba
+  data.tar.gz: 7e16ed8ffd66ef61fa5af9af47a887b1cf497961f35e62c9ff035b94c448aa30120d14827c07802c0e02f2c8640e3b1698210f9d5b7d148b1912be89c18408e5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.1.4
+* [enhancement] Limit automatic retries to server side errors only
+
 # v0.1.2
 * [fix] properly load stack outputs into data model
 * [fix] stub event output when stack is being destroyed

data/lib/miasma-azure/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAzure
   # Current library version
-  VERSION = Gem::Version.new('0.1.2')
+  VERSION = Gem::Version.new('0.1.4')
 end

data/lib/miasma/contrib/azure.rb

@@ -317,7 +317,7 @@ module Miasma
 
         def request_client_token
           result = HTTP.post(
-            File.join(azure_login_url, azure_tenant_id, 'oauth2', 'token'),
+            [azure_login_url, azure_tenant_id, 'oauth2', 'token'].join('/'),
             :form => {
               :grant_type => 'client_credentials',
               :client_id => azure_client_id,
@@ -326,11 +326,10 @@ module Miasma
             }
           )
           unless(result.code == 200)
-            # TODO: Wrap this in custom exception to play nice
-            puts result.inspect
-            puts "FAIL: #{result.body.to_s}"
-            puts result.headers
-            raise 'ACK'
+            raise Miasma::Error::ApiError.new(
+              'Request for client authentication token failed',
+              :response => result
+            )
           end
           @oauth_token_information = MultiJson.load(
             result.body.to_s
@@ -348,6 +347,18 @@ module Miasma
           end
         end
 
+        # Define when request should be retried
+        #
+        # @param exception [Exception]
+        # @return [TrueClass, FalseClass]
+        def perform_request_retry(exception)
+          if(exception.is_a?(Error::ApiError::RequestError))
+            exception.response.code >= 500
+          else
+            false
+          end
+        end
+
         # @return [String] custom escape
         def uri_escape(string)
           signer.safe_escape(string)

data/lib/miasma/contrib/azure/orchestration.rb

@@ -436,7 +436,7 @@ module Miasma
                 :resource_logical_id => event.get(:properties, :targetResource, :resourceName),
                 :resource_state => status_to_state(event.get(:properties, :provisioningState)),
                 :resource_status => event.get(:properties, :provisioningState),
-                :resource_status_reason => event.get(:properties, :statusCode),
+                :resource_status_reason => event.get(:properties, :statusCode).to_s,
                 :time => Time.parse(event.get(:properties, :timestamp))
               ).valid_state
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-azure
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma