datadog_api_client 1.7.0 → 1.10.0

data/lib/datadog_api_client/v1/api_client.rb

@@ -5,7 +5,7 @@
 
 The version of the OpenAPI document: 1.0
 Contact: support@datadoghq.com
-Generated by: https://openapi-generator.tech
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
 
  Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
  This product includes software developed at Datadog (https://www.datadoghq.com/).
@@ -18,7 +18,7 @@ require 'json'
 require 'logger'
 require 'tempfile'
 require 'time'
-require 'typhoeus'
+require 'httparty'
 
 module DatadogAPIClient::V1
   class APIClient
@@ -36,7 +36,6 @@ module DatadogAPIClient::V1
       @config = config
       @user_agent = "#{DatadogAPIClient::USER_AGENT}"
       @default_headers = {
-        'Content-Type' => 'application/json',
         'User-Agent' => @user_agent
       }
       @default_headers['Accept-Encoding'] = 'gzip' if @config.compress
@@ -52,14 +51,46 @@ module DatadogAPIClient::V1
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
       request = build_request(http_method, path, opts)
-      response = request.run
+      if opts[:stream_body]
+        tempfile = nil
+        encoding = nil
+
+        response = request.perform do | chunk |
+          unless tempfile
+            content_disposition = chunk.http_response.header['Content-Disposition']
+            if content_disposition && content_disposition =~ /filename=/i
+              filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+              prefix = sanitize_filename(filename)
+            else
+              prefix = 'download-'
+            end
+            prefix = prefix + '-' unless prefix.end_with?('-')
+            unless encoding
+              encoding = chunk.encoding
+            end
+            tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
+            @tempfile = tempfile
+          end
+          chunk.force_encoding(encoding)
+          tempfile.write(chunk)
+        end
+        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
+      else
+        response = request.perform
+      end
 
       if @config.debugging
         @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
       end
 
       unless response.success?
-        if response.timed_out?
+        if response.request_timeout?
           fail APIError.new('Connection timed out')
         elsif response.code == 0
           # Errors from libcurl will be made visible here
@@ -75,7 +106,7 @@ module DatadogAPIClient::V1
           fail APIError.new(:code => response.code,
                             :response_headers => response.headers,
                             :response_body => body),
-               response.status_message
+               response.message
         end
       end
 
@@ -87,7 +118,7 @@ module DatadogAPIClient::V1
       return data, response.code, response.headers
     end
 
-    # Builds the HTTP request
+    # Build the HTTP request
     #
     # @param [String] http_method HTTP method/verb (e.g. POST)
     # @param [String] path URL path (e.g. /account/new)
@@ -95,11 +126,9 @@ module DatadogAPIClient::V1
     # @option opts [Hash] :query_params Query parameters
     # @option opts [Hash] :form_params Query parameters
     # @option opts [Object] :body HTTP body (JSON/XML)
-    # @return [Typhoeus::Request] A Typhoeus Request
+    # @return [HTTParty::Request] A httparty Request
     def build_request(http_method, path, opts = {})
       url = build_request_url(path, opts)
-      http_method = http_method.to_sym.downcase
-
       header_params = @default_headers.merge(opts[:header_params] || {})
       query_params = opts[:query_params] || {}
       form_params = opts[:form_params] || {}
@@ -112,20 +141,22 @@ module DatadogAPIClient::V1
       req_opts = {
         :method => http_method,
         :headers => header_params,
-        :params => query_params,
-        :params_encoding => @config.params_encoding,
+        :query => query_params,
         :timeout => @config.timeout,
-        :ssl_verifypeer => @config.verify_ssl,
-        :ssl_verifyhost => _verify_ssl_host,
-        :sslcert => @config.cert_file,
-        :sslkey => @config.key_file,
+        :verify_peer => @config.verify_ssl,
+        :verify => _verify_ssl_host,
         :verbose => @config.debugging
       }
 
+      req_opts[:pem] = File.read(@config.cert_file) if @config.cert_file
+      req_opts[:pem_password] = File.read(@config.key_file) if @config.key_file
+
+      opts[:stream_body] = true if opts[:return_type] == 'File'
+
       # set custom cert, if provided
-      req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
+      req_opts[:ssl_ca_file] = File.read(@config.ssl_ca_cert) if @config.ssl_ca_cert
 
-      if [:post, :patch, :put, :delete].include?(http_method)
+      if ["POST", "PATCH", "PUT", "DELETE"].include?(http_method.const_get(:METHOD))
         req_body = build_request_body(header_params, form_params, opts[:body])
         req_opts.update :body => req_body
         if @config.debugging
@@ -133,12 +164,10 @@ module DatadogAPIClient::V1
         end
       end
 
-      request = Typhoeus::Request.new(url, req_opts)
-      download_file(request) if opts[:return_type] == 'File'
-      request
+      HTTParty::Request.new(http_method, url, req_opts)
     end
 
-    # Builds the HTTP request body
+    # Build the HTTP request body
     #
     # @param [Hash] header_params Header parameters
     # @param [Hash] form_params Query parameters
@@ -152,7 +181,7 @@ module DatadogAPIClient::V1
         form_params.each do |key, value|
           case value
           when ::File, ::Array, nil
-            # let typhoeus handle File, Array and nil parameters
+            # let httparty handle File, Array and nil parameters
             data[key] = value
           else
             data[key] = value.to_s
@@ -173,44 +202,6 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Save response body into a file in (the defined) temporary folder, using the filename
-    # from the "Content-Disposition" header if provided, otherwise a random filename.
-    # The response body is written to the file in chunks in order to handle files which
-    # size is larger than maximum Ruby String or even larger than the maximum memory a Ruby
-    # process can use.
-    #
-    # @see Configuration#temp_folder_path
-    def download_file(request)
-      tempfile = nil
-      encoding = nil
-      request.on_headers do |response|
-        content_disposition = response.headers['Content-Disposition']
-        if content_disposition && content_disposition =~ /filename=/i
-          filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-          prefix = sanitize_filename(filename)
-        else
-          prefix = 'download-'
-        end
-        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
-      end
-    end
-
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -349,9 +340,7 @@ module DatadogAPIClient::V1
     # @return [String] the Accept header (e.g. application/json)
     def select_header_accept(accepts)
       return nil if accepts.nil? || accepts.empty?
-      # use JSON when present, otherwise use all of the provided
-      json_accept = accepts.find { |s| json_mime?(s) }
-      json_accept || accepts.join(',')
+      accepts.join(', ')
     end
 
     # Return Content-Type header based on an array of content types provided.
@@ -403,11 +392,62 @@ module DatadogAPIClient::V1
       when :pipes
         param.join('|')
       when :multi
-        # return the array directly as typhoeus will handle it as expected
+        # return the array directly as httparty will handle it as expected
         param
       else
         fail "unknown collection format: #{collection_format.inspect}"
       end
     end
+
+
+    # Retrieve an attribute from a path specification.
+    #
+    # @param [Object] obj The source object
+    # @param [String] attribute_path The path spefication, separated by "."
+    # @param [Object] default The default value, if not found
+    # @return [Object] The value found, or default
+    # @!visibility private
+    def get_attribute_from_path(obj, attribute_path, default=nil)
+      for attr in attribute_path.split(".") do
+        case obj
+        when Hash
+          obj = !obj[attr.to_sym].nil? ? obj[attr.to_sym] : obj[attr]
+        else
+          obj = obj.send(attr)
+        end
+        return default if obj.nil?
+      end
+      obj
+    end
+
+    # Set an attribute at the given path
+    #
+    # @param [Object] obj The source object
+    # @param [String] attribute_path The path spefication, separated by "."
+    # @param [Object] builder The class matching the top level attribute
+    # @param [Object] value The value to set
+    # @!visibility private
+    def set_attribute_from_path(obj, attribute_path, builder, value)
+      attrs = attribute_path.split(".")
+      last = attrs.pop
+      i = 0
+      for attr in attrs do
+        case obj
+        when Hash
+          obj = !obj[attr.to_sym].nil? ? obj[attr.to_sym] : obj[attr]
+        else
+          obj = obj.send(attr)
+        end
+        builder = DatadogAPIClient::V2.const_get(builder.openapi_types[attr.to_sym]) if i > 0
+        obj = builder.new if obj.nil?
+        i += 1
+      end
+      case obj
+      when Hash
+        obj[last.to_sym] = value
+      else
+        obj.send(last + "=", value)
+      end
+    end
   end
-end
+end

data/lib/datadog_api_client/v1/api_error.rb

@@ -5,7 +5,7 @@
 
 The version of the OpenAPI document: 1.0
 Contact: support@datadoghq.com
-Generated by: https://openapi-generator.tech
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
 
  Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
  This product includes software developed at Datadog (https://www.datadoghq.com/).
@@ -57,4 +57,4 @@ module DatadogAPIClient::V1
       msg
     end
   end
-end
+end

data/lib/datadog_api_client/v1/configuration.rb

@@ -5,7 +5,7 @@
 
 The version of the OpenAPI document: 1.0
 Contact: support@datadoghq.com
-Generated by: https://openapi-generator.tech
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
 
  Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
  This product includes software developed at Datadog (https://www.datadoghq.com/).
@@ -119,9 +119,6 @@ module DatadogAPIClient::V1
     # Set this to customize the certificate file to verify the peer.
     #
     # @return [String] the path to the certificate file
-    #
-    # @see The `cainfo` option of Typhoeus, `--cert` option of libcurl. Related source code:
-    # https://github.com/typhoeus/typhoeus/blob/master/lib/typhoeus/easy_factory.rb#L145
     attr_accessor :ssl_ca_cert
 
     ### TLS/SSL setting
@@ -132,13 +129,6 @@ module DatadogAPIClient::V1
     # Client private key file (for client certificate)
     attr_accessor :key_file
 
-    # Set this to customize parameters encoding of array parameter with multi collectionFormat.
-    # Default to nil.
-    #
-    # @see The params_encoding option of Ethon. Related source code:
-    # https://github.com/typhoeus/ethon/blob/master/lib/ethon/easy/queryable.rb#L96
-    attr_accessor :params_encoding
-
     attr_accessor :inject_format
 
     attr_accessor :force_ending_format
@@ -156,11 +146,10 @@ module DatadogAPIClient::V1
       @server_operation_variables = {}
       @api_key = {}
       @api_key_prefix = {}
-      @timeout = 0
+      @timeout = nil
       @client_side_validation = true
       @verify_ssl = true
       @verify_ssl_host = true
-      @params_encoding = nil
       @cert_file = nil
       @key_file = nil
       @debugging = false
@@ -169,20 +158,14 @@ module DatadogAPIClient::V1
       @compress = true
       @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
       @unstable_operations = {
-            create_slo_correction: false,
-            delete_slo_correction: false,
-            get_slo_correction: false,
-            list_slo_correction: false,
-            update_slo_correction: false,
-            get_slo_corrections: false,
-            get_slo_history: false,
             get_daily_custom_reports: false,
-            get_hourly_usage_attribution: false,
-            get_monthly_custom_reports: false,
-            get_monthly_usage_attribution: false,
             get_specified_daily_custom_reports: false,
+            get_monthly_custom_reports: false,
             get_specified_monthly_custom_reports: false,
+            get_slo_history: false,
             get_usage_attribution: false,
+            get_hourly_usage_attribution: false,
+            get_monthly_usage_attribution: false,
       }
       @server_variables[:site] = ENV['DD_SITE'] if ENV.key? 'DD_SITE'
       @api_key['apiKeyAuth'] = ENV['DD_API_KEY'] if ENV.key? 'DD_API_KEY'
@@ -290,49 +273,49 @@ module DatadogAPIClient::V1
           description: "No description provided",
           variables: {
             site: {
-                description: "The regional site for a Datadog customer.",
-                default_value: "datadoghq.com",
-                enum_values: [
-                  "datadoghq.com",
-                  "us3.datadoghq.com",
-                  "us5.datadoghq.com",
-                  "datadoghq.eu",
-                  "ddog-gov.com"
-                ]
-              },
+              description: "The regional site for a Datadog customer.",
+              default_value: "datadoghq.com",
+              enum_values: [
+                "datadoghq.com",
+                "us3.datadoghq.com",
+                "us5.datadoghq.com",
+                "datadoghq.eu",
+                "ddog-gov.com"
+              ]
+            },
             subdomain: {
-                description: "The subdomain where the API is deployed.",
-                default_value: "api",
-              }
+              description: "The subdomain where the API is deployed.",
+              default_value: "api",
             }
+          }
         },
         {
           url: "{protocol}://{name}",
           description: "No description provided",
           variables: {
             name: {
-                description: "Full site DNS name.",
-                default_value: "api.datadoghq.com",
-              },
+              description: "Full site DNS name.",
+              default_value: "api.datadoghq.com",
+            },
             protocol: {
-                description: "The protocol for accessing the API.",
-                default_value: "https",
-              }
+              description: "The protocol for accessing the API.",
+              default_value: "https",
             }
