lib/fastly/models/logging_loggly_response.rb in fastly-6.0.2 vs lib/fastly/models/logging_loggly_response.rb in fastly-7.0.0

@@ -17,19 +17,19 @@
     attr_accessor :name
 
     # Where in the generated VCL the logging call should be placed. If not set, endpoints with `format_version` of 2 are placed in `vcl_log` and those with `format_version` of 1 are placed in `vcl_deliver`. 
     attr_accessor :placement
 
-    # The version of the custom logging format used for the configured endpoint. The logging call gets placed by default in `vcl_log` if `format_version` is set to `2` and in `vcl_deliver` if `format_version` is set to `1`. 
-    attr_accessor :format_version
-
     # The name of an existing condition in the configured endpoint, or leave blank to always execute.
     attr_accessor :response_condition
 
     # A Fastly [log format string](https://docs.fastly.com/en/guides/custom-log-formats).
     attr_accessor :format
 
+    # The version of the custom logging format used for the configured endpoint. The logging call gets placed by default in `vcl_log` if `format_version` is set to `2` and in `vcl_deliver` if `format_version` is set to `1`. 
+    attr_accessor :format_version
+
     # The token to use for authentication ([https://www.loggly.com/docs/customer-token-authentication-token/](https://www.loggly.com/docs/customer-token-authentication-token/)).
     attr_accessor :token
 
     # Date and time in ISO 8601 format.
     attr_accessor :created_at
@@ -69,13 +69,13 @@
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'name' => :'name',
         :'placement' => :'placement',
-        :'format_version' => :'format_version',
         :'response_condition' => :'response_condition',
         :'format' => :'format',
+        :'format_version' => :'format_version',
         :'token' => :'token',
         :'created_at' => :'created_at',
         :'deleted_at' => :'deleted_at',
         :'updated_at' => :'updated_at',
         :'service_id' => :'service_id',
@@ -91,19 +91,19 @@
     # Attribute type mapping.
     def self.fastly_types
       {
         :'name' => :'String',
         :'placement' => :'String',
-        :'format_version' => :'Integer',
         :'response_condition' => :'String',
         :'format' => :'String',
+        :'format_version' => :'String',
         :'token' => :'String',
         :'created_at' => :'Time',
         :'deleted_at' => :'Time',
         :'updated_at' => :'Time',
         :'service_id' => :'String',
-        :'version' => :'Integer'
+        :'version' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.fastly_nullable
@@ -117,12 +117,13 @@
     end
 
     # List of class defined in allOf (OpenAPI v3)
     def self.fastly_all_of
       [
-      :'LoggingLoggly',
-      :'ServiceIdAndVersion',
+      :'LoggingCommonResponse',
+      :'LoggingLogglyAdditional',
+      :'ServiceIdAndVersionString',
       :'Timestamps'
       ]
     end
 
     # Initializes the object
@@ -146,26 +147,26 @@
 
       if attributes.key?(:'placement')
         self.placement = attributes[:'placement']
       end
 
-      if attributes.key?(:'format_version')
-        self.format_version = attributes[:'format_version']
-      else
-        self.format_version = FORMAT_VERSION::v2
-      end
-
       if attributes.key?(:'response_condition')
         self.response_condition = attributes[:'response_condition']
       end
 
       if attributes.key?(:'format')
         self.format = attributes[:'format']
       else
         self.format = '%h %l %u %t \"%r\" %>s %b'
       end
 
+      if attributes.key?(:'format_version')
+        self.format_version = attributes[:'format_version']
+      else
+        self.format_version = '2'
+      end
+
       if attributes.key?(:'token')
         self.token = attributes[:'token']
       end
 
       if attributes.key?(:'created_at')
@@ -199,11 +200,11 @@
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
       placement_validator = EnumAttributeValidator.new('String', ["none", "waf_debug", "null"])
       return false unless placement_validator.valid?(@placement)
-      format_version_validator = EnumAttributeValidator.new('Integer', [1, 2])
+      format_version_validator = EnumAttributeValidator.new('String', ["1", "2"])
       return false unless format_version_validator.valid?(@format_version)
       true
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -217,11 +218,11 @@
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] format_version Object to be assigned
     def format_version=(format_version)
-      validator = EnumAttributeValidator.new('Integer', [1, 2])
+      validator = EnumAttributeValidator.new('String', ["1", "2"])
       unless validator.valid?(format_version)
         fail ArgumentError, "invalid value for \"format_version\", must be one of #{validator.allowable_values}."
       end
       @format_version = format_version
     end
@@ -231,13 +232,13 @@
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           name == o.name &&
           placement == o.placement &&
-          format_version == o.format_version &&
           response_condition == o.response_condition &&
           format == o.format &&
+          format_version == o.format_version &&
           token == o.token &&
           created_at == o.created_at &&
           deleted_at == o.deleted_at &&
           updated_at == o.updated_at &&
           service_id == o.service_id &&
@@ -251,10 +252,10 @@
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, placement, format_version, response_condition, format, token, created_at, deleted_at, updated_at, service_id, version].hash
+      [name, placement, response_condition, format, format_version, token, created_at, deleted_at, updated_at, service_id, version].hash
     end
 
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself