fastly 4.1.0 → 4.2.0

data/lib/fastly/api/object_store_api.rb

@@ -80,76 +80,8 @@ module Fastly
       return data, status_code, headers
     end
 
-    # Delete object store key.
-    # Delete a key from a customer store.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :key_name  (required)
-    # @return [nil]
-    def delete_key_from_store(opts = {})
-      delete_key_from_store_with_http_info(opts)
-      nil
-    end
-
-    # Delete object store key.
-    # Delete a key from a customer store.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :key_name  (required)
-    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
-    def delete_key_from_store_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: ObjectStoreApi.delete_key_from_store ...'
-      end
-      # unbox the parameters from the hash
-      store_id = opts[:'store_id']
-      key_name = opts[:'key_name']
-      # verify the required parameter 'store_id' is set
-      if @api_client.config.client_side_validation && store_id.nil?
-        fail ArgumentError, "Missing the required parameter 'store_id' when calling ObjectStoreApi.delete_key_from_store"
-      end
-      # verify the required parameter 'key_name' is set
-      if @api_client.config.client_side_validation && key_name.nil?
-        fail ArgumentError, "Missing the required parameter 'key_name' when calling ObjectStoreApi.delete_key_from_store"
-      end
-      # resource path
-      local_var_path = '/resources/stores/object/{store_id}/keys/{key_name}'.sub('{' + 'store_id' + '}', CGI.escape(store_id.to_s)).sub('{' + 'key_name' + '}', CGI.escape(key_name.to_s))
-
-      # query parameters
-      query_params = opts[:query_params] || {}
-
-      # header parameters
-      header_params = opts[:header_params] || {}
-
-      # form parameters
-      form_params = opts[:form_params] || {}
-
-      # http body (model)
-      post_body = opts[:debug_body]
-
-      # return_type
-      return_type = opts[:debug_return_type]
-
-      # auth_names
-      auth_names = opts[:debug_auth_names] || ['token']
-
-      new_options = opts.merge(
-        :operation => :"ObjectStoreApi.delete_key_from_store",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
-      )
-
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: ObjectStoreApi#delete_key_from_store\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Delete an object store.
-    # An object store must be empty before it can be deleted.  Deleting an object store that still contains keys will result in a 409 Conflict.
+    # An object store must be empty before it can be deleted.  Deleting an object store that still contains keys will result in a `409` (Conflict).
     # @option opts [String] :store_id  (required)
     # @return [nil]
     def delete_store(opts = {})
@@ -158,7 +90,7 @@ module Fastly
     end
 
     # Delete an object store.
-    # An object store must be empty before it can be deleted.  Deleting an object store that still contains keys will result in a 409 Conflict.
+    # An object store must be empty before it can be deleted.  Deleting an object store that still contains keys will result in a &#x60;409&#x60; (Conflict).
     # @option opts [String] :store_id  (required)
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_store_with_http_info(opts = {})
@@ -209,75 +141,6 @@ module Fastly
       return data, status_code, headers
     end
 
