Merge branch 'master' into godriver2976

Author: qingyang-hu

.evergreen/config.yml

@@ -1,3 +1,3 @@
 asn1crypto==1.3.0
 bottle==0.12.20
-oscrypto==1.2.0
+oscrypto==1.2.0

.evergreen/ocsp-requirements.txt

@@ -44,7 +44,7 @@ do
 			for CORPUS_FILE in $PARENTDIR/testdata/fuzz/$FUNC/*
 			do
 				# Check to see if the value for CORPUS_FILE is in cset.
-				if [[ ! " ${cset[@]} " =~ " ${CORPUS_FILE} " ]]; then
+				if [[ ! " ${cset[*]} " =~ " ${CORPUS_FILE} " ]]; then
 					# Create the directory if it doesn't exist.
 					if [ ! -d $PROJECT_DIRECTORY/fuzz/$FUNC ]; then
 						mkdir -p $PROJECT_DIRECTORY/fuzz/$FUNC
@@ -69,4 +69,3 @@ if [ -d $PROJECT_DIRECTORY/fuzz ]; then
 	# This will trigger a notification to be sent to the Go Driver team.
 	exit 1
 fi
-

.evergreen/run-fuzz.sh

@@ -12,20 +12,9 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #                 mechanism.
 
 echo "Running MONGODB-AWS authentication tests"
-# ensure no secrets are printed in log files
-set +x
 
-# load the script
-shopt -s expand_aliases # needed for `urlencode` alias
-[ -s "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh" ] && source "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
-
-MONGODB_URI=${MONGODB_URI:-"mongodb://localhost"}
-MONGODB_URI="${MONGODB_URI}/aws?authMechanism=MONGODB-AWS"
-if [[ -n ${SESSION_TOKEN} ]]; then
-    MONGODB_URI="${MONGODB_URI}&authMechanismProperties=AWS_SESSION_TOKEN:${SESSION_TOKEN}"
-fi
-
-export MONGODB_URI="$MONGODB_URI"
+# Handle credentials and environment setup.
+. $DRIVERS_TOOLS/.evergreen/auth_aws/aws_setup.sh $1
 
 # show test output
 set -x

.evergreen/run-mongodb-aws-test.sh

@@ -4,7 +4,11 @@ set -o errexit
 
 export GOPATH=$(dirname $(dirname $(dirname `pwd`)))
 export GOCACHE="$(pwd)/.cache"
-export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
+export DRIVERS_TOOLS=${DRIVERS_TOOLS:-""}
+
+if [ -z $DRIVERS_TOOLS ]; then
+  export DRIVERS_TOOLS="$(dirname $(dirname $(dirname `pwd`)))/drivers-tools"
+fi
 
 if [ "Windows_NT" = "$OS" ]; then
     export GOPATH=$(cygpath -m $GOPATH)
@@ -14,6 +18,7 @@ fi
 
 export GOROOT="${GOROOT}"
 export PATH="${GOROOT}/bin:${GCC_PATH}:$GOPATH/bin:$PATH"
+export PATH="${MONGODB_BINARIES:-$DRIVERS_TOOLS/mongodb/bin}:$PATH"
 export PROJECT="${project}"
 export PKG_CONFIG_PATH=$(pwd)/install/libmongocrypt/lib64/pkgconfig:$(pwd)/install/mongo-c-driver/lib/pkgconfig
 export LD_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib64
@@ -43,7 +48,7 @@ fi
 # Using python3-venv in Ubuntu 14.04 (an OS required for legacy server version
 # tasks) requires the use of apt-get, which we wish to avoid. So, we do not set
 # a python3 binary on Ubuntu 14.04. Setting AWS temp credentials for legacy
-# server version tasks is unneccesary, as temp credentials are only needed on 4.2+.
+# server version tasks is unnecessary, as temp credentials are only needed on 4.2+.
 if [ ! -z ${PYTHON3_BINARY} ]; then
   export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}"
   export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}"

.evergreen/run-tests.sh

@@ -0,0 +1,21 @@
+name: GoDriver Tests
+
+on:
+  push:
+  pull_request:
+
+concurrency:
+  group: test-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash -eux {0}
+
+jobs:
+  pre_commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+      - uses: pre-commit/action@v3.0.0

.github/workflows/comment.yml

@@ -12,7 +12,13 @@ perf
 **mongocryptd.pid
 *.test
 .DS_Store
+install
 main.so
+.cache
+install
+libmongocrypt
+venv
+test.suite
 
 # AWS SAM-generated files
 internal/test/faas/awslambda/.aws-sam

.github/workflows/test.yml

@@ -0,0 +1,50 @@
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.5.0
+  hooks:
+    - id: check-case-conflict
+    - id: check-executables-have-shebangs
+    - id: check-added-large-files
+    - id: check-case-conflict
+    - id: check-merge-conflict
+    - id: check-json
+    - id: end-of-file-fixer
+      exclude: ^vendor/
+      exclude_types: [json,yaml]
+    - id: trailing-whitespace
+      exclude: ^(vendor/|internal/assert/assertions_test.go)
+      exclude_types: [json,yaml]
+
+- repo: https://github.com/executablebooks/mdformat
+  rev: 0.7.17
+  hooks:
+    - id: mdformat
+      exclude: ^vendor/
+
+- repo: https://github.com/python-jsonschema/check-jsonschema
+  rev: 0.27.0
+  hooks:
+    - id: check-github-workflows
+
+# We use the Python version instead of the original version which seems to require Docker
+# https://github.com/koalaman/shellcheck-precommit
+- repo: https://github.com/shellcheck-py/shellcheck-py
+  rev: v0.9.0.6
+  hooks:
+    - id: shellcheck
+      name: shellcheck
+      args: ["--severity=error"]
+
+- repo: https://github.com/codespell-project/codespell
+  rev: "v2.2.6"
+  hooks:
+  - id: codespell
+    args: ["-L", "te,fo,fle,alo,nin,compres,wil,collone,asess,sav,ot,wll,dne,nulll,hellow"]
+    exclude: ^(vendor/|benchmark/operation_test.go)
+    exclude_types: [json,yaml,pem]
+
+- repo: https://github.com/golangci/golangci-lint
+  rev: v1.55.1
+  hooks:
+  - id: golangci-lint

.gitignore

@@ -0,0 +1,53 @@
+# Dockerfile for Go Driver local development.
+
+# Build libmongocrypt in a separate build stage.
+FROM ubuntu:20.04 as libmongocrypt
+
+RUN apt-get -qq update && \
+  apt-get -qqy install --no-install-recommends \
+    git \
+    ca-certificates \
+    curl \
+    build-essential \
+    libssl-dev \
+    python
+
+COPY etc/install-libmongocrypt.sh /root/install-libmongocrypt.sh
+RUN cd /root && bash ./install-libmongocrypt.sh
+
+
+# Inherit from the drivers-evergreen-tools image and copy in the files
+# from the libmongocrypt build stage.
+FROM drivers-evergreen-tools
+
+# Install common deps.
+RUN export DEBIAN_FRONTEND=noninteractive && \
+  export TZ=Etc/UTC && \
+  apt-get -qq update && \
+  apt-get -qqy install --reinstall --no-install-recommends \
+    tzdata \
+    ca-certificates \
+    pkg-config \
+    software-properties-common \
+    gpg \
+    apt-utils \
+    libc6-dev \
+    gcc \
+    make && \
+  sudo update-ca-certificates && \
+  rm -rf /var/lib/apt/lists/*
+
+# Install golang from the golang-backports ppa.
+RUN export DEBIAN_FRONTEND=noninteractive && \
+  export TZ=Etc/UTC && \
+  export LC_ALL=C.UTF-8 && \
+  sudo -E apt-add-repository "ppa:longsleep/golang-backports" && \
+  apt-get -qq update && \
+  apt-get -qqy install --no-install-recommends golang-go && \
+  rm -rf /var/lib/apt/lists/*
+
+COPY ./etc/docker_entry.sh /root/docker_entry.sh
+
+COPY --from=libmongocrypt /root/install /root/install
+
+ENTRYPOINT ["/bin/bash", "/root/docker_entry.sh"]