right_chimp 2.2.2 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7af2f093be4858573827cdf6ec385ddc54e1f06
-  data.tar.gz: 595742deb978554cf377a4725ddc47cef94f4eac
+  metadata.gz: fdeacec528b901c2b6941a6e3506a76cb113a72e
+  data.tar.gz: f463c5a7fdf2f249a444ff55ee6348024a20c6ee
 SHA512:
-  metadata.gz: 9da4371d7ee3f666985c280ede3372f5a83b43c30af3f1df373077ed790a1b4c91dae15ae490818858c1aee118023c125f069ab7d887a53cb2001c067585600f
-  data.tar.gz: b080b64e7c69eaf648413e9a518951a66b2a711b7d8281ef696a965de4d388c365d374d22246fb1efb53023dd4f26587eb47d437d7148b5c55ebece30d902f33
+  metadata.gz: 7d2e67fa34f3db3ef97766c951af955e322870a72a07b380b527e95a43054521857dd0aa50c15a4c97844e754ac943c88d3f6bd15c7a6bcaade18f6aac114c91
+  data.tar.gz: b0c616182b48b6ee7f378e73b0aefbf38e8fdaf7025739ddb97f5e9d3a1bd845ec7fdd15b0b778cef1d4b980612ab0bd938495e8b1e88da945bd163fcd231f6c

data/CHANGES

@@ -1,7 +1,11 @@
+Version 2.3
+-----------
+* Feature: Allow authentication via OAuth token.
+
 Version 2.2.2
 -------------
 * Feature: Now compatible with RightLink10 task states.
-* Bugfix: Fixes standalone retry execution. 
+* Bugfix: Fixes standalone retry execution.
 
 Version 2.2
 --------------

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.2.2)
+    right_chimp (2.3)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)
@@ -16,14 +16,14 @@ GEM
     coderay (1.1.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160826)
+    domain_name (0.5.20161021)
       unf (>= 0.0.5, < 1.0.0)
     highline (1.7.8)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     json (1.8.3)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.99.3)
     mini_portile2 (2.0.0)
     netrc (0.11.0)
     nokogiri (1.6.7.2)
@@ -41,9 +41,9 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    right_api_client (1.6.1)
+    right_api_client (1.6.2)
       json (~> 1.0)
-      mime-types (~> 1.0)
+      mime-types (~> 2.0)
       rest-client (~> 1.6)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)

data/INSTALL

@@ -12,21 +12,30 @@ creds. First create a directory for the configuration file:
 
   mkdir ~/.rest_connection
 
-Next create the configuration file. Name it rest_api_config.yaml and place it in the 
-.rest_connection folder. Use the following YAML as a template, replacing <email>, <password> 
+Next create the configuration file. Name it rest_api_config.yaml and place it in the
+.rest_connection folder. Use the following YAML as a template, replacing <email>, <password>
 and <account> with your email address, RightScale password, and account number.
 
-  --- 
-  :ssh_keys: 
+  ---
+  :ssh_keys:
   - ~/.ssh/id_rsa
   :pass: <password>
   :user: <email>
   :api_url: https://my.rightscale.com/api/acct/<account>
-  :common_headers: 
-    X_API_VERSION: "1.0"
 
 Now you're ready to run a test query. The following chimp command should return
 a list of all the operational servers in your account:
 
   chimp --tag="rs_monitoring:state=active"
 
+  RIGHTSCALE OAUTH SPECIFIC NOTES
+  --------------------------------
+
+   rest_api_config.yaml should look like
+
+    :ssh_keys:
+    - ~/.ssh/id_rsa
+    :user: <email>
+    :refresh_token: <refresh_token>
+    :api_url: https://us-3.rightscale.com
+    :account: <account>

data/lib/right_chimp/resources/connection.rb

@@ -51,10 +51,17 @@ module Chimp
         @endpoint = URI.parse(creds[:api_url]).host
 
         Log.debug "Logging into Api 1.5 right_api_client"
-
-        @client = RightApi::Client.new(:email => creds[:user], :password => creds[:pass],
-                                        :account_id => creds[:account], :api_url => creds[:api_url],
-                                        :timeout => 60, :enable_retry => true)
+        if creds[:refresh_token] then
+          # no account id extraction, must be specified in config file
+          # refresh_token must be specified in config
+          @client = RightApi::Client.new(refresh_token: creds[:refresh_token],
+                                         account_id: creds[:account], api_url: creds[:api_url],
+                                         timeout: 60, enable_retry: true)
+        else
+          @client = RightApi::Client.new(email: creds[:user], password: creds[:pass],
+                                         account_id: creds[:account], api_url: creds[:api_url],
+                                         timeout: 60, enable_retry: true)
+        end
       rescue
         puts "##############################################################################"
         puts "Error: "
@@ -125,7 +132,6 @@ module Chimp
     # Provides a way to make an api1.6 call directly
     #
     def Connection.api16_call(query)
-
       Thread.current[:retry] = true
       Thread.current[:response] = nil
       retries = 5
@@ -133,8 +139,13 @@ module Chimp
       sleep_for = 20
 
       begin
-        get  = Net::HTTP::Get.new(query)
-        get['Cookie']        = @client.cookies.map { |key, value| "%s=%s" % [key, value] }.join(';')
+        get = Net::HTTP::Get.new(query)
+        if @client.access_token
+          # auth using oauth access token
+          get['Authorization'] = 'Bearer ' + @client.access_token
+        else
+          get['Cookie']        = @client.cookies.map { |key, value| "%s=%s" % [key, value] }.join(';')
+        end
         get['X-Api_Version'] = '1.6'
         get['X-Account']     = @client.account_id
 

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = '2.2.2'
+  VERSION = '2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: '2.3'
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake