environment-manager 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7616fe50db69b1126c7554583c5694e9476d58
-  data.tar.gz: 6b97e6b74244a35df981507ba7c4c1585aff0a28
+  metadata.gz: 5c891db666b68e9496cba114013f475ed907f943
+  data.tar.gz: a4c92f862e061ef98181cbb949863d9f05146bca
 SHA512:
-  metadata.gz: dd31fe45e0a7a865a350626a3df69b68c8c7472108968f6486e7160561e29834de8381bac2945bc8fd771f14927152ba0f89394e498947a46f8d3ca0d2b41dcb
-  data.tar.gz: 3ff450c7d58fb864370b6f4d773bf8de6c333791ca43df11bbbc51590061ba2df9b3a1382af15988a4eb3b93b3a20d417815f5a7e9468d052c9aa6ce03b147da
+  metadata.gz: d2f1fa9c6aeec590f5a83e48b0d492eb20aec9f410316bcf75b59ab8c7e56a42c26e1f00c36764b4f91c5811284d17191a2f1d1b4c98ee36ba25c9b12de94b85
+  data.tar.gz: 76a9a591be2bb04a88d051bb2ed3972b25ee3d0f0f95e6f9b5382974223577e7fe6302c6a09f747c9292ff2d9692403ff4b32aab7c23f0de30d211a1192dca4a

data/lib/environment_manager/api.rb

@@ -13,6 +13,8 @@ module EnvironmentManager
       @user = user
       @password = password
       @retries = retries
+      @token = nil
+
       # Sanitise input
       if server.empty? or user.empty? or password.empty?
         raise(IndexError, "API(server: SERVERNAME, user: USERNAME, password: PASSWORD, [retries: N])")
@@ -43,6 +45,7 @@ module EnvironmentManager
           sleep 2
         end
         retries += 1
+        sleep 2
       end
       if not token.to_s.strip.empty?
         token_bearer = "Bearer #{token}"
@@ -52,6 +55,19 @@ module EnvironmentManager
       end
     end
 
+    private
+    def get_token
+      if @token.nil?
+        @token = api_auth()
+      end
+      return @token
+    end
+
+    private
+    def renew_token
+      @token = api_auth()
+    end
+
     private
     def query(query_endpoint, data=nil, query_type="get", headers={}, retries=5, backoff=2)
       # Sanitise input
@@ -66,7 +82,7 @@ module EnvironmentManager
       retry_num = 0
       while retry_num < retries
         retry_num += 1
-        token = api_auth()
+        token = get_token()
         base_url = "https://#{@server}"
         request_url = "#{base_url}#{query_endpoint}"
         query_headers = {"Accept" => "application/json", "Content-Type" => "application/json", "Authorization" => token}
@@ -74,25 +90,32 @@ module EnvironmentManager
           query_headers.merge!(header)
         end
         # Add any extra headers
-        if query_type.downcase == "get"
-          request = RestClient::Request.execute(url: request_url, method: :get, headers: query_headers, verify_ssl: false, open_timeout: 10)
-        elsif query_type.downcase == "post"
-          request = RestClient::Request.execute(url: request_url, method: :post, payload: data, headers: query_headers, verify_ssl: false, open_timeout: 10)
-        elsif query_type.downcase == "put"
-          request = RestClient::Request.execute(url: request_url, method: :put, payload: data, headers: query_headers, verify_ssl: false, open_timeout: 10)
-        elsif query_type.downcase == "patch"
-          request = RestClient::Request.execute(url: request_url, method: :patch, payload: data, headers: query_headers, verify_ssl: false, open_timeout: 10)
-        elsif query_type.downcase == "delete"
-          request = RestClient::Request.execute(url: request_url, method: :delete, headers: query_headers, verify_ssl: false, open_timeout: 10)
-        else
-          raise("Cannot process query type #{query_type}")
-        end
-        if request.code.to_s[0].to_i == 2
-          return JSON.parse(request.body)
-        elsif request.code.to_s[0].to_i == 2 or request.code.to_s[0].to_i == 5
-          raise(request)
-        else
-          sleep backoff
+        begin
+          if query_type.downcase == "get"
+            request = RestClient::Request.execute(url: request_url, method: :get, payload: data, headers: query_headers, verify_ssl: false, open_timeout: 10)
+          elsif query_type.downcase == "post"
+            request = RestClient::Request.execute(url: request_url, method: :post, payload: data, headers: query_headers, verify_ssl: false, open_timeout: 10)
+          elsif query_type.downcase == "put"
+            request = RestClient::Request.execute(url: request_url, method: :put, payload: data, headers: query_headers, verify_ssl: false, open_timeout: 10)
+          elsif query_type.downcase == "patch"
+            request = RestClient::Request.execute(url: request_url, method: :patch, payload: data, headers: query_headers, verify_ssl: false, open_timeout: 10)
+          elsif query_type.downcase == "delete"
+            request = RestClient::Request.execute(url: request_url, method: :delete, headers: query_headers, verify_ssl: false, open_timeout: 10)
+          else
+            raise("Cannot process query type #{query_type}")
+          end
+          status_type = request.code.to_s[0].to_i
+          if status_type == 2 or status_type == 3
+            return JSON.parse(request.body)
+          elsif request.code == 401
+              renew_token()
+          elsif status_type == 4
+            raise(request)
+          else
+            sleep backoff
+          end
+        rescue
+          renew_token()
         end
       end
       raise("Max number of retries (#{retry_num}) querying Environment Manager, last http code is #{request.code}, will abort for now")
@@ -680,9 +703,19 @@ module EnvironmentManager
 
     ## Instance
     public
-    def get_instances()
+    def get_instances(environment=nil, cluster=nil)
       # Get all instances matching the given criteria
       request_endpoint = "/api/v1/instances"
+      queries = Array.new()
+      if environment != nil
+        queries.push("environment=#{environment}")
+      end
+      if cluster != nil
+        queries.push("cluster=#{cluster}")
+      end
+      if queries.size > 0
+        request_endpoint << '?%s' % queries.join("&")
+      end
       return query(request_endpoint, query_type: "GET")
     end
 
@@ -723,7 +756,7 @@ module EnvironmentManager
       if id.nil?
         raise("Load Balancer ID has not been specified")
       end
-      request_endpoint = "/api/v1/config/load-balancer/#{id}"
+      request_endpoint = "/api/v1/load-balancer/#{id}"
       return query(request_endpoint, query_type: "GET")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: environment-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Marc Cluet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby client for Environment Manager