leaseweb-rest-api 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743087b4ba877486ef230d512f40cfa5af62345e
-  data.tar.gz: 1589cce027ee933dfb9281156af2f488ada15144
+  metadata.gz: adc4d1eef0cc5d6c853af1e1bfd5283241140d15
+  data.tar.gz: 906b653fd5dbeeeaab1e91e0c29ce2b5b6afcf86
 SHA512:
-  metadata.gz: 6df59f6bf86d14b98453d71440fbe968bfe32208ad3688362017ea59742d87b5e97f55c872c352538ac3d882945c264fb0fb5e4ccf3135e815416fc8e4114369
-  data.tar.gz: 71ccdd0968f9a6fe4e896b25085d05f53cc38709874c49ec76803c982cedaea0bfad0b4e836b23978c929644c5dab7368407cf29944f273d838bf251409069ed
+  metadata.gz: 4269770ca1487cd9c82315b7a1cf5df14e36496bfe7289e722f11f3fae5d79f1a87ec6949adf5a6a257ceae21b2f4ab0e85f2063af5239ed5c617a095aae3343
+  data.tar.gz: 1b0efc5c9ed2eaad0685eb670f10019fdc41e78334ae6b49d9d86c4f3e5f5c5aacf887b8f97e39e031bb896fe6d532fe493aead9e4c73cfa775d3f688b04c118

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
-gemspec
+gem 'gemspec'
+gem 'rake'

data/leaseweb-rest-api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'leaseweb-rest-api'
-  s.version       = '1.0.1'
+  s.version       = '1.0.2'
   s.authors       = 'Arnoud Vermeer'
   s.email         = 'a.vermeer@tech.leaseweb.com'
   s.license       = 'Apache'
@@ -14,4 +14,4 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'webmock'
-end
+end

data/lib/hash-to-uri-conversion.rb

@@ -1,6 +1,6 @@
 class HashToURIConversion
   def to_params(hash)
-    params = hash.map { |k,v| normalize_param(k,v) }.join
+    params = hash.map { |k, v| normalize_param(k, v) }.join
     params.chop! # trailing &
     params
   end
@@ -12,7 +12,7 @@ class HashToURIConversion
     if value.is_a?(Array)
       param << value.each_with_index.map { |element, i| normalize_param("#{key}[#{i}]", element) }.join
     elsif value.is_a?(Hash)
-      stack << [key,value]
+      stack << [key, value]
     else
       param << "#{key}=#{URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
     end
@@ -29,4 +29,4 @@ class HashToURIConversion
 
     param
   end
-end
+end

data/lib/leaseweb-rest-api.rb

@@ -3,23 +3,56 @@
 require 'httparty'
 require 'base64'
 require 'time'
+require 'json'
 require_relative 'hash-to-uri-conversion'
 
 class LeasewebAPI
   include HTTParty
   format :json
-  #debug_output $stderr
+  # debug_output $stderr
 
   base_uri 'https://api.leaseweb.com/v1'
 
-  def initialize (apikey, privateKey, password)
-    @options = { headers: { "X-Lsw-Auth" => apikey } }
-    @private_key = OpenSSL::PKey::RSA.new(File.read(privateKey),password)
+  def initialize(apikey = nil, privateKey = nil, password = nil, clientId = nil, clientSecret = nil)
+    @auth_token_url = 'https://auth.leaseweb.com/token'
+    if !apikey.nil?
+      @options = { headers: { 'X-Lsw-Auth' => apikey } }
+    elsif !clientId.nil? && !clientSecret.nil?
+      access_token = getOauthToken(clientId, clientSecret)['access_token']
+      @options = { headers: { 'Authorization' => "Bearer #{access_token}" } }
+    else
+      puts 'Your API credentials are required.'
+      exit
+    end
+    @private_key = OpenSSL::PKey::RSA.new(File.read(privateKey), password) unless privateKey.nil? || password.nil?
+  end
+
+  def getOauthToken(clientId, clientSecret)
+    auth = { username: clientId, password: clientSecret }
+    self.class.post(@auth_token_url, basic_auth: auth, body: { grant_type: 'client_credentials' })
+  end
+
+  def get(url)
+    self.class.get(url, @options)
+  end
+
+  def post(url, body)
+    opt = @options.merge!(body: body)
+    self.class.post(url, opt)
+  end
+
+  def put(url, body)
+    opt = @options.merge!(body: body)
+    self.class.put(url, opt)
+  end
+
+  def delete(url)
+    self.class.delete(url, @options)
   end
 
   # Domains
   def getDomains
