fastly 6.0.2 → 7.1.0

data/lib/fastly/models/{logging_sumologic_all_of.rb → logging_sumologic_additional.rb}

@@ -12,7 +12,7 @@ require 'date'
 require 'time'
 
 module Fastly
-  class LoggingSumologicAllOf
+  class LoggingSumologicAdditional
     attr_accessor :message_type
 
     # The URL to post logs to.
@@ -49,13 +49,13 @@ module Fastly
     # @param [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 `Fastly::LoggingSumologicAllOf` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Fastly::LoggingSumologicAdditional` 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 `Fastly::LoggingSumologicAllOf`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Fastly::LoggingSumologicAdditional`. 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
       }

data/lib/fastly/models/logging_sumologic_response.rb

@@ -19,15 +19,15 @@ module Fastly
     # 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
+
     attr_accessor :message_type
 
     # The URL to post logs to.
@@ -73,9 +73,9 @@ module Fastly
       {
         :'name' => :'name',
         :'placement' => :'placement',
-        :'format_version' => :'format_version',
         :'response_condition' => :'response_condition',
         :'format' => :'format',
+        :'format_version' => :'format_version',
         :'message_type' => :'message_type',
         :'url' => :'url',
         :'created_at' => :'created_at',
@@ -96,16 +96,16 @@ module Fastly
       {
         :'name' => :'String',
         :'placement' => :'String',
-        :'format_version' => :'Integer',
         :'response_condition' => :'String',
         :'format' => :'String',
+        :'format_version' => :'String',
         :'message_type' => :'LoggingMessageType',
         :'url' => :'String',
         :'created_at' => :'Time',
         :'deleted_at' => :'Time',
         :'updated_at' => :'Time',
         :'service_id' => :'String',
-        :'version' => :'Integer'
+        :'version' => :'String'
       }
     end
 
@@ -123,8 +123,9 @@ module Fastly
     # List of class defined in allOf (OpenAPI v3)
     def self.fastly_all_of
       [
-      :'LoggingSumologic',
-      :'ServiceIdAndVersion',
+      :'LoggingCommonResponse',
+      :'LoggingSumologicAdditional',
+      :'ServiceIdAndVersionString',
       :'Timestamps'
       ]
     end
@@ -152,12 +153,6 @@ module Fastly
         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
@@ -168,6 +163,12 @@ module Fastly
         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?(:'message_type')
         self.message_type = attributes[:'message_type']
       else
@@ -211,7 +212,7 @@ module Fastly
     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
@@ -229,7 +230,7 @@ module Fastly
     # 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
@@ -243,9 +244,9 @@ module Fastly
       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 &&
           message_type == o.message_type &&
           url == o.url &&
           created_at == o.created_at &&
@@ -264,7 +265,7 @@ module Fastly
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, placement, format_version, response_condition, format, message_type, url, created_at, deleted_at, updated_at, service_id, version].hash
+      [name, placement, response_condition, format, format_version, message_type, url, created_at, deleted_at, updated_at, service_id, version].hash
     end
 
     # Builds the object from hash

data/lib/fastly/models/{logging_syslog_all_of.rb → logging_syslog_additional.rb}

@@ -12,7 +12,7 @@ require 'date'
 require 'time'
 
 module Fastly
-  class LoggingSyslogAllOf
+  class LoggingSyslogAdditional
     attr_accessor :message_type
 
     # The hostname used for the syslog endpoint.
@@ -65,13 +65,13 @@ module Fastly
     # @param [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 `Fastly::LoggingSyslogAllOf` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Fastly::LoggingSyslogAdditional` 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 `Fastly::LoggingSyslogAllOf`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Fastly::LoggingSyslogAdditional`. 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
       }

data/lib/fastly/models/logging_syslog_response.rb

@@ -19,15 +19,15 @@ module Fastly
     # 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
+
     # A secure certificate to authenticate a server with. Must be in PEM format.
     attr_accessor :tls_ca_cert
 
