Skip to content

Commit cecfdfe

Browse files
baileympearsonbaileympearson
committed
fix custom fle tests
1 parent 851147c commit cecfdfe

File tree

3 files changed

+45
-47
lines changed

3 files changed

+45
-47
lines changed

‎.evergreen/run-custom-csfle-tests.sh

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -55,54 +55,61 @@ pushd libmongocrypt/bindings/node
5555
npm install --production --ignore-scripts
5656
bash ./etc/build-static.sh
5757

58+
npm run rebuild # just in case this is necessary?
59+
60+
ls
61+
ls lib
62+
BINDINGS_DIR=$(pwd)
5863
popd # libmongocrypt/bindings/node
5964
popd # ../csfle-deps-tmp
6065

6166
# copy mongodb-client-encryption into driver's node_modules
62-
cp -R ../csfle-deps-tmp/libmongocrypt/bindings/node node_modules/mongodb-client-encryption
67+
npm link $BINDINGS_DIR
68+
69+
node --eval "console.log(require('mongodb-client-encryption').MongoCrypt)"
6370

6471
export MONGODB_URI=${MONGODB_URI}
6572
export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
6673
export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
6774
export TEST_CSFLE=true
6875

69-
set +o errexit # We want to run both test suites even if the first fails
76+
# set +o errexit # We want to run both test suites even if the first fails
7077
npm run check:csfle
71-
DRIVER_CSFLE_TEST_RESULT=$?
72-
set -o errexit
78+
# DRIVER_CSFLE_TEST_RESULT=$?
79+
# set -o errexit
7380

74-
# Great! our drivers tests ran
75-
# there are tests inside the bindings repo that we also want to check
81+
# # Great! our drivers tests ran
82+
# # there are tests inside the bindings repo that we also want to check
7683

77-
pushd ../csfle-deps-tmp/libmongocrypt/bindings/node
84+
# pushd ../csfle-deps-tmp/libmongocrypt/bindings/node
7885

79-
# a mongocryptd was certainly started by the driver tests,
80-
# let us let the bindings tests start their own
81-
killall mongocryptd || true
86+
# # a mongocryptd was certainly started by the driver tests,
87+
# # let us let the bindings tests start their own
88+
# killall mongocryptd || true
8289

83-
# only prod deps were installed earlier, install devDependencies here (except for mongodb!)
84-
npm install --ignore-scripts
90+
# # only prod deps were installed earlier, install devDependencies here (except for mongodb!)
91+
# npm install --ignore-scripts
8592

86-
# copy mongodb into CSFLE's node_modules
87-
rm -rf node_modules/mongodb
88-
cp -R "$ABS_PATH_TO_PATCH" node_modules/mongodb
89-
pushd node_modules/mongodb
90-
# lets be sure we have compiled TS since driver tests don't need to compile
91-
npm run build:ts
92-
popd # node_modules/mongodb
93+
# # copy mongodb into CSFLE's node_modules
94+
# rm -rf node_modules/mongodb
95+
# cp -R "$ABS_PATH_TO_PATCH" node_modules/mongodb
96+
# pushd node_modules/mongodb
97+
# # lets be sure we have compiled TS since driver tests don't need to compile
98+
# npm run build:ts
99+
# popd # node_modules/mongodb
93100

94-
# this variable needs to be empty
95-
export MONGODB_NODE_SKIP_LIVE_TESTS=""
96-
# all of the below must be defined (as well as AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY)
97-
export AWS_REGION="us-east-1"
98-
export AWS_CMK_ID="arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
101+
# # this variable needs to be empty
102+
# export MONGODB_NODE_SKIP_LIVE_TESTS=""
103+
# # all of the below must be defined (as well as AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY)
104+
# export AWS_REGION="us-east-1"
105+
# export AWS_CMK_ID="arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
99106

100-
npm test -- --colors
107+
# npm test -- --colors
101108

102-
popd # ../csfle-deps-tmp/libmongocrypt/bindings/node
109+
# popd # ../csfle-deps-tmp/libmongocrypt/bindings/node
103110

104-
# Exit the script in a way that will show evergreen a pass or fail
105-
if [ $DRIVER_CSFLE_TEST_RESULT -ne 0 ]; then
106-
echo "Driver tests failed, look above for results"
107-
exit 1
108-
fi
111+
# # Exit the script in a way that will show evergreen a pass or fail
112+
# if [ $DRIVER_CSFLE_TEST_RESULT -ne 0 ]; then
113+
# echo "Driver tests failed, look above for results"
114+
# exit 1
115+
# fi

‎src/client-side-encryption/providers/azure.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const MINIMUM_TOKEN_REFRESH_IN_MILLISECONDS = 6000;
1010
* @class
1111
* @ignore
1212
*/
13-
class AzureCredentialCache {
13+
export class AzureCredentialCache {
1414
constructor() {
1515
/**
1616
* @type { { accessToken: string, expiresOnTimestamp: number } | null}
@@ -69,7 +69,7 @@ let tokenCache = new AzureCredentialCache();
6969
* @returns { Promise<{ accessToken: string, expiresOnTimestamp: number } >}
7070
* @ignore
7171
*/
72-
async function parseResponse(response) {
72+
export async function parseResponse(response) {
7373
const { status, body: rawBody } = response;
7474

7575
/**
@@ -119,7 +119,7 @@ async function parseResponse(response) {
119119
*
120120
* @ignore
121121
*/
122-
function prepareRequest(options) {
122+
export function prepareRequest(options) {
123123
const url =
124124
options.url == null
125125
? new URL('http://169.254.169.254/metadata/identity/oauth2/token')
@@ -154,7 +154,7 @@ function prepareRequest(options) {
154154
*
155155
* @ignore
156156
*/
157-
async function fetchAzureKMSToken(options = {}) {
157+
export async function fetchAzureKMSToken(options = {}) {
158158
const { headers, url } = prepareRequest(options);
159159
const response = await utils.get(url, { headers }).catch(error => {
160160
if (error instanceof MongoCryptKMSRequestNetworkTimeoutError) {
@@ -168,9 +168,7 @@ async function fetchAzureKMSToken(options = {}) {
168168
/**
169169
* @ignore
170170
*/
171-
async function loadAzureCredentials(kmsProviders) {
171+
export async function loadAzureCredentials(kmsProviders) {
172172
const azure = await tokenCache.getToken();
173173
return { ...kmsProviders, azure };
174174
}
175-
176-
module.exports = { loadAzureCredentials, AzureCredentialCache, fetchAzureKMSToken, tokenCache };

‎test/integration/client-side-encryption/client_side_encryption.prose.18.azure_kms_mock_server.test.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { expect } from 'chai';
22

33
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
44
import { MongoCryptAzureKMSRequestError } from '../../../src/client-side-encryption/errors';
5+
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
6+
import { fetchAzureKMSToken } from '../../../src/client-side-encryption/providers/azure';
57
import { type Document } from '../../mongodb';
68

79
const BASE_URL = new URL(`http://127.0.0.1:8080/metadata/identity/oauth2/token`);
@@ -26,15 +28,6 @@ const metadata: MongoDBMetadataUI = {
2628
};
2729

2830
context('Azure KMS Mock Server Tests', function () {
29-
let fetchAzureKMSToken: (options: {
30-
url: URL;
31-
headers: Document;
32-
}) => Promise<{ accessToken: string }>;
33-
34-
beforeEach(async function () {
35-
fetchAzureKMSToken = this.configuration.mongodbClientEncryption['___azureKMSProseTestExports'];
36-
});
37-
3831
context('Case 1: Success', metadata, function () {
3932
// Do not set an ``X-MongoDB-HTTP-TestParams`` header.
4033

0 commit comments

Comments
 (0)