oci 2.0.4 → 2.0.5

data/lib/oci/identity/models/create_user_details.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -18,6 +18,18 @@ module OCI
     # @return [String]
     attr_accessor :description
 
+    # Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only.
+    # Example: `{\"bar-key\": \"value\"}`
+    # 
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # Usage of predefined tag keys. These predefined keys are scoped to namespaces.
+    # Example: `{\"foo-namespace\": {\"bar-key\": \"foo-value\"}}`
+    # 
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
@@ -39,6 +51,14 @@ module OCI
         self.description = attributes[:'description']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
     end
 
     # Checks equality by comparing each attribute.
@@ -48,7 +68,9 @@ module OCI
       self.class == other_object.class &&
           compartment_id == other_object.compartment_id &&
           name == other_object.name &&
-          description == other_object.description
+          description == other_object.description &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags
     end
 
     # @see the `==` method
@@ -60,7 +82,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [compartment_id, name, description].hash
+      [compartment_id, name, description, freeform_tags, defined_tags].hash
     end
 
     # Builds the object from hash
@@ -73,10 +95,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -94,7 +116,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
@@ -128,7 +150,9 @@ module OCI
       { 
         :'compartment_id' => :'compartmentId',
         :'name' => :'name',
-        :'description' => :'description'
+        :'description' => :'description',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags'
       }
     end
 
@@ -137,7 +161,9 @@ module OCI
       { 
         :'compartment_id' => :'String',
         :'name' => :'String',
-        :'description' => :'String'
+        :'description' => :'String',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>'
       }
     end
   end

data/lib/oci/identity/models/customer_secret_key.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -144,10 +144,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -165,7 +165,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end

data/lib/oci/identity/models/customer_secret_key_summary.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -134,10 +134,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -155,7 +155,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end

data/lib/oci/identity/models/group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -47,6 +47,19 @@ module OCI
     # @return [Integer]
     attr_accessor :inactive_status
 
+    # Simple key-value pair that is applied without any predefined name, type or scope. Exists solely for
+    # compatibility with other cloud provider tagging schemes.
+    # Example: `{\"bar-key\": \"value\"}`
+    # 
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # Usage of predefined tag keys. These predefined keys are scoped to namespaces.
+    # Example: `{\"foo-namespace\": {\"bar-key\": \"foo-value\"}}`
+    # 
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
@@ -84,6 +97,14 @@ module OCI
         self.inactive_status = attributes[:'inactiveStatus']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -107,7 +128,9 @@ module OCI
           description == other_object.description &&
           time_created == other_object.time_created &&
           lifecycle_state == other_object.lifecycle_state &&
-          inactive_status == other_object.inactive_status
+          inactive_status == other_object.inactive_status &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags
     end
 
     # @see the `==` method
@@ -119,7 +142,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, compartment_id, name, description, time_created, lifecycle_state, inactive_status].hash
+      [id, compartment_id, name, description, time_created, lifecycle_state, inactive_status, freeform_tags, defined_tags].hash
     end
 
     # Builds the object from hash
@@ -132,10 +155,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -153,7 +176,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
@@ -191,7 +214,9 @@ module OCI
         :'description' => :'description',
         :'time_created' => :'timeCreated',
         :'lifecycle_state' => :'lifecycleState',
-        :'inactive_status' => :'inactiveStatus'
+        :'inactive_status' => :'inactiveStatus',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags'
       }
     end
 
@@ -204,7 +229,9 @@ module OCI
         :'description' => :'String',
         :'time_created' => :'DateTime',
         :'lifecycle_state' => :'String',
-        :'inactive_status' => :'Integer'
+        :'inactive_status' => :'Integer',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>'
       }
     end
   end

data/lib/oci/identity/models/identity_provider.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -72,6 +72,18 @@ module OCI
     # @return [String]
     attr_accessor :protocol
 
+    # Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only.
+    # Example: `{\"bar-key\": \"value\"}`
+    # 
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # Usage of predefined tag keys. These predefined keys are scoped to namespaces.
+    # Example: `{\"foo-namespace\": {\"bar-key\": \"foo-value\"}}`
+    # 
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
 
     # Given the hash representation of a subtype of this class,
     # use the info in the hash to return the class of the subtype.
@@ -128,6 +140,14 @@ module OCI
         self.protocol = attributes[:'protocol']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -153,7 +173,9 @@ module OCI
           time_created == other_object.time_created &&
           lifecycle_state == other_object.lifecycle_state &&
           inactive_status == other_object.inactive_status &&
-          protocol == other_object.protocol
+          protocol == other_object.protocol &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags
     end
 
     # @see the `==` method
@@ -165,7 +187,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, compartment_id, name, description, product_type, time_created, lifecycle_state, inactive_status, protocol].hash
+      [id, compartment_id, name, description, product_type, time_created, lifecycle_state, inactive_status, protocol, freeform_tags, defined_tags].hash
     end
 
     # Builds the object from hash
@@ -178,10 +200,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -199,7 +221,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
@@ -239,7 +261,9 @@ module OCI
         :'time_created' => :'timeCreated',
         :'lifecycle_state' => :'lifecycleState',
         :'inactive_status' => :'inactiveStatus',
-        :'protocol' => :'protocol'
+        :'protocol' => :'protocol',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags'
       }
     end
 
@@ -254,7 +278,9 @@ module OCI
         :'time_created' => :'DateTime',
         :'lifecycle_state' => :'String',
         :'inactive_status' => :'Integer',
-        :'protocol' => :'String'
+        :'protocol' => :'String',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>'
       }
     end
   end

data/lib/oci/identity/models/idp_group_mapping.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -139,10 +139,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -160,7 +160,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end

data/lib/oci/identity/models/policy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -59,6 +59,18 @@ module OCI
     # @return [DateTime]
     attr_accessor :version_date
 
+    # Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only.
+    # Example: `{\"bar-key\": \"value\"}`
+    # 
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # Usage of predefined tag keys. These predefined keys are scoped to namespaces.
+    # Example: `{\"foo-namespace\": {\"bar-key\": \"foo-value\"}}`
+    # 
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
@@ -104,6 +116,14 @@ module OCI
         self.version_date = attributes[:'versionDate']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -129,7 +149,9 @@ module OCI
           time_created == other_object.time_created &&
           lifecycle_state == other_object.lifecycle_state &&
           inactive_status == other_object.inactive_status &&
-          version_date == other_object.version_date
+          version_date == other_object.version_date &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags
     end
 
     # @see the `==` method
@@ -141,7 +163,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, compartment_id, name, statements, description, time_created, lifecycle_state, inactive_status, version_date].hash
+      [id, compartment_id, name, statements, description, time_created, lifecycle_state, inactive_status, version_date, freeform_tags, defined_tags].hash
     end
 
     # Builds the object from hash
@@ -154,10 +176,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -175,7 +197,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
@@ -215,7 +237,9 @@ module OCI
         :'time_created' => :'timeCreated',
         :'lifecycle_state' => :'lifecycleState',
         :'inactive_status' => :'inactiveStatus',
-        :'version_date' => :'versionDate'
+        :'version_date' => :'versionDate',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags'
       }
     end
 
@@ -230,7 +254,9 @@ module OCI
         :'time_created' => :'DateTime',
         :'lifecycle_state' => :'String',
         :'inactive_status' => :'Integer',
-        :'version_date' => :'DateTime'
+        :'version_date' => :'DateTime',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>'
       }
     end
   end