datadog_api_client 1.7.0 → 1.8.0

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/).
@@ -169,20 +169,20 @@ module DatadogAPIClient::V1
       @compress = true
       @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
       @unstable_operations = {
+            get_daily_custom_reports: false,
+            get_specified_daily_custom_reports: false,
+            get_monthly_custom_reports: false,
+            get_specified_monthly_custom_reports: false,
+            list_slo_correction: false,
             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_usage_attribution: false,
             get_hourly_usage_attribution: false,
-            get_monthly_custom_reports: false,
             get_monthly_usage_attribution: false,
-            get_specified_daily_custom_reports: false,
-            get_specified_monthly_custom_reports: false,
-            get_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 +290,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 +341,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 +355,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 +402,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 +488,4 @@ module DatadogAPIClient::V1
     end
   end
 
-end
+end

data/lib/datadog_api_client/v1/{models/notebook_cell_create_request.rb → model_base.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/).
@@ -13,136 +13,46 @@ Generated by: https://openapi-generator.tech
 
 =end
 
-require 'date'
-require 'time'
-
 module DatadogAPIClient::V1
-  # The description of a notebook cell create request.
-  class NotebookCellCreateRequest
-    # Whether the object has unparsed attributes
-    # @!visibility private
-    attr_accessor :_unparsed
-
-    attr_accessor :attributes
-
-    attr_accessor :type
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    # @!visibility private
-    def self.attribute_map
-      {
-        :'attributes' => :'attributes',
-        :'type' => :'type'
-      }
-    end
-
-    # Returns all the JSON keys this model knows about
-    # @!visibility private
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
-    # Attribute type mapping.
-    # @!visibility private
-    def self.openapi_types
-      {
-        :'attributes' => :'NotebookCellCreateRequestAttributes',
-        :'type' => :'NotebookCellResourceType'
-      }
-    end
-
-    # List of attributes with nullable: true
-    # @!visibility private
-    def self.openapi_nullable
-      Set.new([
-      ])
-    end
-
-    # Initializes the object
-    # @param attributes [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::NotebookCellCreateRequest` initialize method"
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::NotebookCellCreateRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
-        end
-        h[k.to_sym] = v
-      }
-
-      if attributes.key?(:'attributes')
-        self.attributes = attributes[:'attributes']
-      end
-
-      if attributes.key?(:'type')
-        self.type = attributes[:'type']
-      else
-        self.type = 'notebook_cells'
+  module BaseEnumModel
+    # Builds the enum from string
+    # @param value [String] The enum value in the form of the string
+    # @return [String] The enum value
+    # @!visibility private
+    def build_from_hash(value)
+      constantValues = self.class.constants.select { |c| self.class::const_get(c) == value }
+      constantValues.empty? ? DatadogAPIClient::V1::UnparsedObject.new(value) : value
+    end
+
+    module ClassMethods
+      # Builds the enum from string
+      # @param value [String] The enum value in the form of the string
+      # @return [String] The enum value
+      # @!visibility private
+      def build_from_hash(value)
+        new.build_from_hash(value)
       end
     end
 
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @!visibility private
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      if @attributes.nil?
-        invalid_properties.push('invalid value for "attributes", attributes cannot be nil.')
-      end
-
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
-      end
-
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    # @!visibility private
-    def valid?
-      return false if @attributes.nil?
-      return false if @type.nil?
-      true
+    def self.included(base)
+        base.extend(ClassMethods)
     end
+  end
 
-    # Checks equality by comparing each attribute.
-    # @param o [Object] Object to be compared
+  module BaseGenericModel
+    # Whether the object has unparsed attributes
     # @!visibility private
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          attributes == o.attributes &&
-          type == o.type
-    end
+    attr_accessor :_unparsed
 
-    # @see the `==` method
+    # @see the `==` method implementation in child classes
     # @param o [Object] Object to be compared
     # @!visibility private
     def eql?(o)
       self == o
     end
 
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    # @!visibility private
-    def hash
-      [attributes, type].hash
-    end
-
-    # Builds the object from hash
-    # @param attributes [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    # @!visibility private
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
     # Builds the object from hash
-    # @param attributes [Hash] attributes Model attributes in the form of hash
+    # @param attributes [Hash] Model attributes in the form of hash
     # @return [Object] Returns the model itself
     # @!visibility private
     def build_from_hash(attributes)
@@ -172,7 +82,7 @@ module DatadogAPIClient::V1
     def _deserialize(type, value)
       case type.to_sym
       when :Time
-        Time.parse(value)
+      Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -248,7 +158,7 @@ module DatadogAPIClient::V1
 
     # Outputs non-array value in the form of hash
     # For object, use to_hash. Otherwise, just return the value
-    # @param value [Object] value Any valid value
+     # @param value [Object] Any valid value
     # @return [Hash] Returns the value in the form of hash
     # @!visibility private
     def _to_hash(value)
@@ -265,6 +175,78 @@ module DatadogAPIClient::V1
       end
     end
 
+    module ClassMethods
+      # Builds the object from hash
+      # @param attributes [Hash] Model attributes in the form of hash
+      # @return [Object] Returns the model itself
+      # @!visibility private
+      def build_from_hash(attributes)
+        new.build_from_hash(attributes)
+      end
+    end
+
+    def self.included(base)
+        base.extend(ClassMethods)
+    end
+  end
+
+  module BaseOneOfModel
+    attr_accessor :_unparsed
   end
 
+  module BaseOneOfModelNoDiscriminator
+
+    private
+
+    SchemaMismatchError = Class.new(StandardError)
+
+    # Note: 'File' is missing here because in the regular case we get the data _after_ a call to JSON.parse.
+    def find_and_cast_into_type(klass, data)
+      return if data.nil?
+
+      case klass.to_s
+      when 'Boolean'
+        return data if data.instance_of?(TrueClass) || data.instance_of?(FalseClass)
+      when 'Float'
+        return data if data.instance_of?(Float)
+      when 'Integer'
+        return data if data.instance_of?(Integer)
+      when 'Time'
+        return Time.parse(data)
+      when 'Date'
+        return Date.parse(data)
+      when 'String'
+        return data if data.instance_of?(String)
+      when 'Object' # "type: object"
+        return data if data.instance_of?(Hash)
+      when /\AArray<(?<sub_type>.+)>\z/ # "type: array"
+        if data.instance_of?(Array)
+          sub_type = Regexp.last_match[:sub_type]
+          return data.map { |item| find_and_cast_into_type(sub_type, item) }
+        end
+      when /\AHash<String, (?<sub_type>.+)>\z/ # "type: object" with "additionalProperties: { ... }"
+        if data.instance_of?(Hash) && data.keys.all? { |k| k.instance_of?(Symbol) || k.instance_of?(String) }
+          sub_type = Regexp.last_match[:sub_type]
+          return data.each_with_object({}) { |(k, v), hsh| hsh[k] = find_and_cast_into_type(sub_type, v) }
+        end
+      else # model
+        const = DatadogAPIClient::V1.const_get(klass)
+        if const
+          if const.respond_to?(:openapi_one_of) # nested oneOf model
+            model = const.build(data)
+            return model if model
+          else
+            # raise if data contains keys that are not known to the model
+            raise unless (data.keys - const.acceptable_attributes).empty?
+            model = const.build_from_hash(data)
+            return model if model && model.valid?
+          end
+        end
+      end
+
+      raise # if no match by now, raise
+    rescue
+      raise SchemaMismatchError, "#{data} doesn't match the #{klass} type"
+    end
+  end
 end

data/lib/datadog_api_client/v1/models/access_role.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/).
@@ -17,28 +17,13 @@ require 'date'
 require 'time'
 
 module DatadogAPIClient::V1
+  # The access role of the user. Options are **st** (standard user), **adm** (admin user), or **ro** (read-only user).
   class AccessRole
+    include BaseEnumModel
+
     STANDARD = "st".freeze
     ADMIN = "adm".freeze
     READ_ONLY = "ro".freeze
     ERROR = "ERROR".freeze
-
-    # Builds the enum from string
-    # @param value [String] The enum value in the form of the string
-    # @return [String] The enum value
-    # @!visibility private
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
-
-    # Builds the enum from string
-    # @param value [String] The enum value in the form of the string
-    # @return [String] The enum value
-    # @!visibility private
-    def build_from_hash(value)
-      constantValues = AccessRole.constants.select { |c| AccessRole::const_get(c) == value }
-      constantValues.empty? ? DatadogAPIClient::V1::UnparsedObject.new(value) : value
-    end
   end
-
 end