[CDRIVER-4637] A config settings command

.evergreen/config_generator/components/make_release_archive.py

@@ -20,6 +20,7 @@ class ReleaseArchive(Function):
                 'MONGOC_TEST_SKIP_LIVE': 'on',
                 'MONGOC_TEST_SKIP_SLOW': 'on',
             },
+            include_expansions_in_env=['distro_id'],
             script='''\
                 set -o errexit
                 bash tools/poetry.sh install --with=docs

.evergreen/config_generator/etc/utils.py

@@ -1,13 +1,13 @@
 from importlib import import_module
 from pathlib import Path
 from textwrap import dedent
-from typing import Sequence
+from typing import Sequence, Iterable, Mapping
 
 import yaml
 
 from shrub.v3.evg_project import EvgProject
 from shrub.v3.evg_task import EvgTask
-from shrub.v3.evg_command import subprocess_exec
+from shrub.v3.evg_command import subprocess_exec, EvgCommandType
 
 
 # Equivalent to EvgTask but defines additional properties.
@@ -23,11 +23,23 @@ class Task(EvgTask):
 
 
 # Automatically formats the provided script and invokes it in Bash.
-def bash_exec(script, **kwargs):
+def bash_exec(
+    script,
+    *,
+    include_expansions_in_env: Iterable[str] | None = None,
+    working_dir: str | None = None,
+    command_type: EvgCommandType | None = None,
+    env: Mapping[str, str] | None = None,
+    **kwargs,
+):
     return subprocess_exec(
-        binary='bash',
-        args=['-c', dedent(script)],
-        **kwargs
+        binary="bash",
+        args=["-c", dedent(script)],
+        include_expansions_in_env=list(include_expansions_in_env) if include_expansions_in_env else None,
+        working_dir=working_dir,
+        command_type=command_type,
+        env=dict(env) if env else None,
+        **kwargs,
     )
 
 

.evergreen/etc/mongo-c-driver.spec

@@ -118,7 +118,6 @@ Documentation: http://mongoc.org/libbson/%{version}/
 
 %build
 %cmake \
-    -DENABLE_BSON:STRING=ON \
     -DENABLE_MONGOC:BOOL=ON \
     -DENABLE_SHM_COUNTERS:BOOL=ON \
     -DENABLE_SSL:STRING=OPENSSL \

.evergreen/generated_configs/functions.yml

@@ -280,6 +280,8 @@ functions:
           MONGOC_TEST_FUTURE_TIMEOUT_MS: "30000"
           MONGOC_TEST_SKIP_LIVE: "on"
           MONGOC_TEST_SKIP_SLOW: "on"
+        include_expansions_in_env:
+          - distro_id
         args:
           - -c
           - |

.evergreen/generated_configs/legacy-config.yml

@@ -86,6 +86,8 @@ functions:
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
@@ -95,29 +97,33 @@ functions:
         export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED}
         export ENABLE_SSL=${ENABLE_SSL}
         export ENABLE_SNAPPY=${ENABLE_SNAPPY}
-        LINK_STATIC=  sh .evergreen/scripts/link-sample-program.sh
-        LINK_STATIC=1 sh .evergreen/scripts/link-sample-program.sh
+        LINK_STATIC=  bash .evergreen/scripts/link-sample-program.sh
+        LINK_STATIC=1 bash .evergreen/scripts/link-sample-program.sh
   link sample program bson:
   - command: shell.exec
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
         # Compile a program that links dynamically or statically to libbson,
         # using variables from pkg-config or from CMake's find_package command.
-        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=  sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=  bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
   link sample program MSVC:
   - command: shell.exec
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
@@ -126,24 +132,34 @@ functions:
         # find_package command.
         export ENABLE_SSL=${ENABLE_SSL}
         export ENABLE_SNAPPY=${ENABLE_SNAPPY}
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         LINK_STATIC=  cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
         LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
   link sample program mingw:
   - command: shell.exec
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
         # Build libmongoc with CMake and compile a program that links
         # dynamically to it, using variables from pkg-config.exe.
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw.cmd
   link sample program MSVC bson:
   - command: shell.exec
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
@@ -152,6 +168,9 @@ functions:
         # find_package command.
         export ENABLE_SSL=${ENABLE_SSL}
         export ENABLE_SNAPPY=${ENABLE_SNAPPY}
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         LINK_STATIC=  cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
         LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
   link sample program mingw bson:
@@ -164,6 +183,9 @@ functions:
         set -o errexit
         # Build libmongoc with CMake and compile a program that links
         # dynamically to it, using variables from pkg-config.exe.
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw-bson.cmd
   update codecov.io:
   - command: shell.exec
@@ -201,7 +223,7 @@ functions:
         set -o errexit
         cd drivers-evergreen-tools
         export DRIVERS_TOOLS=$(pwd)
-        sh .evergreen/atlas_data_lake/build-mongohouse-local.sh
+        bash .evergreen/atlas_data_lake/build-mongohouse-local.sh
   run mongohouse:
   - command: shell.exec
     type: test
@@ -212,7 +234,7 @@ functions:
         set -o errexit
         cd drivers-evergreen-tools
         export DRIVERS_TOOLS=$(pwd)
-        sh .evergreen/atlas_data_lake/run-mongohouse-local.sh
+        bash .evergreen/atlas_data_lake/run-mongohouse-local.sh
   test mongohouse:
   - command: shell.exec
     type: test
@@ -962,9 +984,13 @@ tasks:
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(find_cmake_latest)"
         export CC="C:/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin/gcc.exe"
         BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
         cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
@@ -977,9 +1003,13 @@ tasks:
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(find_cmake_latest)"
         export CC="Visual Studio 14 2015 Win64"
         BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
         cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
@@ -992,12 +1022,16 @@ tasks:
     type: test
     params:
       working_dir: mongoc
+      include_expansions_in_env:
+      - distro_id
       shell: bash
       script: |-
         set -o errexit
-        DESTDIR="$(pwd)/dest" sh ./.evergreen/scripts/install-uninstall-check.sh
-        BSON_ONLY=1 sh ./.evergreen/scripts/install-uninstall-check.sh
-        sh ./.evergreen/scripts/install-uninstall-check.sh
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(find_cmake_latest)"
+        DESTDIR="$(pwd)/dest" bash ./.evergreen/scripts/install-uninstall-check.sh
+        BSON_ONLY=1 bash ./.evergreen/scripts/install-uninstall-check.sh
+        bash ./.evergreen/scripts/install-uninstall-check.sh
 - name: debug-compile-with-warnings
   commands:
   - command: shell.exec
@@ -1049,7 +1083,7 @@ tasks:
     params:
       aws_key: ${toolchain_aws_key}
       aws_secret: ${toolchain_aws_secret}
-      remote_file: mongo-c-toolchain/${distro_id}/mongo-c-toolchain.tar.gz
+      remote_file: mongo-c-toolchain/${distro_id}/2023/06/07/mongo-c-toolchain.tar.gz
       bucket: mongo-c-toolchain
       local_file: mongo-c-toolchain.tar.gz
   - command: shell.exec

.evergreen/legacy_config_generator/evergreen_config_generator/functions.py

@@ -14,6 +14,7 @@
 
 from collections import OrderedDict as OD
 from textwrap import dedent
+from typing import Iterable
 
 from evergreen_config_generator import ConfigObject
 
@@ -67,6 +68,7 @@ def shell_exec(
     background: bool = False,
     add_expansions_to_env: bool = False,
     redirect_standard_error_to_output: bool = False,
+    include_expansions_in_env: Iterable[str] = (),
 ) -> ValueMapping:
     dedented = ""
     if errexit:
@@ -99,6 +101,9 @@ def shell_exec(
     if redirect_standard_error_to_output:
         command["params"]["redirect_standard_error_to_output"] = True
 
+    if include_expansions_in_env:
+        command["params"]["include_expansions_in_env"] = list(include_expansions_in_env)
+
     command["params"]["shell"] = "bash"
     command["params"]["script"] = dedented
     return command

.evergreen/legacy_config_generator/evergreen_config_lib/__init__.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import Iterable
 from evergreen_config_generator.functions import shell_exec
 
 
@@ -25,6 +26,7 @@ def shell_mongoc(
     background: bool = False,
     add_expansions_to_env: bool = False,
     redirect_standard_error_to_output: bool = False,
+    include_expansions_in_env: Iterable[str] = (),
 ):
     return shell_exec(
         script,
@@ -36,5 +38,6 @@ def shell_mongoc(
         continue_on_err=continue_on_err,
         background=background,
         add_expansions_to_env=add_expansions_to_env,
+        include_expansions_in_env=include_expansions_in_env,
         redirect_standard_error_to_output=redirect_standard_error_to_output,
     )

.evergreen/legacy_config_generator/evergreen_config_lib/functions.py

@@ -70,21 +70,23 @@
         export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED}
         export ENABLE_SSL=${ENABLE_SSL}
         export ENABLE_SNAPPY=${ENABLE_SNAPPY}
-        LINK_STATIC=  sh .evergreen/scripts/link-sample-program.sh
-        LINK_STATIC=1 sh .evergreen/scripts/link-sample-program.sh
-        '''),
+        LINK_STATIC=  bash .evergreen/scripts/link-sample-program.sh
+        LINK_STATIC=1 bash .evergreen/scripts/link-sample-program.sh
+        ''',
+        include_expansions_in_env=['distro_id']),
     )),
     ('link sample program bson', Function(
         shell_mongoc(r'''
         # Compile a program that links dynamically or statically to libbson,
         # using variables from pkg-config or from CMake's find_package command.
-        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=  sh .evergreen/scripts/link-sample-program-bson.sh
-        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
-        '''),
+        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=  BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=  bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=  LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=  bash .evergreen/scripts/link-sample-program-bson.sh
+        BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
+        ''',
+        include_expansions_in_env=['distro_id']),
     )),
     ('link sample program MSVC', Function(
         shell_mongoc(r'''
@@ -93,16 +95,24 @@
         # find_package command.
         export ENABLE_SSL=${ENABLE_SSL}
         export ENABLE_SNAPPY=${ENABLE_SNAPPY}
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         LINK_STATIC=  cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
         LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
-        '''),
+        ''',
+        include_expansions_in_env=['distro_id']),
     )),
     ('link sample program mingw', Function(
         shell_mongoc(r'''
         # Build libmongoc with CMake and compile a program that links
         # dynamically to it, using variables from pkg-config.exe.
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw.cmd
-        '''),
+        ''',
+        include_expansions_in_env=['distro_id']),
     )),
     ('link sample program MSVC bson', Function(
         shell_mongoc(r'''
@@ -111,14 +121,21 @@
         # find_package command.
         export ENABLE_SSL=${ENABLE_SSL}
         export ENABLE_SNAPPY=${ENABLE_SNAPPY}
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         LINK_STATIC=  cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
         LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
-        '''),
+        ''',
+        include_expansions_in_env=['distro_id']),
     )),
     ('link sample program mingw bson', Function(
         shell_mongoc(r'''
         # Build libmongoc with CMake and compile a program that links
         # dynamically to it, using variables from pkg-config.exe.
+        . .evergreen/scripts/use-tools.sh paths
+        . .evergreen/scripts/find-cmake-latest.sh
+        export CMAKE="$(native-path "$(find_cmake_latest)")"
         cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw-bson.cmd
         '''),
     )),
@@ -145,14 +162,14 @@
         shell_exec(r'''
         cd drivers-evergreen-tools
         export DRIVERS_TOOLS=$(pwd)
-        sh .evergreen/atlas_data_lake/build-mongohouse-local.sh
+        bash .evergreen/atlas_data_lake/build-mongohouse-local.sh
         '''),
     )),
     ('run mongohouse', Function(
         shell_exec(r'''
         cd drivers-evergreen-tools
         export DRIVERS_TOOLS=$(pwd)
-        sh .evergreen/atlas_data_lake/run-mongohouse-local.sh
+        bash .evergreen/atlas_data_lake/run-mongohouse-local.sh
         ''', background=True),
     )),
     ('test mongohouse', Function(