-    self.class.get("/domains", @options)
+    self.class.get('/domains', @options)
   end
 
   def getDomain(domain)
@@ -27,7 +60,7 @@ class LeasewebAPI
   end
 
   def updateDomain(domain, ttl)
-    opt = @options.merge!({ :body => { :ttl => ttl } })
+    opt = @options.merge!(body: { ttl: ttl })
 
     self.class.put("/domains/#{domain}", opt)
   end
@@ -37,9 +70,9 @@ class LeasewebAPI
   end
 
   def createDNSRecords(domain, host, content, type, priority = nil)
-    opt = @options.merge!({ :body => { :host => host, :content => content, :type => type } })
+    opt = @options.merge!(body: { host: host, content: content, type: type })
 
-    if not priority.nil? and (type == 'MX' or type == 'SRV')
+    if !priority.nil? && ((type == 'MX') || (type == 'SRV'))
       opt[:body][:priority] = priority
     end
 
@@ -51,9 +84,9 @@ class LeasewebAPI
   end
 
   def updateDNSRecord(domain, dnsRecordId, host, content, type, priority = nil)
-    opt = @options.merge!({ :body => { :id => dnsRecordId, :host => host, :content => content, :type => type } })
+    opt = @options.merge!(body: { id: dnsRecordId, host: host, content: content, type: type })
 
-    if not priority.nil? and (type == 'MX' or type == 'SRV')
+    if !priority.nil? && ((type == 'MX') || (type == 'SRV'))
       opt[:body][:priority] = priority
     end
 
@@ -66,12 +99,12 @@ class LeasewebAPI
 
   # Rescue
   def getRescueImages
-    self.class.get("/rescueImages", @options)
+    self.class.get('/rescueImages', @options)
   end
 
   # BareMetals
   def getBareMetals
-    self.class.get("/bareMetals", @options)
+    self.class.get('/bareMetals', @options)
   end
 
   def getBareMetal(bareMetalId)
@@ -79,7 +112,7 @@ class LeasewebAPI
   end
 
   def updateBareMetal(bareMetalId, reference)
-    opt = @options.merge!({ :body => { :reference => reference } })
+    opt = @options.merge!(body: { reference: reference })
 
     self.class.put("/bareMetals/#{bareMetalId}", opt)
   end
@@ -108,8 +141,8 @@ class LeasewebAPI
     self.class.get("/bareMetals/#{bareMetalId}/ips/#{ipAddress}", @options)
   end
 
-  def updateIP(bareMetalId, ipAddress, reverseLookup='', nullRouted=0)
-    opt = @options.merge!({ :body => { :reverseLookup => reverseLookup, :nullRouted => nullRouted } })
+  def updateIP(bareMetalId, ipAddress, reverseLookup = '', nullRouted = 0)
+    opt = @options.merge!(body: { reverseLookup: reverseLookup, nullRouted: nullRouted })
 
     self.class.put("/bareMetals/#{bareMetalId}/ips/#{ipAddress}", opt)
   end
@@ -122,11 +155,11 @@ class LeasewebAPI
     self.class.get("/bareMetals/#{bareMetalId}/networkUsage", @options)
   end
 
-  def getNetworkUsageBandWidth(bareMetalId, dateFrom, dateTo, format='json')
+  def getNetworkUsageBandWidth(bareMetalId, dateFrom, dateTo, format = 'json')
     self.class.get("/bareMetals/#{bareMetalId}/networkUsage/bandWidth", formatRequest(dateFrom, dateTo, format))
   end
 
-  def getNetworkUsageDataTraffic(bareMetalId, dateFrom, dateTo, format='json')
+  def getNetworkUsageDataTraffic(bareMetalId, dateFrom, dateTo, format = 'json')
     self.class.get("/bareMetals/#{bareMetalId}/networkUsage/dataTraffic", formatRequest(dateFrom, dateTo, format))
   end
 
@@ -135,19 +168,19 @@ class LeasewebAPI
   end
 
   def installServer(bareMetalId, osId, hdd = [])
-    opt = @options.merge!({ :body => { :osId => osId, :hdd => hdd }, query_string_normalizer: ->(h){ HashToURIConversion.new().to_params(h) } })
+    opt = @options.merge!(body: { osId: osId, hdd: hdd }, query_string_normalizer: ->(h) { HashToURIConversion.new.to_params(h) })
 
     self.class.post("/bareMetals/#{bareMetalId}/install", opt)
   end
 
   def postResqueMode(bareMetalId, osId)
-    opt = @options.merge!({ :body => { :osId => osId } })
+    opt = @options.merge!(body: { osId: osId })
 
     self.class.post("/bareMetals/#{bareMetalId}/rescueMode", opt)
   end
 
-  def getRootPassword(bareMetalId, format='json')
-    opt = @options.merge!({ :headers => self.formatHeader(format) })
+  def getRootPassword(bareMetalId, format = 'json')
+    opt = @options.merge!(headers: formatHeader(format))
 
     self.class.get("/bareMetals/#{bareMetalId}/rootPassword", opt)
   end
@@ -155,12 +188,12 @@ class LeasewebAPI
   def getInstallationStatus(bareMetalId)
     response = self.class.get("/bareMetals/#{bareMetalId}/installationStatus", @options)
 
-    if response["installationStatus"].include?('initRootPassword')
-      response["installationStatus"]["initRootPassword"] = self.decrypt(response["installationStatus"]["initRootPassword"])
+    if response['installationStatus'].include?('initRootPassword')
+      response['installationStatus']['initRootPassword'] = decrypt(response['installationStatus']['initRootPassword'])
     end
 
-    if response["installationStatus"].include?('rescueModeRootPass')
-      response["installationStatus"]["rescueModeRootPass"] = self.decrypt(response["installationStatus"]["rescueModeRootPass"])
+    if response['installationStatus'].include?('rescueModeRootPass')
+      response['installationStatus']['rescueModeRootPass'] = decrypt(response['installationStatus']['rescueModeRootPass'])
     end
 
     response
@@ -171,7 +204,7 @@ class LeasewebAPI
   end
 
   def setLease(bareMetalId, bootFileName)
-    opt = @options.merge!({ :body => { :bootFileName => bootFileName } })
+    opt = @options.merge!(body: { bootFileName: bootFileName })
 
     self.class.post("/bareMetals/#{bareMetalId}/leases", opt)
   end
@@ -184,16 +217,24 @@ class LeasewebAPI
     self.class.delete("/bareMetals/#{bareMetalId}/leases/#{macAddress}", @options)
   end
 
+  # New install call
+  def install(bareMetalId, operatingSystemId, options = {})
+    options[:operatingSystemId] = operatingSystemId
+    opt = @options.merge!(body: options.to_json)
+
+    self.class.post("/bmpapi/bareMetals/#{bareMetalId}/install", opt)
+  end
+
   # Private Networks
   def getPrivateNetworks
-    self.class.get("/privateNetworks", @options)
+    self.class.get('/privateNetworks', @options)
   end
 
   # TODO: check post with name
-  def createPrivateNetworks(name='')
-    opt = @options.merge!({ :body => { :name => name } })
+  def createPrivateNetworks(name = '')
+    opt = @options.merge!(body: { name: name })
 
-    self.class.post("/privateNetworks", opt)
+    self.class.post('/privateNetworks', opt)
   end
 
   def getPrivateNetwork(id)
@@ -201,8 +242,8 @@ class LeasewebAPI
   end
 
   # TODO: Check with Jeroen if it works
-  def updatePrivateNetwork(id, name='')
-    opt = @options.merge!({ :body => { :name => name } })
+  def updatePrivateNetwork(id, name = '')
+    opt = @options.merge!(body: { name: name })
 
     self.class.put("/privateNetworks/#{id}", opt)
   end
@@ -212,7 +253,7 @@ class LeasewebAPI
   end
 
   def createPrivateNetworksBareMetals(id, bareMetalId)
-    opt = @options.merge!({ :body => { :bareMetalId => bareMetalId } })
+    opt = @options.merge!(body: { bareMetalId: bareMetalId })
 
     self.class.post("/privateNetworks/#{id}/bareMetals", opt)
   end
@@ -223,7 +264,7 @@ class LeasewebAPI
 
   # Operating Systems
   def getOperatingSystems
-    self.class.get("/operatingSystems", @options)
+    self.class.get('/operatingSystems', @options)
   end
 
   def getOperatingSystem(operatingSystemId)
@@ -239,27 +280,55 @@ class LeasewebAPI
   end
 
   def getPartitionSchema(operatingSystemId, bareMetalId)
-    opt = @options.merge!({ :query => { :serverPackId => bareMetalId } })
+    opt = @options.merge!(query: { serverPackId: bareMetalId })
 
     self.class.get("/operatingSystems/#{operatingSystemId}/partitionSchema", opt)
   end
 
   # IPs
   def getIps
-    self.class.get("/ips", @options)
+    self.class.get('/ips', @options)
   end
 
   def getIp(ipAddress)
     self.class.get("/ips/#{ipAddress}", @options)
   end
 
-  def updateIp(ipAddress, reverseLookup='', nullRouted=0)
-    opt = @options.merge!({ :body => { :reverseLookup => reverseLookup, :nullRouted => nullRouted } })
+  def updateIp(ipAddress, reverseLookup = '', nullRouted = 0)
+    opt = @options.merge!(body: { reverseLookup: reverseLookup, nullRouted: nullRouted })
 
     self.class.put("/ips/#{ipAddress}", opt)
   end
 
+  # Pay as you go
+  def getPAYGInstances
+    self.class.get('/payAsYouGo/bareMetals/instances', @options)
+  end
+
+  def createPAYGInstance(modelId)
+    opt = @options.merge!(model: modelId)
+
+    self.class.post('/payAsYouGo/bareMetals/instances', opt)
+  end
+
+  def getPAYGInstance(bareMetalId)
+    self.class.get("/payAsYouGo/bareMetals/instances/#{bareMetalId}", @options)
+  end
+
+  def destroyPAYGInstance(bareMetalId)
+    self.class.post("/payAsYouGo/bareMetals/instances/#{bareMetalId}/destroy", @options)
+  end
+
+  def getPAYGModels
+    self.class.get('/payAsYouGo/bareMetals/models', @options)
+  end
+
+  def getPAYGModelInstance(modelId)
+    self.class.get("/payAsYouGo/bareMetals/models/#{modelId}", @options)
+  end
+
   protected
+
   def decrypt(string)
     @private_key.private_decrypt(Base64.decode64(string))
   end
@@ -269,16 +338,16 @@ class LeasewebAPI
   end
 
   def formatHeader(format)
-    if format == 'json'
-      header = { 'Accept' => 'application/json' }.merge!(@options[:headers])
-    else
-      header = { 'Accept' => 'image/png' }.merge!(@options[:headers])
-    end
+    header = if format == 'json'
+               { 'Accept' => 'application/json' }.merge!(@options[:headers])
+             else
+               { 'Accept' => 'image/png' }.merge!(@options[:headers])
+             end
 
     header
   end
 
   def formatRequest(dateFrom, dateTo, format)
-    @options.merge!({ :query => { :dateFrom => self.dateFormat(dateFrom), :dateTo => self.dateFormat(dateTo) }, :headers => self.formatHeader(format) })
+    @options.merge!(query: { dateFrom: dateFormat(dateFrom), dateTo: dateFormat(dateTo) }, headers: formatHeader(format))
   end
 end