oci 2.0.4 → 2.0.5

data/lib/oci/identity/models/update_saml2_identity_provider_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'
 require_relative 'update_identity_provider_details'
@@ -46,6 +46,8 @@ module OCI
       self.class == other_object.class &&
           protocol == other_object.protocol &&
           description == other_object.description &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags &&
           metadata_url == other_object.metadata_url &&
           metadata == other_object.metadata
     end
@@ -59,7 +61,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [protocol, description, metadata_url, metadata].hash
+      [protocol, description, freeform_tags, defined_tags, metadata_url, metadata].hash
     end
 
     # Builds the object from hash
@@ -72,10 +74,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
 
@@ -93,7 +95,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
@@ -127,6 +129,8 @@ module OCI
       { 
         :'protocol' => :'protocol',
         :'description' => :'description',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags',
         :'metadata_url' => :'metadataUrl',
         :'metadata' => :'metadata'
       }
@@ -137,6 +141,8 @@ module OCI
       { 
         :'protocol' => :'String',
         :'description' => :'String',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>',
         :'metadata_url' => :'String',
         :'metadata' => :'String'
       }

data/lib/oci/identity/models/update_state_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'
 
@@ -54,10 +54,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
 
@@ -75,7 +75,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/update_swift_password_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'
 
@@ -53,10 +53,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
 
@@ -74,7 +74,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/update_tag_details.rb

@@ -0,0 +1,157 @@
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+
+require 'date'
+
+module OCI
+  class Identity::Models::UpdateTagDetails
+    # The description of the tag.
+    # @return [String]
+    attr_accessor :description
+
+    # whether or not the tag is retired
+    # @return [BOOLEAN]
+    attr_accessor :is_retired
+
+    # 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
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+
+      if attributes[:'description']
+        self.description = attributes[:'description']
+      end
+
+      if attributes[:'isRetired']
+        self.is_retired = attributes[:'isRetired']
+      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.
+    # @param [Object] other_object to be compared
+    def ==(other_object)
+      return true if self.equal?(other_object)
+      self.class == other_object.class &&
+          description == other_object.description &&
+          is_retired == other_object.is_retired &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags
+    end
+
+    # @see the `==` method
+    # @param [Object] other_object to be compared
+    def eql?(other_object)
+      self == other_object
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [description, is_retired, freeform_tags, defined_tags].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # 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_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_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
+
+      self
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value 
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      { 
+        :'description' => :'description',
+        :'is_retired' => :'isRetired',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      { 
+        :'description' => :'String',
+        :'is_retired' => :'BOOLEAN',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>'
+      }
+    end
+  end
+end

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

@@ -0,0 +1,157 @@
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+
+require 'date'
+
+module OCI
+  class Identity::Models::UpdateTagNamespaceDetails
+    # The description of the tagNamespace.
+    # @return [String]
+    attr_accessor :description
+
+    # whether or not the tagNamespace is retired
+    # @return [BOOLEAN]
+    attr_accessor :is_retired
+
+    # 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
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+
+      if attributes[:'description']
+        self.description = attributes[:'description']
+      end
+
+      if attributes[:'isRetired']
+        self.is_retired = attributes[:'isRetired']
+      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.
+    # @param [Object] other_object to be compared
+    def ==(other_object)
+      return true if self.equal?(other_object)
+      self.class == other_object.class &&
+          description == other_object.description &&
+          is_retired == other_object.is_retired &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags
+    end
+
+    # @see the `==` method
+    # @param [Object] other_object to be compared
+    def eql?(other_object)
+      self == other_object
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [description, is_retired, freeform_tags, defined_tags].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # 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_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_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
+
+      self
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value 
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      { 
+        :'description' => :'description',
+        :'is_retired' => :'isRetired',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      { 
+        :'description' => :'String',
+        :'is_retired' => :'BOOLEAN',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>'
+      }
+    end
+  end
+end

data/lib/oci/identity/models/update_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'
 
@@ -8,6 +8,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
@@ -21,6 +33,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.
@@ -28,7 +48,9 @@ module OCI
     def ==(other_object)
       return true if self.equal?(other_object)
       self.class == other_object.class &&
-          description == other_object.description
+          description == other_object.description &&
+          freeform_tags == other_object.freeform_tags &&
+          defined_tags == other_object.defined_tags
     end
 
     # @see the `==` method
@@ -40,7 +62,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [description].hash
+      [description, freeform_tags, defined_tags].hash
     end
 
     # Builds the object from hash
@@ -53,10 +75,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
 
@@ -74,7 +96,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
@@ -106,14 +128,18 @@ module OCI
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       { 
-        :'description' => :'description'
+        :'description' => :'description',
+        :'freeform_tags' => :'freeformTags',
+        :'defined_tags' => :'definedTags'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       { 
-        :'description' => :'String'
+        :'description' => :'String',
+        :'freeform_tags' => :'Hash<String, String>',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>'
       }
     end
   end