oci 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1b25a53001f2b6fcef4aaa4d49420748da3c3644a89c23c6854603a347ef06
-  data.tar.gz: cb8ec4c3331f2ef1828e5f97a8ac5ee82af0a1fb850e1ddca385c9e09dd3528b
+  metadata.gz: e2b92722ec1966e7dde1c815a6f17cc9ce02a78ae34c69e74915e3d196e2517c
+  data.tar.gz: 70ef65d3a37c9f629cbe2df847e1e7ccf0befd6677eb2c6c60be7325df052f38
 SHA512:
-  metadata.gz: 61429f626c832403b8178bae6686f94a32a23d8e0fb2fcab06ec3dc096076ebcf98bf9050867d3cd4397837442a438d7eb5c8da66fa9c283912ab6f22f95954a
-  data.tar.gz: 871b334fb263dabc4bb6e5b7181fa719a8cd5d70d5bbabc6569796da13de9a0ceba366a9fe59e50ed37a573a4801d441bdcb8d9708e7acd1b42864f5ffe5eedb
+  metadata.gz: 7983dd94e186bfdf68ac94791f5f94cdfca632442385228ae344f8f7aeb078a2af779ab0629f33d99aad0d55015bb7579126d2c9fac95e791fe39bbb6c024265
+  data.tar.gz: ac8b2b4bd13f1beefd3c1a6aa1fae13609f50d6a3c4960716e0885e432d9e0cdaa0a1055ba35f5e77aa7f5f94fb428f3630e2ceba8ccd79f7eb2c82a57dd44aa

data/README.md

@@ -1,5 +1,5 @@
 # Oracle Cloud Infrastructure Ruby SDK
-**Version 2.4.4**
+**Version 2.4.5**
 
 This topic describes how to install, configure, and use the Oracle Cloud Infrastructure Ruby SDK.
 

data/lib/oci/auth/federation_client.rb

@@ -2,7 +2,6 @@
 
 require 'json'
 require 'net/http'
-require 'thread'
 
 require 'oci/auth/internal/auth_token_request_signer'
 require 'oci/auth/session_key_supplier'
@@ -27,6 +26,8 @@ module OCI
       # @return [OCI::Auth::SessionKeySupplier] A supplier which vends a private and public key for signing token requests to Auth Service
       attr_reader :session_key_supplier
 
+      # rubocop:disable Metrics/LineLength
+
       # Creates a new FederationClient
       #
       # @param [String] federation_endpoint The Auth Service endpoint from which to retrieve the token
@@ -51,6 +52,8 @@ module OCI
         @security_token = nil
       end
 
+      # rubocop:enable Metrics/LineLength
+
       # Retrieves a security token, but always asks Auth Service for a new token, regardless of whether or not the previously requested
       # token is still valid
       # @return [String] The security token
@@ -63,69 +66,84 @@ module OCI
       # @return [String] The security token
       def security_token
         return @security_token.security_token if @security_token && @security_token.token_valid?
+
         refresh_security_token_inner
       end
 
       private
-        def refresh_security_token_inner
-          @refresh_lock.lock
-
-          @session_key_supplier.refresh
-          @leaf_certificate_supplier.refresh
 
-          updated_tenancy_id = OCI::Auth::Util.get_tenancy_id_from_certificate(@leaf_certificate_supplier.certificate)
-          raise "Unexpected update of tenancy OCID in the leaf certificate. Previous tenancy: #{@tenancy_id}, Updated: #{updated_tenancy_id}" if updated_tenancy_id != @tenancy_id
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
-          @intermediate_certificate_suppliers.each { |supplier| supplier.refresh }
+      def refresh_security_token_inner
+        @refresh_lock.lock
 
-          leaf_certificate_pem = @leaf_certificate_supplier.certificate_pem
-          request_payload = {
-            'certificate': OCI::Auth::Util.sanitize_certificate_string(leaf_certificate_pem),
-            'publicKey': OCI::Auth::Util.sanitize_certificate_string(@session_key_supplier.key_pair[:public_key].to_pem)
-          }
+        @session_key_supplier.refresh
+        @leaf_certificate_supplier.refresh
 
-          unless @intermediate_certificate_suppliers.empty?
-            retrieved_certs = []
-            @intermediate_certificate_suppliers.each { |supplier| retrieved_certs << OCI::Auth::Util.sanitize_certificate_string(supplier.certificate_pem) }
-            request_payload['intermediateCertificates'] = retrieved_certs
-          end
-
-          fingerprint = OCI::Auth::Util.colon_separate_fingerprint(OpenSSL::Digest::SHA1.new(@leaf_certificate_supplier.certificate.to_der).to_s)
-          signer = OCI::Auth::Internal::AuthTokenRequestSigner.new(@tenancy_id, fingerprint, @leaf_certificate_supplier.private_key_pem)
-
-          request = Net::HTTP::Post.new(@federation_endpoint)
-          request.body = request_payload.to_json
+        updated_tenancy_id = OCI::Auth::Util.get_tenancy_id_from_certificate(@leaf_certificate_supplier.certificate)
+        if updated_tenancy_id != @tenancy_id
+          raise 'Unexpected update of tenancy OCID in the leaf certificate.' \
+             "Previous tenancy: #{@tenancy_id}, Updated: #{updated_tenancy_id}"
+        end
 
-          header_params = {}
-          header_params['content-type'] = 'application/json'
-          signer.sign(:post, @federation_endpoint, header_params, request.body)
-          header_params.each { |key, value| request[key.to_s] = value }
+        @intermediate_certificate_suppliers.each(&:refresh)
 
-          # Additional header info to aid in debugging issues
-          request['opc-client-info'] = OCI::ApiClient.build_user_info
-          request['opc-request-id'] ||= OCI::ApiClient.build_request_id
-          request['User-Agent'] =  OCI::ApiClient.build_user_agent
+        leaf_certificate_pem = @leaf_certificate_supplier.certificate_pem
+        request_payload = {
+          'certificate': OCI::Auth::Util.sanitize_certificate_string(leaf_certificate_pem),
+          'publicKey': OCI::Auth::Util.sanitize_certificate_string(@session_key_supplier.key_pair[:public_key].to_pem)
+        }
 
-          raw_body = nil
-          @federation_http_client.start do
-            @federation_http_client.request(request) do |response|
-              raw_body = response.body
-            end
+        unless @intermediate_certificate_suppliers.empty?
+          retrieved_certs = []
+          @intermediate_certificate_suppliers.each do |supplier|
+            retrieved_certs << OCI::Auth::Util.sanitize_certificate_string(supplier.certificate_pem)
           end
+          request_payload['intermediateCertificates'] = retrieved_certs
+        end
 
-          begin
-            parsed_response = JSON.parse(raw_body)
-            raise "No token received in the response from auth service: #{raw_body}" unless parsed_response.has_key?('token')
-
-            @security_token = OCI::Auth::SecurityTokenContainer.new(parsed_response['token'])
-          rescue JSON::ParserError => e
-            raise "Unable to parse response from Auth Service: #{raw_body}"
+        fingerprint = OCI::Auth::Util.colon_separate_fingerprint(
+          OpenSSL::Digest::SHA1.new(@leaf_certificate_supplier.certificate.to_der).to_s
+        )
+        signer = OCI::Auth::Internal::AuthTokenRequestSigner.new(@tenancy_id,
+                                                                 fingerprint,
+                                                                 @leaf_certificate_supplier.private_key_pem)
+
+        request = Net::HTTP::Post.new(@federation_endpoint)
+        request.body = request_payload.to_json
+
+        header_params = {}
+        header_params['content-type'] = 'application/json'
+        signer.sign(:post, @federation_endpoint, header_params, request.body)
+        header_params.each { |key, value| request[key.to_s] = value }
+
+        # Additional header info to aid in debugging issues
+        request['opc-client-info'] = OCI::ApiClient.build_user_info
+        request['opc-request-id'] ||= OCI::ApiClient.build_request_id
+        request['User-Agent'] = OCI::ApiClient.build_user_agent
+
+        raw_body = nil
+        @federation_http_client.start do
+          @federation_http_client.request(request) do |response|
+            raw_body = response.body
           end
+        end
+
+        begin
+          parsed_response = JSON.parse(raw_body)
+          raise "No token received in the response from auth service: #{raw_body}" unless parsed_response.key?('token')
 
-          @security_token.security_token
-        ensure
-          @refresh_lock.unlock if @refresh_lock.locked? && @refresh_lock.owned?
+          @security_token = OCI::Auth::SecurityTokenContainer.new(parsed_response['token'])
+        rescue JSON::ParserError => ex
+          raise "Unable to parse response from Auth Service [#{ex}]: #{raw_body}"
         end
+
+        @security_token.security_token
+      ensure
+        @refresh_lock.unlock if @refresh_lock.locked? && @refresh_lock.owned?
+      end
+
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
     end
   end
 end

data/lib/oci/database/models/create_database_from_backup_details.rb

@@ -18,13 +18,18 @@ module OCI
     # @return [String]
     attr_accessor :admin_password
 
+    # The display name of the database to be created from the backup. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted.
+    # @return [String]
+    attr_accessor :db_name
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
         'backup_id': :'backupId',
         'backup_tde_password': :'backupTDEPassword',
-        'admin_password': :'adminPassword'
+        'admin_password': :'adminPassword',
+        'db_name': :'dbName'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -35,7 +40,8 @@ module OCI
         # rubocop:disable Style/SymbolLiteral
         'backup_id': :'String',
         'backup_tde_password': :'String',
-        'admin_password': :'String'
+        'admin_password': :'String',
+        'db_name': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -49,6 +55,7 @@ module OCI
     # @option attributes [String] :backup_id The value to assign to the {#backup_id} property
     # @option attributes [String] :backup_tde_password The value to assign to the {#backup_tde_password} property
     # @option attributes [String] :admin_password The value to assign to the {#admin_password} property
+    # @option attributes [String] :db_name The value to assign to the {#db_name} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -72,6 +79,12 @@ module OCI
       raise 'You cannot provide both :adminPassword and :admin_password' if attributes.key?(:'adminPassword') && attributes.key?(:'admin_password')
 
       self.admin_password = attributes[:'admin_password'] if attributes[:'admin_password']
+
+      self.db_name = attributes[:'dbName'] if attributes[:'dbName']
+
+      raise 'You cannot provide both :dbName and :db_name' if attributes.key?(:'dbName') && attributes.key?(:'db_name')
+
+      self.db_name = attributes[:'db_name'] if attributes[:'db_name']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -87,7 +100,8 @@ module OCI
       self.class == other.class &&
         backup_id == other.backup_id &&
         backup_tde_password == other.backup_tde_password &&
-        admin_password == other.admin_password
+        admin_password == other.admin_password &&
+        db_name == other.db_name
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -103,7 +117,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [backup_id, backup_tde_password, admin_password].hash
+      [backup_id, backup_tde_password, admin_password, db_name].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/internal/util.rb

@@ -4,7 +4,7 @@ module OCI
   module Internal
     # Utility methods for internal use only.
     module Util
-      BLANK_STRING_REGEX = /\A[[:space:]]*\z/
+      BLANK_STRING_REGEX = /\A[[:space:]]*\z/.freeze
       def self.blank_string?(str)
         str.nil? || str.empty? || !BLANK_STRING_REGEX.match(str).nil?
       end

data/lib/oci/regions.rb

@@ -4,6 +4,7 @@ module OCI
   # Module defining available regions and helper methods to get value service endpoints
   module Regions
     REGION_ENUM = [
+      REGION_CA_TORONTO_1 = 'ca-toronto-1'.freeze,
       REGION_US_PHOENIX_1 = 'us-phoenix-1'.freeze,
       REGION_US_ASHBURN_1 = 'us-ashburn-1'.freeze,
       REGION_EU_FRANKFURT_1 = 'eu-frankfurt-1'.freeze,
@@ -11,6 +12,7 @@ module OCI
     ].freeze
 
     REGION_SHORT_NAMES_TO_LONG_NAMES = {
+      'yyz': REGION_CA_TORONTO_1,
       'phx': REGION_US_PHOENIX_1,
       'iad': REGION_US_ASHBURN_1,
       'fra': REGION_EU_FRANKFURT_1,
@@ -19,6 +21,7 @@ module OCI
 
     # --- Start of region realm mapping ---
     REGION_REALM_MAPPING = {
+      'ca-toronto-1': 'oc1'.freeze,
       'us-phoenix-1': 'oc1'.freeze,
       'us-ashburn-1': 'oc1'.freeze,
       'eu-frankfurt-1': 'oc1'.freeze,

data/lib/oci/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oci
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Oracle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json