zuora_connect 2.0.60e → 2.0.60f

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9efee2fa39c05fb2cf07a2e9a49e14b76a75e68c8be87f008018287a45551ceb
-  data.tar.gz: f59b6c98c859dc205afc28a2eae57d5037b6d9cc1f41a5dd33e36d3e2b55a307
+  metadata.gz: 2c0b307a59b8fdea6b65f97152dfeb29ce391030160c744aa04b3cb38f87691c
+  data.tar.gz: 7eeed93e89cee77af7521b36daf9465e53b7e0ce4b3e97edaf10e2882426029a
 SHA512:
-  metadata.gz: 73b79ce54de6008219f2f3fd2abce7defccc27454f3328cf57b02ff116ea7faef8d22d5789566bad372e440c38f486a6bc2062ed2c1ff497d0ea1ac3863cbbdd
-  data.tar.gz: 940145c4211fa0be98c0e099f69df168a3224d17695c8fe3efa70ad4ed6fcc4788377d4ed74f17fd089f3c8adab481a1b224c33a46f71701403b00dbc1d386b6
+  metadata.gz: b93072f75b28ade9243d6ebf16dfd7f884744420a6d620f25747067f05c0c0ef6c261eb4d567b41395ff19106dfe4045f769278c760b317ae4799269e849fec1
+  data.tar.gz: b68884827084f3c53ce8bf0cd827bbe311fa6be686e3aad61293375d173876ded63eee6f94391fda51f060f17aff3dc98d728119951bd2f0dc4921ceed2ca759

data/app/models/zuora_connect/app_instance_base.rb

@@ -338,6 +338,10 @@ module ZuoraConnect
       raise
     end
 
+    def aws_secrets
+      (Rails.application.secrets.aws || {}).transform_keys { |key| key.to_s }
+    end
+
     #### START KMS ENCRYPTION Methods ####
       def zuora_logins=(val)
         write_attribute(:zuora_logins, kms_encrypt(val.to_json))
@@ -350,7 +354,7 @@ module ZuoraConnect
 
       def kms_decrypt(value)
         kms_tries ||= 0
-        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if { |k, v| v.blank? })
+        kms_client = Aws::KMS::Client.new({region: aws_secrets['AWS_REGION'], credentials: self.aws_auth_client}.delete_if { |k, v| v.blank? })
         resp = kms_client.decrypt({ciphertext_blob: [value].pack("H*") })
         return resp.plaintext
       rescue *AWS_AUTH_ERRORS => ex
@@ -365,7 +369,7 @@ module ZuoraConnect
 
       def kms_encrypt(value)
         kms_tries ||= 0
-        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if {|k,v| v.blank? })
+        kms_client = Aws::KMS::Client.new({region: aws_secrets['AWS_REGION'], credentials: self.aws_auth_client}.delete_if {|k,v| v.blank? })
 
         resp = kms_client.encrypt({key_id: kms_key, plaintext: value})
         return resp.ciphertext_blob.unpack('H*').first
@@ -380,12 +384,12 @@ module ZuoraConnect
       end
 
       def kms_key
-        return ENV['AWS_KMS_ARN'] || Rails.application.secrets.dig(:aws,'AWS_KMS_ARN')
+        return ENV['AWS_KMS_ARN'] || aws_secrets['AWS_KMS_ARN']
       end
 
       def aws_auth_client
         if Rails.env.to_s == 'development'
-          return Aws::Credentials.new(Rails.application.secrets.aws['AWS_ACCESS_KEY_ID'], Rails.application.secrets.aws['AWS_SECRET_ACCESS_KEY'])
+          return Aws::Credentials.new(aws_secrets['AWS_ACCESS_KEY_ID'], aws_secrets['AWS_SECRET_ACCESS_KEY'])
         else
           return nil
         end

data/config/initializers/postgresql_adapter.rb

@@ -2,7 +2,33 @@ module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapter < AbstractAdapter
       private
-        def load_additional_types(type_map, oids = nil)
+        def load_additional_types_latest(oids = nil)
+          initializer = OID::TypeMapInitializer.new(type_map)
+          if supports_ranges?
+            query = <<-SQL
+              SELECT DISTINCT on (t.typname) t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
+              FROM pg_type as t
+              LEFT JOIN pg_range as r ON oid = rngtypid
+            SQL
+          else
+            query = <<-SQL
+              SELECT DISTINCT on (t.typname) t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype
+              FROM pg_type as t
+            SQL
+          end
+
+          if oids
+            query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+          else
+            query += initializer.query_conditions_for_initial_load
+          end
+
+          execute_and_clear(query, "SCHEMA", []) do |records|
+            initializer.run(records)
+          end
+        end
+
+        def load_additional_types_deprecated(type_map, oids = nil)
           initializer = OID::TypeMapInitializer.new(type_map)
           if supports_ranges?
             query = <<-SQL
@@ -27,6 +53,13 @@ module ActiveRecord
             initializer.run(records)
           end
         end
+
+        rails_version = Rails.version.split('.').map { |x| x.to_i }
+        if (rails_version <=> [5, 2, 0]) >= 1
+          alias :load_additional_types :load_additional_types_latest
+        else
+          alias :load_additional_types :load_additional_types_deprecated
+        end
     end
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.60e"
+  VERSION = "2.0.60f"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60e
+  version: 2.0.60f
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment