fastly 6.0.2 → 7.1.0

data/lib/fastly/models/logging_s3_response.rb

@@ -19,29 +19,42 @@ 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
+
     # How the message should be formatted.
     attr_accessor :message_type
 
     # A timestamp format
     attr_accessor :timestamp_format
 
+    # The codec used for compressing your logs. Valid values are `zstd`, `snappy`, and `gzip`. Specifying both `compression_codec` and `gzip_level` in the same API request will result in an error.
+    attr_accessor :compression_codec
+
     # How frequently log files are finalized so they can be available for reading (in seconds).
     attr_accessor :period
 
     # The level of gzip encoding when sending logs (default `0`, no compression). Specifying both `compression_codec` and `gzip_level` in the same API request will result in an error.
     attr_accessor :gzip_level
 
-    # The codec used for compressing your logs. Valid values are `zstd`, `snappy`, and `gzip`. Specifying both `compression_codec` and `gzip_level` in the same API request will result in an error.
-    attr_accessor :compression_codec
+    # Date and time in ISO 8601 format.
+    attr_accessor :created_at
+
+    # Date and time in ISO 8601 format.
+    attr_accessor :deleted_at
+
+    # Date and time in ISO 8601 format.
+    attr_accessor :updated_at
+
+    attr_accessor :service_id
+
+    attr_accessor :version
 
     # The access key for your S3 account. Not required if `iam_role` is provided.
     attr_accessor :access_key
@@ -76,19 +89,6 @@ module Fastly
     # Set this to `AES256` or `aws:kms` to enable S3 Server Side Encryption.
     attr_accessor :server_side_encryption
 
-    # Date and time in ISO 8601 format.
-    attr_accessor :created_at
-
-    # Date and time in ISO 8601 format.
-    attr_accessor :deleted_at
-
-    # Date and time in ISO 8601 format.
-    attr_accessor :updated_at
-
-    attr_accessor :service_id
-
-    attr_accessor :version
-
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -116,14 +116,19 @@ module Fastly
       {
         :'name' => :'name',
         :'placement' => :'placement',
-        :'format_version' => :'format_version',
         :'response_condition' => :'response_condition',
         :'format' => :'format',
+        :'format_version' => :'format_version',
         :'message_type' => :'message_type',
         :'timestamp_format' => :'timestamp_format',
+        :'compression_codec' => :'compression_codec',
         :'period' => :'period',
         :'gzip_level' => :'gzip_level',
-        :'compression_codec' => :'compression_codec',
+        :'created_at' => :'created_at',
+        :'deleted_at' => :'deleted_at',
+        :'updated_at' => :'updated_at',
+        :'service_id' => :'service_id',
+        :'version' => :'version',
         :'access_key' => :'access_key',
         :'acl' => :'acl',
         :'bucket_name' => :'bucket_name',
@@ -134,12 +139,7 @@ module Fastly
         :'redundancy' => :'redundancy',
         :'secret_key' => :'secret_key',
         :'server_side_encryption_kms_key_id' => :'server_side_encryption_kms_key_id',
-        :'server_side_encryption' => :'server_side_encryption',
-        :'created_at' => :'created_at',
-        :'deleted_at' => :'deleted_at',
-        :'updated_at' => :'updated_at',
-        :'service_id' => :'service_id',
-        :'version' => :'version'
+        :'server_side_encryption' => :'server_side_encryption'
       }
     end
 
@@ -153,14 +153,19 @@ module Fastly
       {
         :'name' => :'String',
         :'placement' => :'String',
-        :'format_version' => :'Integer',
         :'response_condition' => :'String',
         :'format' => :'String',
+        :'format_version' => :'String',
         :'message_type' => :'String',
         :'timestamp_format' => :'String',
-        :'period' => :'Integer',
-        :'gzip_level' => :'Integer',
         :'compression_codec' => :'String',
+        :'period' => :'String',
+        :'gzip_level' => :'String',
+        :'created_at' => :'Time',
+        :'deleted_at' => :'Time',
+        :'updated_at' => :'Time',
+        :'service_id' => :'String',
+        :'version' => :'String',
         :'access_key' => :'String',
         :'acl' => :'String',
         :'bucket_name' => :'String',
@@ -171,12 +176,7 @@ module Fastly
         :'redundancy' => :'String',
         :'secret_key' => :'String',
         :'server_side_encryption_kms_key_id' => :'String',
-        :'server_side_encryption' => :'String',
-        :'created_at' => :'Time',
-        :'deleted_at' => :'Time',
-        :'updated_at' => :'Time',
-        :'service_id' => :'String',
-        :'version' => :'Integer'
+        :'server_side_encryption' => :'String'
       }
     end
 
@@ -186,6 +186,9 @@ module Fastly
         :'placement',
         :'response_condition',
         :'timestamp_format',