+          }
         },
         {
           url: "https://{subdomain}.{site}",
           description: "No description provided",
           variables: {
             site: {
-                description: "Any Datadog deployment.",
-                default_value: "datadoghq.com",
-              },
+              description: "Any Datadog deployment.",
+              default_value: "datadoghq.com",
+            },
             subdomain: {
-                description: "The subdomain where the API is deployed.",
-                default_value: "api",
-              }
+              description: "The subdomain where the API is deployed.",
+              default_value: "api",
             }
+          }
         }
       ]
     end
@@ -341,10 +324,10 @@ module DatadogAPIClient::V1
       {
         get_ip_ranges: [
           {
-          url: "https://{subdomain}.{site}",
-          description: "No description provided",
-          variables: {
-            site: {
+            url: "https://{subdomain}.{site}",
+            description: "No description provided",
+            variables: {
+              site: {
                 description: "The regional site for Datadog customers.",
                 default_value: "datadoghq.com",
                 enum_values: [
@@ -355,43 +338,43 @@ module DatadogAPIClient::V1
                   "ddog-gov.com"
                 ]
               },
-            subdomain: {
+              subdomain: {
                 description: "The subdomain where the API is deployed.",
                 default_value: "ip-ranges",
               }
             }
           },
           {
-          url: "{protocol}://{name}",
-          description: "No description provided",
-          variables: {
-            name: {
+            url: "{protocol}://{name}",
+            description: "No description provided",
+            variables: {
+              name: {
                 description: "Full site DNS name.",
                 default_value: "ip-ranges.datadoghq.com",
               },
-            protocol: {
+              protocol: {
                 description: "The protocol for accessing the API.",
                 default_value: "https",
               }
             }
           },
           {
-          url: "https://{subdomain}.datadoghq.com",
-          description: "No description provided",
-          variables: {
-            subdomain: {
+            url: "https://{subdomain}.datadoghq.com",
+            description: "No description provided",
+            variables: {
+              subdomain: {
                 description: "The subdomain where the API is deployed.",
                 default_value: "ip-ranges",
               }
             }
-          }
+          }  
         ],
         submit_log: [
           {
-          url: "https://{subdomain}.{site}",
-          description: "No description provided",
-          variables: {
-            site: {
+            url: "https://{subdomain}.{site}",
+            description: "No description provided",
+            variables: {
+              site: {
                 description: "The regional site for Datadog customers.",
                 default_value: "datadoghq.com",
                 enum_values: [
@@ -402,40 +385,40 @@ module DatadogAPIClient::V1
                   "ddog-gov.com"
                 ]
               },
-            subdomain: {
+              subdomain: {
                 description: "The subdomain where the API is deployed.",
                 default_value: "http-intake.logs",
               }
             }
           },
           {
-          url: "{protocol}://{name}",
-          description: "No description provided",
-          variables: {
-            name: {
+            url: "{protocol}://{name}",
+            description: "No description provided",
+            variables: {
+              name: {
                 description: "Full site DNS name.",
                 default_value: "http-intake.logs.datadoghq.com",
               },
-            protocol: {
+              protocol: {
                 description: "The protocol for accessing the API.",
                 default_value: "https",
               }
             }
           },
           {
-          url: "https://{subdomain}.{site}",
-          description: "No description provided",
-          variables: {
-            site: {
+            url: "https://{subdomain}.{site}",
+            description: "No description provided",
+            variables: {
+              site: {
                 description: "Any Datadog deployment.",
                 default_value: "datadoghq.com",
               },
-            subdomain: {
+              subdomain: {
                 description: "The subdomain where the API is deployed.",
                 default_value: "http-intake.logs",
               }
             }
-          }
+          }  
         ],
       }
     end
@@ -488,4 +471,4 @@ module DatadogAPIClient::V1
     end
   end
 
-end
+end