fastly 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2ede9580b2a60043debfc3a95545c6ec6d88dce770e53f626975d508922230
-  data.tar.gz: 88471ec1a779279a3b35bbf42c2882caef0adc6fd54161eb0f0793180a1f9e0a
+  metadata.gz: d0331b2215d245985194128508980192db08a0ae94c0da70c1f3b417a4309df7
+  data.tar.gz: d3ab806682ed8e8141a301886fb2bf21b91102f478866dee281b3be2c7480a5c
 SHA512:
-  metadata.gz: d66d4a875d04d5889dd0f7d094073abc575cc9ef3f8c698d03050e35a1236ce3f2d94356503d9391f494a95f7cc47ff0dc581e04a342db79e0689b8038d4ed74
-  data.tar.gz: 257ca1ae2413695c47394fecd8b9a77e9be2d073232ea0a2ea186045c7356e96b562a1d66cafb9b7e2a71fe2760b52c5f121aacae98d99184cd768c10f4aa5b2
+  metadata.gz: 4e738dcf185c95ff25b675f2795fbdd62154894c1c00098dccd48f39d1dfb854491f8f007b5a1c1bef1c0689aad5392b0b5c3facb22ed0a956b501a7300017c3
+  data.tar.gz: f76512046a815ab57aa559abc71f9ab9108246defb81f2c710579f0d11296eb2f422897bb97440aa8a18f9c57b363ae1570db95257e50e9f1ed12736a7a959ac

data/.env.example

@@ -0,0 +1,3 @@
+FASTLY_TEST_USER=
+FASTLY_TEST_PASSWORD=
+FASTLY_TEST_API_KEY=

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [v3.0.0](https://github.com/fastly/fastly-ruby/tree/v3.0.0) (2021-02-03)
+
+[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v2.5.3...v3.0.0)
+
+**Merged pull requests:**
+
+- Removes session authentication [\#170](https://github.com/fastly/fastly-ruby/pull/170) ([conniechu929](https://github.com/conniechu929))
+
+## [v2.5.0](https://github.com/fastly/fastly-ruby/tree/v2.5.0) (2020-01-16)
+
+[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v2.4.0...v2.5.0)
+
+**Merged pull requests:**
+
+- Add tokens.rb [\#150](https://github.com/fastly/fastly-ruby/pull/150) ([malachy-mcconnell](https://github.com/malachy-mcconnell))
+
 ## [v2.4.0](https://github.com/fastly/fastly-ruby/tree/v2.4.0) (2019-07-29)
 [Full Changelog](https://github.com/fastly/fastly-ruby/compare/v2.3.1...v2.4.0)
 

data/Gemfile

@@ -4,10 +4,14 @@ gemspec
 
 group :development, :test do
   gem 'appraisal', '~> 2.1'
-  gem 'rake', '~> 10.3.2'
+  gem 'rake', '>= 12.3.3'
   gem 'rdoc', '~> 4.1.1'
   gem 'minitest', '~> 5.3.4'
   gem 'pry'
   gem 'rubocop', '~> 0.57.2', require: false
   gem 'webmock'
 end
+
+group :test do
+  gem 'dotenv'
+end

data/README.md

@@ -2,6 +2,12 @@
 
 Client library for interacting with the Fastly web acceleration service [API](http://docs.fastly.com/api)
 
+### A Note About Authentication
+
+Authenticating with a username/password is deprecated and will no longer be available starting September 2020.
+
+Authenticating with an API Token is shown in the example section below. For more information on API Tokens, please see [Fastly's API Token documentation](https://developer.fastly.com/reference/api/auth/). For more information about authenticating to our API, please see our [Authentication section](https://developer.fastly.com/reference/api/#authentication).
+
 ## Examples
 
 Add fastly to your Gemfile:
@@ -13,7 +19,8 @@ Create a fastly client:
 
 ```ruby
 # some_file.rb
-# use {api_key: 'your-key'} or {user: 'username', password: 'password'} as login options
+# username/password authentication is deprecated and will not be available
+# starting September 2020; use {api_key: 'your-key'} as the login option
 fastly = Fastly.new(login_opts)
 
 current_user     = fastly.current_user
@@ -202,19 +209,23 @@ This option should not be used in a production setting as all HTTP headers, requ
 
 ### Notes for testing
 
-The test suite requires the following `ENV` variables to be set:
+The test suite tests create and delete three services in sequence, so you may want to create an account just for these tests.
+
+To run the test suite:
+
+1. Generate a personal token for these tests: https://manage.fastly.com/account/personal/tokens
+
+2. Copy `.env.example` to `.env` and add the values for the variables:
 
-* `FASTLY_TEST_USER` - Your user email
-* `FASTLY_TEST_PASSWORD` - Your account password
-* `FASTLY_TEST_API_KEY` - Your API key (found at https://app.fastly.com/#account)
+  * `FASTLY_TEST_USER` - Your user email
+  * `FASTLY_TEST_PASSWORD` - Your account password
+  * `FASTLY_TEST_API_KEY` - Your personal token
 
-While the test suite is safe to be run on all accounts and isn't harmful to your
-data, the tests will create and delete 3 services in sequence so you may want
-to create an account just for tests.
+3. Run the tests via `bundle exec rake test:unit`
 
 ## Copyright
 
-Copyright 2011-2014 - Fastly Inc
+Copyright 2011-2020 - Fastly, Inc.
 
 ## Redistribution
 

data/lib/fastly.rb

@@ -34,6 +34,7 @@ require 'fastly/snippet'
 require 'fastly/dynamic_snippet'
 require 'fastly/sumologic_logging'
 require 'fastly/syslog'
+require 'fastly/token'
 require 'fastly/s3_logging'
 require 'fastly/gcs_logging'
 require 'fastly/user'
@@ -54,8 +55,8 @@ class Fastly
   #
   # Some methods require full username and password rather than just auth token.
   def initialize(opts)
-    if opts[:api_key].nil? && (opts[:password].nil? || opts[:user].nil?)
-      raise ArgumentError, "Required options missing. Please pass either ':api_key' or both ':user' and ':password'."
+    if opts[:api_key].nil?
+      raise ArgumentError, "Required option missing. Please pass ':api_key'."
     end
 
     client(opts)
@@ -151,7 +152,7 @@ class Fastly
     client.get_stats('/stats/regions')
   end
 
-  [ACL, ACLEntry, User, Customer, Backend, CacheSetting, Condition, Dictionary, DictionaryItem, Director, Domain, Header, Healthcheck, Gzip, Match, PapertrailLogging, RequestSetting, ResponseObject, Service, Snippet, S3Logging, Syslog, VCL, Version].each do |klass|
+  [ACL, ACLEntry, User, Customer, Backend, CacheSetting, Condition, Dictionary, DictionaryItem, Director, Domain, Header, Healthcheck, Gzip, Match, PapertrailLogging, RequestSetting, ResponseObject, Service, Snippet, S3Logging, Syslog, Token, VCL, Version].each do |klass|
     type = Util.class_to_path(klass)
 
     if klass.respond_to?(:pluralize)

data/lib/fastly/belongs_to_service_and_version.rb

@@ -16,9 +16,9 @@ class Fastly
     end
 
     # Get the number of the Version this belongs to
-    def version_number # rubocop:disable all
-      @version
-    end # rubocop:enable all
+    def version_number
+      @version ||= nil
+    end
 
     # :nodoc:
     def as_hash

data/lib/fastly/client.rb

@@ -11,7 +11,7 @@ class Fastly
 
     DEFAULT_URL = 'https://api.fastly.com'.freeze
 
-    attr_accessor :api_key, :base_url, :debug, :user, :password, :cookie, :customer
+    attr_accessor :api_key, :base_url, :debug, :user, :password, :customer
 
     def initialize(opts)
       @api_key            = opts.fetch(:api_key, nil)
@@ -25,15 +25,12 @@ class Fastly
                               Concurrent::ThreadLocalVar.new { build_http_client }
                             end
 
-      return self unless fully_authed?
-
-      # If full auth creds (user/pass) then log in and set a cookie
-      resp = http.post('/login', make_params(user: user, password: password))
-
-      if resp.kind_of?(Net::HTTPSuccess)
-        @cookie = resp['Set-Cookie']
-      else
-        fail Unauthorized, "Invalid auth credentials. Check username/password."
+      warn("DEPRECATION WARNING: Username/password authentication is deprecated
+      and will not be available starting September 2020;
+      please migrate to API tokens as soon as possible.")
+      
+      if api_key.nil?
+        fail Unauthorized, "Invalid auth credentials. Check api_key."
       end
 
       self
@@ -59,8 +56,9 @@ class Fastly
 
     def get(path, params = {})
       extras = params.delete(:headers) || {}
+      include_auth = params.key?(:include_auth) ? params.delete(:include_auth) : true
       path += "?#{make_params(params)}" unless params.empty?
-      resp  = http.get(path, headers(extras))
+      resp  = http.get(path, headers(extras, include_auth))
       fail Error, resp.body unless resp.kind_of?(Net::HTTPSuccess)
       JSON.parse(resp.body)
     end
@@ -86,7 +84,8 @@ class Fastly
 
     def delete(path, params = {})
       extras = params.delete(:headers) || {}
-      resp  = http.delete(path, headers(extras))
+      include_auth = params.key?(:include_auth) ? params.delete(:include_auth) : true
+      resp  = http.delete(path, headers(extras, include_auth))
       resp.kind_of?(Net::HTTPSuccess)
     end
 
@@ -132,16 +131,18 @@ class Fastly
 
     def post_and_put(method, path, params = {})
       extras = params.delete(:headers) || {}
+      include_auth = params.key?(:include_auth) ? params.delete(:include_auth) : true
       query = make_params(params)
-      resp  = http.send(method, path, query, headers(extras).merge('Content-Type' =>  'application/x-www-form-urlencoded'))
+      resp  = http.send(method, path, query, headers(extras, include_auth).merge('Content-Type' =>  'application/x-www-form-urlencoded'))
       fail Error, resp.body unless resp.kind_of?(Net::HTTPSuccess)
       JSON.parse(resp.body)
     end
 
-    def headers(extras={})
-      headers = fully_authed? ? { 'Cookie' => cookie } : {}
-      headers['Fastly-Key'] = api_key if api_key
-
+    def headers(extras={}, include_auth=true)
+      headers = {}
+      if include_auth
+        headers['Fastly-Key'] = api_key if api_key
+      end
       headers.merge('Content-Accept' => 'application/json', 'User-Agent' => "fastly-ruby-v#{Fastly::VERSION}").merge(extras.keep_if {|k,v| !v.nil? })
     end
 

data/lib/fastly/gem_version.rb

@@ -1,4 +1,4 @@
 # The current version of the library
 class Fastly
-  VERSION = "2.4.0"
+  VERSION = "3.0.0"
 end

data/lib/fastly/service.rb

@@ -2,7 +2,8 @@
 class Fastly
   # Represents something you want to serve - this can be, for example, a whole web site, a Wordpress site, or just your image servers
   class Service < Base
-    attr_accessor :id, :customer_id, :name, :comment, :versions
+    attr_accessor :id, :customer_id, :name, :comment
+    attr_writer :versions
 
     @versions = []
 

data/lib/fastly/token.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Token object
+class Fastly
+  class Token < Base
+    attr_accessor :id, :access_token, :user_id, :services, :name,  :scope, :created_at, :last_used_at, :expires_at, :ip, :user_agent
+    
+    private
+
+    def self.get_path(*_args)
+      '/tokens'
+    end
+
+    def self.post_path(*_args)
+      '/tokens'
+    end
+    
+    def self.delete_path(opts)
+      "/tokens/#{opts.id}"
+    end
+  end
+
+  def new_token(opts)
+    if client.fully_authed?
+      opts[:username] = client.user
+      opts[:password] = client.password
+      opts[:include_auth] = false
+      
+      token = create(Token, opts)
+      token.nil? ? nil : token
+    else
+      raise ArgumentError, "Required options missing. Please pass :api_key, :user and :password." 
+    end
+  end
+
+  def customer_tokens(opts)
+    hash = client.get("/customer/#{opts[:customer_id]}/tokens")
+    hash.map { |token_hash| Token.new(token_hash, Fastly::Fetcher) }
+  end
+end

data/test/api_key_test.rb

@@ -50,7 +50,7 @@ class Fastly
           end
         end
 
-        describe 'with cookie and api key' do
+        describe 'with username/password and api key' do
           before do
             @opts = login_opts(:both)
             @client = Fastly::Client.new(@opts)
@@ -75,26 +75,6 @@ class Fastly
             assert_equal 'ok', response['status']
           end
         end
-
-        describe 'with cookie only' do
-          before do
-            @opts = login_opts(:full)
-            @client = Fastly::Client.new(@opts)
-            @fastly = Fastly.new(@opts)
-            service_name = "fastly-test-service-#{random_string}"
-            @service      = @fastly.create_service(:name => service_name)
-          end
-
-          after do
-            @fastly.delete_service(@service)
-          end
-
-          it 'does not allow purging' do
-            assert_raises Fastly::KeyAuthRequired do
-              @service.purge_by_key('somekey')
-            end
-          end
-        end
       end
     end
   end

data/test/fastly/client_test.rb

@@ -12,7 +12,7 @@ describe Fastly::Client do
       }
     end
 
-    it 'does not log in if user/pass are not provided' do
+    it 'does not set the user/pass if they are not provided' do
       client = Fastly::Client.new(api_key: api_key)
 
       assert_equal api_key, client.api_key
@@ -20,13 +20,17 @@ describe Fastly::Client do
       assert_equal nil, client.password
     end
 
+    it 'raises Unauthorized if api_key is not passed in the options' do
+      assert_raises(Fastly::Unauthorized) { Fastly::Client.new(user: user, password: password)}
+    end
+
     it 'raises Unauthorized if user/pass provided but are invalid' do
       stub_request(:any, /api.fastly.com/).to_return(status: 400)
 
       e = assert_raises(Fastly::Unauthorized) {
-        Fastly::Client.new(user: user, password: pass)
+        Fastly::Client.new(user: user, password: password)
       }
-      assert_equal "Invalid auth credentials. Check username/password.", e.message
+      assert_equal "Invalid auth credentials. Check api_key.", e.message
     end
 
     it 'initializes an http client' do
@@ -38,23 +42,13 @@ describe Fastly::Client do
       assert client.http.use_ssl?
     end
 
-    it 'sets a cookie when auth with valid user/pass' do
-      stub_request(:any, /api.fastly.com/).
-        to_return(body: JSON.generate(i: "dont care"), status: 200, headers: { 'Set-Cookie' => 'tasty!' })
-
-      client = Fastly::Client.new(user: user, password: pass)
-      assert_equal "tasty!", client.cookie
-    end
-
     it 'raises an Error if username is used in place of user as an option' do
       stub_request(:any, /api.fastly.com/).
-        to_return(body: JSON.generate(i: "dont care"), status: 200, headers: { 'Set-Cookie' => 'tasty!' })
+        to_return(body: JSON.generate(i: "dont care"), status: 200)
 
-      assert_raises(ArgumentError) { Fastly.new(username: user, password: pass) }
+      assert_raises(ArgumentError) { Fastly.new(username: user, password: password) }
 
-      Fastly.new(user: user, password: pass)
-      Fastly.new(api_key: api_key)
-      Fastly.new(api_key: api_key, user: user, password: pass)
+      Fastly.new(api_key: api_key, user: user, password: password)
     end
   end
 
@@ -98,6 +92,25 @@ describe Fastly::Client do
       assert_equal resp.class, Hash
       assert_includes resp, "i"
     end
+
+    it 'can make a POST without auth if asked to do so' do
+      stub_request(:post, /api.fastly.com/).
+        with(headers: {
+          'Accept'=>'*/*',
+          'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Content-Accept'=>'application/json',
+          'Content-Type'=>'application/x-www-form-urlencoded',
+          #'Fastly-Key'=>'notasecreteither',
+          'User-Agent'=> /fastly-ruby/
+          }).
+        to_return(body: JSON.generate(i: "dont care"), status: 200)
+
+      resp = client.post(
+        '/service/blah',
+        {include_auth: false}
+      )
+    end
+
   end
 
   describe 'get_stats' do

data/test/fastly/customer_test.rb

@@ -7,7 +7,7 @@ describe Fastly::Customer do
   let(:owner_id)    { SecureRandom.hex(6) }
 
   let(:customer) do
-    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200, headers: { 'Set-Cookie' => 'tasty!' })
+    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200)
 
     customer_body = JSON.dump(
       'id' => customer_id,

data/test/fastly/dictionary_test.rb

@@ -2,13 +2,13 @@ require_relative '../test_helper'
 
 describe Fastly::Dictionary do
 
-  let(:client)     { Fastly.new(user: 'test@example.com', password: 'password') }
+  let(:client)     { Fastly.new(api_key: 'notasecrettestkey') }
   let(:service_id) { SecureRandom.hex(6) }
   let(:version)    {  1 }
   let(:dictionary) { Fastly::Dictionary.new({id: SecureRandom.hex(6), service_id: service_id, version: 1}, client) }
 
   before {
-    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200, headers: { 'Set-Cookie' => 'tasty!' })
+    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200)
   }
 
   describe '#item' do

data/test/fastly/syslog_test.rb

@@ -2,13 +2,13 @@ require_relative '../test_helper'
 
 describe Fastly::Syslog do
 
-  let(:client)     { Fastly.new(user: 'test@example.com', password: 'password') }
+  let(:client)     { Fastly.new(api_key: 'notasecrettestkey', user: 'test@example.com', password: 'password') }
   let(:service_id) { SecureRandom.hex(6) }
   let(:version)    { 1 }
   let(:syslog) { Fastly::Syslog.new({ name: 'test_syslog', service_id: service_id, version: 1 }, client) }
 
   before {
-    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200, headers: { 'Set-Cookie' => 'tasty!' })
+    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200)
   }
 
   describe '#item' do

data/test/fastly/token_test.rb

@@ -0,0 +1,127 @@
+require_relative '../test_helper'
+
+describe Fastly::Token do
+  let(:fastly) { Fastly.new(api_key:'my_api_key', user: 'test@example.com', password: 'password') }
+
+  before {
+    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200)
+  }
+
+  describe '#fastly' do
+    it 'cannot create itself because POST /tokens must have no auth headers' do
+      stub_request(:post, "https://api.fastly.com/tokens").
+      with(
+        body: {"name"=>"name_of_token", "scope"=>"token_scope such_as purge_all purge_select", "services"=>"service_id_that_token_can_access"},
+        headers: {
+        'Accept'=>'*/*',
+        'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+        'Content-Accept'=>'application/json',
+        'Content-Type'=>'application/x-www-form-urlencoded',
+        'User-Agent'=> /fastly-ruby/
+        }).
+      to_return(status: 403, body: '{"msg":"You must POST /sudo to access this endpoint"}', headers: {})
+
+      assert_raises(Fastly::Error,'{"msg":"You must POST /sudo to access this endpoint"}') do
+        fastly.create_token(
+          name: 'name_of_token',
+          services: 'service_id_that_token_can_access',
+          scope: 'token_scope such_as purge_all purge_select'
+        )
+      end
+    end
+    
+    it 'can create a new token only if there are no auth headers' do
+      response_body = %q(
+        {
+          "id": "5Yo3XXnrQpjc20u0ybrf2g",
+          "access_token": "YOUR_FASTLY_TOKEN",
+          "user_id": "4y5K5trZocEAQYkesWlk7M",
+          "services": ["service_id_that_token_can_access"],
+          "name": "name_of_token",
+          "scope": "optional token_scope such_as purge_all purge_select",
+          "created_at": "2016-06-22T03:19:48+00:00",
+          "last_used_at": "2016-06-22T03:19:48+00:00",
+          "expires_at": "2016-07-28T19:24:50+00:00",
+          "ip": "127.17.202.173",
+          "user_agent": "fastly-ruby-v2.4.0"
+        }
+      )
+
+      stub_request(:post, "https://api.fastly.com/tokens").
+      with(
+        body: {"name"=>"name_of_token", "password"=>"password", "scope"=>"optional token_scope such_as purge_all purge_select", "services"=>"service_id_that_token_can_access", "username"=>"test@example.com"},
+        headers: {
+        'Accept'=>'*/*',
+        'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+        'Content-Accept'=>'application/json',
+        'Content-Type'=>'application/x-www-form-urlencoded',
+        'User-Agent'=> /fastly-ruby/
+        }).
+      to_return(status: 200, body: response_body, headers: {})
+
+      token = fastly.new_token(
+        name: 'name_of_token',
+        services: 'service_id_that_token_can_access',
+        scope: 'optional token_scope such_as purge_all purge_select'
+      )
+      assert_equal token.id, '5Yo3XXnrQpjc20u0ybrf2g'
+      assert_equal token.user_id, '4y5K5trZocEAQYkesWlk7M'
+      assert_equal token.services[0], 'service_id_that_token_can_access'
+      assert_equal token.name, 'name_of_token'
+      assert_equal token.scope, 'optional token_scope such_as purge_all purge_select'
+      assert_equal token.created_at, '2016-06-22T03:19:48+00:00'
+      assert_equal token.last_used_at, '2016-06-22T03:19:48+00:00'
+      assert_equal token.expires_at, '2016-07-28T19:24:50+00:00'
+      assert_equal token.ip, '127.17.202.173'
+      assert_equal token.user_agent, 'fastly-ruby-v2.4.0'
+      assert_equal token.access_token, 'YOUR_FASTLY_TOKEN'
+    end
+    
+    it 'would delete a token' do
+      stub_request(:delete, "https://api.fastly.com/tokens/").
+      with(
+        headers: {
+        'Accept'=>'*/*',
+        'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+        'Content-Accept'=>'application/json',
+        'Fastly-Key'=>'my_api_key',
+        'User-Agent'=> /fastly-ruby/
+        }).
+      to_return(status: 204, body: "", headers: {})
+
+      token = Fastly::Token.new({acess_token: 'my_api_key'}, Fastly::Fetcher)  
+      fastly.delete_token(token) 
+    end
+
+    it 'would list all the tokens belonging to a token' do
+      stub_request(:get, "https://api.fastly.com/tokens").
+        with(
+          headers: {
+          'Accept'=>'*/*',
+          'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Content-Accept'=>'application/json',
+          'Fastly-Key'=>'my_api_key',
+          'User-Agent'=> /fastly-ruby/
+          }).
+        to_return(status: 200, body: "[]", headers: {})
+
+      fastly.list_tokens()
+    end
+
+    it 'would list all the tokens belonging to a customer' do
+      stub_request(:get, "https://api.fastly.com/customer/customer_account_number/tokens").
+        with(
+          headers: {
+          'Accept'=>'*/*',
+          'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Content-Accept'=>'application/json',
+          'Fastly-Key'=>'my_api_key',
+          'User-Agent'=> /fastly-ruby/
+          }).
+        to_return(status: 200, body: "[]", headers: {})
+
+      fastly.customer_tokens({customer_id: 'customer_account_number'})
+    end
+
+  end
+end

data/test/full_login_test.rb

@@ -3,7 +3,7 @@ require 'helper'
 # Test username/password login access to user and customer objects
 class Fastly
   describe 'FullLoginTest' do
-    let(:opts)             { login_opts(:full) }
+    let(:opts)             { login_opts(:both) }
     let(:client)           { Client.new(opts) }
     let(:fastly)           { Fastly.new(opts) }
     let(:current_user)     { fastly.current_user }

data/test/helper.rb

@@ -2,6 +2,7 @@ require 'common'
 require 'fastly'
 require 'minitest/autorun'
 require 'pry'
+require 'dotenv/load'
 
 class Fastly
   class TestCase < Minitest::Test; end

data/test/token_test.rb

@@ -0,0 +1,64 @@
+require 'helper'
+
+# Testing client components related to tokens
+class Fastly
+  describe 'TokenTest' do
+    let(:opts)             { login_opts(:both) }
+    let(:fastly)           { Fastly.new(opts) }
+
+    let(:service_name) { "fastly-test-service-#{random_string}" } 
+    let(:service) { fastly.create_service(:name => service_name) }
+    let(:current_customer) { fastly.current_customer }
+
+    def create_a_test_token(name, service, scope)
+      fastly.new_token(
+          name: name,
+          services: service,
+          scope: scope
+      )      
+    end
+
+    it 'creates a new token' do
+      token = create_a_test_token('name_vi',service.id,'purge_all purge_select')
+      assert_equal token.name, 'name_vi'
+      assert_equal token.services[0], service.id
+      assert_equal token.scope, 'purge_all purge_select'
+      fastly.delete_token(token)
+    end
+    
+    it 'deletes a token by passed-in token' do
+        token = create_a_test_token('name_vi',service.id,'purge_all purge_select')
+        
+        tokens = fastly.customer_tokens({customer_id: current_customer.id})
+        before_count = tokens.count
+        
+        fastly.delete_token(token)
+        
+        tokens = fastly.customer_tokens({customer_id: current_customer.id})
+        after_count = tokens.count
+
+        assert_equal 1, before_count - after_count
+    end
+      
+    it 'returns a list of tokens belonging to the customer or to the auth token' do
+      @token_i = create_a_test_token('name_i',service.id,'purge_all purge_select')
+      @token_ii = create_a_test_token('name_ii',service.id,'purge_all purge_select')
+      @token_iii = create_a_test_token('name_iii',service.id,'purge_all purge_select')
+      @token_iv = create_a_test_token('name_iv',service.id,'purge_all purge_select')
+      @token_v = create_a_test_token('name_v',service.id,'purge_all purge_select')
+
+      tokens = fastly.customer_tokens({customer_id: current_customer.id})
+      assert tokens.count > 4
+
+      tokens = fastly.list_tokens
+      assert tokens.count > 4
+
+      fastly.delete_token(@token_i)
+      fastly.delete_token(@token_ii)
+      fastly.delete_token(@token_iii)
+      fastly.delete_token(@token_iv)
+      fastly.delete_token(@token_v)
+      fastly.delete_service(service)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastly
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Fastly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies: []
 description: Client library for the Fastly acceleration system
 email:
@@ -21,6 +21,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.example"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -68,6 +69,7 @@ files:
 - lib/fastly/snippet.rb
 - lib/fastly/sumologic_logging.rb
 - lib/fastly/syslog.rb
+- lib/fastly/token.rb
 - lib/fastly/user.rb
 - lib/fastly/util.rb
 - lib/fastly/vcl.rb
@@ -81,12 +83,14 @@ files:
 - test/fastly/customer_test.rb
 - test/fastly/dictionary_test.rb
 - test/fastly/syslog_test.rb
+- test/fastly/token_test.rb
 - test/fastly/util_test.rb
 - test/full_login_test.rb
 - test/helper.rb
 - test/missing_api_key_test.rb
 - test/stats_test.rb
 - test/test_helper.rb
+- test/token_test.rb
 homepage: http://github.com/fastly/fastly-ruby
 licenses:
 - MIT
@@ -106,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Client library for the Fastly acceleration system
@@ -121,9 +124,11 @@ test_files:
 - test/fastly/customer_test.rb
 - test/fastly/dictionary_test.rb
 - test/fastly/syslog_test.rb
+- test/fastly/token_test.rb
 - test/fastly/util_test.rb
 - test/full_login_test.rb
 - test/helper.rb
 - test/missing_api_key_test.rb
 - test/stats_test.rb
 - test/test_helper.rb
+- test/token_test.rb