-    # List object store keys.
-    # List all keys within an object store.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :cursor 
-    # @option opts [Integer] :limit  (default to 100)
-    # @return [KeyResponse]
-    def get_keys(opts = {})
-      data, _status_code, _headers = get_keys_with_http_info(opts)
-      data
-    end
-
-    # List object store keys.
-    # List all keys within an object store.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :cursor 
-    # @option opts [Integer] :limit  (default to 100)
-    # @return [Array<(KeyResponse, Integer, Hash)>] KeyResponse data, response status code and response headers
-    def get_keys_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: ObjectStoreApi.get_keys ...'
-      end
-      # unbox the parameters from the hash
-      store_id = opts[:'store_id']
-      # verify the required parameter 'store_id' is set
-      if @api_client.config.client_side_validation && store_id.nil?
-        fail ArgumentError, "Missing the required parameter 'store_id' when calling ObjectStoreApi.get_keys"
-      end
-      # resource path
-      local_var_path = '/resources/stores/object/{store_id}/keys'.sub('{' + 'store_id' + '}', CGI.escape(store_id.to_s))
-
-      # query parameters
-      query_params = opts[:query_params] || {}
-      query_params[:'cursor'] = opts[:'cursor'] if !opts[:'cursor'].nil?
-      query_params[:'limit'] = opts[:'limit'] if !opts[:'limit'].nil?
-
-      # header parameters
-      header_params = opts[:header_params] || {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-
-      # form parameters
-      form_params = opts[:form_params] || {}
-
-      # http body (model)
-      post_body = opts[:debug_body]
-
-      # return_type
-      return_type = opts[:debug_return_type] || 'KeyResponse'
-
-      # auth_names
-      auth_names = opts[:debug_auth_names] || ['token']
-
-      new_options = opts.merge(
-        :operation => :"ObjectStoreApi.get_keys",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
-      )
-
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: ObjectStoreApi#get_keys\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Describe an object store.
     # Get an object store by ID.
     # @option opts [String] :store_id  (required)
@@ -345,7 +208,7 @@ module Fastly
     # Get all stores for a given customer.
     # @option opts [String] :cursor 
     # @option opts [Integer] :limit  (default to 100)
-    # @return [GetStoresResponse]
+    # @return [InlineResponse2002]
     def get_stores(opts = {})
       data, _status_code, _headers = get_stores_with_http_info(opts)
       data
@@ -355,7 +218,7 @@ module Fastly
     # Get all stores for a given customer.
     # @option opts [String] :cursor 
     # @option opts [Integer] :limit  (default to 100)
-    # @return [Array<(GetStoresResponse, Integer, Hash)>] GetStoresResponse data, response status code and response headers
+    # @return [Array<(InlineResponse2002, Integer, Hash)>] InlineResponse2002 data, response status code and response headers
     def get_stores_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: ObjectStoreApi.get_stores ...'
@@ -381,7 +244,7 @@ module Fastly
       post_body = opts[:debug_body]
 
       # return_type
-      return_type = opts[:debug_return_type] || 'GetStoresResponse'
+      return_type = opts[:debug_return_type] || 'InlineResponse2002'
 
       # auth_names
       auth_names = opts[:debug_auth_names] || ['token']
@@ -402,152 +265,5 @@ module Fastly
       end
       return data, status_code, headers
     end
-
-    # Get object store key value.
-    # Get the value associated with a key.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :key_name  (required)
-    # @return [File]
-    def get_value_for_key(opts = {})
-      data, _status_code, _headers = get_value_for_key_with_http_info(opts)
-      data
-    end
-
-    # Get object store key value.
-    # Get the value associated with a key.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :key_name  (required)
-    # @return [Array<(File, Integer, Hash)>] File data, response status code and response headers
-    def get_value_for_key_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: ObjectStoreApi.get_value_for_key ...'
-      end
-      # unbox the parameters from the hash
-      store_id = opts[:'store_id']
-      key_name = opts[:'key_name']
-      # verify the required parameter 'store_id' is set
-      if @api_client.config.client_side_validation && store_id.nil?
-        fail ArgumentError, "Missing the required parameter 'store_id' when calling ObjectStoreApi.get_value_for_key"
-      end
-      # verify the required parameter 'key_name' is set
-      if @api_client.config.client_side_validation && key_name.nil?
-        fail ArgumentError, "Missing the required parameter 'key_name' when calling ObjectStoreApi.get_value_for_key"
-      end
-      # resource path
-      local_var_path = '/resources/stores/object/{store_id}/keys/{key_name}'.sub('{' + 'store_id' + '}', CGI.escape(store_id.to_s)).sub('{' + 'key_name' + '}', CGI.escape(key_name.to_s))
-
-      # query parameters
-      query_params = opts[:query_params] || {}
-
-      # header parameters
-      header_params = opts[:header_params] || {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/octet-stream'])
-
-      # form parameters
-      form_params = opts[:form_params] || {}
-
-      # http body (model)
-      post_body = opts[:debug_body]
-
-      # return_type
-      return_type = opts[:debug_return_type] || 'File'
-
-      # auth_names
-      auth_names = opts[:debug_auth_names] || ['token']
-
-      new_options = opts.merge(
-        :operation => :"ObjectStoreApi.get_value_for_key",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
-      )
-
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: ObjectStoreApi#get_value_for_key\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
-    # Insert object store key-value.
-    # Insert a new key-value pair into an object store.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :key_name  (required)
-    # @option opts [File] :body 
-    # @return [File]
-    def set_value_for_key(opts = {})
-      data, _status_code, _headers = set_value_for_key_with_http_info(opts)
-      data
-    end
-
-    # Insert object store key-value.
-    # Insert a new key-value pair into an object store.
-    # @option opts [String] :store_id  (required)
-    # @option opts [String] :key_name  (required)
-    # @option opts [File] :body 
-    # @return [Array<(File, Integer, Hash)>] File data, response status code and response headers
-    def set_value_for_key_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: ObjectStoreApi.set_value_for_key ...'
-      end
-      # unbox the parameters from the hash
-      store_id = opts[:'store_id']
-      key_name = opts[:'key_name']
-      # verify the required parameter 'store_id' is set
-      if @api_client.config.client_side_validation && store_id.nil?
-        fail ArgumentError, "Missing the required parameter 'store_id' when calling ObjectStoreApi.set_value_for_key"
-      end
-      # verify the required parameter 'key_name' is set
-      if @api_client.config.client_side_validation && key_name.nil?
-        fail ArgumentError, "Missing the required parameter 'key_name' when calling ObjectStoreApi.set_value_for_key"
-      end
-      # resource path
-      local_var_path = '/resources/stores/object/{store_id}/keys/{key_name}'.sub('{' + 'store_id' + '}', CGI.escape(store_id.to_s)).sub('{' + 'key_name' + '}', CGI.escape(key_name.to_s))
-
-      # query parameters
-      query_params = opts[:query_params] || {}
-
-      # header parameters
-      header_params = opts[:header_params] || {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/octet-stream'])
-      # HTTP header 'Content-Type'
-      content_type = @api_client.select_header_content_type(['application/octet-stream'])
-      if !content_type.nil?
-          header_params['Content-Type'] = content_type
-      end
-
-      # form parameters
-      form_params = opts[:form_params] || {}
-
-      # http body (model)
-      post_body = opts[:debug_body] || @api_client.object_to_http_body(opts[:'body'])
-
-      # return_type
-      return_type = opts[:debug_return_type] || 'File'
-
-      # auth_names
-      auth_names = opts[:debug_auth_names] || ['token']
-
-      new_options = opts.merge(
-        :operation => :"ObjectStoreApi.set_value_for_key",
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
-      )
-
-      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, new_options)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: ObjectStoreApi#set_value_for_key\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
   end
 end

data/lib/fastly/api/purge_api.rb

@@ -203,7 +203,7 @@ module Fastly
       return_type = opts[:debug_return_type] || 'PurgeResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || ['url_purge']
+      auth_names = opts[:debug_auth_names] || ['token']
 
       new_options = opts.merge(
         :operation => :"PurgeApi.purge_single_url",

data/lib/fastly/api/resource_api.rb

@@ -17,24 +17,24 @@ module Fastly
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-    # Create a resource
-    # Create a resource.
+    # Create a resource link
+    # Create a link between a resource and a service version.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :name The name of the resource.
-    # @option opts [String] :resource_id The ID of the linked resource.
+    # @option opts [String] :resource_id The ID of the underlying linked resource.
+    # @option opts [String] :name The name of the resource link.
     # @return [ResourceResponse]
     def create_resource(opts = {})
       data, _status_code, _headers = create_resource_with_http_info(opts)
       data
     end
 
-    # Create a resource
-    # Create a resource.
+    # Create a resource link
+    # Create a link between a resource and a service version.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :name The name of the resource.
-    # @option opts [String] :resource_id The ID of the linked resource.
+    # @option opts [String] :resource_id The ID of the underlying linked resource.
+    # @option opts [String] :name The name of the resource link.
     # @return [Array<(ResourceResponse, Integer, Hash)>] ResourceResponse data, response status code and response headers
     def create_resource_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -69,8 +69,8 @@ module Fastly
 
       # form parameters
       form_params = opts[:form_params] || {}
-      form_params['name'] = opts[:'name'] if !opts[:'name'].nil?
       form_params['resource_id'] = opts[:'resource_id'] if !opts[:'resource_id'].nil?
+      form_params['name'] = opts[:'name'] if !opts[:'name'].nil?
 
       # http body (model)
       post_body = opts[:debug_body]
@@ -98,22 +98,22 @@ module Fastly
       return data, status_code, headers
     end
 
-    # Delete a resource
-    # Delete a resource.
+    # Delete a resource link
+    # Delete a link between a resource and a service version.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :resource_id An alphanumeric string identifying the resource. (required)
+    # @option opts [String] :id An alphanumeric string identifying the resource link. (required)
     # @return [InlineResponse200]
     def delete_resource(opts = {})
       data, _status_code, _headers = delete_resource_with_http_info(opts)
       data
     end
 
-    # Delete a resource
-    # Delete a resource.
+    # Delete a resource link
+    # Delete a link between a resource and a service version.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :resource_id An alphanumeric string identifying the resource. (required)
+    # @option opts [String] :id An alphanumeric string identifying the resource link. (required)
     # @return [Array<(InlineResponse200, Integer, Hash)>] InlineResponse200 data, response status code and response headers
     def delete_resource_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -122,7 +122,7 @@ module Fastly
       # unbox the parameters from the hash
       service_id = opts[:'service_id']
       version_id = opts[:'version_id']
-      resource_id = opts[:'resource_id']
+      id = opts[:'id']
       # verify the required parameter 'service_id' is set
       if @api_client.config.client_side_validation && service_id.nil?
         fail ArgumentError, "Missing the required parameter 'service_id' when calling ResourceApi.delete_resource"
@@ -131,12 +131,12 @@ module Fastly
       if @api_client.config.client_side_validation && version_id.nil?
         fail ArgumentError, "Missing the required parameter 'version_id' when calling ResourceApi.delete_resource"
       end
-      # verify the required parameter 'resource_id' is set
-      if @api_client.config.client_side_validation && resource_id.nil?
-        fail ArgumentError, "Missing the required parameter 'resource_id' when calling ResourceApi.delete_resource"
+      # verify the required parameter 'id' is set
+      if @api_client.config.client_side_validation && id.nil?
+        fail ArgumentError, "Missing the required parameter 'id' when calling ResourceApi.delete_resource"
       end
       # resource path
-      local_var_path = '/service/{service_id}/version/{version_id}/resource/{resource_id}'.sub('{' + 'service_id' + '}', CGI.escape(service_id.to_s)).sub('{' + 'version_id' + '}', CGI.escape(version_id.to_s)).sub('{' + 'resource_id' + '}', CGI.escape(resource_id.to_s))
+      local_var_path = '/service/{service_id}/version/{version_id}/resource/{id}'.sub('{' + 'service_id' + '}', CGI.escape(service_id.to_s)).sub('{' + 'version_id' + '}', CGI.escape(version_id.to_s)).sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -175,22 +175,22 @@ module Fastly
       return data, status_code, headers
     end
 
-    # Display a resource
-    # Display a resource by its identifier.
+    # Display a resource link
+    # Display a resource link by its identifier.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :resource_id An alphanumeric string identifying the resource. (required)
+    # @option opts [String] :id An alphanumeric string identifying the resource link. (required)
     # @return [ResourceResponse]
     def get_resource(opts = {})
       data, _status_code, _headers = get_resource_with_http_info(opts)
       data
     end
 
-    # Display a resource
-    # Display a resource by its identifier.
+    # Display a resource link
+    # Display a resource link by its identifier.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :resource_id An alphanumeric string identifying the resource. (required)
+    # @option opts [String] :id An alphanumeric string identifying the resource link. (required)
     # @return [Array<(ResourceResponse, Integer, Hash)>] ResourceResponse data, response status code and response headers
     def get_resource_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -199,7 +199,7 @@ module Fastly
       # unbox the parameters from the hash
       service_id = opts[:'service_id']
       version_id = opts[:'version_id']
-      resource_id = opts[:'resource_id']
+      id = opts[:'id']
       # verify the required parameter 'service_id' is set
       if @api_client.config.client_side_validation && service_id.nil?
         fail ArgumentError, "Missing the required parameter 'service_id' when calling ResourceApi.get_resource"
@@ -208,12 +208,12 @@ module Fastly
       if @api_client.config.client_side_validation && version_id.nil?
         fail ArgumentError, "Missing the required parameter 'version_id' when calling ResourceApi.get_resource"
       end
-      # verify the required parameter 'resource_id' is set
-      if @api_client.config.client_side_validation && resource_id.nil?
-        fail ArgumentError, "Missing the required parameter 'resource_id' when calling ResourceApi.get_resource"
+      # verify the required parameter 'id' is set
+      if @api_client.config.client_side_validation && id.nil?
+        fail ArgumentError, "Missing the required parameter 'id' when calling ResourceApi.get_resource"
       end
       # resource path
-      local_var_path = '/service/{service_id}/version/{version_id}/resource/{resource_id}'.sub('{' + 'service_id' + '}', CGI.escape(service_id.to_s)).sub('{' + 'version_id' + '}', CGI.escape(version_id.to_s)).sub('{' + 'resource_id' + '}', CGI.escape(resource_id.to_s))
+      local_var_path = '/service/{service_id}/version/{version_id}/resource/{id}'.sub('{' + 'service_id' + '}', CGI.escape(service_id.to_s)).sub('{' + 'version_id' + '}', CGI.escape(version_id.to_s)).sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -252,8 +252,8 @@ module Fastly
       return data, status_code, headers
     end
 
-    # List resources
-    # List resources.
+    # List resource links
+    # List links between resources and services
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
     # @return [Array<ResourceResponse>]
@@ -262,8 +262,8 @@ module Fastly
       data
     end
 
-    # List resources
-    # List resources.
+    # List resource links
+    # List links between resources and services
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
     # @return [Array<(Array<ResourceResponse>, Integer, Hash)>] Array<ResourceResponse> data, response status code and response headers
@@ -322,24 +322,26 @@ module Fastly
       return data, status_code, headers
     end
 
-    # Update a resource
-    # Update a resource.
+    # Update a resource link
+    # Update a link between a resource and a service version.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :resource_id An alphanumeric string identifying the resource. (required)
-    # @option opts [String] :name The name of the resource.
+    # @option opts [String] :id An alphanumeric string identifying the resource link. (required)
+    # @option opts [String] :resource_id The ID of the underlying linked resource.
+    # @option opts [String] :name The name of the resource link.
     # @return [ResourceResponse]
     def update_resource(opts = {})
       data, _status_code, _headers = update_resource_with_http_info(opts)
       data
     end
 
-    # Update a resource
-    # Update a resource.
+    # Update a resource link
+    # Update a link between a resource and a service version.
     # @option opts [String] :service_id Alphanumeric string identifying the service. (required)
     # @option opts [Integer] :version_id Integer identifying a service version. (required)
-    # @option opts [String] :resource_id An alphanumeric string identifying the resource. (required)
-    # @option opts [String] :name The name of the resource.
+    # @option opts [String] :id An alphanumeric string identifying the resource link. (required)
+    # @option opts [String] :resource_id The ID of the underlying linked resource.
+    # @option opts [String] :name The name of the resource link.
     # @return [Array<(ResourceResponse, Integer, Hash)>] ResourceResponse data, response status code and response headers
     def update_resource_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -348,7 +350,7 @@ module Fastly
       # unbox the parameters from the hash
       service_id = opts[:'service_id']
       version_id = opts[:'version_id']
-      resource_id = opts[:'resource_id']
+      id = opts[:'id']
       # verify the required parameter 'service_id' is set
       if @api_client.config.client_side_validation && service_id.nil?
         fail ArgumentError, "Missing the required parameter 'service_id' when calling ResourceApi.update_resource"
@@ -357,12 +359,12 @@ module Fastly
       if @api_client.config.client_side_validation && version_id.nil?
         fail ArgumentError, "Missing the required parameter 'version_id' when calling ResourceApi.update_resource"
       end
-      # verify the required parameter 'resource_id' is set
-      if @api_client.config.client_side_validation && resource_id.nil?
-        fail ArgumentError, "Missing the required parameter 'resource_id' when calling ResourceApi.update_resource"
+      # verify the required parameter 'id' is set
+      if @api_client.config.client_side_validation && id.nil?
+        fail ArgumentError, "Missing the required parameter 'id' when calling ResourceApi.update_resource"
       end
       # resource path
-      local_var_path = '/service/{service_id}/version/{version_id}/resource/{resource_id}'.sub('{' + 'service_id' + '}', CGI.escape(service_id.to_s)).sub('{' + 'version_id' + '}', CGI.escape(version_id.to_s)).sub('{' + 'resource_id' + '}', CGI.escape(resource_id.to_s))
+      local_var_path = '/service/{service_id}/version/{version_id}/resource/{id}'.sub('{' + 'service_id' + '}', CGI.escape(service_id.to_s)).sub('{' + 'version_id' + '}', CGI.escape(version_id.to_s)).sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -379,6 +381,7 @@ module Fastly
 
       # form parameters
       form_params = opts[:form_params] || {}
+      form_params['resource_id'] = opts[:'resource_id'] if !opts[:'resource_id'].nil?
       form_params['name'] = opts[:'name'] if !opts[:'name'].nil?
 
       # http body (model)

data/lib/fastly/api/tls_subscriptions_api.rb

@@ -364,7 +364,7 @@ module Fastly
 
     # List TLS subscriptions
     # List all TLS subscriptions.
-    # @option opts [String] :filter_state Limit the returned subscriptions by state. Valid values are `pending`, `processing`, `issued`, and `renewing`. Accepts parameters: `not` (e.g., `filter[state][not]=renewing`). 
+    # @option opts [String] :filter_state Limit the returned subscriptions by state. Valid values are `pending`, `processing`, `issued`, `renewing`, and `failed`. Accepts parameters: `not` (e.g., `filter[state][not]=renewing`). 
     # @option opts [String] :filter_tls_domains_id Limit the returned subscriptions to those that include the specific domain.
     # @option opts [Boolean] :filter_has_active_order Limit the returned subscriptions to those that have currently active orders. Permitted values: `true`. 
     # @option opts [String] :include Include related objects. Optional, comma-separated values. Permitted values: `tls_authorizations` and `tls_authorizations.globalsign_email_challenge`. 
@@ -379,7 +379,7 @@ module Fastly
 
     # List TLS subscriptions
     # List all TLS subscriptions.
-    # @option opts [String] :filter_state Limit the returned subscriptions by state. Valid values are `pending`, `processing`, `issued`, and `renewing`. Accepts parameters: `not` (e.g., `filter[state][not]=renewing`). 
+    # @option opts [String] :filter_state Limit the returned subscriptions by state. Valid values are `pending`, `processing`, `issued`, `renewing`, and `failed`. Accepts parameters: `not` (e.g., `filter[state][not]=renewing`). 
     # @option opts [String] :filter_tls_domains_id Limit the returned subscriptions to those that include the specific domain.
     # @option opts [Boolean] :filter_has_active_order Limit the returned subscriptions to those that have currently active orders. Permitted values: `true`. 
     # @option opts [String] :include Include related objects. Optional, comma-separated values. Permitted values: `tls_authorizations` and `tls_authorizations.globalsign_email_challenge`. 
@@ -452,7 +452,7 @@ module Fastly
     end
 
     # Update a TLS subscription
-    # Change the TLS domains or common name associated with this subscription, or update the TLS configuration for this set of domains.
+    # Change the TLS domains or common name associated with this subscription, update the TLS configuration for this set of domains, or retry a subscription with state `failed` by setting the state to `retry`.
     # @option opts [String] :tls_subscription_id Alphanumeric string identifying a TLS subscription. (required)
     # @option opts [Boolean] :force A flag that allows you to edit and delete a subscription with active domains. Valid to use on PATCH and DELETE actions. As a warning, removing an active domain from a subscription or forcing the deletion of a subscription may result in breaking TLS termination to that domain. 
     # @option opts [TlsSubscription] :tls_subscription 
@@ -463,7 +463,7 @@ module Fastly
     end
 
     # Update a TLS subscription
-    # Change the TLS domains or common name associated with this subscription, or update the TLS configuration for this set of domains.
+    # Change the TLS domains or common name associated with this subscription, update the TLS configuration for this set of domains, or retry a subscription with state `failed` by setting the state to `retry`.
     # @option opts [String] :tls_subscription_id Alphanumeric string identifying a TLS subscription. (required)
     # @option opts [Boolean] :force A flag that allows you to edit and delete a subscription with active domains. Valid to use on PATCH and DELETE actions. As a warning, removing an active domain from a subscription or forcing the deletion of a subscription may result in breaking TLS termination to that domain. 
     # @option opts [TlsSubscription] :tls_subscription 

data/lib/fastly/models/backend.rb

@@ -46,7 +46,7 @@ module Fastly
     # IPv6 address of the backend. May be used as an alternative to `address` to set the backend location.
     attr_accessor :ipv6
 
-    # How long to keep a persistent connection to the backend between requests.
+    # How long in seconds to keep a persistent connection to the backend between requests.
     attr_accessor :keepalive_time
 
     # Maximum number of concurrent connections this backend will accept.

data/lib/fastly/models/backend_response.rb

@@ -46,7 +46,7 @@ module Fastly
     # IPv6 address of the backend. May be used as an alternative to `address` to set the backend location.
     attr_accessor :ipv6
 
-    # How long to keep a persistent connection to the backend between requests.
+    # How long in seconds to keep a persistent connection to the backend between requests.
     attr_accessor :keepalive_time
 
     # Maximum number of concurrent connections this backend will accept.