Fix code review remarks

Author: comandeo-mongo

.evergreen/config.yml

@@ -1289,7 +1289,9 @@ buildvariants:
   - matrix_name: "fle-4.4"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
+      # https://jira.mongodb.org/browse/RUBY-2832
+      # ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
+      ruby: [ruby-3.0, ruby-2.7]
       topology: standalone
       mongodb-version: ['4.4']
       os: ubuntu1804

.evergreen/config/standard.yml.erb

@@ -437,7 +437,9 @@ buildvariants:
   - matrix_name: "fle-4.4"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
+      # https://jira.mongodb.org/browse/RUBY-2832
+      # ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
+      ruby: [ruby-3.0, ruby-2.7]
       topology: standalone
       mongodb-version: ['4.4']
       os: ubuntu1804

lib/mongo/crypt/binding.rb

@@ -799,9 +799,12 @@ def self.kms_ctx_get_kms_provider(kms_context)
           nil
         else
           len = if BSON::Environment.jruby?
+            # JRuby FFI implementation does not have `read(type)` method, but it
+            # has this `get_uint32`.
             len_ptr.get_uint32
           else
-            len_ptr.get(:uint32, 0)
+            # For MRI we use a documented `read` method - https://www.rubydoc.info/github/ffi/ffi/FFI%2FPointer:read
+            len_ptr.read(:uint32)
           end
           provider.read_string(len).to_sym
         end

spec/integration/client_side_encryption/custom_endpoint_spec.rb

@@ -28,6 +28,13 @@
       )
     end
 
+    let(:master_key_template) do
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
+      }
+    end
+
     let(:data_key_id) do
       client_encryption.create_data_key('aws', master_key: master_key)
     end
@@ -51,100 +58,75 @@
 
     context 'with region and key options' do
       let(:master_key) do
-        {
-          region: "us-east-1",
-          key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
-        }
+        master_key_template
       end
 
       it_behaves_like 'a functioning data key'
     end
 
     context 'with region, key, and endpoint options' do
       let(:master_key) do
-        {
-          region: "us-east-1",
-          key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
-          endpoint: "kms.us-east-1.amazonaws.com"
-        }
+        master_key_template.merge({endpoint: "kms.us-east-1.amazonaws.com"})
       end
 
       it_behaves_like 'a functioning data key'
     end
 
     context 'with region, key, and endpoint with valid port' do
       let(:master_key) do
-        {
-          region: "us-east-1",
-          key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
-          endpoint: "kms.us-east-1.amazonaws.com:443"
-        }
+        master_key_template.merge({endpoint: "kms.us-east-1.amazonaws.com:443"})
       end
 
       it_behaves_like 'a functioning data key'
     end
 
+    shared_examples 'raising a KMS error' do
+      it 'throws an exception' do
+        expect do
+          data_key_id
+        end.to raise_error(Mongo::Error::KmsError, error_regex)
+      end
+    end
+
     context 'with region, key, and endpoint with invalid port' do
       let(:master_key) do
-        {
-          region: "us-east-1",
-          key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
-          endpoint: "kms.us-east-1.amazonaws.com:12345"
-        }
+        master_key_template.merge({endpoint: "kms.us-east-1.amazonaws.com:12345"})
       end
 
-      context 'MRI' do
-        require_mri
-
-        it 'throws an exception' do
-          expect do
-            data_key_id
-          end.to raise_error(Mongo::Error::KmsError, /Connection refused/)
+      let(:error_regex) do
+        if BSON::Environment.jruby?
+          /Bad file descriptor/
+        else
+          /Connection refused/
         end
       end
 
-      context 'JRuby' do
-        require_jruby
-
-        it 'throws an exception' do
-          expect do
-            data_key_id
-          end.to raise_error(Mongo::Error::KmsError)
-        end
-      end
+      it_behaves_like 'raising a KMS error'
     end
 
 
     context 'with region, key, and endpoint with invalid region' do
       let(:master_key) do
-        {
-          region: "us-east-1",
-          key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
-          endpoint: "kms.us-east-2.amazonaws.com"
-        }
+        master_key_template.merge({endpoint: "kms.us-east-2.amazonaws.com"})
       end
 
-      it 'throws an exception' do
-        expect do
-          data_key_id
-        end.to raise_error(Mongo::Error::KmsError, /us-east-1/)
+      let(:error_regex) do
+        /us-east-1/
       end
+
+      it_behaves_like 'raising a KMS error'
     end
 
     context 'with region, key, and endpoint at incorrect domain' do
       let(:master_key) do
-        {
-          region: "us-east-1",
-          key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
-          endpoint: "example.com"
-        }
+        master_key_template.merge({endpoint: "example.com"})
       end
 
-      it 'throws an exception' do
-        expect do
-          data_key_id
-        end.to raise_error(Mongo::Error::KmsError, /parse error/)
+      let(:error_regex) do
+        /parse error/
       end
+
+      it_behaves_like 'raising a KMS error'
     end
   end
 end