@@ -99,9 +99,9 @@ module Fastly
       {
         :'name' => :'name',
         :'placement' => :'placement',
-        :'format_version' => :'format_version',
         :'response_condition' => :'response_condition',
         :'format' => :'format',
+        :'format_version' => :'format_version',
         :'tls_ca_cert' => :'tls_ca_cert',
         :'tls_client_cert' => :'tls_client_cert',
         :'tls_client_key' => :'tls_client_key',
@@ -131,9 +131,9 @@ module Fastly
       {
         :'name' => :'String',
         :'placement' => :'String',
-        :'format_version' => :'Integer',
         :'response_condition' => :'String',
         :'format' => :'String',
+        :'format_version' => :'String',
         :'tls_ca_cert' => :'String',
         :'tls_client_cert' => :'String',
         :'tls_client_key' => :'String',
@@ -149,7 +149,7 @@ module Fastly
         :'deleted_at' => :'Time',
         :'updated_at' => :'Time',
         :'service_id' => :'String',
-        :'version' => :'Integer'
+        :'version' => :'String'
       }
     end
 
@@ -173,8 +173,11 @@ module Fastly
     # List of class defined in allOf (OpenAPI v3)
     def self.fastly_all_of
       [
-      :'LoggingSyslog',
-      :'ServiceIdAndVersion',
+      :'LoggingAddressAndPort',
+      :'LoggingCommonResponse',
+      :'LoggingSyslogAdditional',
+      :'LoggingTlsCommon',
+      :'ServiceIdAndVersionString',
       :'Timestamps'
       ]
     end
@@ -202,12 +205,6 @@ module Fastly
         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
@@ -218,6 +215,12 @@ module Fastly
         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?(:'tls_ca_cert')
         self.tls_ca_cert = attributes[:'tls_ca_cert']
       else
@@ -311,7 +314,7 @@ module Fastly
     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
@@ -329,7 +332,7 @@ module Fastly
     # 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
@@ -343,9 +346,9 @@ module Fastly
       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 &&
           tls_ca_cert == o.tls_ca_cert &&
           tls_client_cert == o.tls_client_cert &&
           tls_client_key == o.tls_client_key &&
@@ -373,7 +376,7 @@ module Fastly
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, placement, format_version, response_condition, format, tls_ca_cert, tls_client_cert, tls_client_key, tls_hostname, address, port, message_type, hostname, ipv4, token, use_tls, created_at, deleted_at, updated_at, service_id, version].hash
+      [name, placement, response_condition, format, format_version, tls_ca_cert, tls_client_cert, tls_client_key, tls_hostname, address, port, message_type, hostname, ipv4, token, use_tls, created_at, deleted_at, updated_at, service_id, version].hash
     end
 
     # Builds the object from hash

data/lib/fastly/models/{pool_all_of.rb → pool_additional.rb}

@@ -12,7 +12,7 @@ require 'date'
 require 'time'
 
 module Fastly
-  class PoolAllOf
+  class PoolAdditional
     # Name for the Pool.
     attr_accessor :name
 
@@ -22,27 +22,12 @@ module Fastly
     # Condition which, if met, will select this configuration during a request. Optional.
     attr_accessor :request_condition
 
-    # Maximum number of connections. Optional.
-    attr_accessor :max_conn_default
-
-    # How long to wait for a timeout in milliseconds. Optional.
-    attr_accessor :connect_timeout
-
-    # How long to wait for the first byte in milliseconds. Optional.
-    attr_accessor :first_byte_timeout
-
-    # Percentage of capacity (`0-100`) that needs to be operationally available for a pool to be considered up.
-    attr_accessor :quorum
-
     # List of OpenSSL ciphers (see the [openssl.org manpages](https://www.openssl.org/docs/man1.1.1/man1/ciphers.html) for details). Optional.
     attr_accessor :tls_ciphers
 
     # SNI hostname. Optional.
     attr_accessor :tls_sni_hostname
 
-    # Be strict on checking TLS certs. Optional.
-    attr_accessor :tls_check_cert
-
     # Minimum allowed TLS version on connections to this server. Optional.
     attr_accessor :min_tls_version
 
@@ -89,13 +74,8 @@ module Fastly
         :'name' => :'name',
         :'shield' => :'shield',
         :'request_condition' => :'request_condition',
-        :'max_conn_default' => :'max_conn_default',
-        :'connect_timeout' => :'connect_timeout',
-        :'first_byte_timeout' => :'first_byte_timeout',
-        :'quorum' => :'quorum',
         :'tls_ciphers' => :'tls_ciphers',
         :'tls_sni_hostname' => :'tls_sni_hostname',
-        :'tls_check_cert' => :'tls_check_cert',
         :'min_tls_version' => :'min_tls_version',
         :'max_tls_version' => :'max_tls_version',
         :'healthcheck' => :'healthcheck',
@@ -116,13 +96,8 @@ module Fastly
         :'name' => :'String',
         :'shield' => :'String',
         :'request_condition' => :'String',
