oci 2.5.5 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af639ff621d286e8511ecd0b878787d84116158380f1c2fe6024d6d930a91d8f
-  data.tar.gz: 14dc82ce98df05617cdfe2fc7c682a1a37f43043f4cce66d097ff061edd4dda9
+  metadata.gz: 0e0a6561b3c4f995f4f142e0d82b5af4ebe09b462c940c9ea01620747f44cb98
+  data.tar.gz: 3ffb00221f305c5b4567e95499b668029047a4383c9f4ddb0d110259c41b68e5
 SHA512:
-  metadata.gz: ba119a6299c6c8e0067098fb2e5d44778be8b1fa7183d704ae7f8d0c9002e4db0a43af9ae2d54032d0dc897f056b45b0bb287c20c976ae002c18956d46bf1381
-  data.tar.gz: 471a6001fafca5afc4aaeeda500af37314b607b29149f707e55fff5f2b74b38e0ac3396ff763461663825ecc2540177f851809993db6f54d3d4e995e6aea852b
+  metadata.gz: f01745efe5a63d40b0344d52db9dfe0025dc7231bc37ae9bd87ee85405b2ec3fae6199589afc6fe3837b91e1195b1eca74fc656ea7169da81722bdb8749fd7f6
+  data.tar.gz: f95613a6d102cb8fcd2fbd1fc6d4525df50084121c7d53198168adfaa07520375760fabab4737779dc8f4d7adfb25759fabb9c02629992babe02822d2333b2dc

data/README.md

@@ -1,5 +1,5 @@
 # Oracle Cloud Infrastructure Ruby SDK
-**Version 2.5.5**
+**Version 2.5.6**
 
 This topic describes how to install, configure, and use the Oracle Cloud Infrastructure Ruby SDK.
 

data/lib/oci/api_client.rb

@@ -361,7 +361,7 @@ module OCI
             response.body
           end
         end
-      rescue StandardError => err
+      rescue StandardError => e
         # Unfortunately, catching StandardError is the surest way to capture all the errors originating from Net::HTTP
         code_from_response = if !response_ref.nil?
                                response_ref.code.to_i