+        :'created_at',
+        :'deleted_at',
+        :'updated_at',
         :'access_key',
         :'iam_role',
         :'path',
@@ -193,18 +196,17 @@ module Fastly
         :'redundancy',
         :'secret_key',
         :'server_side_encryption_kms_key_id',
-        :'server_side_encryption',
-        :'created_at',
-        :'deleted_at',
-        :'updated_at',
+        :'server_side_encryption'
       ])
     end
 
     # List of class defined in allOf (OpenAPI v3)
     def self.fastly_all_of
       [
-      :'LoggingS3',
-      :'ServiceIdAndVersion',
+      :'LoggingCommonResponse',
+      :'LoggingGenericCommonResponse',
+      :'LoggingS3Additional',
+      :'ServiceIdAndVersionString',
       :'Timestamps'
       ]
     end
@@ -232,12 +234,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
@@ -248,6 +244,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
@@ -258,20 +260,40 @@ module Fastly
         self.timestamp_format = attributes[:'timestamp_format']
       end
 
+      if attributes.key?(:'compression_codec')
+        self.compression_codec = attributes[:'compression_codec']
+      end
+
       if attributes.key?(:'period')
         self.period = attributes[:'period']
       else
-        self.period = 3600
+        self.period = '3600'
       end
 
       if attributes.key?(:'gzip_level')
         self.gzip_level = attributes[:'gzip_level']
       else
-        self.gzip_level = 0
+        self.gzip_level = '0'
       end
 
-      if attributes.key?(:'compression_codec')
-        self.compression_codec = attributes[:'compression_codec']
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'deleted_at')
+        self.deleted_at = attributes[:'deleted_at']
+      end
+
+      if attributes.key?(:'updated_at')
+        self.updated_at = attributes[:'updated_at']
+      end
+
+      if attributes.key?(:'service_id')
+        self.service_id = attributes[:'service_id']
+      end
+
+      if attributes.key?(:'version')
+        self.version = attributes[:'version']
       end
 
       if attributes.key?(:'access_key')
@@ -327,26 +349,6 @@ module Fastly
       else
         self.server_side_encryption = 'null'
       end
-
-      if attributes.key?(:'created_at')
-        self.created_at = attributes[:'created_at']
-      end
-
-      if attributes.key?(:'deleted_at')
-        self.deleted_at = attributes[:'deleted_at']
-      end
-
-      if attributes.key?(:'updated_at')
-        self.updated_at = attributes[:'updated_at']
-      end
-
-      if attributes.key?(:'service_id')
-        self.service_id = attributes[:'service_id']
-      end
-
-      if attributes.key?(:'version')
-        self.version = attributes[:'version']
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -361,7 +363,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)
       message_type_validator = EnumAttributeValidator.new('String', ["classic", "loggly", "logplex", "blank"])
       return false unless message_type_validator.valid?(@message_type)
@@ -383,7 +385,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
@@ -417,14 +419,19 @@ 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 &&
           timestamp_format == o.timestamp_format &&
+          compression_codec == o.compression_codec &&
           period == o.period &&
           gzip_level == o.gzip_level &&
-          compression_codec == o.compression_codec &&
+          created_at == o.created_at &&
+          deleted_at == o.deleted_at &&
+          updated_at == o.updated_at &&
+          service_id == o.service_id &&
+          version == o.version &&
           access_key == o.access_key &&
           acl == o.acl &&
           bucket_name == o.bucket_name &&
@@ -435,12 +442,7 @@ module Fastly
           redundancy == o.redundancy &&
           secret_key == o.secret_key &&
           server_side_encryption_kms_key_id == o.server_side_encryption_kms_key_id &&
-          server_side_encryption == o.server_side_encryption &&
-          created_at == o.created_at &&
-          deleted_at == o.deleted_at &&
-          updated_at == o.updated_at &&
-          service_id == o.service_id &&
-          version == o.version
+          server_side_encryption == o.server_side_encryption
     end
 
     # @see the `==` method
@@ -452,7 +454,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, timestamp_format, period, gzip_level, compression_codec, access_key, acl, bucket_name, domain, iam_role, path, public_key, redundancy, secret_key, server_side_encryption_kms_key_id, server_side_encryption, created_at, deleted_at, updated_at, service_id, version].hash
+      [name, placement, response_condition, format, format_version, message_type, timestamp_format, compression_codec, period, gzip_level, created_at, deleted_at, updated_at, service_id, version, access_key, acl, bucket_name, domain, iam_role, path, public_key, redundancy, secret_key, server_side_encryption_kms_key_id, server_side_encryption].hash
     end
 
     # Builds the object from hash

data/lib/fastly/models/{logging_scalyr_all_of.rb → logging_scalyr_additional.rb}

@@ -12,7 +12,7 @@ require 'date'
 require 'time'
 
 module Fastly
-  class LoggingScalyrAllOf
+  class LoggingScalyrAdditional
     # The region that log data will be sent to.
     attr_accessor :region
 
@@ -77,13 +77,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::LoggingScalyrAllOf` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Fastly::LoggingScalyrAdditional` 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::LoggingScalyrAllOf`. 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::LoggingScalyrAdditional`. 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_scalyr_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
+
     # The region that log data will be sent to.
     attr_accessor :region
 
@@ -77,9 +77,9 @@ module Fastly
       {
         :'name' => :'name',
         :'placement' => :'placement',
-        :'format_version' => :'format_version',
         :'response_condition' => :'response_condition',
         :'format' => :'format',
+        :'format_version' => :'format_version',
         :'region' => :'region',
         :'token' => :'token',
         :'project_id' => :'project_id',
@@ -101,9 +101,9 @@ module Fastly
       {
         :'name' => :'String',
         :'placement' => :'String',
-        :'format_version' => :'Integer',
         :'response_condition' => :'String',
         :'format' => :'String',
+        :'format_version' => :'String',
         :'region' => :'String',
         :'token' => :'String',
         :'project_id' => :'String',
@@ -111,7 +111,7 @@ module Fastly
         :'deleted_at' => :'Time',
         :'updated_at' => :'Time',
         :'service_id' => :'String',
-        :'version' => :'Integer'
+        :'version' => :'String'
       }
     end
 
@@ -129,8 +129,9 @@ module Fastly
     # List of class defined in allOf (OpenAPI v3)
     def self.fastly_all_of
       [
-      :'LoggingScalyr',
-      :'ServiceIdAndVersion',
+      :'LoggingCommonResponse',
+      :'LoggingScalyrAdditional',
+      :'ServiceIdAndVersionString',
       :'Timestamps'
       ]
     end
@@ -158,12 +159,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
@@ -174,6 +169,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?(:'region')
         self.region = attributes[:'region']
       else
@@ -223,7 +224,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)
       region_validator = EnumAttributeValidator.new('String', ["US", "EU"])
       return false unless region_validator.valid?(@region)
@@ -243,7 +244,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
@@ -267,9 +268,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 &&
           region == o.region &&
           token == o.token &&
           project_id == o.project_id &&
@@ -289,7 +290,7 @@ module Fastly
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, placement, format_version, response_condition, format, region, token, project_id, created_at, deleted_at, updated_at, service_id, version].hash
+      [name, placement, response_condition, format, format_version, region, token, project_id, created_at, deleted_at, updated_at, service_id, version].hash
     end
 
     # Builds the object from hash

data/lib/fastly/models/{logging_sftp_all_of.rb → logging_sftp_additional.rb}

@@ -12,16 +12,13 @@ require 'date'
 require 'time'
 
 module Fastly
-  class LoggingSftpAllOf
+  class LoggingSftpAdditional
     # The password for the server. If both `password` and `secret_key` are passed, `secret_key` will be used in preference.
     attr_accessor :password
 
     # The path to upload logs to.
     attr_accessor :path
 
-    # The port number.
-    attr_accessor :port
-
     # A PGP public key that Fastly will use to encrypt your log files before writing them to disk.
     attr_accessor :public_key
 
@@ -39,7 +36,6 @@ module Fastly
       {
         :'password' => :'password',
         :'path' => :'path',
-        :'port' => :'port',
         :'public_key' => :'public_key',
         :'secret_key' => :'secret_key',
         :'ssh_known_hosts' => :'ssh_known_hosts',
@@ -57,7 +53,6 @@ module Fastly
       {
         :'password' => :'String',
         :'path' => :'String',
-        :'port' => :'Integer',
         :'public_key' => :'String',
         :'secret_key' => :'String',
         :'ssh_known_hosts' => :'String',
@@ -78,13 +73,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::LoggingSftpAllOf` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Fastly::LoggingSftpAdditional` 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::LoggingSftpAllOf`. 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::LoggingSftpAdditional`. 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
       }
@@ -99,12 +94,6 @@ module Fastly
         self.path = 'null'
       end
 
-      if attributes.key?(:'port')
-        self.port = attributes[:'port']
-      else
-        self.port = 22
-      end
-
       if attributes.key?(:'public_key')
         self.public_key = attributes[:'public_key']
       else
@@ -146,7 +135,6 @@ module Fastly
       self.class == o.class &&
           password == o.password &&
           path == o.path &&
-          port == o.port &&
           public_key == o.public_key &&
           secret_key == o.secret_key &&
           ssh_known_hosts == o.ssh_known_hosts &&
@@ -162,7 +150,7 @@ module Fastly
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [password, path, port, public_key, secret_key, ssh_known_hosts, user].hash
+      [password, path, public_key, secret_key, ssh_known_hosts, user].hash
     end
 
     # Builds the object from hash