libmongocrypt-helper 1.7.4.0.1002 → 1.8.0.0.1001

data/ext/libmongocrypt/libmongocrypt/bindings/node/test/requirements.helper.js

@@ -15,6 +15,24 @@ const SKIP_LIVE_TESTS = !!process.env.MONGODB_NODE_SKIP_LIVE_TESTS;
 const SKIP_AWS_TESTS =
   SKIP_LIVE_TESTS || !AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY || !AWS_REGION || !AWS_CMK_ID;
 
+function isAWSCredentialProviderInstalled() {
+  try {
+    require.resolve('@aws-sdk/credential-providers');
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function isGCPCredentialProviderInstalled() {
+  try {
+    require.resolve('gcp-metadata');
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 module.exports = {
   SKIP_LIVE_TESTS,
   SKIP_AWS_TESTS,
@@ -25,5 +43,9 @@ module.exports = {
     AWS_CMK_ID
   },
   awsKmsProviders,
-  awsDataKeyOptions
+  awsDataKeyOptions,
+  credentialProvidersInstalled: {
+    aws: isAWSCredentialProviderInstalled(),
+    gcp: isGCPCredentialProviderInstalled()
+  }
 };

data/ext/libmongocrypt/libmongocrypt/bindings/node/test/stateMachine.test.js

@@ -4,7 +4,7 @@ const { EventEmitter, once } = require('events');
 const net = require('net');
 const tls = require('tls');
 const fs = require('fs');
-const expect = require('chai').expect;
+const { expect } = require('chai');
 const sinon = require('sinon');
 const mongodb = require('mongodb');
 const BSON = mongodb.BSON;

data/ext/libmongocrypt/libmongocrypt/bindings/node/test/tools/chai-addons.js

@@ -0,0 +1,8 @@
+'use strict';
+
+// configure chai
+const chai = require('chai');
+chai.use(require('sinon-chai'));
+chai.use(require('chai-subset'));
+
+chai.config.truncateThreshold = 0;

data/ext/libmongocrypt/libmongocrypt/bindings/node/test/types/index.test-d.ts

@@ -0,0 +1,63 @@
+import { expectAssignable, expectError, expectType, expectNotType, expectNotAssignable } from 'tsd';
+import { RangeOptions, AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, ClientEncryption, GCPEncryptionKeyOptions, ClientEncryptionEncryptOptions, KMSProviders } from '../..';
+
+type RequiredCreateEncryptedCollectionSettings = Parameters<
+  ClientEncryption['createEncryptedCollection']
+>[2];
+
+expectError<RequiredCreateEncryptedCollectionSettings>({});
+expectError<RequiredCreateEncryptedCollectionSettings>({
+  provider: 'blah!',
+  createCollectionOptions: { encryptedFields: {} }
+});
+expectError<RequiredCreateEncryptedCollectionSettings>({
+  provider: 'aws',
+  createCollectionOptions: {}
+});
+expectError<RequiredCreateEncryptedCollectionSettings>({
+  provider: 'aws',
+  createCollectionOptions: { encryptedFields: null }
+});
+
+expectAssignable<RequiredCreateEncryptedCollectionSettings>({
+  provider: 'aws',
+  createCollectionOptions: { encryptedFields: {} }
+});
+expectAssignable<RequiredCreateEncryptedCollectionSettings>({
+  provider: 'aws',
+  createCollectionOptions: { encryptedFields: {} },
+  masterKey: { } as AWSEncryptionKeyOptions | AzureEncryptionKeyOptions | GCPEncryptionKeyOptions
+});
+
+{
+  // NODE-5041 - incorrect spelling of rangeOpts in typescript definitions
+  const options = {} as ClientEncryptionEncryptOptions;
+  expectType<RangeOptions | undefined>(options.rangeOptions)
+}
+
+{
+  // KMSProviders
+  // aws
+  expectAssignable<KMSProviders['aws']>({ accessKeyId: '', secretAccessKey: '' });
+  expectAssignable<KMSProviders['aws']>({ accessKeyId: '', secretAccessKey: '', sessionToken: undefined });
+  expectAssignable<KMSProviders['aws']>({ accessKeyId: '', secretAccessKey: '', sessionToken: '' });
+  // automatic
+  expectAssignable<KMSProviders['aws']>({});
+
+  // azure
+  expectAssignable<KMSProviders['azure']>({ tenantId: 'a', clientId: 'a', clientSecret: 'a' });
+  expectAssignable<KMSProviders['azure']>({ tenantId: 'a', clientId: 'a', clientSecret: 'a' });
+  expectAssignable<KMSProviders['azure']>({ tenantId: 'a', clientId: 'a', clientSecret: 'a', identityPlatformEndpoint: undefined });
+  expectAssignable<KMSProviders['azure']>({ tenantId: 'a', clientId: 'a', clientSecret: 'a', identityPlatformEndpoint: '' });
+  expectAssignable<KMSProviders['azure']>({ accessToken: 'a' });
+  expectAssignable<KMSProviders['azure']>({});
+
+  // gcp
+  expectAssignable<KMSProviders['gcp']>({ email: 'a', privateKey: 'a' });
+  expectAssignable<KMSProviders['gcp']>({ email: 'a', privateKey: 'a', endpoint: undefined });
+  expectAssignable<KMSProviders['gcp']>({ email: 'a', privateKey: 'a', endpoint: 'a' });
+  expectAssignable<KMSProviders['gcp']>({ accessToken: 'a' });
+  // automatic
+  expectAssignable<KMSProviders['gcp']>({});
+
+}

data/ext/libmongocrypt/libmongocrypt/bindings/python/CHANGELOG.rst

@@ -1,6 +1,32 @@
 Changelog
 =========
 
+Changes in Version 1.6.0
+------------------------
+
+- Drop support for Python 2 and Python <3.7. Python >=3.7 is now required.
+
+Changes in Version 1.5.2
+------------------------
+
+- Bundle libmongocrypt 1.7.3 in release wheels.
+
+Changes in Version 1.5.1
+------------------------
+
+- Bundle libmongocrypt 1.7.1 in release wheels.
+
+Changes in Version 1.5.0
+------------------------
+
+- Add support for range-based Queryable Encryption with the new "rangePreview"
+  algorithm. NOTE: The "rangePreview" algorithm is experimental only. It is
+  not intended for public use.
+- Bundle libmongocrypt 1.7.0 in release wheels.
+- **Remove support for libmongocrypt <=1.7.0, libmongocrypt >=1.7.0 is now
+  required.** Note this is only relevant for users that install from
+  source or use the ``PYMONGOCRYPT_LIB`` environment variable.
+
 Changes in Version 1.4.1
 ------------------------
 

data/ext/libmongocrypt/libmongocrypt/bindings/python/README.rst

@@ -13,7 +13,7 @@ Python wrapper library for libmongocrypt that supports client side encryption
 in drivers. PyMongoCrypt uses `cffi <https://pypi.org/project/cffi/>`_ and
 `cryptography <https://pypi.org/project/cryptography/>`_.
 
-PyMongoCrypt supports Python 2.7, 3.4+, and PyPy3.5+.
+PyMongoCrypt supports Python 3.7+ and PyPy3.7+.
 
 Support / Feedback
 ==================
@@ -145,7 +145,7 @@ Linux::
 Dependencies
 ============
 
-PyMongoCrypt supports CPython 2.7, 3.4+, PyPy, and PyPy3.5+.
+PyMongoCrypt supports Python 3.7+ and PyPy3.7+.
 
 PyMongoCrypt requires `cffi <https://pypi.org/project/cffi/>`_ and
 `cryptography <https://pypi.org/project/cryptography/>`_.

data/ext/libmongocrypt/libmongocrypt/bindings/python/build-manylinux-wheel.sh

@@ -4,7 +4,7 @@ cd /python
 # Compile wheel
 # https://github.com/pypa/manylinux/issues/49
 rm -rf build
-/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel --universal
+/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
 
 # Audit wheels and write manylinux tag
 for whl in dist/*.whl; do