@@ -370,7 +370,7 @@ module OCI
                              end
 
         raise Errors::NetworkError.new(
-          err.message,
+          e.message,
           code_from_response,
           request_made: request,
           response_received: response_ref

data/lib/oci/auth/federation_client.rb

@@ -134,8 +134,8 @@ module OCI
           raise "No token received in the response from auth service: #{raw_body}" unless parsed_response.key?('token')
 
           @security_token = OCI::Auth::SecurityTokenContainer.new(parsed_response['token'])
-        rescue JSON::ParserError => ex
-          raise "Unable to parse response from Auth Service [#{ex}]: #{raw_body}"
+        rescue JSON::ParserError => e
+          raise "Unable to parse response from Auth Service [#{e}]: #{raw_body}"
         end
 
         @security_token.security_token

data/lib/oci/email/email_client.rb

@@ -225,6 +225,10 @@ module OCI
     # @param [Hash] opts the optional parameters
     # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
     #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [String] :if_match Used for optimistic concurrency control. In the update or delete call for a resource, set the `if-match`
+    #   parameter to the value of the etag from a previous get, create, or update response for that resource.  The resource
+    #   will be updated or deleted only if the etag you provide matches the resource's current etag value.
+    #
     # @option opts [String] :opc_request_id The request ID for tracing from the system
     # @return [Response] A Response object with data of type nil
     def delete_sender(sender_id, opts = {})
@@ -244,6 +248,7 @@ module OCI
       header_params = {}
       header_params[:accept] = 'application/json'
       header_params[:'content-type'] = 'application/json'
+      header_params[:'if-match'] = opts[:if_match] if opts[:if_match]
       header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
       # rubocop:enable Style/NegatedIf
 
@@ -640,6 +645,10 @@ module OCI
     # @param [Hash] opts the optional parameters
     # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
     #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [String] :if_match Used for optimistic concurrency control. In the update or delete call for a resource, set the `if-match`
+    #   parameter to the value of the etag from a previous get, create, or update response for that resource.  The resource
+    #   will be updated or deleted only if the etag you provide matches the resource's current etag value.
+    #
     # @option opts [String] :opc_request_id The request ID for tracing from the system
     # @return [Response] A Response object with data of type {OCI::Email::Models::Sender Sender}
     def update_sender(sender_id, update_sender_details, opts = {})
@@ -660,6 +669,7 @@ module OCI
       header_params = {}
       header_params[:accept] = 'application/json'
       header_params[:'content-type'] = 'application/json'
+      header_params[:'if-match'] = opts[:if_match] if opts[:if_match]
       header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
       # rubocop:enable Style/NegatedIf
 

data/lib/oci/email/models/sender_summary.rb

@@ -15,6 +15,10 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
+    # The OCID for the compartment.
+    # @return [String]
+    attr_accessor :compartment_id
+
     # The email address of the sender.
     # @return [String]
     attr_accessor :email_address
@@ -51,6 +55,7 @@ module OCI
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
+        'compartment_id': :'compartmentId',
         'email_address': :'emailAddress',
         'id': :'id',
         'lifecycle_state': :'lifecycleState',
@@ -65,6 +70,7 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
+        'compartment_id': :'String',
         'email_address': :'String',
         'id': :'String',
         'lifecycle_state': :'String',
@@ -81,6 +87,7 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
     # @option attributes [String] :email_address The value to assign to the {#email_address} property
     # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
@@ -93,6 +100,12 @@ module OCI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
+
+      raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
+
+      self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
+
       self.email_address = attributes[:'emailAddress'] if attributes[:'emailAddress']
 
       raise 'You cannot provide both :emailAddress and :email_address' if attributes.key?(:'emailAddress') && attributes.key?(:'email_address')
@@ -152,6 +165,7 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
+        compartment_id == other.compartment_id &&
         email_address == other.email_address &&
         id == other.id &&
         lifecycle_state == other.lifecycle_state &&
@@ -173,7 +187,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [email_address, id, lifecycle_state, time_created, freeform_tags, defined_tags].hash
+      [compartment_id, email_address, id, lifecycle_state, time_created, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/email/models/suppression_summary.rb

@@ -17,6 +17,10 @@ module OCI
       REASON_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
+    # The OCID for the compartment.
+    # @return [String]
+    attr_accessor :compartment_id
+
     # The email address of the suppression.
     # @return [String]
     attr_accessor :email_address
@@ -40,6 +44,7 @@ module OCI
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
+        'compartment_id': :'compartmentId',
         'email_address': :'emailAddress',
         'id': :'id',
         'reason': :'reason',
@@ -52,6 +57,7 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
+        'compartment_id': :'String',
         'email_address': :'String',
         'id': :'String',
         'reason': :'String',
@@ -66,6 +72,7 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
     # @option attributes [String] :email_address The value to assign to the {#email_address} property
     # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :reason The value to assign to the {#reason} property
@@ -76,6 +83,12 @@ module OCI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
+
+      raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
+
+      self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
+
       self.email_address = attributes[:'emailAddress'] if attributes[:'emailAddress']
 
       raise 'You cannot provide both :emailAddress and :email_address' if attributes.key?(:'emailAddress') && attributes.key?(:'email_address')
@@ -119,6 +132,7 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
+        compartment_id == other.compartment_id &&
         email_address == other.email_address &&
         id == other.id &&
         reason == other.reason &&
@@ -138,7 +152,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [email_address, id, reason, time_created].hash
+      [compartment_id, email_address, id, reason, time_created].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/object_storage/transfer/multipart/multipart_object_assembler.rb

@@ -265,9 +265,9 @@ module OCI
                   upload_stdin(stdin_io_wrapper) if stdin?(@manifest[:object_io_or_file_path])
 
                   nil
-                rescue => error
+                rescue => e
                   pending_parts.clear! # Stop any futher processing on error
-                  error
+                  e
                 end
               end
 

data/lib/oci/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 
 module OCI
-  VERSION = '2.5.5'.freeze
+  VERSION = '2.5.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oci
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6
 platform: ruby
 authors:
 - Oracle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -136,22 +136,22 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.55'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.67.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.55'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.67.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement