pnap_ip_api 1.1.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b714b22829f98f2200ef0a7ddd8824fd6b0308c759dea8535aebae3c6db55a
-  data.tar.gz: bda64e5f5d18d8d8a3dbfad56c0dc05378bacfbeb5a4d8beead5489c2fae2ad7
+  metadata.gz: 286bf8a5fe8b5059e9689d8f445019052990a291374ab763d72b7ba583e06bfe
+  data.tar.gz: 4d903469ced8b007026170e198802a4eb4593972c2cd1f54bd9976ac24093ec0
 SHA512:
-  metadata.gz: '09b6fcb9b9686d3fae42c7417a5492382c6de77b3c15e5af23ffa24b1d850cd2a973dec6294994854c6603bc86e15a48c2b0d44c448d5ea86f1ac75f84f3ae31'
-  data.tar.gz: de6858a830b34cad8dfe9bdce6f2024a911f8174548a7e3d52aced61cc55e746f0bb3f6c144a960ae587f363ed95322a3bda1e2c8e09aa577aaa5af9f337ec8d
+  metadata.gz: 66647d812e58603d8b9c19e7b0e86e19474bfe00a9ce43e75dff7b6cacf7b0e4fd60cf8ec7d371e0ed041794d9a46667ac5108dab40e2c5dfe853cd2f6d0225e
+  data.tar.gz: b074dc0f90fe64f2c5a41161904682682aafd302ce9b6ca86790adf700e948b521f18e2d89d44379c0bc2ae1acc216aa8ff5949e12ebeb478ba8d1efa772e688

data/README.md

@@ -74,6 +74,8 @@ require 'pnap_ip_api'
 IpApi.configure do |config|
   # Configure OAuth2 access token for authorization: OAuth2
   config.access_token = 'YOUR ACCESS TOKEN'
+  # Configure a proc to get access tokens in lieu of the static access_token configuration
+  config.access_token_getter = -> { 'YOUR TOKEN GETTER PROC' } 
 end
 
 api_instance = IpApi::IPBlocksApi.new
@@ -144,6 +146,7 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 
+Authentication schemes defined for the API:
 ### OAuth2
 
 

data/VERSION

@@ -1 +1 @@
-1.1.5
+2.0.0

data/docs/IPBlocksApi.md

@@ -223,7 +223,7 @@ end
 
 ## ip_blocks_ip_block_id_patch
 
-> <IpBlock> ip_blocks_ip_block_id_patch(ip_block_id, opts)
+> <IpBlock> ip_blocks_ip_block_id_patch(ip_block_id, ip_block_patch)
 
 Update IP block.
 
@@ -242,13 +242,11 @@ end
 
 api_instance = IpApi::IPBlocksApi.new
 ip_block_id = '6047127fed34ecc3ba8402d2' # String | The IP Block identifier.
-opts = {
-  ip_block_patch: IpApi::IpBlockPatch.new # IpBlockPatch | 
-}
+ip_block_patch = IpApi::IpBlockPatch.new # IpBlockPatch | 
 
 begin
   # Update IP block.
-  result = api_instance.ip_blocks_ip_block_id_patch(ip_block_id, opts)
+  result = api_instance.ip_blocks_ip_block_id_patch(ip_block_id, ip_block_patch)
   p result
 rescue IpApi::ApiError => e
   puts "Error when calling IPBlocksApi->ip_blocks_ip_block_id_patch: #{e}"
@@ -259,12 +257,12 @@ end
 
 This returns an Array which contains the response data, status code and headers.
 
-> <Array(<IpBlock>, Integer, Hash)> ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, opts)
+> <Array(<IpBlock>, Integer, Hash)> ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, ip_block_patch)
 
 ```ruby
 begin
   # Update IP block.
-  data, status_code, headers = api_instance.ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, opts)
+  data, status_code, headers = api_instance.ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, ip_block_patch)
   p status_code # => 2xx
   p headers # => { ... }
   p data # => <IpBlock>
@@ -278,7 +276,7 @@ end
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
 | **ip_block_id** | **String** | The IP Block identifier. |  |
-| **ip_block_patch** | [**IpBlockPatch**](IpBlockPatch.md) |  | [optional] |
+| **ip_block_patch** | [**IpBlockPatch**](IpBlockPatch.md) |  |  |
 
 ### Return type
 
@@ -296,7 +294,7 @@ end
 
 ## ip_blocks_ip_block_id_tags_put
 
-> <IpBlock> ip_blocks_ip_block_id_tags_put(ip_block_id, opts)
+> <IpBlock> ip_blocks_ip_block_id_tags_put(ip_block_id, tag_assignment_request)
 
 Overwrite tags assigned for IP Block.
 
@@ -315,13 +313,11 @@ end
 
 api_instance = IpApi::IPBlocksApi.new
 ip_block_id = '6047127fed34ecc3ba8402d2' # String | The IP Block identifier.
-opts = {
-  tag_assignment_request: [IpApi::TagAssignmentRequest.new({name: 'Environment'})] # Array<TagAssignmentRequest> | 
-}
+tag_assignment_request = [IpApi::TagAssignmentRequest.new({name: 'Environment'})] # Array<TagAssignmentRequest> | 
 
 begin
   # Overwrite tags assigned for IP Block.
-  result = api_instance.ip_blocks_ip_block_id_tags_put(ip_block_id, opts)
+  result = api_instance.ip_blocks_ip_block_id_tags_put(ip_block_id, tag_assignment_request)
   p result
 rescue IpApi::ApiError => e
   puts "Error when calling IPBlocksApi->ip_blocks_ip_block_id_tags_put: #{e}"
@@ -332,12 +328,12 @@ end
 
 This returns an Array which contains the response data, status code and headers.
 
-> <Array(<IpBlock>, Integer, Hash)> ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, opts)
+> <Array(<IpBlock>, Integer, Hash)> ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, tag_assignment_request)
 
 ```ruby
 begin
   # Overwrite tags assigned for IP Block.
-  data, status_code, headers = api_instance.ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, opts)
+  data, status_code, headers = api_instance.ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, tag_assignment_request)
   p status_code # => 2xx
   p headers # => { ... }
   p data # => <IpBlock>
@@ -351,7 +347,7 @@ end
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
 | **ip_block_id** | **String** | The IP Block identifier. |  |
-| **tag_assignment_request** | [**Array&lt;TagAssignmentRequest&gt;**](TagAssignmentRequest.md) |  | [optional] |
+| **tag_assignment_request** | [**Array&lt;TagAssignmentRequest&gt;**](TagAssignmentRequest.md) |  |  |
 
 ### Return type
 
@@ -369,7 +365,7 @@ end
 
 ## ip_blocks_post
 
-> <IpBlock> ip_blocks_post(opts)
+> <IpBlock> ip_blocks_post(ip_block_create)
 
 Create an IP Block.
 
@@ -387,13 +383,11 @@ IpApi.configure do |config|
 end
 
 api_instance = IpApi::IPBlocksApi.new
-opts = {
-  ip_block_create: IpApi::IpBlockCreate.new({location: 'PHX', cidr_block_size: '/30'}) # IpBlockCreate | 
-}
+ip_block_create = IpApi::IpBlockCreate.new({location: 'PHX', cidr_block_size: '/30'}) # IpBlockCreate | 
 
 begin
   # Create an IP Block.
-  result = api_instance.ip_blocks_post(opts)
+  result = api_instance.ip_blocks_post(ip_block_create)
   p result
 rescue IpApi::ApiError => e
   puts "Error when calling IPBlocksApi->ip_blocks_post: #{e}"
@@ -404,12 +398,12 @@ end
 
 This returns an Array which contains the response data, status code and headers.
 
-> <Array(<IpBlock>, Integer, Hash)> ip_blocks_post_with_http_info(opts)
+> <Array(<IpBlock>, Integer, Hash)> ip_blocks_post_with_http_info(ip_block_create)
 
 ```ruby
 begin
   # Create an IP Block.
-  data, status_code, headers = api_instance.ip_blocks_post_with_http_info(opts)
+  data, status_code, headers = api_instance.ip_blocks_post_with_http_info(ip_block_create)
   p status_code # => 2xx
   p headers # => { ... }
   p data # => <IpBlock>
@@ -422,7 +416,7 @@ end
 
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
-| **ip_block_create** | [**IpBlockCreate**](IpBlockCreate.md) |  | [optional] |
+| **ip_block_create** | [**IpBlockCreate**](IpBlockCreate.md) |  |  |
 
 ### Return type
 

data/docs/IpBlock.md

@@ -8,7 +8,7 @@
 | **location** | **String** | IP Block location ID. Currently this field should be set to `PHX`, `ASH`, `SGP`, `NLD`, `CHI`, `SEA` or `AUS`. |  |
 | **cidr_block_size** | **String** | CIDR IP Block Size. Currently this field should be set to either `/31`, `/30`, `/29`, `/28`, `/27`, `/26`, `/25`, `/24`, `/23` or `/22`. |  |
 | **cidr** | **String** | The IP Block in CIDR notation. |  |
-| **status** | **String** | The status of the IP Block. |  |
+| **status** | **String** | The status of the IP Block. Can have one of the following values: `creating` , `assigning` , `error assigning` , `assigned` , `unassigning` , `error unassigning` or `unassigned`. |  |
 | **assigned_resource_id** | **String** | ID of the resource assigned to the IP Block. | [optional] |
 | **assigned_resource_type** | **String** | Type of the resource assigned to the IP Block. | [optional] |
 | **description** | **String** | The description of the IP Block. | [optional] |

data/lib/pnap_ip_api/api/ip_blocks_api.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: support@phoenixnap.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+OpenAPI Generator version: 7.2.0
 
 =end
 
@@ -208,21 +208,21 @@ module IpApi
     # Update IP block.
     # Update IP Block's details.
     # @param ip_block_id [String] The IP Block identifier.
+    # @param ip_block_patch [IpBlockPatch] 
     # @param [Hash] opts the optional parameters
-    # @option opts [IpBlockPatch] :ip_block_patch 
     # @return [IpBlock]
-    def ip_blocks_ip_block_id_patch(ip_block_id, opts = {})
-      data, _status_code, _headers = ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, opts)
+    def ip_blocks_ip_block_id_patch(ip_block_id, ip_block_patch, opts = {})
+      data, _status_code, _headers = ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, ip_block_patch, opts)
       data
     end
 
     # Update IP block.
     # Update IP Block's details.
     # @param ip_block_id [String] The IP Block identifier.
+    # @param ip_block_patch [IpBlockPatch] 
     # @param [Hash] opts the optional parameters
-    # @option opts [IpBlockPatch] :ip_block_patch 
     # @return [Array<(IpBlock, Integer, Hash)>] IpBlock data, response status code and response headers
-    def ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, opts = {})
+    def ip_blocks_ip_block_id_patch_with_http_info(ip_block_id, ip_block_patch, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: IPBlocksApi.ip_blocks_ip_block_id_patch ...'
       end
@@ -230,6 +230,10 @@ module IpApi
       if @api_client.config.client_side_validation && ip_block_id.nil?
         fail ArgumentError, "Missing the required parameter 'ip_block_id' when calling IPBlocksApi.ip_blocks_ip_block_id_patch"
       end
+      # verify the required parameter 'ip_block_patch' is set
+      if @api_client.config.client_side_validation && ip_block_patch.nil?
+        fail ArgumentError, "Missing the required parameter 'ip_block_patch' when calling IPBlocksApi.ip_blocks_ip_block_id_patch"
+      end
       # resource path
       local_var_path = '/ip-blocks/{ipBlockId}'.sub('{' + 'ipBlockId' + '}', CGI.escape(ip_block_id.to_s))
 
@@ -250,7 +254,7 @@ module IpApi
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:debug_body] || @api_client.object_to_http_body(opts[:'ip_block_patch'])
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(ip_block_patch)
 
       # return_type
       return_type = opts[:debug_return_type] || 'IpBlock'
@@ -278,21 +282,21 @@ module IpApi
     # Overwrite tags assigned for IP Block.
     # Overwrites tags assigned for IP Block and unassigns any tags not part of the request.
     # @param ip_block_id [String] The IP Block identifier.
+    # @param tag_assignment_request [Array<TagAssignmentRequest>] 
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<TagAssignmentRequest>] :tag_assignment_request 
     # @return [IpBlock]
-    def ip_blocks_ip_block_id_tags_put(ip_block_id, opts = {})
-      data, _status_code, _headers = ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, opts)
+    def ip_blocks_ip_block_id_tags_put(ip_block_id, tag_assignment_request, opts = {})
+      data, _status_code, _headers = ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, tag_assignment_request, opts)
       data
     end
 
     # Overwrite tags assigned for IP Block.
     # Overwrites tags assigned for IP Block and unassigns any tags not part of the request.
     # @param ip_block_id [String] The IP Block identifier.
+    # @param tag_assignment_request [Array<TagAssignmentRequest>] 
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<TagAssignmentRequest>] :tag_assignment_request 
     # @return [Array<(IpBlock, Integer, Hash)>] IpBlock data, response status code and response headers
-    def ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, opts = {})
+    def ip_blocks_ip_block_id_tags_put_with_http_info(ip_block_id, tag_assignment_request, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: IPBlocksApi.ip_blocks_ip_block_id_tags_put ...'
       end
@@ -300,6 +304,10 @@ module IpApi
       if @api_client.config.client_side_validation && ip_block_id.nil?
         fail ArgumentError, "Missing the required parameter 'ip_block_id' when calling IPBlocksApi.ip_blocks_ip_block_id_tags_put"
       end
+      # verify the required parameter 'tag_assignment_request' is set
+      if @api_client.config.client_side_validation && tag_assignment_request.nil?
+        fail ArgumentError, "Missing the required parameter 'tag_assignment_request' when calling IPBlocksApi.ip_blocks_ip_block_id_tags_put"
+      end
       # resource path
       local_var_path = '/ip-blocks/{ipBlockId}/tags'.sub('{' + 'ipBlockId' + '}', CGI.escape(ip_block_id.to_s))
 
@@ -320,7 +328,7 @@ module IpApi
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:debug_body] || @api_client.object_to_http_body(opts[:'tag_assignment_request'])
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(tag_assignment_request)
 
       # return_type
       return_type = opts[:debug_return_type] || 'IpBlock'
@@ -347,23 +355,27 @@ module IpApi
 
     # Create an IP Block.
     # Request an IP Block. An IP Block is a set of contiguous IPs that can be assigned to other resources such as servers.
+    # @param ip_block_create [IpBlockCreate] 
     # @param [Hash] opts the optional parameters
-    # @option opts [IpBlockCreate] :ip_block_create 
     # @return [IpBlock]
-    def ip_blocks_post(opts = {})
-      data, _status_code, _headers = ip_blocks_post_with_http_info(opts)
+    def ip_blocks_post(ip_block_create, opts = {})
+      data, _status_code, _headers = ip_blocks_post_with_http_info(ip_block_create, opts)
       data
     end
 
     # Create an IP Block.
     # Request an IP Block. An IP Block is a set of contiguous IPs that can be assigned to other resources such as servers.
+    # @param ip_block_create [IpBlockCreate] 
     # @param [Hash] opts the optional parameters
-    # @option opts [IpBlockCreate] :ip_block_create 
     # @return [Array<(IpBlock, Integer, Hash)>] IpBlock data, response status code and response headers
-    def ip_blocks_post_with_http_info(opts = {})
+    def ip_blocks_post_with_http_info(ip_block_create, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: IPBlocksApi.ip_blocks_post ...'
       end
+      # verify the required parameter 'ip_block_create' is set
+      if @api_client.config.client_side_validation && ip_block_create.nil?
+        fail ArgumentError, "Missing the required parameter 'ip_block_create' when calling IPBlocksApi.ip_blocks_post"
+      end
       # resource path
       local_var_path = '/ip-blocks'
 
@@ -384,7 +396,7 @@ module IpApi
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:debug_body] || @api_client.object_to_http_body(opts[:'ip_block_create'])
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(ip_block_create)
 
       # return_type
       return_type = opts[:debug_return_type] || 'IpBlock'

data/lib/pnap_ip_api/api_client.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: support@phoenixnap.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+OpenAPI Generator version: 7.2.0
 
 =end
 
@@ -17,6 +17,7 @@ require 'tempfile'
 require 'time'
 require 'typhoeus'
 
+
 module IpApi
   class ApiClient
     # The Configuration object holding settings to be used in the API client.
@@ -31,6 +32,7 @@ module IpApi
     # @option config [Configuration] Configuration for initializing the object, default to Configuration.default
     def initialize(config = Configuration.default)
       @config = config
+      @config.params_encoding = :multi
       @user_agent = "PNAP-ruby-sdk-bmc/#{ IpApi::VERSION }"
       @powered_by = "PNAP-ruby-sdk-bmc/#{ IpApi::VERSION }"
       @default_headers = {
@@ -47,9 +49,10 @@ module IpApi
     # Call an API with given options.
     #
     # @return [Array<(Object, Integer, Hash)>] an array of 3 elements:
-    #   the data deserialized from response body (could be nil), response status code and response headers.
+    #   the data deserialized from response body (may be a Tempfile or nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
       request = build_request(http_method, path, opts)
+      tempfile = download_file(request) if opts[:return_type] == 'File'
       response = request.run
 
       if @config.debugging
@@ -71,7 +74,9 @@ module IpApi
         end
       end
 
-      if opts[:return_type]
+      if opts[:return_type] == 'File'
+        data = tempfile
+      elsif opts[:return_type]
         data = deserialize(response, opts[:return_type])
       else
         data = nil
@@ -127,9 +132,7 @@ module IpApi
         end
       end
 
-      request = Typhoeus::Request.new(url, req_opts)
-      download_file(request) if opts[:return_type] == 'File'
-      request
+      Typhoeus::Request.new(url, req_opts)
     end
 
     # Builds the HTTP request body
@@ -167,6 +170,8 @@ module IpApi
     # process can use.
     #
     # @see Configuration#temp_folder_path
+    #
+    # @return [Tempfile] the tempfile generated
     def download_file(request)
       tempfile = nil
       encoding = nil
@@ -181,21 +186,24 @@ module IpApi
         prefix = prefix + '-' unless prefix.end_with?('-')
         encoding = response.body.encoding
         tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
-        @tempfile = tempfile
       end
       request.on_body do |chunk|
         chunk.force_encoding(encoding)
         tempfile.write(chunk)
       end
-      request.on_complete do |response|
-        if tempfile
-          tempfile.close
-          @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
-                              "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
-                              "will be deleted automatically with GC. It's also recommended to delete the temp file "\
-                              "explicitly with `tempfile.delete`"
-        end
+      # run the request to ensure the tempfile is created successfully before returning it
+      request.run
+      if tempfile
+        tempfile.close
+        @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
+                            "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
+                            "will be deleted automatically with GC. It's also recommended to delete the temp file "\
+                            "explicitly with `tempfile.delete`"
+      else
+        fail ApiError.new("Failed to create the tempfile based on the HTTP response from the server: #{request.inspect}") 
       end
+
+      tempfile
     end
 
     # Check if the given MIME is a JSON MIME.
@@ -216,15 +224,10 @@ module IpApi
     # @param [String] return_type some examples: "User", "Array<User>", "Hash<String, Integer>"
     def deserialize(response, return_type)
       body = response.body
-
-      # handle file downloading - return the File instance processed in request callbacks
-      # note that response body is empty when the file is written in chunks in request on_body callback
-      return @tempfile if return_type == 'File'
-
       return nil if body.nil? || body.empty?
 
       # return response body directly for String return type
-      return body if return_type == 'String'
+      return body.to_s if return_type == 'String'
 
       # ensuring a default content type
       content_type = response.headers['Content-Type'] || 'application/json'

data/lib/pnap_ip_api/api_error.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: support@phoenixnap.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+OpenAPI Generator version: 7.2.0
 
 =end
 
@@ -32,6 +32,7 @@ module IpApi
         end
       else
         super arg
+        @message = arg
       end
     end
 

data/lib/pnap_ip_api/configuration.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: support@phoenixnap.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+OpenAPI Generator version: 7.2.0
 
 =end
 
@@ -62,6 +62,16 @@ module IpApi
     # Defines the access token (Bearer) used with OAuth2.
     attr_accessor :access_token
 
+    # Defines a Proc used to fetch or refresh access tokens (Bearer) used with OAuth2.
+    # Overrides the access_token if set
+    # @return [Proc]
+    attr_accessor :access_token_getter
+
+    # Set this to return data as binary instead of downloading a temp file. When enabled (set to true)
+    # HTTP responses with return type `File` will be returned as a stream of binary data.
+    # Default to false.
+    attr_accessor :return_binary_data
+
     # Set this to enable/disable debugging. When enabled (set to true), HTTP request/response
     # details will be logged with `logger.debug` (see the `logger` attribute).
     # Default to false.
@@ -142,7 +152,7 @@ module IpApi
       @scheme = 'https'
       @host = 'api.phoenixnap.com'
       @base_path = '/ips/v1'
-      @server_index = 0
+      @server_index = nil
       @server_operation_index = {}
       @server_variables = {}
       @server_operation_variables = {}
@@ -190,10 +200,12 @@ module IpApi
 
     # Returns base URL for specified operation based on server settings
     def base_url(operation = nil)
-      index = server_operation_index.fetch(operation, server_index)
-      return "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') if index == nil
-
-      server_url(index, server_operation_variables.fetch(operation, server_variables), operation_server_settings[operation])
+      if operation_server_settings.key?(operation) then
+        index = server_operation_index.fetch(operation, server_index)
+        server_url(index.nil? ? 0 : index, server_operation_variables.fetch(operation, server_variables), operation_server_settings[operation])
+      else
+        server_index.nil? ? "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') : server_url(server_index, server_variables, nil)
+      end
     end
 
     # Gets API key (with prefix if set).
@@ -208,6 +220,12 @@ module IpApi
       end
     end
 
+    # Gets access_token using access_token_getter or uses the static access_token
+    def access_token_with_refresh
+      return access_token if access_token_getter.nil?
+      access_token_getter.call
+    end
+
     # Gets Basic Auth token string
     def basic_auth_token
       'Basic ' + ["#{username}:#{password}"].pack('m').delete("\r\n")
@@ -221,7 +239,7 @@ module IpApi
             type: 'oauth2',
             in: 'header',
             key: 'Authorization',
-            value: "Bearer #{access_token}"
+            value: "Bearer #{access_token_with_refresh}"
           },
       }
     end
@@ -249,8 +267,8 @@ module IpApi
       servers = server_settings if servers == nil
 
       # check array index out of bound
-      if (index < 0 || index >= servers.size)
-        fail ArgumentError, "Invalid index #{index} when selecting the server. Must be less than #{servers.size}"
+      if (index.nil? || index < 0 || index >= servers.size)
+        fail ArgumentError, "Invalid index #{index} when selecting the server. Must not be nil and must be less than #{servers.size}"
       end
 
       server = servers[index]
@@ -275,5 +293,6 @@ module IpApi
       url
     end
 
+
   end
 end

data/lib/pnap_ip_api/models/delete_ip_block_result.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: support@phoenixnap.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+OpenAPI Generator version: 7.2.0
 
 =end
 
@@ -66,16 +66,21 @@ module IpApi
 
       if attributes.key?(:'result')
         self.result = attributes[:'result']
+      else
+        self.result = nil
       end
 
       if attributes.key?(:'ip_block_id')
         self.ip_block_id = attributes[:'ip_block_id']
+      else
+        self.ip_block_id = nil
       end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @result.nil?
         invalid_properties.push('invalid value for "result", result cannot be nil.')
@@ -91,6 +96,7 @@ module IpApi
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @result.nil?
       return false if @ip_block_id.nil?
       true
@@ -121,37 +127,30 @@ module IpApi
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)
@@ -186,7 +185,7 @@ module IpApi
       else # model
         # models (e.g. Pet) or oneOf
         klass = IpApi.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end