oci 2.0.7 → 2.0.8

data/lib/oci/object_storage/models/update_namespace_metadata_details.rb

@@ -18,8 +18,8 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :defaultS3CompartmentId The value to assign to the {#default_s3_compartment_id} property
-    # @option attributes [String] :defaultSwiftCompartmentId The value to assign to the {#default_swift_compartment_id} property
+    # @option attributes [String] :default_s3_compartment_id The value to assign to the {#default_s3_compartment_id} property
+    # @option attributes [String] :default_swift_compartment_id The value to assign to the {#default_swift_compartment_id} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -30,10 +30,22 @@ module OCI
         self.default_s3_compartment_id = attributes[:'defaultS3CompartmentId']
       end
 
+      raise 'You cannot provide both :defaultS3CompartmentId and :default_s3_compartment_id' if attributes.key?(:'defaultS3CompartmentId') && attributes.key?(:'default_s3_compartment_id')
+
+      if attributes[:'default_s3_compartment_id']
+        self.default_s3_compartment_id = attributes[:'default_s3_compartment_id']
+      end
+
       if attributes[:'defaultSwiftCompartmentId']
         self.default_swift_compartment_id = attributes[:'defaultSwiftCompartmentId']
       end
 
+      raise 'You cannot provide both :defaultSwiftCompartmentId and :default_swift_compartment_id' if attributes.key?(:'defaultSwiftCompartmentId') && attributes.key?(:'default_swift_compartment_id')
+
+      if attributes[:'default_swift_compartment_id']
+        self.default_swift_compartment_id = attributes[:'default_swift_compartment_id']
+      end
+
     end
 
     # Checks equality by comparing each attribute.

data/lib/oci/object_storage/object_storage_client.rb

@@ -779,6 +779,11 @@ module OCI
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :limit The maximum number of items to return.
     # @option opts [String] :page The page at which to start retrieving results.
+    # @option opts [Array<String>] :fields Bucket summary in list of buckets includes the 'namespace', 'name', 'compartmentId', 'createdBy', 'timeCreated',
+    #   and 'etag' fields. This parameter can also include 'tags' (freeformTags and definedTags). The only supported value
+    #   of this parameter is 'tags' for now. Example 'tags'.
+    #   
+    #   Allowed values are: tags
     # @option opts [String] :opc_client_request_id The client request ID for tracing.
     # @return [Response] A Response object with data of type Array<OCI::ObjectStorage::Models::BucketSummary>
     def list_buckets(namespace_name, compartment_id, opts = {})
@@ -787,6 +792,16 @@ module OCI
       fail "Missing the required parameter 'namespace_name' when calling list_buckets." if namespace_name.nil?
       fail "Missing the required parameter 'compartment_id' when calling list_buckets." if compartment_id.nil?
 
+      
+      fields_allowable_values = ['tags']
+      if opts[:'fields'] && !opts[:'fields'].empty?
+        opts[:'fields'].each do |val_to_check|
+          unless fields_allowable_values.include?(val_to_check)
+            raise 'Invalid value for "fields", must be one of tags.'
+          end
+        end
+      end
+
       path = "/n/{namespaceName}/b/".sub('{namespaceName}', namespace_name.to_s)
 
       # Query Params
@@ -794,6 +809,7 @@ module OCI
       query_params[:'compartmentId'] = compartment_id
       query_params[:'limit'] = opts[:'limit'] if opts[:'limit']
       query_params[:'page'] = opts[:'page'] if opts[:'page']
+      query_params[:'fields'] = OCI::ApiClient.build_collection_params(opts[:'fields'], :csv) if opts[:'fields'] && !opts[:'fields'].empty?
 
       # Header Params
       header_params = {}
@@ -930,7 +946,6 @@ module OCI
     #   Value of this parameter should be a comma-separated, case-insensitive list of those field names.
     #   For example 'name,timeCreated,md5'.
     #   
-    #   Allowed values are: name, size, timeCreated, md5
     # @option opts [String] :opc_client_request_id The client request ID for tracing.
     # @return [Response] A Response object with data of type OCI::ObjectStorage::Models::ListObjects
     def list_objects(namespace_name, bucket_name, opts = {})
@@ -939,10 +954,6 @@ module OCI
       fail "Missing the required parameter 'namespace_name' when calling list_objects." if namespace_name.nil?
       fail "Missing the required parameter 'bucket_name' when calling list_objects." if bucket_name.nil?
 
-      if opts[:'fields'] && !['name', 'size', 'timeCreated', 'md5'].include?(opts[:'fields'])
-        fail 'Invalid value for "fields", must be one of name, size, timeCreated, md5.'
-      end
-
       path = "/n/{namespaceName}/b/{bucketName}/o".sub('{namespaceName}', namespace_name.to_s).sub('{bucketName}', bucket_name.to_s)
 
       # Query Params
@@ -1125,6 +1136,7 @@ module OCI
     end
 
     # Restore one or more objects specified by objectName parameter.
+    # By default object will be restored for 24 hours.Duration can be configured using hours parameter.
     # 
     # @param [String] namespace_name The top-level namespace used for the request.
     # @param [String] bucket_name The name of the bucket. Avoid entering confidential information.

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

@@ -1,7 +1,7 @@
 # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'base64'
-require 'digest'
+require 'openssl'
 require 'tempfile'
 
 require_relative 'internal/file_part_io_wrapper'
@@ -191,7 +191,15 @@ module OCI
           #
           # @param [String, IO] object_io_or_file_path Either a path to the file to upload, an IO-like object containing the data to upload or $stdin.
           def io_for_transfer=(object_io_or_file_path)
-            @manifest[:object_io_or_file_path] = object_io_or_file_path
+            # 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
+            @manifest[:object_io_or_file_path] = object_io_or_file_path.to_io if object_io_or_file_path.respond_to?(:to_io)
+            @manifest[:object_io_or_file_path] = object_io_or_file_path unless object_io_or_file_path.respond_to?(:to_io)
 
             return if stdin?(object_io_or_file_path)
 
@@ -379,7 +387,7 @@ module OCI
 
           def calculate_md5(file_part: nil, raw_content: nil)
             raise 'Cannot specify both a file_part and raw_content' if file_part && raw_content
-            md5 = Digest::MD5.new
+            md5 = OpenSSL::Digest::MD5.new
 
             if file_part
               file_part.rewind

data/lib/oci/signer.rb

@@ -1,13 +1,5 @@
 # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
-require 'base64'
-require 'digest'
-require 'openssl'
-require 'securerandom'
-require 'time'
-require 'uri'
-require 'cgi'
-
 require_relative 'base_signer'
 
 module OCI

data/lib/oci/version.rb

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

data/lib/oci/waiter.rb

@@ -98,6 +98,7 @@ module OCI
 
         begin
           response = @api_call.call(nil)
+          response.api_call = @api_call
         rescue OCI::Errors::ServiceError => e
           return nil if e.status_code == 404 && succeed_on_not_found
           raise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oci
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Oracle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -359,6 +359,26 @@ files:
 - "./lib/oci/dns/models/zone_summary.rb"
 - "./lib/oci/dns/util.rb"
 - "./lib/oci/errors.rb"
+- "./lib/oci/file_storage/file_storage.rb"
+- "./lib/oci/file_storage/file_storage_client.rb"
+- "./lib/oci/file_storage/models/create_export_details.rb"
+- "./lib/oci/file_storage/models/create_file_system_details.rb"
+- "./lib/oci/file_storage/models/create_mount_target_details.rb"
+- "./lib/oci/file_storage/models/create_snapshot_details.rb"
+- "./lib/oci/file_storage/models/export.rb"
+- "./lib/oci/file_storage/models/export_set.rb"
+- "./lib/oci/file_storage/models/export_set_summary.rb"
+- "./lib/oci/file_storage/models/export_summary.rb"
+- "./lib/oci/file_storage/models/file_system.rb"
+- "./lib/oci/file_storage/models/file_system_summary.rb"
+- "./lib/oci/file_storage/models/mount_target.rb"
+- "./lib/oci/file_storage/models/mount_target_summary.rb"
+- "./lib/oci/file_storage/models/snapshot.rb"
+- "./lib/oci/file_storage/models/snapshot_summary.rb"
+- "./lib/oci/file_storage/models/update_export_set_details.rb"
+- "./lib/oci/file_storage/models/update_file_system_details.rb"
+- "./lib/oci/file_storage/models/update_mount_target_details.rb"
+- "./lib/oci/file_storage/util.rb"
 - "./lib/oci/global_context.rb"
 - "./lib/oci/identity/identity.rb"
 - "./lib/oci/identity/identity_client.rb"