-        :'max_conn_default' => :'Integer',
-        :'connect_timeout' => :'Integer',
-        :'first_byte_timeout' => :'Integer',
-        :'quorum' => :'Integer',
         :'tls_ciphers' => :'String',
         :'tls_sni_hostname' => :'String',
-        :'tls_check_cert' => :'Integer',
         :'min_tls_version' => :'Integer',
         :'max_tls_version' => :'Integer',
         :'healthcheck' => :'String',
@@ -139,7 +114,6 @@ module Fastly
         :'request_condition',
         :'tls_ciphers',
         :'tls_sni_hostname',
-        :'tls_check_cert',
         :'min_tls_version',
         :'max_tls_version',
         :'healthcheck',
@@ -152,13 +126,13 @@ module Fastly
     # @param [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 `Fastly::PoolAllOf` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Fastly::PoolAdditional` 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 `Fastly::PoolAllOf`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Fastly::PoolAdditional`. 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
       }
@@ -177,26 +151,6 @@ module Fastly
         self.request_condition = attributes[:'request_condition']
       end
 
-      if attributes.key?(:'max_conn_default')
-        self.max_conn_default = attributes[:'max_conn_default']
-      else
-        self.max_conn_default = 200
-      end
-
-      if attributes.key?(:'connect_timeout')
-        self.connect_timeout = attributes[:'connect_timeout']
-      end
-
-      if attributes.key?(:'first_byte_timeout')
-        self.first_byte_timeout = attributes[:'first_byte_timeout']
-      end
-
-      if attributes.key?(:'quorum')
-        self.quorum = attributes[:'quorum']
-      else
-        self.quorum = 75
-      end
-
       if attributes.key?(:'tls_ciphers')
         self.tls_ciphers = attributes[:'tls_ciphers']
       end
@@ -205,10 +159,6 @@ module Fastly
         self.tls_sni_hostname = attributes[:'tls_sni_hostname']
       end
 
-      if attributes.key?(:'tls_check_cert')
-        self.tls_check_cert = attributes[:'tls_check_cert']
-      end
-
       if attributes.key?(:'min_tls_version')
         self.min_tls_version = attributes[:'min_tls_version']
       end
@@ -240,41 +190,17 @@ module Fastly
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@quorum.nil? && @quorum > 100
-        invalid_properties.push('invalid value for "quorum", must be smaller than or equal to 100.')
-      end
-
-      if !@quorum.nil? && @quorum < 0
-        invalid_properties.push('invalid value for "quorum", must be greater than or equal to 0.')
-      end
-
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if !@quorum.nil? && @quorum > 100
-      return false if !@quorum.nil? && @quorum < 0
       type_validator = EnumAttributeValidator.new('String', ["random", "hash", "client"])
       return false unless type_validator.valid?(@type)
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] quorum Value to be assigned
-    def quorum=(quorum)
-      if !quorum.nil? && quorum > 100
-        fail ArgumentError, 'invalid value for "quorum", must be smaller than or equal to 100.'
-      end
-
-      if !quorum.nil? && quorum < 0
-        fail ArgumentError, 'invalid value for "quorum", must be greater than or equal to 0.'
-      end
-
-      @quorum = quorum
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] type Object to be assigned
     def type=(type)
@@ -293,13 +219,8 @@ module Fastly
           name == o.name &&
           shield == o.shield &&
           request_condition == o.request_condition &&
-          max_conn_default == o.max_conn_default &&
-          connect_timeout == o.connect_timeout &&
-          first_byte_timeout == o.first_byte_timeout &&
-          quorum == o.quorum &&
           tls_ciphers == o.tls_ciphers &&
           tls_sni_hostname == o.tls_sni_hostname &&
-          tls_check_cert == o.tls_check_cert &&
           min_tls_version == o.min_tls_version &&
           max_tls_version == o.max_tls_version &&
           healthcheck == o.healthcheck &&
@@ -317,7 +238,7 @@ module Fastly
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, shield, request_condition, max_conn_default, connect_timeout, first_byte_timeout, quorum, tls_ciphers, tls_sni_hostname, tls_check_cert, min_tls_version, max_tls_version, healthcheck, comment, type, override_host].hash
+      [name, shield, request_condition, tls_ciphers, tls_sni_hostname, min_tls_version, max_tls_version, healthcheck, comment, type, override_host].hash
     end
 
     # Builds the object from hash