oci 2.3.1 → 2.3.2

data/lib/oci/load_balancer/models/load_balancer.rb

@@ -36,6 +36,14 @@ module OCI
     # @return [String]
     attr_accessor :compartment_id
 
+    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
+    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
+    #
+    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
     # **[Required]** A user-friendly name. It does not have to be unique, and it is changeable.
     #
     # Example: `example_load_balancer`
@@ -43,6 +51,14 @@ module OCI
     # @return [String]
     attr_accessor :display_name
 
+    # Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace.
+    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
+    #
+    # Example: `{\"Department\": \"Finance\"}`
+    #
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
     # @return [Hash<String, OCI::LoadBalancer::Models::Hostname>]
     attr_accessor :hostnames
 
@@ -112,7 +128,9 @@ module OCI
         'backend_sets': :'backendSets',
         'certificates': :'certificates',
         'compartment_id': :'compartmentId',
+        'defined_tags': :'definedTags',
         'display_name': :'displayName',
+        'freeform_tags': :'freeformTags',
         'hostnames': :'hostnames',
         'id': :'id',
         'ip_addresses': :'ipAddresses',
@@ -134,7 +152,9 @@ module OCI
         'backend_sets': :'Hash<String, OCI::LoadBalancer::Models::BackendSet>',
         'certificates': :'Hash<String, OCI::LoadBalancer::Models::Certificate>',
         'compartment_id': :'String',
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
         'display_name': :'String',
+        'freeform_tags': :'Hash<String, String>',
         'hostnames': :'Hash<String, OCI::LoadBalancer::Models::Hostname>',
         'id': :'String',
         'ip_addresses': :'Array<OCI::LoadBalancer::Models::IpAddress>',
@@ -158,7 +178,9 @@ module OCI
     # @option attributes [Hash<String, OCI::LoadBalancer::Models::BackendSet>] :backend_sets The value to assign to the {#backend_sets} property
     # @option attributes [Hash<String, OCI::LoadBalancer::Models::Certificate>] :certificates The value to assign to the {#certificates} property
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
+    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
     # @option attributes [Hash<String, OCI::LoadBalancer::Models::Hostname>] :hostnames The value to assign to the {#hostnames} property
     # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [Array<OCI::LoadBalancer::Models::IpAddress>] :ip_addresses The value to assign to the {#ip_addresses} property
@@ -189,12 +211,24 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+
+      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+
       self.display_name = attributes[:'displayName'] if attributes[:'displayName']
 
       raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
 
       self.display_name = attributes[:'display_name'] if attributes[:'display_name']
 
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
+
+      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
+
+      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+
       self.hostnames = attributes[:'hostnames'] if attributes[:'hostnames']
 
       self.id = attributes[:'id'] if attributes[:'id']
@@ -272,7 +306,9 @@ module OCI
         backend_sets == other.backend_sets &&
         certificates == other.certificates &&
         compartment_id == other.compartment_id &&
+        defined_tags == other.defined_tags &&
         display_name == other.display_name &&
+        freeform_tags == other.freeform_tags &&
         hostnames == other.hostnames &&
         id == other.id &&
         ip_addresses == other.ip_addresses &&
@@ -298,7 +334,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [backend_sets, certificates, compartment_id, display_name, hostnames, id, ip_addresses, is_private, lifecycle_state, listeners, path_route_sets, shape_name, subnet_ids, time_created].hash
+      [backend_sets, certificates, compartment_id, defined_tags, display_name, freeform_tags, hostnames, id, ip_addresses, is_private, lifecycle_state, listeners, path_route_sets, shape_name, subnet_ids, time_created].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/load_balancer/models/update_load_balancer_details.rb

@@ -6,7 +6,15 @@ require 'date'
 module OCI
   # Configuration details to update a load balancer.
   class LoadBalancer::Models::UpdateLoadBalancerDetails # rubocop:disable Metrics/LineLength
-    # **[Required]** The user-friendly display name for the load balancer. It does not have to be unique, and it is changeable.
+    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
+    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
+    #
+    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
+    # The user-friendly display name for the load balancer. It does not have to be unique, and it is changeable.
     # Avoid entering confidential information.
     #
     # Example: `example_load_balancer`
@@ -14,11 +22,21 @@ module OCI
     # @return [String]
     attr_accessor :display_name
 
+    # Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace.
+    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
+    #
+    # Example: `{\"Department\": \"Finance\"}`
+    #
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'display_name': :'displayName'
+        'defined_tags': :'definedTags',
+        'display_name': :'displayName',
+        'freeform_tags': :'freeformTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -27,7 +45,9 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'display_name': :'String'
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'display_name': :'String',
+        'freeform_tags': :'Hash<String, String>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -38,18 +58,32 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
     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 }
 
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+
+      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+
       self.display_name = attributes[:'displayName'] if attributes[:'displayName']
 
       raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
 
       self.display_name = attributes[:'display_name'] if attributes[:'display_name']
+
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
+
+      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
+
+      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -62,7 +96,9 @@ module OCI
     def ==(other)
       return true if equal?(other)
       self.class == other.class &&
-        display_name == other.display_name
+        defined_tags == other.defined_tags &&
+        display_name == other.display_name &&
+        freeform_tags == other.freeform_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -78,7 +114,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [display_name].hash
+      [defined_tags, display_name, freeform_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/regions.rb

@@ -17,6 +17,7 @@ module OCI
       'lhr': REGION_UK_LONDON_1
     }.freeze
 
+    # --- Start of service prefixes ---
     SERVICE_ENDPOINT_PREFIX_MAPPING = {
       BlockstorageClient: 'iaas',
       ComputeClient: 'iaas',
@@ -32,6 +33,7 @@ module OCI
       EmailClient: 'email',
       ContainerEngineClient: 'containerengine'
     }.freeze
+    # --- End of service prefixes ---
 
     # Returns an endpoint for the given region and service.
     #

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.3.1'.freeze
+  VERSION = '2.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oci
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Oracle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -146,6 +146,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.55'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: Ruby SDK for Oracle Cloud Infrastructure.
 email:
 - joe.levy@oracle.com
@@ -452,6 +492,7 @@ files:
 - "./lib/oci/file_storage/file_storage.rb"
 - "./lib/oci/file_storage/file_storage_client.rb"
 - "./lib/oci/file_storage/file_storage_client_composite_operations.rb"
+- "./lib/oci/file_storage/models/client_options.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"
@@ -466,6 +507,7 @@ files:
 - "./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_details.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"