akamai_api 0.4.1 → 1.1.0

data/cassettes/akamai_api_eccu_publish/invalid_domain.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: |-
@@ -20,13 +20,15 @@ http_interactions:
       Content-Type:
       - text/xml;charset=UTF-8
       Content-Length:
-      - '1198'
+      - '1270'
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 500

data/cassettes/akamai_api_eccu_publish/successful.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: |-
@@ -20,13 +20,15 @@ http_interactions:
       Content-Type:
       - text/xml;charset=UTF-8
       Content-Length:
-      - '1265'
+      - '1264'
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200
@@ -60,7 +62,7 @@ http_interactions:
   recorded_at: Tue, 20 May 2014 16:49:29 GMT
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -81,6 +83,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200

data/cassettes/akamai_api_eccu_requests/invalid_credentials.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://foo:bar@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -22,6 +22,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 401

data/cassettes/akamai_api_eccu_requests/valid_credentials.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -22,6 +22,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200
@@ -57,7 +59,7 @@ http_interactions:
   recorded_at: Tue, 20 May 2014 15:39:06 GMT
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -78,6 +80,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200
@@ -124,7 +128,7 @@ http_interactions:
   recorded_at: Tue, 20 May 2014 15:39:06 GMT
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -145,6 +149,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200
@@ -190,7 +196,7 @@ http_interactions:
   recorded_at: Tue, 20 May 2014 15:39:07 GMT
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -211,6 +217,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200
@@ -257,7 +265,7 @@ http_interactions:
   recorded_at: Tue, 20 May 2014 15:39:07 GMT
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -278,6 +286,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200

data/cassettes/akamai_api_eccu_update_email/invalid_credentials.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://foo:bar@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -20,16 +20,16 @@ http_interactions:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic Zm9vOmJhcg==
   response:
     status:
       code: 401
       message: Unauthorized
     headers:
-      Server:
-      - Apache
       Www-Authenticate:
       - Basic realm="Luna Control Center Web Services (use your Luna username and
         password)"
@@ -38,15 +38,17 @@ http_interactions:
       Content-Type:
       - text/html; charset=iso-8859-1
       Expires:
-      - Thu, 22 May 2014 13:28:09 GMT
+      - Thu, 02 Mar 2017 05:54:58 GMT
       Cache-Control:
       - max-age=0, no-cache, no-store
       Pragma:
       - no-cache
       Date:
-      - Thu, 22 May 2014 13:28:09 GMT
+      - Thu, 02 Mar 2017 05:54:58 GMT
       Connection:
       - close
+      Strict-Transport-Security:
+      - max-age=15552000
       X-Frame-Options:
       - SAMEORIGIN
     body:
@@ -64,6 +66,6 @@ http_interactions:
         browser doesn't understand how to supply
         the credentials required.</p>
         </body></html>
-    http_version:
-  recorded_at: Thu, 22 May 2014 13:28:07 GMT
-recorded_with: VCR 2.9.0
+    http_version: 
+  recorded_at: Thu, 02 Mar 2017 05:54:58 GMT
+recorded_with: VCR 3.0.3

data/cassettes/akamai_api_eccu_update_email/not_found_request.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -23,6 +23,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 500

data/cassettes/akamai_api_eccu_update_email/successful.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -16,13 +16,15 @@ http_interactions:
       Content-Type:
       - text/xml;charset=UTF-8
       Content-Length:
-      - '561'
+      - '555'
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200

data/cassettes/akamai_api_eccu_update_notes/invalid_credentials.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://foo:bar@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -21,16 +21,16 @@ http_interactions:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic Zm9vOmJhcg==
   response:
     status:
       code: 401
       message: Unauthorized
     headers:
-      Server:
-      - Apache
       Www-Authenticate:
       - Basic realm="Luna Control Center Web Services (use your Luna username and
         password)"
@@ -39,15 +39,17 @@ http_interactions:
       Content-Type:
       - text/html; charset=iso-8859-1
       Expires:
-      - Thu, 22 May 2014 12:49:14 GMT
+      - Thu, 02 Mar 2017 05:58:41 GMT
       Cache-Control:
       - max-age=0, no-cache, no-store
       Pragma:
       - no-cache
       Date:
-      - Thu, 22 May 2014 12:49:14 GMT
+      - Thu, 02 Mar 2017 05:58:41 GMT
       Connection:
       - close
+      Strict-Transport-Security:
+      - max-age=15552000
       X-Frame-Options:
       - SAMEORIGIN
     body:
@@ -65,6 +67,6 @@ http_interactions:
         browser doesn't understand how to supply
         the credentials required.</p>
         </body></html>
-    http_version:
-  recorded_at: Thu, 22 May 2014 12:49:13 GMT
-recorded_with: VCR 2.9.0
+    http_version: 
+  recorded_at: Thu, 02 Mar 2017 05:58:41 GMT
+recorded_with: VCR 3.0.3

data/cassettes/akamai_api_eccu_update_notes/not_found_request.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -24,6 +24,8 @@ http_interactions:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 500

data/cassettes/akamai_api_eccu_update_notes/successful.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://USERNAME:PASSWORD@control.akamai.com/webservices/services/PublishECCU
+    uri: https://control.akamai.com/webservices/services/PublishECCU
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -17,13 +17,15 @@ http_interactions:
       Content-Type:
       - text/xml;charset=UTF-8
       Content-Length:
-      - '574'
+      - '569'
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
       - '*/*'
       User-Agent:
       - Ruby
+      Authorization:
+      - Basic VVNFUk5BTUU6UEFTU1dPUkQ=
   response:
     status:
       code: 200

data/features/ccu_arl_invalidate.feature

@@ -37,22 +37,10 @@ Feature: akamai_api ccu arl invalidate
       """
       * Purge ID: 12345678-1234-1234-1234-123456789012 | Support ID: 12345678901234567890-123456789
       """
-    And the output should contain:
-      """
-      * Estimated time: 420 secs.
-      """
-    And the output should contain:
-      """
-      * Progress URI: /ccu/v2/purges/12345678-1234-5678-1234-123456789012
-      """
-    And the output should contain:
-      """
-      * Time to wait before check: 420 secs.
-      """
 
   @vcr
   Scenario: multiple items
-    When I run `akamai_api ccu arl invalidate http://www.foo.com/bar.txt http://www.foo.com/baz.txt`
+    When I run `akamai_api ccu arl invalidate http://www.foo.bar/t.txt http://www.foo.com/baz.txt`
     Then the output should contain:
       """
       Purge request successfully submitted:
@@ -65,15 +53,3 @@ Feature: akamai_api ccu arl invalidate
       """
       * Purge ID: 12345678-1234-1234-1234-123456789012 | Support ID: 12345678901234567890-123456789
       """
-    And the output should contain:
-      """
-      * Estimated time: 420 secs.
-      """
-    And the output should contain:
-      """
-      * Progress URI: /ccu/v2/purges/12345678-1234-5678-1234-123456789012
-      """
-    And the output should contain:
-      """
-      * Time to wait before check: 420 secs.
-      """

data/features/support/env.rb

@@ -7,11 +7,16 @@ require 'vcr'
 require 'webmock'
 require 'coveralls'
 Coveralls.wear_merged!
-
 begin
   require File.expand_path '../auth.rb', __FILE__
 rescue LoadError
-  AkamaiApi.config[:auth] = ['test_username', 'test_password']
+  AkamaiApi.config[:auth] = ['USERNAME', 'PASSWORD']
+  AkamaiApi.config[:openapi] = {
+    :base_url => "https://some-subdomain.purge.akamaiapis.net",
+    :client_token => "client_token",
+    :client_secret => "client_secret",
+    :access_token => "access_token"
+  }
 end
 ENV['AKAMAI_USERNAME'], ENV['AKAMAI_PASSWORD'] = AkamaiApi.config[:auth]
 

data/lib/akamai_api.rb

@@ -1,4 +1,5 @@
 require "active_support/core_ext/object/blank"
+require "active_support/core_ext/hash"
 
 %w(version ccu eccu eccu_request eccu_parser).each do |file|
   require "akamai_api/#{file}"
@@ -9,8 +10,9 @@ module AkamaiApi
     @config ||= {
       :auth => [
         ENV.fetch('AKAMAI_USERNAME', ''),
-        ENV.fetch('AKAMAI_PASSWORD', '')
+        ENV.fetch('AKAMAI_PASSWORD', ''),
       ],
+      :openapi => {},
       :log => false
     }
   end
@@ -19,7 +21,11 @@ module AkamaiApi
     config[:auth].select { |v| v.blank? }.any?
   end
 
+  def self.auth_ok?
+    [:username, :password, :base_url, :client_token, :client_secret, :access_token ].all? { |k| auth.key? k }
+  end
+
   def self.auth
-    { username: config[:auth].first, password: config[:auth].last }
+    { username: config[:auth].first, password: config[:auth].last }.merge(config[:openapi].symbolize_keys)
   end
 end