oci 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38997be752356f7675ae441e8484117e64d915db
-  data.tar.gz: a69876808a735db9203b22f513c5001f87c1dd6d
+  metadata.gz: aa73e09ea6e6897641631122359ccf2354069ad5
+  data.tar.gz: b0b3fe78647c5982a3b354c143ad36f672d8f2e2
 SHA512:
-  metadata.gz: 2576ec59cbd7d9add589c6ec00d8c710804bfec442b89cb361cfd091a0e41e7fe1ca46ddbd882136378acc751794ef2ecec709d40f404d90584e992721f949a0
-  data.tar.gz: 45c2aa5111c5fc29fc99acfe918b5f7c8ce66a815df125e472b99801f9083b5229dcf0c7d71cd9be959b09fb240f1b18fe0637e0cc18fdb4d80e286e8d3172e5
+  metadata.gz: 13d661686c77600dbb899e7f2739ff01f7d2708a11c99d7295d7bcde69c359d695d54705e50af380eca956ed897d12a8ba6164a8b9400305bacc7bf1c66b0faf
+  data.tar.gz: 0ec6c7af0092462718ed58e4637c5c59d6509c0411619daf33fca72b2fbf3e6628388a7d5e9c16d2c058202e9d4ebd8ac228a574a10f0e14832d550e415e8d52

data/README.md

@@ -1,5 +1,5 @@
 # Oracle Cloud Infrastructure Ruby SDK
-**Version 2.0.7**
+**Version 2.0.8**
 
 This topic describes how to install, configure, and use the Oracle Cloud Infrastructure Ruby SDK.
 
@@ -14,6 +14,7 @@ The Ruby SDK supports the following services:
 * Load Balancing Service
 * Object Storage Service
 * Domain Name System Service
+* File Storage Service
 
 **Licensing:** This SDK and sample is dual licensed under the Universal Permissive License 1.0 and the Apache License.
 

data/lib/oci.rb

@@ -19,6 +19,7 @@ require 'oci/audit/audit'
 require 'oci/core/core'
 require 'oci/database/database'
 require 'oci/dns/dns'
+require 'oci/file_storage/file_storage'
 require 'oci/identity/identity'
 require 'oci/load_balancer/load_balancer'
 require 'oci/object_storage/object_storage'

data/lib/oci/api_client.rb

@@ -21,9 +21,9 @@ module OCI
     # The :multi type contains no delimiter because this means we should preserve values as
     # a collection rather than transforming them into a single string
     VALID_COLLECTION_FORMATS = {
-      multi: nil, 
+      multi: nil,
       csv: ',',
-      ssv: ' ', 
+      ssv: ' ',
       tsv: "\t",  # this is double quoted so it is interpreted as a tab rather than as a literal slash ('\') followed by a 't'
       pipes: '|'
     }
@@ -87,7 +87,7 @@ module OCI
 
       response = proc.call(nil) if !using_instance_principals?
       response = instance_principals_signer_wrapped_call { proc.call(nil) } if using_instance_principals?
-      
+
       response.api_call = proc
       response
     end
@@ -98,6 +98,16 @@ module OCI
     def object_to_http_body(model)
       # to support IO-like object as well like StringIO
       return model if model.nil? || model.is_a?(String) || (model.respond_to?(:read) && model.respond_to?(:write))
+
+      # Supports IO-wrapping objects we can convert to an IO. An example is Rails' 
+      # ActionDispatch::Http::UploadedFile, which wraps an IO (a Tempfile) but 
+      # doesn't expose all the IO operations directly (e.g. you can't write to it, it's not seekable)
+      #
+      # This should be safe to use with IO and its subclasses as well as to_io is a method on IO:
+      # http://ruby-doc.org/core-2.3.1/IO.html#method-i-to_io and returns itself if called on
+      # an IO
+      return model.to_io if (model.respond_to?(:read) || model.respond_to?(:write)) && model.respond_to?(:to_io)
+
       if model.is_a?(Array)
         local_body = model.map{|m| object_to_hash(m) }
       else
@@ -279,14 +289,14 @@ module OCI
       if query_params.empty?
         url
       else
-        # First divide our query params into ones where the param value is a simple value (e.g. a string), an array or a hash. 
-        # The params  where the value is a hash are, for example, tags we need to handle differently for inclusion in the query 
+        # First divide our query params into ones where the param value is a simple value (e.g. a string), an array or a hash.
+        # The params  where the value is a hash are, for example, tags we need to handle differently for inclusion in the query
         # string. We also need to handle array params differently in the query string since the values should appear as separate entries
         # in the query string with the same key (this corresponds to using collectionFormat=multi in Swagger)
         #
         # An example query_params is:
         #
-        #   { 
+        #   {
         #       "stuff" => "things",
         #       "anArrayType" => ["hello", "world"]
         #       "definedTags" => { "tag1" => ["val1", "val2", "val3"], "tag2" => ["val1"] },
@@ -333,7 +343,7 @@ module OCI
                                   # to_s tag_key to avoid errors around implicit conversion of symbols to strings
                                   tag_val.map { |tv| "#{k}.#{CGI.escape(tag_key.to_s)}=#{CGI.escape(tv.to_s)}" }.join('&')
                                 else
-                                  "#{k}.#{CGI.escape(tag_key.to_s)}=#{CGI.escape(tag_val.to_s)}" 
+                                  "#{k}.#{CGI.escape(tag_key.to_s)}=#{CGI.escape(tag_val.to_s)}"
                                 end
             base_query_string << '&' unless base_query_string.empty?
             base_query_string << query_string_val
@@ -412,8 +422,8 @@ module OCI
         data = {}
         form_params.each do |key, value|
           case value
-          when File, Array, nil
-            # let typhoeus handle File, Array and nil parameters
+          when File, Tempfile, Array, nil
+            # let Net::HTTP handle File, Tempfile, Array and nil parameters
             data[key] = value
           else
             data[key] = value.to_s
@@ -444,14 +454,14 @@ module OCI
 
     def instance_principals_signer_wrapped_call
       max_attempts = 2
-      
+
       max_attempts.times do |attempt|
         begin
           return yield
         rescue OCI::Errors::ServiceError => e
           raise if attempt >= (max_attempts - 1)  # .times is zero-based
           raise if e.status != 401
-          
+
           @signer.refresh_security_token
           retry
         end

data/lib/oci/audit/models/audit_event.rb

@@ -83,25 +83,25 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :tenantId The value to assign to the {#tenant_id} property
-    # @option attributes [String] :compartmentId The value to assign to the {#compartment_id} property
-    # @option attributes [String] :eventId The value to assign to the {#event_id} property
-    # @option attributes [String] :eventSource The value to assign to the {#event_source} property
-    # @option attributes [String] :eventType The value to assign to the {#event_type} property
-    # @option attributes [DateTime] :eventTime The value to assign to the {#event_time} property
-    # @option attributes [String] :principalId The value to assign to the {#principal_id} property
-    # @option attributes [String] :credentialId The value to assign to the {#credential_id} property
-    # @option attributes [String] :requestAction The value to assign to the {#request_action} property
-    # @option attributes [String] :requestId The value to assign to the {#request_id} property
-    # @option attributes [String] :requestAgent The value to assign to the {#request_agent} property
-    # @option attributes [Hash<String, Array<String>>] :requestHeaders The value to assign to the {#request_headers} property
-    # @option attributes [String] :requestOrigin The value to assign to the {#request_origin} property
-    # @option attributes [Hash<String, Array<String>>] :requestParameters The value to assign to the {#request_parameters} property
-    # @option attributes [String] :requestResource The value to assign to the {#request_resource} property
-    # @option attributes [Hash<String, Array<String>>] :responseHeaders The value to assign to the {#response_headers} property
-    # @option attributes [String] :responseStatus The value to assign to the {#response_status} property
-    # @option attributes [DateTime] :responseTime The value to assign to the {#response_time} property
-    # @option attributes [Hash<String, Object>] :responsePayload The value to assign to the {#response_payload} property
+    # @option attributes [String] :tenant_id The value to assign to the {#tenant_id} property
+    # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
+    # @option attributes [String] :event_id The value to assign to the {#event_id} property
+    # @option attributes [String] :event_source The value to assign to the {#event_source} property
+    # @option attributes [String] :event_type The value to assign to the {#event_type} property
+    # @option attributes [DateTime] :event_time The value to assign to the {#event_time} property
+    # @option attributes [String] :principal_id The value to assign to the {#principal_id} property
+    # @option attributes [String] :credential_id The value to assign to the {#credential_id} property
+    # @option attributes [String] :request_action The value to assign to the {#request_action} property
+    # @option attributes [String] :request_id The value to assign to the {#request_id} property
+    # @option attributes [String] :request_agent The value to assign to the {#request_agent} property
+    # @option attributes [Hash<String, Array<String>>] :request_headers The value to assign to the {#request_headers} property
+    # @option attributes [String] :request_origin The value to assign to the {#request_origin} property
+    # @option attributes [Hash<String, Array<String>>] :request_parameters The value to assign to the {#request_parameters} property
+    # @option attributes [String] :request_resource The value to assign to the {#request_resource} property
+    # @option attributes [Hash<String, Array<String>>] :response_headers The value to assign to the {#response_headers} property
+    # @option attributes [String] :response_status The value to assign to the {#response_status} property
+    # @option attributes [DateTime] :response_time The value to assign to the {#response_time} property
+    # @option attributes [Hash<String, Object>] :response_payload The value to assign to the {#response_payload} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -112,78 +112,192 @@ module OCI
         self.tenant_id = attributes[:'tenantId']
       end
 
+      raise 'You cannot provide both :tenantId and :tenant_id' if attributes.key?(:'tenantId') && attributes.key?(:'tenant_id')
+
+      if attributes[:'tenant_id']
+        self.tenant_id = attributes[:'tenant_id']
+      end
+
       if attributes[:'compartmentId']
         self.compartment_id = attributes[:'compartmentId']
       end
 
+      raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
+
+      if attributes[:'compartment_id']
+        self.compartment_id = attributes[:'compartment_id']
+      end
+
       if attributes[:'eventId']
         self.event_id = attributes[:'eventId']
       end
 
+      raise 'You cannot provide both :eventId and :event_id' if attributes.key?(:'eventId') && attributes.key?(:'event_id')
+
+      if attributes[:'event_id']
+        self.event_id = attributes[:'event_id']
+      end
+
       if attributes[:'eventSource']
         self.event_source = attributes[:'eventSource']
       end
 
+      raise 'You cannot provide both :eventSource and :event_source' if attributes.key?(:'eventSource') && attributes.key?(:'event_source')
+
+      if attributes[:'event_source']
+        self.event_source = attributes[:'event_source']
+      end
+
       if attributes[:'eventType']
         self.event_type = attributes[:'eventType']
       end
 
+      raise 'You cannot provide both :eventType and :event_type' if attributes.key?(:'eventType') && attributes.key?(:'event_type')
+
+      if attributes[:'event_type']
+        self.event_type = attributes[:'event_type']
+      end
+
       if attributes[:'eventTime']
         self.event_time = attributes[:'eventTime']
       end
 
+      raise 'You cannot provide both :eventTime and :event_time' if attributes.key?(:'eventTime') && attributes.key?(:'event_time')
+
+      if attributes[:'event_time']
+        self.event_time = attributes[:'event_time']
+      end
+
       if attributes[:'principalId']
         self.principal_id = attributes[:'principalId']
       end
 
+      raise 'You cannot provide both :principalId and :principal_id' if attributes.key?(:'principalId') && attributes.key?(:'principal_id')
+
+      if attributes[:'principal_id']
+        self.principal_id = attributes[:'principal_id']
+      end
+
       if attributes[:'credentialId']
         self.credential_id = attributes[:'credentialId']
       end
 
+      raise 'You cannot provide both :credentialId and :credential_id' if attributes.key?(:'credentialId') && attributes.key?(:'credential_id')
+
+      if attributes[:'credential_id']
+        self.credential_id = attributes[:'credential_id']
+      end
+
       if attributes[:'requestAction']
         self.request_action = attributes[:'requestAction']
       end
 
+      raise 'You cannot provide both :requestAction and :request_action' if attributes.key?(:'requestAction') && attributes.key?(:'request_action')
+
+      if attributes[:'request_action']
+        self.request_action = attributes[:'request_action']
+      end
+
       if attributes[:'requestId']
         self.request_id = attributes[:'requestId']
       end
 
+      raise 'You cannot provide both :requestId and :request_id' if attributes.key?(:'requestId') && attributes.key?(:'request_id')
+
+      if attributes[:'request_id']
+        self.request_id = attributes[:'request_id']
+      end
+
       if attributes[:'requestAgent']
         self.request_agent = attributes[:'requestAgent']
       end
 
+      raise 'You cannot provide both :requestAgent and :request_agent' if attributes.key?(:'requestAgent') && attributes.key?(:'request_agent')
+
+      if attributes[:'request_agent']
+        self.request_agent = attributes[:'request_agent']
+      end
+
       if attributes[:'requestHeaders']
         self.request_headers = attributes[:'requestHeaders']
       end
 
+      raise 'You cannot provide both :requestHeaders and :request_headers' if attributes.key?(:'requestHeaders') && attributes.key?(:'request_headers')
+
+      if attributes[:'request_headers']
+        self.request_headers = attributes[:'request_headers']
+      end
+
       if attributes[:'requestOrigin']
         self.request_origin = attributes[:'requestOrigin']
       end
 
+      raise 'You cannot provide both :requestOrigin and :request_origin' if attributes.key?(:'requestOrigin') && attributes.key?(:'request_origin')
+
+      if attributes[:'request_origin']
+        self.request_origin = attributes[:'request_origin']
+      end
+
       if attributes[:'requestParameters']
         self.request_parameters = attributes[:'requestParameters']
       end
 
+      raise 'You cannot provide both :requestParameters and :request_parameters' if attributes.key?(:'requestParameters') && attributes.key?(:'request_parameters')
+
+      if attributes[:'request_parameters']
+        self.request_parameters = attributes[:'request_parameters']
+      end
+
       if attributes[:'requestResource']
         self.request_resource = attributes[:'requestResource']
       end
 
+      raise 'You cannot provide both :requestResource and :request_resource' if attributes.key?(:'requestResource') && attributes.key?(:'request_resource')
+
+      if attributes[:'request_resource']
+        self.request_resource = attributes[:'request_resource']
+      end
+
       if attributes[:'responseHeaders']
         self.response_headers = attributes[:'responseHeaders']
       end
 
+      raise 'You cannot provide both :responseHeaders and :response_headers' if attributes.key?(:'responseHeaders') && attributes.key?(:'response_headers')
+
+      if attributes[:'response_headers']
+        self.response_headers = attributes[:'response_headers']
+      end
+
       if attributes[:'responseStatus']
         self.response_status = attributes[:'responseStatus']
       end
 
+      raise 'You cannot provide both :responseStatus and :response_status' if attributes.key?(:'responseStatus') && attributes.key?(:'response_status')
+
+      if attributes[:'response_status']
+        self.response_status = attributes[:'response_status']
+      end
+
       if attributes[:'responseTime']
         self.response_time = attributes[:'responseTime']
       end
 
+      raise 'You cannot provide both :responseTime and :response_time' if attributes.key?(:'responseTime') && attributes.key?(:'response_time')
+
+      if attributes[:'response_time']
+        self.response_time = attributes[:'response_time']
+      end
+
       if attributes[:'responsePayload']
         self.response_payload = attributes[:'responsePayload']
       end
 
+      raise 'You cannot provide both :responsePayload and :response_payload' if attributes.key?(:'responsePayload') && attributes.key?(:'response_payload')
+
+      if attributes[:'response_payload']
+        self.response_payload = attributes[:'response_payload']
+      end
+
     end
 
     # Checks equality by comparing each attribute.

data/lib/oci/audit/models/configuration.rb

@@ -11,7 +11,7 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Integer] :retentionPeriodDays The value to assign to the {#retention_period_days} property
+    # @option attributes [Integer] :retention_period_days The value to assign to the {#retention_period_days} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -22,6 +22,12 @@ module OCI
         self.retention_period_days = attributes[:'retentionPeriodDays']
       end
 
+      raise 'You cannot provide both :retentionPeriodDays and :retention_period_days' if attributes.key?(:'retentionPeriodDays') && attributes.key?(:'retention_period_days')
+
+      if attributes[:'retention_period_days']
+        self.retention_period_days = attributes[:'retention_period_days']
+      end
+
     end
 
     # Checks equality by comparing each attribute.

data/lib/oci/audit/models/update_configuration_details.rb

@@ -11,7 +11,7 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Integer] :retentionPeriodDays The value to assign to the {#retention_period_days} property
+    # @option attributes [Integer] :retention_period_days The value to assign to the {#retention_period_days} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -22,6 +22,12 @@ module OCI
         self.retention_period_days = attributes[:'retentionPeriodDays']
       end
 
+      raise 'You cannot provide both :retentionPeriodDays and :retention_period_days' if attributes.key?(:'retentionPeriodDays') && attributes.key?(:'retention_period_days')
+
+      if attributes[:'retention_period_days']
+        self.retention_period_days = attributes[:'retention_period_days']
+      end
+
     end
 
     # Checks equality by comparing each attribute.

data/lib/oci/base_signer.rb

@@ -1,7 +1,6 @@
 # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'base64'
-require 'digest'
 require 'openssl'
 require 'securerandom'
 require 'time'
@@ -95,7 +94,7 @@ module OCI
       # For object storage service's put method, we don't need to set content length and x-content sha256
       if method != :put || @signing_strategy != OBJECT_STORAGE
         headers['content-length'] ||= body.length.to_s
-        headers['x-content-sha256'] ||= Digest::SHA256.base64digest(body)
+        headers['x-content-sha256'] ||= OpenSSL::Digest::SHA256.new.update(body).base64digest
       else
         headers['Content-Length'] ||= if body.respond_to?(:read) && body.respond_to?(:write)
                                         body.respond_to?('size') ? body.size : body.stat.size

data/lib/oci/core/models/attach_boot_volume_details.rb

@@ -20,9 +20,9 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :bootVolumeId The value to assign to the {#boot_volume_id} property
-    # @option attributes [String] :displayName The value to assign to the {#display_name} property
-    # @option attributes [String] :instanceId The value to assign to the {#instance_id} property
+    # @option attributes [String] :boot_volume_id The value to assign to the {#boot_volume_id} property
+    # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [String] :instance_id The value to assign to the {#instance_id} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -33,14 +33,32 @@ module OCI
         self.boot_volume_id = attributes[:'bootVolumeId']
       end
 
+      raise 'You cannot provide both :bootVolumeId and :boot_volume_id' if attributes.key?(:'bootVolumeId') && attributes.key?(:'boot_volume_id')
+
+      if attributes[:'boot_volume_id']
+        self.boot_volume_id = attributes[:'boot_volume_id']
+      end
+
       if attributes[:'displayName']
         self.display_name = attributes[:'displayName']
       end
 
+      raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
+
+      if attributes[:'display_name']
+        self.display_name = attributes[:'display_name']
+      end
+
       if attributes[:'instanceId']
         self.instance_id = attributes[:'instanceId']
       end
 
+      raise 'You cannot provide both :instanceId and :instance_id' if attributes.key?(:'instanceId') && attributes.key?(:'instance_id')
+
+      if attributes[:'instance_id']
+        self.instance_id = attributes[:'instance_id']
+      end
+
     end
 
     # Checks equality by comparing each attribute.