diff -pruN 2.0.2-1/.clang-format 2.1.0-1/.clang-format --- 2.0.2-1/.clang-format 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.clang-format 2025-08-14 18:37:23.000000000 +0000 @@ -1,6 +1,6 @@ --- -Language: Cpp -# BasedOnStyle: LLVM +# Note: the "Language" option is omitted to apply this format style to all files +# regardless of the detected language. AccessModifierOffset: -2 AlignAfterOpenBracket: Align AlignArrayOfStructures: None @@ -9,30 +9,63 @@ AlignConsecutiveAssignments: AcrossEmptyLines: false AcrossComments: false AlignCompound: false + AlignFunctionDeclarations: false + AlignFunctionPointers: false PadOperators: true AlignConsecutiveBitFields: Enabled: false AcrossEmptyLines: false AcrossComments: false AlignCompound: false + AlignFunctionDeclarations: false + AlignFunctionPointers: false PadOperators: false AlignConsecutiveDeclarations: Enabled: false AcrossEmptyLines: false AcrossComments: false AlignCompound: false + AlignFunctionDeclarations: true + AlignFunctionPointers: false PadOperators: false AlignConsecutiveMacros: Enabled: false AcrossEmptyLines: false AcrossComments: false AlignCompound: false + AlignFunctionDeclarations: false + AlignFunctionPointers: false PadOperators: false AlignConsecutiveShortCaseStatements: Enabled: false AcrossEmptyLines: false AcrossComments: false + AlignCaseArrows: false AlignCaseColons: false +AlignConsecutiveTableGenBreakingDAGArgColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionDeclarations: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveTableGenCondOperatorColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionDeclarations: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveTableGenDefinitionColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionDeclarations: false + AlignFunctionPointers: false + PadOperators: false AlignEscapedNewlines: Left AlignOperands: Align AlignTrailingComments: @@ -40,17 +73,19 @@ AlignTrailingComments: OverEmptyLines: 0 AllowAllArgumentsOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true +AllowBreakBeforeNoexceptSpecifier: Never AllowShortBlocksOnASingleLine: Never +AllowShortCaseExpressionOnASingleLine: true AllowShortCaseLabelsOnASingleLine: false +AllowShortCompoundRequirementOnASingleLine: true AllowShortEnumsOnASingleLine: true AllowShortFunctionsOnASingleLine: None AllowShortIfStatementsOnASingleLine: Never AllowShortLambdasOnASingleLine: All AllowShortLoopsOnASingleLine: false +AllowShortNamespacesOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: All AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: MultiLine AttributeMacros: - __capability - BSON_GNUC_WARN_UNUSED_RESULT @@ -78,17 +113,22 @@ BraceWrapping: SplitEmptyFunction: true SplitEmptyRecord: true SplitEmptyNamespace: true +BreakAdjacentStringLiterals: true BreakAfterAttributes: Never BreakAfterJavaFieldAnnotations: false +BreakAfterReturnType: All BreakArrays: true BreakBeforeBinaryOperators: None BreakBeforeConceptDeclarations: Always BreakBeforeBraces: Linux BreakBeforeInlineASMColon: OnlyMultiline BreakBeforeTernaryOperators: true +BreakBinaryOperations: Never BreakConstructorInitializers: BeforeColon +BreakFunctionDefinitionParameters: false BreakInheritanceList: BeforeColon BreakStringLiterals: true +BreakTemplateDeclarations: MultiLine ColumnLimit: 120 CommentPragmas: '^ IWYU pragma:' CompactNamespaces: false @@ -112,25 +152,55 @@ ForEachMacros: IfMacros: - mlib_assert_aborts - KJ_IF_MAYBE -IncludeBlocks: Preserve +IncludeBlocks: Regroup IncludeCategories: - - Regex: '^"(llvm|llvm-c|clang|clang-c)/' - Priority: 2 - SortPriority: 0 - CaseSensitive: false - - Regex: '^(<|"(gtest|gmock|isl|json)/)' - Priority: 3 - SortPriority: 0 - CaseSensitive: false - - Regex: '.*' - Priority: 1 - SortPriority: 0 - CaseSensitive: false + # The prelude header must always come first + - Regex: '-prelude\.h>' + Priority: 1 + # Relative "in this directory" headers next + - Regex: '"\./|"\.\./' + Priority: 2 + # Private API headers + - Regex: '-private\.h>' + Priority: 5 + # All other `mongoc/` headers + - Regex: '' + Priority: 90 + # Darwin platform headers + - Regex: '<(Availability|AvailabilityMacros|TargetConditionals|CommonCrypto/.*|Security/.*|CoreFoundation/.*)\.h>' + CaseSensitive: false + Priority: 90 + # Windows platform headers + - Regex: '<(win(dows|sock2|error|trnl|error|crypt|ver|dns)|sspi|ws2tcpip|ntstatus|mstcpip|process)\.h>' + CaseSensitive: false + Priority: 90 + # Standard library headers are near last + - Regex: '<(assert|string|ctype|limits|time|math|errno|inttypes|signal).h>|' + Priority: 100 + # Other -I headers get sorted before platform headers + - Regex: '<' + Priority: 80 IncludeIsMainRegex: '(Test)?$' IncludeIsMainSourceRegex: '' IndentAccessModifiers: false IndentCaseBlocks: false IndentCaseLabels: false +IndentExportBlock: true IndentExternBlock: AfterExternBlock IndentGotoLabels: true IndentPPDirectives: None @@ -149,12 +219,16 @@ IntegerLiteralSeparator: HexMinDigits: 0 JavaScriptQuotes: Leave JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: false -KeepEmptyLinesAtEOF: false +KeepEmptyLines: + AtEndOfFile: false + AtStartOfBlock: false + AtStartOfFile: false +KeepFormFeed: false LambdaBodyIndentation: Signature LineEnding: DeriveLF MacroBlockBegin: '' MacroBlockEnd: '' +MainIncludeChar: AngleBracket MaxEmptyLinesToKeep: 2 NamespaceIndentation: None ObjCBinPackProtocolList: Auto @@ -165,9 +239,11 @@ ObjCSpaceBeforeProtocolList: true PackConstructorInitializers: BinPack PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakBeforeMemberAccess: 150 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 PenaltyBreakOpenParenthesis: 0 +PenaltyBreakScopeResolution: 500 PenaltyBreakString: 1000 PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 @@ -177,15 +253,17 @@ PointerAlignment: Right PPIndentWidth: -1 QualifierAlignment: Leave ReferenceAlignment: Pointer -ReflowComments: true +ReflowComments: Always RemoveBracesLLVM: false +RemoveEmptyLinesInUnwrappedLines: false RemoveParentheses: Leave RemoveSemicolon: false RequiresClausePosition: OwnLine RequiresExpressionIndentation: OuterScope SeparateDefinitionBlocks: Leave ShortNamespaceLines: 1 -SortIncludes: Never +SkipMacroDefinitionBody: false +SortIncludes: CaseSensitive SortJavaStaticImport: Before SortUsingDeclarations: LexicographicNumeric SpaceAfterCStyleCast: true @@ -206,6 +284,7 @@ SpaceBeforeParensOptions: AfterFunctionDeclarationName: false AfterIfMacros: true AfterOverloadedOperator: false + AfterPlacementOperator: false AfterRequiresInClause: false AfterRequiresInExpression: false BeforeNonEmptyParentheses: false @@ -220,6 +299,7 @@ SpacesInLineCommentPrefix: Maximum: -1 SpacesInParens: Never SpacesInParensOptions: + ExceptDoubleParentheses: false InCStyleCasts: false InConditionalStatements: false InEmptyParentheses: false @@ -231,6 +311,7 @@ StatementAttributeLikeMacros: StatementMacros: - Q_UNUSED - QT_REQUIRE_VERSION +TableGenBreakInsideDAGArg: DontBreak TabWidth: 3 UseTab: Never VerilogBreakBetweenInstancePorts: true @@ -240,4 +321,5 @@ WhitespaceSensitiveMacros: - NS_SWIFT_NAME - PP_STRINGIZE - STRINGIZE +WrapNamespaceBodyWithEmptyLines: Leave ... diff -pruN 2.0.2-1/.evergreen/benchmark.yml 2.1.0-1/.evergreen/benchmark.yml --- 2.0.2-1/.evergreen/benchmark.yml 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/benchmark.yml 2025-08-14 18:37:23.000000000 +0000 @@ -170,10 +170,44 @@ functions: file_location: mongo-c-driver/report.json "send dashboard data" : - command: perf.send - params: - name: perf - file: mongo-c-driver/results.json + # Here we begin to generate the request to send the data to Signal Processing Service (SPS) + - command: shell.exec + params: + script: | + # We use the requester expansion to determine whether the data is from a mainline evergreen run or not + if [ "${requester}" == "commit" ]; then + echo "is_mainline: true" >> expansion.yml + else + echo "is_mainline: false" >> expansion.yml + fi + + # We parse the username out of the order_id as patches append that in and SPS does not need that information + echo "parsed_order_id: $(echo "${revision_order_id}" | awk -F'_' '{print $NF}')" >> expansion.yml + - command: expansions.update + params: + file: expansion.yml + - command: shell.exec + params: + script: | + # Submit the performance data to the SPS endpoint + response=$(curl -s -w "\nHTTP_STATUS:%{http_code}" -X 'POST' \ + "https://performance-monitoring-api.corp.mongodb.com/raw_perf_results/cedar_report?project=${project_id}&version=${version_id}&variant=${build_variant}&order=${parsed_order_id}&task_name=${task_name}&task_id=${task_id}&execution=${execution}&mainline=${is_mainline}" \ + -H 'accept: application/json' \ + -H 'Content-Type: application/json' \ + -d @mongo-c-driver/results.json) + + http_status=$(echo "$response" | grep "HTTP_STATUS" | awk -F':' '{print $2}') + response_body=$(echo "$response" | sed '/HTTP_STATUS/d') + + # We want to throw an error if the data was not successfully submitted + if [ "$http_status" -ne 200 ]; then + echo "Error: Received HTTP status $http_status" + echo "Response Body: $response_body" + exit 1 + fi + + echo "Response Body: $response_body" + echo "HTTP Status: $http_status" "backtrace": - command: shell.exec diff -pruN 2.0.2-1/.evergreen/config_generator/README.md 2.1.0-1/.evergreen/config_generator/README.md --- 2.0.2-1/.evergreen/config_generator/README.md 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/README.md 2025-08-14 18:37:23.000000000 +0000 @@ -3,36 +3,22 @@ The scripts in this directory are used to generate the Evergreen configuration files stored in `.evergreen/generated_configs/`. -The easiest way to execute these scripts is using the Poetry to install the -dependencies and then run the scripts. +The easiest way to execute these scripts is to use [uv](https://docs.astral.sh/uv/) to run the scripts. **Note**: These scripts require Python 3.10 or newer. ## Setting Up -Before running, use Poetry to install a virtualenv containing the dependencies. -This can be done by using the `poetry.sh` (or `poetry.ps1`) script contained in -the `tools/` directory at the root of the `mongo-c-driver` repository: - -```sh -./tools/poetry.sh install --with=dev -``` - -Or with PowerShell: - -```pwsh -./tools/poetry.ps1 install --with=dev -``` +`uv` is required to run Python scripts. See ["Installing uv"](https://docs.astral.sh/uv/getting-started/installation/) for instructions on how to obtain `uv`. ## Running the Generator -The package defines a program `mc-evg-generate`, which can be run within the -virtualenv. This can be done via Poetry as well, following the setup: +The package provides the `mc-evg-generate` [entry point](https://packaging.python.org/en/latest/specifications/entry-points): ```sh -./tools/poetry.sh run mc-evg-generate +uv run --frozen mc-evg-generate ``` This command will ready the generation files and generate a new set of Evergreen diff -pruN 2.0.2-1/.evergreen/config_generator/components/abi_compliance_check.py 2.1.0-1/.evergreen/config_generator/components/abi_compliance_check.py --- 2.0.2-1/.evergreen/config_generator/components/abi_compliance_check.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/abi_compliance_check.py 2025-08-14 18:37:23.000000000 +0000 @@ -33,7 +33,7 @@ class CheckABICompliance(Function): display_name='ABI Compliance Check: ', local_files_include_filter='abi-compliance/compat_reports/**/compat_report.html', permissions='public-read', - remote_file='mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/', + remote_file='${project}/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/', ), s3_put( command_type=EvgCommandType.SYSTEM, @@ -44,14 +44,10 @@ class CheckABICompliance(Function): display_name='ABI Compliance Check: ', local_files_include_filter='abi-compliance/logs/**/log.txt', permissions='public-read', - remote_file='mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/', + remote_file='${project}/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/', ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return CheckABICompliance.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/c_std_compile.py 2.1.0-1/.evergreen/config_generator/components/c_std_compile.py --- 2.0.2-1/.evergreen/config_generator/components/c_std_compile.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/c_std_compile.py 2025-08-14 18:37:23.000000000 +0000 @@ -28,20 +28,21 @@ MATRIX = [ ('rhel94', 'clang', None, [99, 11, 17, 23]), # Clang 17.0 (max: C2x) ('rhel95', 'clang', None, [99, 11, 17, 23]), # Clang 18.0 (max: C23) - ('rhel76', 'gcc', None, [99, 11, ]), # GCC 4.8 (max: C11) - ('rhel80', 'gcc', None, [99, 11, 17, ]), # GCC 8.2 (max: C17) - ('debian10', 'gcc-8', None, [99, 11, 17, ]), # GCC 8.3 (max: C17) - ('rhel84', 'gcc', None, [99, 11, 17, ]), # GCC 8.4 (max: C17) - ('ubuntu2004', 'gcc-9', None, [99, 11, 17, 23]), # GCC 9.4 (max: C2x) - ('debian11', 'gcc-10', None, [99, 11, 17, 23]), # GCC 10.2 (max: C2x) - ('rhel90', 'gcc', None, [99, 11, 17, 23]), # GCC 11.2 (max: C2x) - ('rhel92', 'gcc', None, [99, 11, 17, 23]), # GCC 11.3 (max: C2x) - ('rhel94', 'gcc', None, [99, 11, 17, 23]), # GCC 11.4 (max: C2x) - ('rhel95', 'gcc', None, [99, 11, 17, 23]), # GCC 11.5 (max: C2x) - - ('windows-vsCurrent', 'vs2017x64', None, [99, 11, 17, 'latest']), # Max: C17, clatest (C2x) - ('windows-vsCurrent', 'vs2019x64', None, [99, 11, 17, 'latest']), # Max: C17, clatest (C2x) - ('windows-vsCurrent', 'vs2022x64', None, [99, 11, 17, 'latest']), # Max: C17, clatest (C2x) + ('rhel7-latest', 'gcc', None, [99, 11, ]), # GCC 4.8 (max: C11) + ('rhel80', 'gcc', None, [99, 11, 17, ]), # GCC 8.2 (max: C17) + ('rhel84', 'gcc', None, [99, 11, 17, ]), # GCC 8.4 (max: C17) + ('ubuntu2004', 'gcc-9', None, [99, 11, 17, 23]), # GCC 9.4 (max: C2x) + ('debian11', 'gcc-10', None, [99, 11, 17, 23]), # GCC 10.2 (max: C2x) + ('rhel90', 'gcc', None, [99, 11, 17, 23]), # GCC 11.2 (max: C2x) + ('rhel92', 'gcc', None, [99, 11, 17, 23]), # GCC 11.3 (max: C2x) + ('rhel94', 'gcc', None, [99, 11, 17, 23]), # GCC 11.4 (max: C2x) + ('rhel95', 'gcc', None, [99, 11, 17, 23]), # GCC 11.5 (max: C2x) + ('ubuntu2404', 'gcc-13', None, [99, 11, 17, 23]), # GCC 13.3 (max: C2x) + + ('windows-vsCurrent', 'vs2015x64', None, [99, 11, ]), # Max: C11 + ('windows-vsCurrent', 'vs2017x64', None, [99, 11, ]), # Max: C11 + ('windows-vsCurrent', 'vs2019x64', None, [99, 11, 17]), # Max: C17 + ('windows-vsCurrent', 'vs2022x64', None, [99, 11, 17]), # Max: C17 ] # fmt: on # pylint: enable=line-too-long @@ -58,10 +59,6 @@ class StdCompile(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return StdCompile.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/check_mongoc_public_headers.py 2.1.0-1/.evergreen/config_generator/components/check_mongoc_public_headers.py --- 2.0.2-1/.evergreen/config_generator/components/check_mongoc_public_headers.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/check_mongoc_public_headers.py 2025-08-14 18:37:23.000000000 +0000 @@ -20,10 +20,6 @@ class CheckMongocPublicHeaders(Function) ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return CheckMongocPublicHeaders.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/clang_format.py 2.1.0-1/.evergreen/config_generator/components/clang_format.py --- 2.0.2-1/.evergreen/config_generator/components/clang_format.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/clang_format.py 2025-08-14 18:37:23.000000000 +0000 @@ -3,41 +3,27 @@ from shrub.v3.evg_command import EvgComm from shrub.v3.evg_task import EvgTask from shrub.v3.evg_task import EvgTaskRef -from config_generator.etc.distros import find_large_distro +from config_generator.etc.distros import find_small_distro from config_generator.etc.function import Function from config_generator.etc.utils import bash_exec TAG = "clang-format" -DISTROS = [ - find_large_distro("ubuntu2204").name, - find_large_distro("ubuntu2004").name, -] - class ClangFormat(Function): name = TAG commands = [ bash_exec( - command_type=EvgCommandType.SETUP, - working_dir="mongoc", - script="./tools/poetry.sh install --with=dev" - ), - bash_exec( command_type=EvgCommandType.TEST, working_dir="mongoc", env={ "DRYRUN": "1", }, - script="./tools/poetry.sh run .evergreen/scripts/clang-format-all.sh", + script="uv run --frozen --only-group=format tools/format.py --mode=check", ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return ClangFormat.defn() @@ -56,7 +42,7 @@ def variants(): BuildVariant( name=TAG, display_name=TAG, - run_on=DISTROS, - tasks=[EvgTaskRef(name=f'.{TAG}')], + run_on=[find_small_distro("ubuntu2204").name], + tasks=[EvgTaskRef(name=f".{TAG}")], ), ] diff -pruN 2.0.2-1/.evergreen/config_generator/components/cse/openssl.py 2.1.0-1/.evergreen/config_generator/components/cse/openssl.py --- 2.0.2-1/.evergreen/config_generator/components/cse/openssl.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/cse/openssl.py 2025-08-14 18:37:23.000000000 +0000 @@ -15,35 +15,40 @@ TAG = f'cse-matrix-{SSL}' # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('debian92', 'clang', None, ['cyrus']), - ('debian92', 'gcc', None, ['cyrus']), - ('debian10', 'clang', None, ['cyrus']), - ('debian10', 'gcc', None, ['cyrus']), - ('debian11', 'clang', None, ['cyrus']), - ('debian11', 'gcc', None, ['cyrus']), - ('rhel80', 'gcc', None, ['cyrus']), + # For test matrix. + ('rhel8-latest', 'gcc', None, ['cyrus']), ('rhel8-zseries', 'gcc', None, ['cyrus']), - ('ubuntu2004', 'clang', None, ['cyrus']), - ('ubuntu2004', 'gcc', None, ['cyrus']), ('ubuntu2004-arm64', 'gcc', None, ['cyrus']), ('windows-vsCurrent', 'vs2017x64', None, ['cyrus']), + + # For compile only. + ('debian11', 'clang', None, ['cyrus']), + ('debian11', 'gcc', None, ['cyrus']), + ('debian12', 'clang', None, ['cyrus']), + ('debian12', 'gcc', None, ['cyrus']), + ('rhel80', 'gcc', None, ['cyrus']), + ('ubuntu2004', 'gcc', None, ['cyrus']), + ('ubuntu2004', 'clang', None, ['cyrus']), + ('ubuntu2204', 'gcc', None, ['cyrus']), + ('ubuntu2204', 'clang-12', None, ['cyrus']), + ('ubuntu2404', 'gcc', None, ['cyrus']), + ('ubuntu2404', 'clang-14', None, ['cyrus']), ] # TODO (CDRIVER-3789): test cse with the 'sharded' topology. +# CSFLE requires 4.2+. QE requires 7.0+ and are skipped on "server" tasks. TEST_MATRIX = [ - # 4.2 and 4.4 not available on rhel8-zseries. - ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']), + # rhel8-latest provides 4.2+. + ('rhel8-latest', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - ('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]), + # windows-vsCurrent provides 4.2+. + ('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - # Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+. - ('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']), - ('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - ('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']), + # ubuntu2004-arm64 provides 4.4+. + ('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. - ('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']), + # rhel8-zseries provides 5.0+. + ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['5.0', '6.0', '7.0', '8.0', 'latest']), ] # fmt: on # pylint: enable=line-too-long @@ -106,6 +111,8 @@ def variants(): else: tasks.append(task.get_task_ref()) + tasks.sort(key=lambda t: t.name) + return [ BuildVariant( name=TAG, diff -pruN 2.0.2-1/.evergreen/config_generator/components/earthly.py 2.1.0-1/.evergreen/config_generator/components/earthly.py --- 2.0.2-1/.evergreen/config_generator/components/earthly.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/earthly.py 2025-08-14 18:37:23.000000000 +0000 @@ -5,9 +5,18 @@ import re from typing import Iterable, Literal, Mapping, NamedTuple, TypeVar from shrub.v3.evg_build_variant import BuildVariant -from shrub.v3.evg_command import BuiltInCommand, EvgCommandType, subprocess_exec +from shrub.v3.evg_command import ( + BuiltInCommand, + EvgCommandType, + KeyValueParam, + ec2_assume_role, + expansions_update, + subprocess_exec, +) from shrub.v3.evg_task import EvgTask, EvgTaskRef +from config_generator.etc.function import Function + from ..etc.utils import all_possible T = TypeVar("T") @@ -38,7 +47,7 @@ SASLOption = Literal["Cyrus", "off"] "Valid options for the SASL configuration parameter" TLSOption = Literal["OpenSSL", "off"] "Options for the TLS backend configuration parameter (AKA 'ENABLE_SSL')" -CxxVersion = Literal["none"] # TODO: Once CXX-3103 is released, add latest C++ release tag. +CxxVersion = Literal["master", "r4.1.0", "none"] "C++ driver refs that are under CI test" # A separator character, since we cannot use whitespace @@ -59,7 +68,9 @@ def os_split(env: EnvKey) -> tuple[str, case "centos7": return "CentOS", "7.0" case _: - raise ValueError(f"Failed to split OS env key {env=} into a name+version pair (unrecognized)") + raise ValueError( + f"Failed to split OS env key {env=} into a name+version pair (unrecognized)" + ) class EarthlyVariant(NamedTuple): @@ -136,14 +147,44 @@ class Configuration(NamedTuple): return _SEPARATOR.join(f"{k}={v}" for k, v in self._asdict().items()) +# Authenticate with DevProd-provided Amazon ECR instance to use as pull-through cache for DockerHub. +class DockerLoginAmazonECR(Function): + name = "docker-login-amazon-ecr" + commands = [ + # Avoid inadvertently using a pre-existing and potentially conflicting Docker config. + expansions_update( + updates=[KeyValueParam(key="DOCKER_CONFIG", value="${workdir}/.docker")] + ), + ec2_assume_role( + role_arn="arn:aws:iam::901841024863:role/ecr-role-evergreen-ro" + ), + subprocess_exec( + binary="bash", + command_type=EvgCommandType.SETUP, + include_expansions_in_env=[ + "AWS_ACCESS_KEY_ID", + "AWS_SECRET_ACCESS_KEY", + "AWS_SESSION_TOKEN", + "DOCKER_CONFIG", + ], + args=[ + "-c", + "aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 901841024863.dkr.ecr.us-east-1.amazonaws.com", + ], + ), + ] + + def task_filter(env: EarthlyVariant, conf: Configuration) -> bool: """ Control which tasks are actually defined by matching on the platform and configuration values. """ match env, conf: - # u16/centos7 are not capable of building mongocxx - case e, (_sasl, _tls, cxx) if re.match(r"^Ubuntu 16|^CentOS 7", e.display_name): + # u16/u18/centos7 are not capable of building mongocxx + case e, (_sasl, _tls, cxx) if re.match( + r"^Ubuntu 16|^Ubuntu 18|^CentOS 7", e.display_name + ): # Only build if C++ driver is test is disabled return cxx == "none" # Anything else: Allow it to run: @@ -170,11 +211,16 @@ def earthly_exec( return subprocess_exec( "./tools/earthly.sh", args=[ + # Use Amazon ECR as pull-through cache for DockerHub to avoid rate limits. + "--buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3", *(f"--secret={k}" for k in (secrets or ())), f"+{target}", + # Use Amazon ECR as pull-through cache for DockerHub to avoid rate limits. + "--default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub", *(f"--{arg}={val}" for arg, val in (args or {}).items()), ], command_type=EvgCommandType(kind), + include_expansions_in_env=["DOCKER_CONFIG"], env=env if env else None, working_dir="mongoc", ) @@ -209,15 +255,7 @@ def earthly_task( return EvgTask( name=name, commands=[ - # Ensure subsequent Docker commands are authenticated. - subprocess_exec( - binary="bash", - command_type=EvgCommandType.SETUP, - args=[ - "-c", - r'docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}"', - ], - ), + DockerLoginAmazonECR.call(), # First, just build the "env-warmup" which will prepare the build environment. # This won't generate any output, but allows EVG to track it as a separate build step # for timing and logging purposes. The subequent build step will cache-hit the @@ -241,13 +279,18 @@ def earthly_task( CONTAINER_RUN_DISTROS = [ - "ubuntu2204-large", - "debian10-large", - "debian11-large", "amazon2", + "debian11-large", + "debian12-large", + "ubuntu2204-large", + "ubuntu2404-large", ] +def functions(): + return DockerLoginAmazonECR.defn() + + def tasks() -> Iterable[EvgTask]: for conf in all_possible(Configuration): # test-example is a target in all configurations @@ -265,6 +308,16 @@ def tasks() -> Iterable[EvgTask]: if task is not None: yield task + yield EvgTask( + name="verify-headers", + commands=[ + DockerLoginAmazonECR.call(), + earthly_exec(kind="test", target="verify-headers"), + ], + tags=["pr-merge-gate"], + run_on=CONTAINER_RUN_DISTROS, + ) + def variants() -> Iterable[BuildVariant]: yield from (ev.as_evg_variant() for ev in all_possible(EarthlyVariant)) diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/backtrace.py 2.1.0-1/.evergreen/config_generator/components/funcs/backtrace.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/backtrace.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/backtrace.py 2025-08-14 18:37:23.000000000 +0000 @@ -11,10 +11,6 @@ class Backtrace(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return Backtrace.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/bootstrap_mongo_orchestration.py 2.1.0-1/.evergreen/config_generator/components/funcs/bootstrap_mongo_orchestration.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/bootstrap_mongo_orchestration.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/bootstrap_mongo_orchestration.py 2025-08-14 18:37:23.000000000 +0000 @@ -21,10 +21,6 @@ class BootstrapMongoOrchestration(Functi ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return BootstrapMongoOrchestration.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/fetch_det.py 2.1.0-1/.evergreen/config_generator/components/funcs/fetch_det.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/fetch_det.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/fetch_det.py 2025-08-14 18:37:23.000000000 +0000 @@ -40,10 +40,6 @@ class FetchDET(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return FetchDET.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/fetch_source.py 2.1.0-1/.evergreen/config_generator/components/funcs/fetch_source.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/fetch_source.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/fetch_source.py 2025-08-14 18:37:23.000000000 +0000 @@ -39,10 +39,6 @@ class FetchSource(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return FetchSource.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/restore_instance_profile.py 2.1.0-1/.evergreen/config_generator/components/funcs/restore_instance_profile.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/restore_instance_profile.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/restore_instance_profile.py 2025-08-14 18:37:23.000000000 +0000 @@ -34,10 +34,6 @@ class RestoreInstanceProfile(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return RestoreInstanceProfile.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/run_mock_kms_servers.py 2.1.0-1/.evergreen/config_generator/components/funcs/run_mock_kms_servers.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/run_mock_kms_servers.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/run_mock_kms_servers.py 2025-08-14 18:37:23.000000000 +0000 @@ -55,10 +55,6 @@ class RunMockKMSServers(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return RunMockKMSServers.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/run_simple_http_server.py 2.1.0-1/.evergreen/config_generator/components/funcs/run_simple_http_server.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/run_simple_http_server.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/run_simple_http_server.py 2025-08-14 18:37:23.000000000 +0000 @@ -22,10 +22,6 @@ class RunSimpleHTTPServer(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return RunSimpleHTTPServer.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/run_tests.py 2.1.0-1/.evergreen/config_generator/components/funcs/run_tests.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/run_tests.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/run_tests.py 2025-08-14 18:37:23.000000000 +0000 @@ -15,10 +15,6 @@ class RunTests(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return RunTests.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/stop_load_balancer.py 2.1.0-1/.evergreen/config_generator/components/funcs/stop_load_balancer.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/stop_load_balancer.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/stop_load_balancer.py 2025-08-14 18:37:23.000000000 +0000 @@ -19,10 +19,6 @@ class StopLoadBalancer(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return StopLoadBalancer.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/stop_mongo_orchestration.py 2.1.0-1/.evergreen/config_generator/components/funcs/stop_mongo_orchestration.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/stop_mongo_orchestration.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/stop_mongo_orchestration.py 2025-08-14 18:37:23.000000000 +0000 @@ -14,10 +14,6 @@ class StopMongoOrchestration(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return StopMongoOrchestration.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/upload_build.py 2.1.0-1/.evergreen/config_generator/components/funcs/upload_build.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/upload_build.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/upload_build.py 2025-08-14 18:37:23.000000000 +0000 @@ -22,10 +22,6 @@ class UploadBuild(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return UploadBuild.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py 2.1.0-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py 2025-08-14 18:37:23.000000000 +0000 @@ -87,10 +87,6 @@ class UploadMOArtifacts(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return UploadMOArtifacts.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/funcs/upload_test_results.py 2.1.0-1/.evergreen/config_generator/components/funcs/upload_test_results.py --- 2.0.2-1/.evergreen/config_generator/components/funcs/upload_test_results.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/funcs/upload_test_results.py 2025-08-14 18:37:23.000000000 +0000 @@ -19,10 +19,6 @@ class UploadTestResults(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return UploadTestResults.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/kms_divergence_check.py 2.1.0-1/.evergreen/config_generator/components/kms_divergence_check.py --- 2.0.2-1/.evergreen/config_generator/components/kms_divergence_check.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/kms_divergence_check.py 2025-08-14 18:37:23.000000000 +0000 @@ -16,10 +16,6 @@ class KmsDivergenceCheck(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return KmsDivergenceCheck.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/loadbalanced.py 2.1.0-1/.evergreen/config_generator/components/loadbalanced.py --- 2.0.2-1/.evergreen/config_generator/components/loadbalanced.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/loadbalanced.py 2025-08-14 18:37:23.000000000 +0000 @@ -12,8 +12,8 @@ from config_generator.components.funcs.u from config_generator.etc.distros import make_distro_str, find_small_distro, find_large_distro from config_generator.etc.utils import bash_exec -# Use `rhel8.9` distro. `rhel8.9` distro includes necessary dependency: `haproxy`. -_DISTRO_NAME = "rhel8.9" +# Use `rhel8-latest` distro. `rhel8-latest` distro includes necessary dependency: `haproxy`. +_DISTRO_NAME = "rhel8-latest" _COMPILER = "gcc" @@ -44,7 +44,7 @@ def make_test_task(auth: bool, ssl: bool name=f"loadbalanced-{distro_str}-test-{server_version}-{auth_str}-{ssl_str}", depends_on=[EvgTaskDependency( name=f"loadbalanced-{distro_str}-compile")], - run_on=find_small_distro(_DISTRO_NAME).name, + run_on=find_large_distro(_DISTRO_NAME).name, # DEVPROD-18763 tags=['loadbalanced', _DISTRO_NAME, _COMPILER, auth_str, ssl_str], commands=[ FetchBuild.call(build_name=f"loadbalanced-{distro_str}-compile"), diff -pruN 2.0.2-1/.evergreen/config_generator/components/make_docs.py 2.1.0-1/.evergreen/config_generator/components/make_docs.py --- 2.0.2-1/.evergreen/config_generator/components/make_docs.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/make_docs.py 2025-08-14 18:37:23.000000000 +0000 @@ -17,18 +17,12 @@ class MakeDocs(Function): working_dir="mongoc", include_expansions_in_env=["distro_id"], script="""\ - set -o errexit - ./tools/poetry.sh install --with=docs # See SphinxBuild.cmake for EVG_DOCS_BUILD reasoning - ./tools/poetry.sh run env EVG_DOCS_BUILD=1 .evergreen/scripts/build-docs.sh - """, + uv run --frozen --only-group docs env EVG_DOCS_BUILD=1 .evergreen/scripts/build-docs.sh + """, ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - class UploadDocs(Function): name = "upload-docs" @@ -71,10 +65,6 @@ class UploadDocs(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - class UploadManPages(Function): name = "upload-man-pages" @@ -116,10 +106,6 @@ class UploadManPages(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return merge_defns( diff -pruN 2.0.2-1/.evergreen/config_generator/components/openssl_static_compile.py 2.1.0-1/.evergreen/config_generator/components/openssl_static_compile.py --- 2.0.2-1/.evergreen/config_generator/components/openssl_static_compile.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/openssl_static_compile.py 2025-08-14 18:37:23.000000000 +0000 @@ -17,10 +17,11 @@ TAG = f'{SSL}-matrix' # pylint: disable=line-too-long # fmt: off MATRIX = [ - ('debian92', 'gcc', None), - ('debian10', 'gcc', None), ('debian11', 'gcc', None), + ('debian12', 'gcc', None), ('ubuntu2004', 'gcc', None), + ('ubuntu2204', 'gcc', None), + ('ubuntu2404', 'gcc', None), ] # fmt: on # pylint: enable=line-too-long @@ -37,10 +38,6 @@ class StaticOpenSSLCompile(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return StaticOpenSSLCompile.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/components/sanitizers/asan_cse.py 2.1.0-1/.evergreen/config_generator/components/sanitizers/asan_cse.py --- 2.0.2-1/.evergreen/config_generator/components/sanitizers/asan_cse.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sanitizers/asan_cse.py 2025-08-14 18:37:23.000000000 +0000 @@ -10,16 +10,13 @@ from config_generator.components.sanitiz # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('ubuntu2004', 'clang', None, ['cyrus']), - ('debian10', 'clang', None, ['cyrus']), + ('rhel8-latest', 'clang', None, ['cyrus']), ] +# CSFLE requires 4.2+. QE requires 7.0+ and are skipped on "server" tasks. TEST_MATRIX = [ - # Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+. - ('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - - # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. - ('debian10', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2']), + # rhel8-latest provides 4.2 through latest. + ('rhel8-latest', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ] # fmt: on # pylint: enable=line-too-long diff -pruN 2.0.2-1/.evergreen/config_generator/components/sanitizers/asan_sasl.py 2.1.0-1/.evergreen/config_generator/components/sanitizers/asan_sasl.py --- 2.0.2-1/.evergreen/config_generator/components/sanitizers/asan_sasl.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sanitizers/asan_sasl.py 2025-08-14 18:37:23.000000000 +0000 @@ -10,15 +10,12 @@ from config_generator.components.sanitiz # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('ubuntu2004', 'clang', None, ['cyrus']), - ('debian10', 'clang', None, ['cyrus']), + ('rhel8-latest', 'clang', None, ['cyrus']), ] TEST_MATRIX = [ - ('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - - # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. - ('debian10', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2']), + # rhel8-latest provides 4.2 through latest. + ('rhel8-latest', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ] # fmt: on # pylint: enable=line-too-long diff -pruN 2.0.2-1/.evergreen/config_generator/components/sanitizers/tsan_sasl.py 2.1.0-1/.evergreen/config_generator/components/sanitizers/tsan_sasl.py --- 2.0.2-1/.evergreen/config_generator/components/sanitizers/tsan_sasl.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sanitizers/tsan_sasl.py 2025-08-14 18:37:23.000000000 +0000 @@ -10,15 +10,12 @@ from config_generator.components.sanitiz # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('ubuntu2004', 'clang', None, ['cyrus']), - ('debian10', 'clang', None, ['cyrus']), + ('rhel8-latest', 'clang', None, ['cyrus']), ] TEST_OPENSSL_MATRIX = [ - ('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - - # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. - ('debian10', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2']), + # rhel8-latest provides 4.2 through latest. + ('rhel8-latest', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ] # fmt: on # pylint: enable=line-too-long diff -pruN 2.0.2-1/.evergreen/config_generator/components/sasl/darwinssl.py 2.1.0-1/.evergreen/config_generator/components/sasl/darwinssl.py --- 2.0.2-1/.evergreen/config_generator/components/sasl/darwinssl.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sasl/darwinssl.py 2025-08-14 18:37:23.000000000 +0000 @@ -22,7 +22,7 @@ COMPILE_MATRIX = [ ] TEST_MATRIX = [ - ('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0']), + ('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']), ('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', ]), ('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']), diff -pruN 2.0.2-1/.evergreen/config_generator/components/sasl/nossl.py 2.1.0-1/.evergreen/config_generator/components/sasl/nossl.py --- 2.0.2-1/.evergreen/config_generator/components/sasl/nossl.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sasl/nossl.py 2025-08-14 18:37:23.000000000 +0000 @@ -15,16 +15,17 @@ TAG = f'sasl-matrix-{SSL}' # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('ubuntu2004', 'gcc', None, ['off']), - ('windows-vsCurrent', 'vs2017x64', None, ['off']), - ('debian10', 'gcc', None, ['off']), + # For test matrix. + ('rhel8-latest', 'gcc', None, ['off']), + + # For compile only. + ('ubuntu2204', 'gcc', None, ['off']), + ('ubuntu2404', 'gcc', None, ['off']), + ('windows-vsCurrent', 'vs2017x64', None, ['off']), ] TEST_MATRIX = [ - ('ubuntu2004', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - - # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. - ('debian10', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.2']), + ('rhel8-latest', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ] # fmt: on # pylint: enable=line-too-long diff -pruN 2.0.2-1/.evergreen/config_generator/components/sasl/openssl.py 2.1.0-1/.evergreen/config_generator/components/sasl/openssl.py --- 2.0.2-1/.evergreen/config_generator/components/sasl/openssl.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sasl/openssl.py 2025-08-14 18:37:23.000000000 +0000 @@ -15,31 +15,33 @@ TAG = f'sasl-matrix-{SSL}' # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('debian92', 'clang', None, ['cyrus']), - ('debian92', 'gcc', None, ['cyrus']), - ('debian10', 'gcc', None, ['cyrus']), - ('debian11', 'gcc', None, ['cyrus']), - ('rhel80', 'gcc', None, ['cyrus']), + # For test matrix. + ('amazon2023-arm64-latest-large-m8g', 'gcc', None, ['cyrus']), + ('rhel8-latest', 'gcc', None, ['cyrus']), ('rhel8-power', 'gcc', None, ['cyrus']), ('rhel8-zseries', 'gcc', None, ['cyrus']), - ('ubuntu2004', 'clang', None, ['cyrus']), ('ubuntu2004-arm64', 'gcc', None, ['cyrus']), - ('ubuntu2004', 'gcc', None, ['cyrus']), ('windows-vsCurrent', 'vs2017x64', None, ['cyrus']), - ('amazon2023-arm64-latest-large-m8g', 'gcc', None, ['cyrus']), + + # For compile only. + ('debian11', 'gcc', None, ['cyrus']), + ('debian12', 'gcc', None, ['cyrus']), + ('rhel80', 'gcc', None, ['cyrus']), + ('ubuntu2004', 'clang', None, ['cyrus']), + ('ubuntu2204', 'gcc', None, ['cyrus']), + ('ubuntu2204', 'clang-12', None, ['cyrus']), + ('ubuntu2404', 'gcc', None, ['cyrus']), + ('ubuntu2404', 'clang-14', None, ['cyrus']), ] TEST_MATRIX = [ - ('rhel8-power', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), + ('rhel8-latest', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), + ('rhel8-power', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], [ '5.0', '6.0', '7.0', '8.0', 'latest']), ('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), - ('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], [ 'latest']), - # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. - ('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']), - # Test with Graviton processor: ('amazon2023-arm64-latest-large-m8g', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['latest']), ] @@ -100,6 +102,8 @@ def variants(): else: tasks.append(task.get_task_ref()) + tasks.sort(key=lambda t: t.name) + return [ BuildVariant( name=TAG, diff -pruN 2.0.2-1/.evergreen/config_generator/components/sasl/winssl.py 2.1.0-1/.evergreen/config_generator/components/sasl/winssl.py --- 2.0.2-1/.evergreen/config_generator/components/sasl/winssl.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sasl/winssl.py 2025-08-14 18:37:23.000000000 +0000 @@ -21,7 +21,7 @@ COMPILE_MATRIX = [ ] TEST_MATRIX = [ - ('windows-vsCurrent', 'vs2017x64', None, 'sspi', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), + ('windows-vsCurrent', 'vs2017x64', None, 'sspi', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ('windows-vsCurrent', 'mingw', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']), ('windows-vsCurrent', 'vs2017x86', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']), diff -pruN 2.0.2-1/.evergreen/config_generator/components/sbom.py 2.1.0-1/.evergreen/config_generator/components/sbom.py --- 2.0.2-1/.evergreen/config_generator/components/sbom.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/sbom.py 2025-08-14 18:37:23.000000000 +0000 @@ -3,11 +3,17 @@ from config_generator.etc.function impor from config_generator.etc.utils import bash_exec from shrub.v3.evg_build_variant import BuildVariant -from shrub.v3.evg_command import BuiltInCommand, EvgCommandType, expansions_update, s3_put +from shrub.v3.evg_command import ( + BuiltInCommand, + EvgCommandType, + KeyValueParam, + ec2_assume_role, + expansions_update, + s3_put, +) from shrub.v3.evg_task import EvgTask, EvgTaskRef from pydantic import ConfigDict -from typing import Optional TAG = 'sbom' @@ -18,56 +24,58 @@ class CustomCommand(BuiltInCommand): model_config = ConfigDict(arbitrary_types_allowed=True) -def ec2_assume_role( - role_arn: Optional[str] = None, - policy: Optional[str] = None, - duration_seconds: Optional[int] = None, - command_type: Optional[EvgCommandType] = None, -) -> CustomCommand: - return CustomCommand( - command="ec2.assume_role", - params={ - "role_arn": role_arn, - "policy": policy, - "duration_seconds": duration_seconds, - }, - type=command_type, - ) - - class SBOM(Function): name = 'sbom' commands = [ - ec2_assume_role( - command_type=EvgCommandType.SETUP, - role_arn='${kondukto_role_arn}', - ), - bash_exec( - command_type=EvgCommandType.SETUP, - include_expansions_in_env=[ - 'AWS_ACCESS_KEY_ID', - 'AWS_SECRET_ACCESS_KEY', - 'AWS_SESSION_TOKEN', - ], - script='''\ + # Authenticate with Kondukto. + *[ + ec2_assume_role( + command_type=EvgCommandType.SETUP, + role_arn='${kondukto_role_arn}', + ), + bash_exec( + command_type=EvgCommandType.SETUP, + include_expansions_in_env=[ + 'AWS_ACCESS_KEY_ID', + 'AWS_SECRET_ACCESS_KEY', + 'AWS_SESSION_TOKEN', + ], + script='''\ set -o errexit set -o pipefail kondukto_token="$(aws secretsmanager get-secret-value --secret-id "kondukto-token" --region "us-east-1" --query 'SecretString' --output text)" printf "KONDUKTO_TOKEN: %s\\n" "$kondukto_token" >|expansions.kondukto.yml ''', - ), - expansions_update( - command_type=EvgCommandType.SETUP, - file='expansions.kondukto.yml', - ), + ), + expansions_update( + command_type=EvgCommandType.SETUP, + file='expansions.kondukto.yml', + ), + ], + # Authenticate with Amazon ECR. + *[ + # Avoid inadvertently using a pre-existing and potentially conflicting Podman config. + # Note: podman understands and uses DOCKER_CONFIG despite the name. + expansions_update(updates=[KeyValueParam(key='DOCKER_CONFIG', value='${workdir}/.docker')]), + ec2_assume_role(role_arn="arn:aws:iam::901841024863:role/ecr-role-evergreen-ro"), + bash_exec( + command_type=EvgCommandType.SETUP, + include_expansions_in_env=[ + "AWS_ACCESS_KEY_ID", + "AWS_SECRET_ACCESS_KEY", + "AWS_SESSION_TOKEN", + "DOCKER_CONFIG", + ], + script='aws ecr get-login-password --region us-east-1 | podman login --username AWS --password-stdin 901841024863.dkr.ecr.us-east-1.amazonaws.com', + ), + ], bash_exec( command_type=EvgCommandType.TEST, working_dir='mongoc', include_expansions_in_env=[ - 'artifactory_password', - 'artifactory_username', 'branch_name', - 'KONDUKTO_TOKEN', + 'DOCKER_CONFIG', + "KONDUKTO_TOKEN", ], script='.evergreen/scripts/sbom.sh', ), @@ -84,10 +92,6 @@ class SBOM(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return merge_defns( diff -pruN 2.0.2-1/.evergreen/config_generator/components/scan_build.py 2.1.0-1/.evergreen/config_generator/components/scan_build.py --- 2.0.2-1/.evergreen/config_generator/components/scan_build.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/components/scan_build.py 2025-08-14 18:37:23.000000000 +0000 @@ -38,10 +38,6 @@ class ScanBuild(Function): ), ] - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) - def functions(): return ScanBuild.defn() diff -pruN 2.0.2-1/.evergreen/config_generator/etc/cse/compile.py 2.1.0-1/.evergreen/config_generator/etc/cse/compile.py --- 2.0.2-1/.evergreen/config_generator/etc/cse/compile.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/etc/cse/compile.py 2025-08-14 18:37:23.000000000 +0000 @@ -35,7 +35,3 @@ class CompileCommon(Function): }, ), ] - - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) diff -pruN 2.0.2-1/.evergreen/config_generator/etc/cse/test.py 2.1.0-1/.evergreen/config_generator/etc/cse/test.py --- 2.0.2-1/.evergreen/config_generator/etc/cse/test.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/etc/cse/test.py 2025-08-14 18:37:23.000000000 +0000 @@ -4,7 +4,7 @@ from shrub.v3.evg_command import expansi from shrub.v3.evg_command import KeyValueParam from shrub.v3.evg_task import EvgTask, EvgTaskDependency -from config_generator.etc.distros import find_small_distro +from config_generator.etc.distros import find_large_distro, find_small_distro from config_generator.etc.distros import make_distro_str from config_generator.etc.distros import compiler_to_vars @@ -26,7 +26,10 @@ def generate_test_tasks(SSL, TAG, MATRIX for distro_name, compiler, arch, sasl, auths, topologies, server_vers in MATRIX: tags = [TAG, 'test', distro_name, compiler, f'sasl-{sasl}', 'cse'] - test_distro = find_small_distro(distro_name) + if distro_name == 'rhel8-latest': + test_distro = find_large_distro(distro_name) # DEVPROD-18763 + else: + test_distro = find_small_distro(distro_name) compile_vars = [] compile_vars = [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()] diff -pruN 2.0.2-1/.evergreen/config_generator/etc/distros.py 2.1.0-1/.evergreen/config_generator/etc/distros.py --- 2.0.2-1/.evergreen/config_generator/etc/distros.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/etc/distros.py 2025-08-14 18:37:23.000000000 +0000 @@ -28,8 +28,6 @@ class Distro(BaseModel): '2019', '2022', 'vsCurrent', - 'vsCurrent2', - 'vsMulti', ] | None = None size: Literal['small', 'large'] | None = None arch: Literal['arm64', 'power', 'zseries'] | None = None @@ -37,7 +35,7 @@ class Distro(BaseModel): @validator('os_ver') @classmethod def validate_os_ver(cls, value): - return Version(value) + return value == 'latest' or Version(value) def ls_distro(name, **kwargs): @@ -48,9 +46,8 @@ def ls_distro(name, **kwargs): DEBIAN_DISTROS = [ - *ls_distro(name='debian92', os='debian', os_type='linux', os_ver='9.2'), # CDRIVER-5873 - *ls_distro(name='debian10', os='debian', os_type='linux', os_ver='10'), # CDRIVER-5874 *ls_distro(name='debian11', os='debian', os_type='linux', os_ver='11'), + *ls_distro(name='debian12', os='debian', os_type='linux', os_ver='12'), ] MACOS_DISTROS = [ @@ -63,7 +60,9 @@ MACOS_ARM64_DISTROS = [ ] RHEL_DISTROS = [ - *ls_distro(name='rhel76', os='rhel', os_type='linux', os_ver='7.6'), + *ls_distro(name='rhel7-latest', os='rhel', os_type='linux', os_ver='7'), + *ls_distro(name='rhel8-latest', os='rhel', os_type='linux', os_ver='8'), + *ls_distro(name='rhel80', os='rhel', os_type='linux', os_ver='8.0'), *ls_distro(name='rhel84', os='rhel', os_type='linux', os_ver='8.4'), *ls_distro(name='rhel90', os='rhel', os_type='linux', os_ver='9.0'), @@ -71,9 +70,7 @@ RHEL_DISTROS = [ *ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.2'), *ls_distro(name='rhel93', os='rhel', os_type='linux', os_ver='9.3'), *ls_distro(name='rhel94', os='rhel', os_type='linux', os_ver='9.4'), - *ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'), - *ls_distro(name='rhel8.9', os='rhel', os_type='linux', os_ver='8.7'), - *ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.0'), + *ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'), # rhel9-latest ] RHEL_POWER_DISTROS = [ @@ -87,6 +84,7 @@ RHEL_ZSERIES_DISTROS = [ UBUNTU_DISTROS = [ *ls_distro(name='ubuntu2004', os='ubuntu', os_type='linux', os_ver='20.04'), *ls_distro(name='ubuntu2204', os='ubuntu', os_type='linux', os_ver='22.04'), + *ls_distro(name='ubuntu2404', os='ubuntu', os_type='linux', os_ver='24.04'), ] UBUNTU_ARM64_DISTROS = [ @@ -94,9 +92,6 @@ UBUNTU_ARM64_DISTROS = [ ] WINDOWS_DISTROS = [ - *ls_distro(name='windows-64-vs2017', os='windows', os_type='windows', vs_ver='2017'), - *ls_distro(name='windows-64-vs2019', os='windows', os_type='windows', vs_ver='2019'), - *ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent'), # Windows Server 2019 ] @@ -109,6 +104,7 @@ GRAVITON_DISTROS = [ # Ensure no-arch distros are ordered before arch-specific distros. ALL_DISTROS = [ *DEBIAN_DISTROS, + *GRAVITON_DISTROS, *MACOS_DISTROS, *MACOS_ARM64_DISTROS, *RHEL_DISTROS, @@ -117,7 +113,6 @@ ALL_DISTROS = [ *UBUNTU_DISTROS, *UBUNTU_ARM64_DISTROS, *WINDOWS_DISTROS, - *GRAVITON_DISTROS ] @@ -165,20 +160,7 @@ def make_distro_str(distro_name, compile distro_str = 'windows-' + \ distro_name[len('windows-vsCurrent-'):] + f'-{compiler_str}' else: - distro_str = 'windows-2019' + f'-{compiler_str}' - elif distro_name.startswith('windows-64-vs'): - # Abbreviate 'windows-64-vs' as 'vs' and append '-' if - # given in compiler string as 'vs', e.g.: - # ('windows-64-vs2017', 'vs2017x64', None) -> vs2017-x64 - # ('windows-64-vs2017', 'mingw', None) -> vs2017-mingw - distro_str = distro_name[len('windows-64-'):] + { - 'vs2017x64': '-x64', - 'vs2017x86': '-x86', - 'vs2019x64': '-x64', - 'vs2019x86': '-x86', - 'vs2022x64': '-x64', - 'vs2022x86': '-x86', - }.get(compiler, f'-{compiler}') + distro_str = 'windows-2019-' + compiler_str else: distro_str = distro_name if compiler: @@ -192,6 +174,8 @@ def make_distro_str(distro_name, compile def to_cc(compiler): return { + 'vs2015x64': 'Visual Studio 14 2015', + 'vs2015x86': 'Visual Studio 14 2015', 'vs2017x64': 'Visual Studio 15 2017', 'vs2017x86': 'Visual Studio 15 2017', 'vs2019x64': 'Visual Studio 16 2019', @@ -203,6 +187,8 @@ def to_cc(compiler): def to_platform(compiler): return { + 'vs2015x64': 'x64', + 'vs2015x86': 'Win32', 'vs2017x64': 'x64', 'vs2017x86': 'Win32', 'vs2019x64': 'x64', @@ -213,6 +199,9 @@ def to_platform(compiler): def compiler_to_vars(compiler): + if compiler is None: + return {} + match compiler, compiler.split('-'): case _, ['gcc', *rest]: return { @@ -232,6 +221,12 @@ def compiler_to_vars(compiler): 'CMAKE_GENERATOR_PLATFORM': to_platform(vs), } + case _, ['mingw', *rest]: + return { + 'CC': '-'.join(['gcc'] + rest), + 'CXX': '-'.join(['g++'] + rest), + } + case compiler, _: return { 'CC': compiler, diff -pruN 2.0.2-1/.evergreen/config_generator/etc/function.py 2.1.0-1/.evergreen/config_generator/etc/function.py --- 2.0.2-1/.evergreen/config_generator/etc/function.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/etc/function.py 2025-08-14 18:37:23.000000000 +0000 @@ -18,6 +18,10 @@ class Function: def default_call(cls, **kwargs) -> FunctionCall: return FunctionCall(func=cls.name, **kwargs) + @classmethod + def call(cls, **kwargs) -> FunctionCall: + return cls.default_call(**kwargs) + def merge_defns(*args): return ChainMap(*args) diff -pruN 2.0.2-1/.evergreen/config_generator/etc/sanitizers/test.py 2.1.0-1/.evergreen/config_generator/etc/sanitizers/test.py --- 2.0.2-1/.evergreen/config_generator/etc/sanitizers/test.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/etc/sanitizers/test.py 2025-08-14 18:37:23.000000000 +0000 @@ -4,7 +4,7 @@ from shrub.v3.evg_command import expansi from shrub.v3.evg_command import KeyValueParam from shrub.v3.evg_task import EvgTask, EvgTaskDependency -from config_generator.etc.distros import find_small_distro +from config_generator.etc.distros import find_large_distro, find_small_distro from config_generator.etc.distros import make_distro_str from config_generator.etc.distros import compiler_to_vars @@ -34,7 +34,10 @@ def generate_test_tasks(SSL, TAG, MATRIX TAG, 'test', distro_name, compiler, f'sasl-{sasl}' ] + MORE_COMPILE_TAGS - test_distro = find_small_distro(distro_name) + if distro_name == 'rhel8-latest': + test_distro = find_large_distro(distro_name) # DEVPROD-18763 + else: + test_distro = find_small_distro(distro_name) compile_vars = [] compile_vars = [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()] diff -pruN 2.0.2-1/.evergreen/config_generator/etc/sasl/compile.py 2.1.0-1/.evergreen/config_generator/etc/sasl/compile.py --- 2.0.2-1/.evergreen/config_generator/etc/sasl/compile.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/etc/sasl/compile.py 2025-08-14 18:37:23.000000000 +0000 @@ -30,7 +30,3 @@ class CompileCommon(Function): script='.evergreen/scripts/compile.sh', ), ] - - @classmethod - def call(cls, **kwargs): - return cls.default_call(**kwargs) diff -pruN 2.0.2-1/.evergreen/config_generator/etc/sasl/test.py 2.1.0-1/.evergreen/config_generator/etc/sasl/test.py --- 2.0.2-1/.evergreen/config_generator/etc/sasl/test.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/config_generator/etc/sasl/test.py 2025-08-14 18:37:23.000000000 +0000 @@ -4,7 +4,7 @@ from shrub.v3.evg_command import expansi from shrub.v3.evg_command import KeyValueParam from shrub.v3.evg_task import EvgTask, EvgTaskDependency -from config_generator.etc.distros import find_small_distro +from config_generator.etc.distros import find_large_distro, find_small_distro from config_generator.etc.distros import make_distro_str from config_generator.etc.distros import compiler_to_vars @@ -26,7 +26,10 @@ def generate_test_tasks(SSL, TAG, MATRIX for distro_name, compiler, arch, sasl, auths, topologies, server_vers in MATRIX: tags = [TAG, 'test', distro_name, compiler] - test_distro = find_small_distro(distro_name) + if distro_name == 'rhel8-latest': + test_distro = find_large_distro(distro_name) # DEVPROD-18763 + else: + test_distro = find_small_distro(distro_name) compile_vars = [] compile_vars = [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()] diff -pruN 2.0.2-1/.evergreen/generated_configs/functions.yml 2.1.0-1/.evergreen/generated_configs/functions.yml --- 2.0.2-1/.evergreen/generated_configs/functions.yml 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/generated_configs/functions.yml 2025-08-14 18:37:23.000000000 +0000 @@ -62,7 +62,7 @@ functions: content_type: text/html local_files_include_filter: abi-compliance/compat_reports/**/compat_report.html permissions: public-read - remote_file: mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/ + remote_file: ${project}/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/ - command: s3.put type: system params: @@ -73,7 +73,7 @@ functions: content_type: text/plain local_files_include_filter: abi-compliance/logs/**/log.txt permissions: public-read - remote_file: mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/ + remote_file: ${project}/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/ backtrace: - command: subprocess.exec params: @@ -115,14 +115,6 @@ functions: - .evergreen/scripts/check-preludes.py . clang-format: - command: subprocess.exec - type: setup - params: - binary: bash - working_dir: mongoc - args: - - -c - - ./tools/poetry.sh install --with=dev - - command: subprocess.exec type: test params: binary: bash @@ -131,7 +123,7 @@ functions: DRYRUN: "1" args: - -c - - ./tools/poetry.sh run .evergreen/scripts/clang-format-all.sh + - uv run --frozen --only-group=format tools/format.py --mode=check cse-sasl-cyrus-darwinssl-compile: - command: expansions.update params: @@ -183,6 +175,26 @@ functions: args: - -c - EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON ${EXTRA_CONFIGURE_FLAGS}" .evergreen/scripts/compile.sh + docker-login-amazon-ecr: + - command: expansions.update + params: + updates: + - { key: DOCKER_CONFIG, value: "${workdir}/.docker" } + - command: ec2.assume_role + params: + role_arn: arn:aws:iam::901841024863:role/ecr-role-evergreen-ro + - command: subprocess.exec + type: setup + params: + binary: bash + include_expansions_in_env: + - AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY + - AWS_SESSION_TOKEN + - DOCKER_CONFIG + args: + - -c + - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 901841024863.dkr.ecr.us-east-1.amazonaws.com fetch-build: - command: subprocess.exec type: setup @@ -313,10 +325,8 @@ functions: args: - -c - | - set -o errexit - ./tools/poetry.sh install --with=docs # See SphinxBuild.cmake for EVG_DOCS_BUILD reasoning - ./tools/poetry.sh run env EVG_DOCS_BUILD=1 .evergreen/scripts/build-docs.sh + uv run --frozen --only-group docs env EVG_DOCS_BUILD=1 .evergreen/scripts/build-docs.sh openssl-static-compile: - command: subprocess.exec type: test @@ -516,15 +526,33 @@ functions: type: setup params: file: expansions.kondukto.yml + - command: expansions.update + params: + updates: + - { key: DOCKER_CONFIG, value: "${workdir}/.docker" } + - command: ec2.assume_role + params: + role_arn: arn:aws:iam::901841024863:role/ecr-role-evergreen-ro + - command: subprocess.exec + type: setup + params: + binary: bash + include_expansions_in_env: + - AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY + - AWS_SESSION_TOKEN + - DOCKER_CONFIG + args: + - -c + - aws ecr get-login-password --region us-east-1 | podman login --username AWS --password-stdin 901841024863.dkr.ecr.us-east-1.amazonaws.com - command: subprocess.exec type: test params: binary: bash working_dir: mongoc include_expansions_in_env: - - artifactory_password - - artifactory_username - branch_name + - DOCKER_CONFIG - KONDUKTO_TOKEN args: - -c diff -pruN 2.0.2-1/.evergreen/generated_configs/legacy-config.yml 2.1.0-1/.evergreen/generated_configs/legacy-config.yml --- 2.0.2-1/.evergreen/generated_configs/legacy-config.yml 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/generated_configs/legacy-config.yml 2025-08-14 18:37:23.000000000 +0000 @@ -212,9 +212,16 @@ functions: set -o errexit COVERAGE=ON .evergreen/scripts/compile.sh build mongohouse: + - command: ec2.assume_role + params: + role_arn: ${aws_test_secrets_role} - command: shell.exec type: test params: + include_expansions_in_env: + - AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY + - AWS_SESSION_TOKEN shell: bash script: |- set -o errexit @@ -790,57 +797,6 @@ tasks: sudo rm -rf ../build ../mock-result ../rpm.tar.gz export MOCK_TARGET_CONFIG=rocky+epel-8-aarch64 .evergreen/scripts/build_snapshot_rpm.sh -- name: install-uninstall-check-mingw - commands: - - func: find-cmake-latest - - command: shell.exec - 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 -- name: install-uninstall-check-msvc - commands: - - func: find-cmake-latest - - command: shell.exec - 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 -- name: install-uninstall-check - commands: - - func: find-cmake-latest - - command: shell.exec - 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)" - DESTDIR="$(pwd)/dest" .evergreen/scripts/install-uninstall-check.sh - BSON_ONLY=1 .evergreen/scripts/install-uninstall-check.sh - .evergreen/scripts/install-uninstall-check.sh - name: debug-compile-with-warnings commands: - func: find-cmake-latest @@ -16140,8 +16096,15 @@ task_groups: - name: testazurekms_task_group setup_group: - func: fetch-det + - command: ec2.assume_role + params: + role_arn: ${aws_test_secrets_role} - command: shell.exec params: + include_expansions_in_env: + - AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY + - AWS_SESSION_TOKEN shell: bash script: |- set -o errexit @@ -16236,12 +16199,10 @@ buildvariants: - link-with-cmake - link-with-cmake-ssl - link-with-cmake-snappy + - verify-headers - name: link-with-cmake-mac distros: - macos-14-arm64 - - name: link-with-cmake-mac-deprecated - distros: - - macos-14-arm64 - name: link-with-cmake-windows distros: - windows-vsCurrent-large @@ -16272,17 +16233,10 @@ buildvariants: distros: - windows-vsCurrent-large - check-headers - - install-uninstall-check - - name: install-uninstall-check-mingw - distros: - - windows-vsCurrent-large - - name: install-uninstall-check-msvc - distros: - - windows-vsCurrent-large - debug-compile-with-warnings - name: build-and-test-with-toolchain distros: - - debian10-small + - debian11-small - install-libmongoc-after-libbson tags: - pr-merge-gate @@ -16329,15 +16283,6 @@ buildvariants: - debug-compile-sasl-openssl - .authentication-tests .openssl - .latest .nossl -- name: gcc83 - display_name: GCC 8.3 (Debian 10.0) - expansions: - CC: gcc - run_on: debian10-test - tasks: - - release-compile - - debug-compile-nosasl-nossl - - .latest .nossl - name: gcc102 display_name: GCC 10.2 (Debian 11.0) expansions: @@ -16576,7 +16521,7 @@ buildvariants: - .versioned-api .8.0 - name: testazurekms-variant display_name: Azure KMS - run_on: debian10-small + run_on: debian11-small tasks: - testazurekms_task_group - testazurekms-fail-task diff -pruN 2.0.2-1/.evergreen/generated_configs/tasks.yml 2.1.0-1/.evergreen/generated_configs/tasks.yml --- 2.0.2-1/.evergreen/generated_configs/tasks.yml 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/generated_configs/tasks.yml 2025-08-14 18:37:23.000000000 +0000 @@ -2,9 +2,9 @@ tasks: - name: abi-compliance-check commands: - func: abi-compliance-check - - name: asan-cse-sasl-cyrus-openssl-debian10-clang-compile - run_on: debian10-large - tags: [sanitizers-matrix-asan, compile, debian10, clang, cse, asan, sasl-cyrus] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, compile, rhel8-latest, clang, cse, asan, sasl-cyrus] commands: - func: find-cmake-latest - func: cse-sasl-cyrus-openssl-compile @@ -12,14 +12,14 @@ tasks: CC: clang CXX: clang++ - func: upload-build - - name: asan-cse-sasl-cyrus-openssl-debian10-clang-test-4.2-server-auth - run_on: debian10-small - tags: [sanitizers-matrix-asan, test, debian10, clang, sasl-cyrus, cse, asan, auth, server, "4.2", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-debian10-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "4.2", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -27,7 +27,7 @@ tasks: - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - - { key: TOPOLOGY, value: server } + - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: openssl } - { key: CLIENT_SIDE_ENCRYPTION, value: "on" } - func: fetch-det @@ -35,14 +35,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-debian10-clang-test-4.2-server-auth-with-mongocrypt - run_on: debian10-small - tags: [sanitizers-matrix-asan, test, debian10, clang, sasl-cyrus, cse, asan, auth, server, "4.2", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-debian10-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-replica-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "4.2", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -50,7 +50,7 @@ tasks: - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - - { key: TOPOLOGY, value: server } + - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: openssl } - { key: CLIENT_SIDE_ENCRYPTION, value: "on" } - { key: SKIP_CRYPT_SHARED_LIB, value: "on" } @@ -59,24 +59,61 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile - run_on: ubuntu2004-large - tags: [sanitizers-matrix-asan, compile, ubuntu2004, clang, cse, asan, sasl-cyrus] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "4.2", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile + - func: fetch-build vars: - CC: clang - CXX: clang++ - - func: upload-build - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "4.4", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: CXX, value: clang++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.2" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - { key: CLIENT_SIDE_ENCRYPTION, value: "on" } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-mock-kms-servers + - func: run-tests + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-server-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "4.2", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile + - command: expansions.update + params: + updates: + - { key: CC, value: clang } + - { key: CXX, value: clang++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.2" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - { key: CLIENT_SIDE_ENCRYPTION, value: "on" } + - { key: SKIP_CRYPT_SHARED_LIB, value: "on" } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-mock-kms-servers + - func: run-tests + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "4.4", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -92,14 +129,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-replica-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "4.4", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-replica-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "4.4", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -116,14 +153,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "4.4", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "4.4", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -139,14 +176,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-server-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "4.4", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-server-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "4.4", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -163,14 +200,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "5.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "5.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -186,14 +223,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-replica-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "5.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-replica-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "5.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -210,14 +247,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "5.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "5.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -233,14 +270,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-server-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "5.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-server-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "5.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -257,14 +294,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "6.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "6.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -280,14 +317,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-replica-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "6.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-replica-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "6.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -304,14 +341,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "6.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "6.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -327,14 +364,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-server-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "6.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-server-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "6.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -351,14 +388,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "7.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "7.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -374,14 +411,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-replica-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "7.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-replica-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "7.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -398,14 +435,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "7.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "7.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -421,14 +458,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-server-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "7.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-server-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "7.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -445,14 +482,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "8.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "8.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -468,14 +505,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-replica-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, "8.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-replica-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, "8.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -492,14 +529,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "8.0", openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "8.0", openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -515,14 +552,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-server-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, "8.0", with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-server-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, "8.0", with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -539,14 +576,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, latest, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, latest, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -562,14 +599,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-replica-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, replica, latest, with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-replica-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, replica, latest, with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -586,14 +623,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, latest, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, latest, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -609,14 +646,14 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-server-auth-with-mongocrypt - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, cse, asan, auth, server, latest, with-mongocrypt, openssl] - depends_on: [{ name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-server-auth-with-mongocrypt + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, cse, asan, auth, server, latest, with-mongocrypt, openssl] + depends_on: [{ name: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-cse-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -633,9 +670,9 @@ tasks: - func: run-simple-http-server - func: run-mock-kms-servers - func: run-tests - - name: asan-sasl-cyrus-openssl-debian10-clang-compile - run_on: debian10-large - tags: [sanitizers-matrix-asan, compile, debian10, clang, asan, sasl-cyrus] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, compile, rhel8-latest, clang, asan, sasl-cyrus] commands: - func: find-cmake-latest - func: sasl-cyrus-openssl-compile @@ -643,14 +680,14 @@ tasks: CC: clang CXX: clang++ - func: upload-build - - name: asan-sasl-cyrus-openssl-debian10-clang-test-4.2-replica-auth - run_on: debian10-small - tags: [sanitizers-matrix-asan, test, debian10, clang, sasl-cyrus, asan, auth, replica, "4.2", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-debian10-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, replica, "4.2", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -664,14 +701,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-debian10-clang-test-4.2-server-auth - run_on: debian10-small - tags: [sanitizers-matrix-asan, test, debian10, clang, sasl-cyrus, asan, auth, server, "4.2", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-debian10-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, server, "4.2", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -685,14 +722,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-debian10-clang-test-4.2-sharded-auth - run_on: debian10-small - tags: [sanitizers-matrix-asan, test, debian10, clang, sasl-cyrus, asan, auth, sharded, "4.2", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-debian10-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, sharded, "4.2", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -706,24 +743,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile - run_on: ubuntu2004-large - tags: [sanitizers-matrix-asan, compile, ubuntu2004, clang, asan, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: clang - CXX: clang++ - - func: upload-build - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, replica, "4.4", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, replica, "4.4", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -737,14 +764,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, server, "4.4", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, server, "4.4", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -758,14 +785,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, sharded, "4.4", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, sharded, "4.4", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -779,14 +806,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, replica, "5.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, replica, "5.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -800,14 +827,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, server, "5.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, server, "5.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -821,14 +848,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, sharded, "5.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, sharded, "5.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -842,14 +869,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, replica, "6.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, replica, "6.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -863,14 +890,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, server, "6.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, server, "6.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -884,14 +911,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, sharded, "6.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, sharded, "6.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -905,14 +932,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, replica, "7.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, replica, "7.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -926,14 +953,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, server, "7.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, server, "7.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -947,14 +974,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, sharded, "7.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, sharded, "7.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -968,14 +995,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, replica, "8.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, replica, "8.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -989,14 +1016,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, server, "8.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, server, "8.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -1010,14 +1037,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, sharded, "8.0", openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, sharded, "8.0", openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -1031,14 +1058,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, replica, latest, openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, replica, latest, openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -1052,14 +1079,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, server, latest, openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, server, latest, openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -1073,14 +1100,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-asan, test, ubuntu2004, clang, sasl-cyrus, asan, auth, sharded, latest, openssl] - depends_on: [{ name: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: asan-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-asan, test, rhel8-latest, clang, sasl-cyrus, asan, auth, sharded, latest, openssl] + depends_on: [{ name: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: asan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: asan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -1097,28 +1124,70 @@ tasks: - name: check-headers commands: - func: check-headers - - name: "check:sasl=Cyrus\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=none" + - name: "check:sasl=Cyrus\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=master" run_on: - - ubuntu2204-large - - debian10-large - - debian11-large - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: - binary: bash + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=Cyrus + - --tls=OpenSSL + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=Cyrus + - --tls=OpenSSL + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=Cyrus\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=none" + run_on: + - amazon2 + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --sasl=Cyrus - --tls=OpenSSL - --test_mongocxx_ref=none @@ -1129,36 +1198,125 @@ tasks: params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --targets=test-example - --sasl=Cyrus - --tls=OpenSSL - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=Cyrus\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=none" + - name: "check:sasl=Cyrus\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=r4.1.0" run_on: - - ubuntu2204-large - - debian10-large + - amazon2 - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr + - command: subprocess.exec + type: setup + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=Cyrus + - --tls=OpenSSL + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=Cyrus + - --tls=OpenSSL + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=Cyrus\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=master" + run_on: - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: - binary: bash + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=Cyrus + - --tls=off + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=Cyrus + - --tls=off + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=Cyrus\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=none" + run_on: + - amazon2 + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --sasl=Cyrus - --tls=off - --test_mongocxx_ref=none @@ -1169,36 +1327,125 @@ tasks: params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --targets=test-example - --sasl=Cyrus - --tls=off - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=off\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=none" + - name: "check:sasl=Cyrus\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=r4.1.0" run_on: - - ubuntu2204-large - - debian10-large + - amazon2 - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr + - command: subprocess.exec + type: setup + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=Cyrus + - --tls=off + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=Cyrus + - --tls=off + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=off\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=master" + run_on: - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: - binary: bash + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=off + - --tls=OpenSSL + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=off + - --tls=OpenSSL + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=off\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=none" + run_on: + - amazon2 + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --sasl=off - --tls=OpenSSL - --test_mongocxx_ref=none @@ -1209,36 +1456,125 @@ tasks: params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --targets=test-example - --sasl=off - --tls=OpenSSL - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=off\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=none" + - name: "check:sasl=off\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=r4.1.0" run_on: - - ubuntu2204-large - - debian10-large + - amazon2 - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr + - command: subprocess.exec + type: setup + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=off + - --tls=OpenSSL + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=off + - --tls=OpenSSL + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=off\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=master" + run_on: - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: - binary: bash + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=off + - --tls=off + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=off + - --tls=off + - --test_mongocxx_ref=master + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=off\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=none" + run_on: + - amazon2 + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr - command: subprocess.exec type: setup params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --sasl=off - --tls=off - --test_mongocxx_ref=none @@ -1249,14 +1585,61 @@ tasks: params: binary: ./tools/earthly.sh working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub - --targets=test-example - --sasl=off - --tls=off - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - name: "check:sasl=off\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=r4.1.0" + run_on: + - amazon2 + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] + commands: + - func: docker-login-amazon-ecr + - command: subprocess.exec + type: setup + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +env-warmup + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --sasl=off + - --tls=off + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +run + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub + - --targets=test-example test-cxx-driver + - --sasl=off + - --tls=off + - --test_mongocxx_ref=r4.1.0 + - --env=${MONGOC_EARTHLY_ENV} + - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - name: clang-format tags: [clang-format] commands: @@ -1522,9 +1905,9 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-debian10-clang-compile - run_on: debian10-large - tags: [cse-matrix-openssl, compile, debian10, clang, cse, sasl-cyrus] + - name: cse-sasl-cyrus-openssl-debian11-clang-compile + run_on: debian11-large + tags: [cse-matrix-openssl, compile, debian11, clang, cse, sasl-cyrus] commands: - func: find-cmake-latest - func: cse-sasl-cyrus-openssl-compile @@ -1532,9 +1915,9 @@ tasks: CC: clang CXX: clang++ - func: upload-build - - name: cse-sasl-cyrus-openssl-debian10-gcc-compile - run_on: debian10-large - tags: [cse-matrix-openssl, compile, debian10, gcc, cse, sasl-cyrus] + - name: cse-sasl-cyrus-openssl-debian11-gcc-compile + run_on: debian11-large + tags: [cse-matrix-openssl, compile, debian11, gcc, cse, sasl-cyrus] commands: - func: find-cmake-latest - func: cse-sasl-cyrus-openssl-compile @@ -1542,14 +1925,44 @@ tasks: CC: gcc CXX: g++ - func: upload-build - - name: cse-sasl-cyrus-openssl-debian10-gcc-test-4.2-replica-auth - run_on: debian10-small - tags: [cse-matrix-openssl, test, debian10, gcc, sasl-cyrus, cse, auth, replica, "4.2", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-debian10-gcc-compile }] + - name: cse-sasl-cyrus-openssl-debian12-clang-compile + run_on: debian12-large + tags: [cse-matrix-openssl, compile, debian12, clang, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: clang + CXX: clang++ + - func: upload-build + - name: cse-sasl-cyrus-openssl-debian12-gcc-compile + run_on: debian12-large + tags: [cse-matrix-openssl, compile, debian12, gcc, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, compile, rhel8-latest, gcc, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.2-replica-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, replica, "4.2", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-debian10-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -1563,14 +1976,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-debian10-gcc-test-4.2-server-auth - run_on: debian10-small - tags: [cse-matrix-openssl, test, debian10, gcc, sasl-cyrus, cse, auth, server, "4.2", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-debian10-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.2-server-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, server, "4.2", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-debian10-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -1584,66 +1997,77 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-debian11-clang-compile - run_on: debian11-large - tags: [cse-matrix-openssl, compile, debian11, clang, cse, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile - vars: - CC: clang - CXX: clang++ - - func: upload-build - - name: cse-sasl-cyrus-openssl-debian11-gcc-compile - run_on: debian11-large - tags: [cse-matrix-openssl, compile, debian11, gcc, cse, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile - vars: - CC: gcc - CXX: g++ - - func: upload-build - - name: cse-sasl-cyrus-openssl-debian92-clang-compile - run_on: debian92-large - tags: [cse-matrix-openssl, compile, debian92, clang, cse, sasl-cyrus] + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.4-replica-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, replica, "4.4", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile + - func: fetch-build vars: - CC: clang - CXX: clang++ - - func: upload-build - - name: cse-sasl-cyrus-openssl-debian92-gcc-compile - run_on: debian92-large - tags: [cse-matrix-openssl, compile, debian92, gcc, cse, sasl-cyrus] + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.4" } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.4-server-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, server, "4.4", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile + - func: fetch-build vars: - CC: gcc - CXX: g++ - - func: upload-build - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - run_on: rhel8-zseries-large - tags: [cse-matrix-openssl, compile, rhel8-zseries, gcc, cse, sasl-cyrus] - patchable: false + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.4" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-5.0-replica-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, replica, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile + - func: fetch-build vars: - CC: gcc - CXX: g++ - - func: upload-build - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth - run_on: rhel8-zseries-small - tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] - patchable: false + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "5.0" } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-5.0-server-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -1657,208 +2081,194 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-replica-auth - run_on: rhel8-zseries-small - tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] - patchable: false + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-6.0-replica-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, replica, "6.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth - run_on: rhel8-zseries-small - tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] - patchable: false + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-6.0-server-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, server, "6.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } + - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-replica-auth - run_on: rhel8-zseries-small - tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] - patchable: false + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-7.0-replica-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } + - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth - run_on: rhel8-zseries-small - tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] - patchable: false + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-7.0-server-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } + - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-replica-auth - run_on: rhel8-zseries-small - tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] - patchable: false + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-8.0-replica-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } + - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth - run_on: rhel8-zseries-small - tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] - patchable: false + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-8.0-server-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } + - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile - run_on: rhel80-large - tags: [cse-matrix-openssl, compile, rhel80, gcc, cse, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile - vars: - CC: gcc - CXX: g++ - - func: upload-build - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - run_on: ubuntu2004-arm64-large - tags: [cse-matrix-openssl, compile, ubuntu2004-arm64, gcc, cse, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: cse-sasl-cyrus-openssl-compile - vars: - CC: gcc - CXX: g++ - - func: upload-build - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-replica-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "4.4", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-latest-replica-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } + - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "4.4", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-latest-server-auth + run_on: rhel8-latest-large + tags: [cse-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, cse, auth, server, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } + - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-replica-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "5.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile + run_on: rhel8-zseries-large + tags: [cse-matrix-openssl, compile, rhel8-zseries, gcc, cse, sasl-cyrus] + patchable: false + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1872,14 +2282,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-server-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1893,14 +2304,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-replica-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "6.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "6.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1914,14 +2326,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-server-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "6.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "6.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1935,14 +2348,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-replica-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1956,14 +2370,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-server-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1977,14 +2392,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-replica-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -1998,14 +2414,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-server-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -2019,14 +2436,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-replica-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-replica-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -2040,14 +2458,15 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-server-auth - run_on: ubuntu2004-arm64-small - tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth + run_on: rhel8-zseries-small + tags: [cse-matrix-openssl, test, rhel8-zseries, gcc, sasl-cyrus, cse, auth, server, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile }] + patchable: false commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile - command: expansions.update params: updates: @@ -2061,19 +2480,19 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-clang-compile - run_on: ubuntu2004-large - tags: [cse-matrix-openssl, compile, ubuntu2004, clang, cse, sasl-cyrus] + - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile + run_on: rhel80-large + tags: [cse-matrix-openssl, compile, rhel80, gcc, cse, sasl-cyrus] commands: - func: find-cmake-latest - func: cse-sasl-cyrus-openssl-compile vars: - CC: clang - CXX: clang++ + CC: gcc + CXX: g++ - func: upload-build - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile - run_on: ubuntu2004-large - tags: [cse-matrix-openssl, compile, ubuntu2004, gcc, cse, sasl-cyrus] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile + run_on: ubuntu2004-arm64-large + tags: [cse-matrix-openssl, compile, ubuntu2004-arm64, gcc, cse, sasl-cyrus] commands: - func: find-cmake-latest - func: cse-sasl-cyrus-openssl-compile @@ -2081,14 +2500,14 @@ tasks: CC: gcc CXX: g++ - func: upload-build - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-replica-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, replica, "4.4", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-replica-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "4.4", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2102,14 +2521,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-server-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, server, "4.4", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "4.4", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2123,14 +2542,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-5.0-replica-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, replica, "5.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-replica-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2144,14 +2563,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-5.0-server-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-server-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2165,14 +2584,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-6.0-replica-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, replica, "6.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-replica-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "6.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2186,14 +2605,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-6.0-server-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, server, "6.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-server-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "6.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2207,14 +2626,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-7.0-replica-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-replica-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2228,14 +2647,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-7.0-server-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-server-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "7.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2249,14 +2668,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-8.0-replica-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-replica-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2270,14 +2689,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-8.0-server-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-server-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, "8.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2291,14 +2710,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-latest-replica-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-replica-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, replica, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2312,14 +2731,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-latest-server-auth - run_on: ubuntu2004-small - tags: [cse-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, cse, auth, server, latest, openssl] - depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-server-auth + run_on: ubuntu2004-arm64-small + tags: [cse-matrix-openssl, test, ubuntu2004-arm64, gcc, sasl-cyrus, cse, auth, server, latest, openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + BUILD_NAME: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - command: expansions.update params: updates: @@ -2333,6 +2752,66 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests + - name: cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + run_on: ubuntu2004-large + tags: [cse-matrix-openssl, compile, ubuntu2004, clang, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: clang + CXX: clang++ + - func: upload-build + - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + run_on: ubuntu2004-large + tags: [cse-matrix-openssl, compile, ubuntu2004, gcc, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: cse-sasl-cyrus-openssl-ubuntu2204-clang-12-compile + run_on: ubuntu2204-large + tags: [cse-matrix-openssl, compile, ubuntu2204, clang-12, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: clang-12 + CXX: clang++-12 + - func: upload-build + - name: cse-sasl-cyrus-openssl-ubuntu2204-gcc-compile + run_on: ubuntu2204-large + tags: [cse-matrix-openssl, compile, ubuntu2204, gcc, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: cse-sasl-cyrus-openssl-ubuntu2404-clang-14-compile + run_on: ubuntu2404-large + tags: [cse-matrix-openssl, compile, ubuntu2404, clang-14, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: clang-14 + CXX: clang++-14 + - func: upload-build + - name: cse-sasl-cyrus-openssl-ubuntu2404-gcc-compile + run_on: ubuntu2404-large + tags: [cse-matrix-openssl, compile, ubuntu2404, gcc, cse, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: cse-sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large tags: [cse-matrix-openssl, compile, windows-vsCurrent, vs2017x64, cse, sasl-cyrus] @@ -2343,6 +2822,27 @@ tasks: CMAKE_GENERATOR: Visual Studio 15 2017 CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.2-replica-auth + run_on: windows-vsCurrent-small + tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, replica, "4.2", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.2" } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.2-server-auth run_on: windows-vsCurrent-small tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, server, "4.2", openssl] @@ -2364,6 +2864,27 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.4-replica-auth + run_on: windows-vsCurrent-small + tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, replica, "4.4", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.4" } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.4-server-auth run_on: windows-vsCurrent-small tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, server, "4.4", openssl] @@ -2385,6 +2906,27 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-5.0-replica-auth + run_on: windows-vsCurrent-small + tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, replica, "5.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "5.0" } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-5.0-server-auth run_on: windows-vsCurrent-small tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, server, "5.0", openssl] @@ -2406,6 +2948,27 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-mock-kms-servers - func: run-tests + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-6.0-replica-auth + run_on: windows-vsCurrent-small + tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, replica, "6.0", openssl] + depends_on: [{ name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "6.0" } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-mock-kms-servers + - func: run-tests - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-6.0-server-auth run_on: windows-vsCurrent-small tags: [cse-matrix-openssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, cse, auth, server, "6.0", openssl] @@ -2776,9 +3339,9 @@ tasks: - name: kms-divergence-check commands: - func: kms-divergence-check - - name: loadbalanced-rhel8.9-gcc-compile - run_on: rhel8.9-large - tags: [loadbalanced, rhel8.9, gcc] + - name: loadbalanced-rhel8-latest-gcc-compile + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc] commands: - func: find-cmake-latest - command: subprocess.exec @@ -2794,14 +3357,14 @@ tasks: - -c - .evergreen/scripts/compile.sh - func: upload-build - - name: loadbalanced-rhel8.9-gcc-test-5.0-auth-openssl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, auth, openssl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-5.0-auth-openssl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, auth, openssl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -2820,14 +3383,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: openssl - - name: loadbalanced-rhel8.9-gcc-test-5.0-noauth-nossl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, noauth, nossl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-5.0-noauth-nossl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, noauth, nossl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -2846,14 +3409,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: nossl - - name: loadbalanced-rhel8.9-gcc-test-6.0-auth-openssl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, auth, openssl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-6.0-auth-openssl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, auth, openssl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -2872,14 +3435,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: openssl - - name: loadbalanced-rhel8.9-gcc-test-6.0-noauth-nossl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, noauth, nossl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-6.0-noauth-nossl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, noauth, nossl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -2898,14 +3461,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: nossl - - name: loadbalanced-rhel8.9-gcc-test-7.0-auth-openssl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, auth, openssl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-7.0-auth-openssl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, auth, openssl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -2924,14 +3487,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: openssl - - name: loadbalanced-rhel8.9-gcc-test-7.0-noauth-nossl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, noauth, nossl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-7.0-noauth-nossl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, noauth, nossl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -2950,14 +3513,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: nossl - - name: loadbalanced-rhel8.9-gcc-test-8.0-auth-openssl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, auth, openssl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-8.0-auth-openssl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, auth, openssl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -2976,14 +3539,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: openssl - - name: loadbalanced-rhel8.9-gcc-test-8.0-noauth-nossl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, noauth, nossl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-8.0-noauth-nossl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, noauth, nossl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -3002,14 +3565,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: nossl - - name: loadbalanced-rhel8.9-gcc-test-latest-auth-openssl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, auth, openssl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-latest-auth-openssl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, auth, openssl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -3028,14 +3591,14 @@ tasks: CC: gcc LOADBALANCED: loadbalanced SSL: openssl - - name: loadbalanced-rhel8.9-gcc-test-latest-noauth-nossl - run_on: rhel8.9-small - tags: [loadbalanced, rhel8.9, gcc, noauth, nossl] - depends_on: [{ name: loadbalanced-rhel8.9-gcc-compile }] + - name: loadbalanced-rhel8-latest-gcc-test-latest-noauth-nossl + run_on: rhel8-latest-large + tags: [loadbalanced, rhel8-latest, gcc, noauth, nossl] + depends_on: [{ name: loadbalanced-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: loadbalanced-rhel8.9-gcc-compile + BUILD_NAME: loadbalanced-rhel8-latest-gcc-compile - func: fetch-det - func: bootstrap-mongo-orchestration vars: @@ -3083,15 +3646,6 @@ tasks: args: - -c - .evergreen/scripts/run-mock-server-tests.sh - - name: openssl-static-compile-debian10-gcc - run_on: debian10-large - tags: [openssl-static-matrix, debian10, gcc] - commands: - - func: find-cmake-latest - - func: openssl-static-compile - vars: - CC: gcc - CXX: g++ - name: openssl-static-compile-debian11-gcc run_on: debian11-large tags: [openssl-static-matrix, debian11, gcc] @@ -3101,9 +3655,9 @@ tasks: vars: CC: gcc CXX: g++ - - name: openssl-static-compile-debian92-gcc - run_on: debian92-large - tags: [openssl-static-matrix, debian92, gcc] + - name: openssl-static-compile-debian12-gcc + run_on: debian12-large + tags: [openssl-static-matrix, debian12, gcc] commands: - func: find-cmake-latest - func: openssl-static-compile @@ -3119,6 +3673,24 @@ tasks: vars: CC: gcc CXX: g++ + - name: openssl-static-compile-ubuntu2204-gcc + run_on: ubuntu2204-large + tags: [openssl-static-matrix, ubuntu2204, gcc] + commands: + - func: find-cmake-latest + - func: openssl-static-compile + vars: + CC: gcc + CXX: g++ + - name: openssl-static-compile-ubuntu2404-gcc + run_on: ubuntu2404-large + tags: [openssl-static-matrix, ubuntu2404, gcc] + commands: + - func: find-cmake-latest + - func: openssl-static-compile + vars: + CC: gcc + CXX: g++ - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile run_on: macos-11-arm64 tags: [sasl-matrix-darwinssl, compile, macos-11-arm64, clang, sasl-cyrus] @@ -3275,27 +3847,6 @@ tasks: CC: clang CXX: clang++ - func: upload-build - - name: sasl-cyrus-darwinssl-macos-14-clang-test-4.0-server-auth - run_on: macos-14 - tags: [sasl-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, auth, server, "4.0", darwinssl] - depends_on: [{ name: sasl-cyrus-darwinssl-macos-14-clang-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-darwinssl-macos-14-clang-compile - - command: expansions.update - params: - updates: - - { key: CC, value: clang } - - { key: CXX, value: clang++ } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: darwinssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - name: sasl-cyrus-darwinssl-macos-14-clang-test-4.2-server-auth run_on: macos-14 tags: [sasl-matrix-darwinssl, test, macos-14, clang, sasl-cyrus, auth, server, "4.2", darwinssl] @@ -3432,9 +3983,19 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-debian10-gcc-compile - run_on: debian10-large - tags: [sasl-matrix-openssl, compile, debian10, gcc, sasl-cyrus] + - name: sasl-cyrus-openssl-debian11-gcc-compile + run_on: debian11-large + tags: [sasl-matrix-openssl, compile, debian11, gcc, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: sasl-cyrus-openssl-debian12-gcc-compile + run_on: debian12-large + tags: [sasl-matrix-openssl, compile, debian12, gcc, sasl-cyrus] commands: - func: find-cmake-latest - func: sasl-cyrus-openssl-compile @@ -3442,14 +4003,24 @@ tasks: CC: gcc CXX: g++ - func: upload-build - - name: sasl-cyrus-openssl-debian10-gcc-test-4.2-replica-auth - run_on: debian10-small - tags: [sasl-matrix-openssl, test, debian10, gcc, sasl-cyrus, auth, replica, "4.2", openssl] - depends_on: [{ name: sasl-cyrus-openssl-debian10-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-latest-gcc-compile + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, compile, rhel8-latest, gcc, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-4.2-server-auth + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, auth, server, "4.2", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-debian10-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -3457,63 +4028,138 @@ tasks: - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - - { key: TOPOLOGY, value: replica_set } + - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-debian10-gcc-test-4.2-server-auth - run_on: debian10-small - tags: [sasl-matrix-openssl, test, debian10, gcc, sasl-cyrus, auth, server, "4.2", openssl] - depends_on: [{ name: sasl-cyrus-openssl-debian10-gcc-compile }] + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-4.4-server-auth + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, auth, server, "4.4", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-cyrus-openssl-debian10-gcc-compile + BUILD_NAME: sasl-cyrus-openssl-rhel8-latest-gcc-compile - command: expansions.update params: updates: - { key: CC, value: gcc } - { key: CXX, value: g++ } - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } + - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } - { key: SSL, value: openssl } - func: fetch-det - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-debian11-gcc-compile - run_on: debian11-large - tags: [sasl-matrix-openssl, compile, debian11, gcc, sasl-cyrus] + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-5.0-server-auth + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, auth, server, "5.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile + - func: fetch-build vars: - CC: gcc - CXX: g++ - - func: upload-build - - name: sasl-cyrus-openssl-debian92-clang-compile - run_on: debian92-large - tags: [sasl-matrix-openssl, compile, debian92, clang, sasl-cyrus] + BUILD_NAME: sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "5.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-6.0-server-auth + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, auth, server, "6.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile + - func: fetch-build vars: - CC: clang - CXX: clang++ - - func: upload-build - - name: sasl-cyrus-openssl-debian92-gcc-compile - run_on: debian92-large - tags: [sasl-matrix-openssl, compile, debian92, gcc, sasl-cyrus] + BUILD_NAME: sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "6.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-7.0-server-auth + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, auth, server, "7.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-latest-gcc-compile }] commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile + - func: fetch-build vars: - CC: gcc - CXX: g++ - - func: upload-build + BUILD_NAME: sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "7.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-8.0-server-auth + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, auth, server, "8.0", openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-latest-gcc-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "8.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-latest-server-auth + run_on: rhel8-latest-large + tags: [sasl-matrix-openssl, test, rhel8-latest, gcc, sasl-cyrus, auth, server, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-rhel8-latest-gcc-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-openssl-rhel8-latest-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: latest } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests - name: sasl-cyrus-openssl-rhel8-power-gcc-compile run_on: rhel8-power-large tags: [sasl-matrix-openssl, compile, rhel8-power, gcc, sasl-cyrus] @@ -3956,142 +4602,46 @@ tasks: CC: clang CXX: clang++ - func: upload-build - - name: sasl-cyrus-openssl-ubuntu2004-gcc-compile - run_on: ubuntu2004-large - tags: [sasl-matrix-openssl, compile, ubuntu2004, gcc, sasl-cyrus] + - name: sasl-cyrus-openssl-ubuntu2204-clang-12-compile + run_on: ubuntu2204-large + tags: [sasl-matrix-openssl, compile, ubuntu2204, clang-12, sasl-cyrus] commands: - func: find-cmake-latest - func: sasl-cyrus-openssl-compile vars: - CC: gcc - CXX: g++ + CC: clang-12 + CXX: clang++-12 - func: upload-build - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-server-auth - run_on: ubuntu2004-small - tags: [sasl-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, auth, server, "4.4", openssl] - depends_on: [{ name: sasl-cyrus-openssl-ubuntu2004-gcc-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-openssl-ubuntu2004-gcc-compile - - command: expansions.update - params: - updates: - - { key: CC, value: gcc } - - { key: CXX, value: g++ } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: openssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-5.0-server-auth - run_on: ubuntu2004-small - tags: [sasl-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, auth, server, "5.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-ubuntu2004-gcc-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-openssl-ubuntu2004-gcc-compile - - command: expansions.update - params: - updates: - - { key: CC, value: gcc } - - { key: CXX, value: g++ } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: openssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-6.0-server-auth - run_on: ubuntu2004-small - tags: [sasl-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, auth, server, "6.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-ubuntu2004-gcc-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-openssl-ubuntu2004-gcc-compile - - command: expansions.update - params: - updates: - - { key: CC, value: gcc } - - { key: CXX, value: g++ } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: openssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-7.0-server-auth - run_on: ubuntu2004-small - tags: [sasl-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, auth, server, "7.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + - name: sasl-cyrus-openssl-ubuntu2204-gcc-compile + run_on: ubuntu2204-large + tags: [sasl-matrix-openssl, compile, ubuntu2204, gcc, sasl-cyrus] commands: - - func: fetch-build + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile vars: - BUILD_NAME: sasl-cyrus-openssl-ubuntu2004-gcc-compile - - command: expansions.update - params: - updates: - - { key: CC, value: gcc } - - { key: CXX, value: g++ } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: openssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-8.0-server-auth - run_on: ubuntu2004-small - tags: [sasl-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, auth, server, "8.0", openssl] - depends_on: [{ name: sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + CC: gcc + CXX: g++ + - func: upload-build + - name: sasl-cyrus-openssl-ubuntu2404-clang-14-compile + run_on: ubuntu2404-large + tags: [sasl-matrix-openssl, compile, ubuntu2404, clang-14, sasl-cyrus] commands: - - func: fetch-build + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile vars: - BUILD_NAME: sasl-cyrus-openssl-ubuntu2004-gcc-compile - - command: expansions.update - params: - updates: - - { key: CC, value: gcc } - - { key: CXX, value: g++ } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: openssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-latest-server-auth - run_on: ubuntu2004-small - tags: [sasl-matrix-openssl, test, ubuntu2004, gcc, sasl-cyrus, auth, server, latest, openssl] - depends_on: [{ name: sasl-cyrus-openssl-ubuntu2004-gcc-compile }] + CC: clang-14 + CXX: clang++-14 + - func: upload-build + - name: sasl-cyrus-openssl-ubuntu2404-gcc-compile + run_on: ubuntu2404-large + tags: [sasl-matrix-openssl, compile, ubuntu2404, gcc, sasl-cyrus] commands: - - func: fetch-build + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile vars: - BUILD_NAME: sasl-cyrus-openssl-ubuntu2004-gcc-compile - - command: expansions.update - params: - updates: - - { key: CC, value: gcc } - - { key: CXX, value: g++ } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: openssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests + CC: gcc + CXX: g++ + - func: upload-build - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large tags: [sasl-matrix-openssl, compile, windows-vsCurrent, vs2017x64, sasl-cyrus] @@ -4123,9 +4673,9 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-debian10-gcc-compile - run_on: debian10-large - tags: [sasl-matrix-nossl, compile, debian10, gcc, sasl-off] + - name: sasl-off-nossl-rhel8-latest-gcc-compile + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, compile, rhel8-latest, gcc, sasl-off] commands: - func: find-cmake-latest - func: sasl-off-nossl-compile @@ -4133,14 +4683,14 @@ tasks: CC: gcc CXX: g++ - func: upload-build - - name: sasl-off-nossl-debian10-gcc-test-4.2-replica-noauth - run_on: debian10-small - tags: [sasl-matrix-nossl, test, debian10, gcc, sasl-off, noauth, replica, "4.2"] - depends_on: [{ name: sasl-off-nossl-debian10-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-4.2-replica-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, replica, "4.2"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-debian10-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4154,14 +4704,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-debian10-gcc-test-4.2-server-noauth - run_on: debian10-small - tags: [sasl-matrix-nossl, test, debian10, gcc, sasl-off, noauth, server, "4.2"] - depends_on: [{ name: sasl-off-nossl-debian10-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-4.2-server-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, server, "4.2"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-debian10-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4175,14 +4725,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-debian10-gcc-test-4.2-sharded-noauth - run_on: debian10-small - tags: [sasl-matrix-nossl, test, debian10, gcc, sasl-off, noauth, sharded, "4.2"] - depends_on: [{ name: sasl-off-nossl-debian10-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-4.2-sharded-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, sharded, "4.2"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-debian10-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4196,24 +4746,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-compile - run_on: ubuntu2004-large - tags: [sasl-matrix-nossl, compile, ubuntu2004, gcc, sasl-off] - commands: - - func: find-cmake-latest - - func: sasl-off-nossl-compile - vars: - CC: gcc - CXX: g++ - - func: upload-build - - name: sasl-off-nossl-ubuntu2004-gcc-test-4.4-replica-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, replica, "4.4"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-4.4-replica-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, replica, "4.4"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4227,14 +4767,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-4.4-server-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, server, "4.4"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-4.4-server-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, server, "4.4"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4248,14 +4788,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-4.4-sharded-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, sharded, "4.4"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-4.4-sharded-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, sharded, "4.4"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4269,14 +4809,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-5.0-replica-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, replica, "5.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-5.0-replica-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, replica, "5.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4290,14 +4830,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-5.0-server-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, server, "5.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-5.0-server-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, server, "5.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4311,14 +4851,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-5.0-sharded-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, sharded, "5.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-5.0-sharded-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, sharded, "5.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4332,14 +4872,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-6.0-replica-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, replica, "6.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-6.0-replica-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, replica, "6.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4353,14 +4893,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-6.0-server-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, server, "6.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-6.0-server-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, server, "6.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4374,14 +4914,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-6.0-sharded-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, sharded, "6.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-6.0-sharded-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, sharded, "6.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4395,14 +4935,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-7.0-replica-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, replica, "7.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-7.0-replica-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, replica, "7.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4416,14 +4956,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-7.0-server-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, server, "7.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-7.0-server-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, server, "7.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4437,14 +4977,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-7.0-sharded-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, sharded, "7.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-7.0-sharded-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, sharded, "7.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4458,14 +4998,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-8.0-replica-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, replica, "8.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-8.0-replica-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, replica, "8.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4479,14 +5019,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-8.0-server-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, server, "8.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-8.0-server-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, server, "8.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4500,14 +5040,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-8.0-sharded-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, sharded, "8.0"] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-8.0-sharded-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, sharded, "8.0"] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4521,14 +5061,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-latest-replica-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, replica, latest] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-latest-replica-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, replica, latest] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4542,14 +5082,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-latest-server-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, server, latest] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-latest-server-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, server, latest] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4563,14 +5103,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-ubuntu2004-gcc-test-latest-sharded-noauth - run_on: ubuntu2004-small - tags: [sasl-matrix-nossl, test, ubuntu2004, gcc, sasl-off, noauth, sharded, latest] - depends_on: [{ name: sasl-off-nossl-ubuntu2004-gcc-compile }] + - name: sasl-off-nossl-rhel8-latest-gcc-test-latest-sharded-noauth + run_on: rhel8-latest-large + tags: [sasl-matrix-nossl, test, rhel8-latest, gcc, sasl-off, noauth, sharded, latest] + depends_on: [{ name: sasl-off-nossl-rhel8-latest-gcc-compile }] commands: - func: fetch-build vars: - BUILD_NAME: sasl-off-nossl-ubuntu2004-gcc-compile + BUILD_NAME: sasl-off-nossl-rhel8-latest-gcc-compile - command: expansions.update params: updates: @@ -4584,6 +5124,26 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests + - name: sasl-off-nossl-ubuntu2204-gcc-compile + run_on: ubuntu2204-large + tags: [sasl-matrix-nossl, compile, ubuntu2204, gcc, sasl-off] + commands: + - func: find-cmake-latest + - func: sasl-off-nossl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: sasl-off-nossl-ubuntu2404-gcc-compile + run_on: ubuntu2404-large + tags: [sasl-matrix-nossl, compile, ubuntu2404, gcc, sasl-off] + commands: + - func: find-cmake-latest + - func: sasl-off-nossl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build - name: sasl-off-nossl-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large tags: [sasl-matrix-nossl, compile, windows-vsCurrent, vs2017x64, sasl-off] @@ -4621,8 +5181,8 @@ tasks: - func: find-cmake-latest - func: sasl-sspi-winssl-compile vars: - CC: mingw - CXX: mingw + CC: gcc + CXX: g++ - func: upload-build - name: sasl-sspi-winssl-windows-2019-mingw-test-8.0-server-auth run_on: windows-vsCurrent-small @@ -4635,8 +5195,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: mingw } - - { key: CXX, value: mingw } + - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -4656,8 +5216,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: mingw } - - { key: CXX, value: mingw } + - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -4676,27 +5236,6 @@ tasks: CMAKE_GENERATOR: Visual Studio 15 2017 CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build - - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.0-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.0", winssl] - depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } - - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.2-server-auth run_on: windows-vsCurrent-small tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.2", winssl] @@ -4932,16 +5471,6 @@ tasks: CXX: clang++ MARCH: i686 - func: upload scan artifacts - - name: std-c11-debian10-gcc-compile - run_on: debian10-large - tags: [std-matrix, debian10, gcc, compile, std-c11] - commands: - - func: find-cmake-latest - - func: std-compile - vars: - CC: gcc-8 - CXX: g++-8 - C_STD_VERSION: 11 - name: std-c11-debian11-gcc-compile run_on: debian11-large tags: [std-matrix, debian11, gcc, compile, std-c11] @@ -4952,9 +5481,9 @@ tasks: CC: gcc-10 CXX: g++-10 C_STD_VERSION: 11 - - name: std-c11-rhel76-gcc-compile - run_on: rhel76-large - tags: [std-matrix, rhel76, gcc, compile, std-c11] + - name: std-c11-rhel7-latest-gcc-compile + run_on: rhel7-latest-large + tags: [std-matrix, rhel7-latest, gcc, compile, std-c11] commands: - func: find-cmake-latest - func: std-compile @@ -5132,6 +5661,26 @@ tasks: CC: clang-12 CXX: clang++-12 C_STD_VERSION: 11 + - name: std-c11-ubuntu2404-gcc-compile + run_on: ubuntu2404-large + tags: [std-matrix, ubuntu2404, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-13 + CXX: g++-13 + C_STD_VERSION: 11 + - name: std-c11-windows-2019-vs2015-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2015x64, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 14 2015 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 11 - name: std-c11-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large tags: [std-matrix, windows-vsCurrent, vs2017x64, compile, std-c11] @@ -5162,16 +5711,6 @@ tasks: CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_GENERATOR_PLATFORM: x64 C_STD_VERSION: 11 - - name: std-c17-debian10-gcc-compile - run_on: debian10-large - tags: [std-matrix, debian10, gcc, compile, std-c17] - commands: - - func: find-cmake-latest - - func: std-compile - vars: - CC: gcc-8 - CXX: g++-8 - C_STD_VERSION: 17 - name: std-c17-debian11-gcc-compile run_on: debian11-large tags: [std-matrix, debian11, gcc, compile, std-c17] @@ -5352,15 +5891,15 @@ tasks: CC: clang-12 CXX: clang++-12 C_STD_VERSION: 17 - - name: std-c17-windows-2019-vs2017-x64-compile - run_on: windows-vsCurrent-large - tags: [std-matrix, windows-vsCurrent, vs2017x64, compile, std-c17] + - name: std-c17-ubuntu2404-gcc-compile + run_on: ubuntu2404-large + tags: [std-matrix, ubuntu2404, gcc, compile, std-c17] commands: - func: find-cmake-latest - func: std-compile vars: - CMAKE_GENERATOR: Visual Studio 15 2017 - CMAKE_GENERATOR_PLATFORM: x64 + CC: gcc-13 + CXX: g++-13 C_STD_VERSION: 17 - name: std-c17-windows-2019-vs2019-x64-compile run_on: windows-vsCurrent-large @@ -5532,16 +6071,16 @@ tasks: CC: clang-12 CXX: clang++-12 C_STD_VERSION: 23 - - name: std-c99-debian10-gcc-compile - run_on: debian10-large - tags: [std-matrix, debian10, gcc, compile, std-c99] + - name: std-c23-ubuntu2404-gcc-compile + run_on: ubuntu2404-large + tags: [std-matrix, ubuntu2404, gcc, compile, std-c23] commands: - func: find-cmake-latest - func: std-compile vars: - CC: gcc-8 - CXX: g++-8 - C_STD_VERSION: 99 + CC: gcc-13 + CXX: g++-13 + C_STD_VERSION: 23 - name: std-c99-debian11-gcc-compile run_on: debian11-large tags: [std-matrix, debian11, gcc, compile, std-c99] @@ -5552,9 +6091,9 @@ tasks: CC: gcc-10 CXX: g++-10 C_STD_VERSION: 99 - - name: std-c99-rhel76-gcc-compile - run_on: rhel76-large - tags: [std-matrix, rhel76, gcc, compile, std-c99] + - name: std-c99-rhel7-latest-gcc-compile + run_on: rhel7-latest-large + tags: [std-matrix, rhel7-latest, gcc, compile, std-c99] commands: - func: find-cmake-latest - func: std-compile @@ -5732,69 +6271,59 @@ tasks: CC: clang-12 CXX: clang++-12 C_STD_VERSION: 99 - - name: std-c99-windows-2019-vs2017-x64-compile - run_on: windows-vsCurrent-large - tags: [std-matrix, windows-vsCurrent, vs2017x64, compile, std-c99] + - name: std-c99-ubuntu2404-gcc-compile + run_on: ubuntu2404-large + tags: [std-matrix, ubuntu2404, gcc, compile, std-c99] commands: - func: find-cmake-latest - func: std-compile vars: - CMAKE_GENERATOR: Visual Studio 15 2017 - CMAKE_GENERATOR_PLATFORM: x64 + CC: gcc-13 + CXX: g++-13 C_STD_VERSION: 99 - - name: std-c99-windows-2019-vs2019-x64-compile + - name: std-c99-windows-2019-vs2015-x64-compile run_on: windows-vsCurrent-large - tags: [std-matrix, windows-vsCurrent, vs2019x64, compile, std-c99] + tags: [std-matrix, windows-vsCurrent, vs2015x64, compile, std-c99] commands: - func: find-cmake-latest - func: std-compile vars: - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 14 2015 CMAKE_GENERATOR_PLATFORM: x64 C_STD_VERSION: 99 - - name: std-c99-windows-2019-vs2022-x64-compile - run_on: windows-vsCurrent-large - tags: [std-matrix, windows-vsCurrent, vs2022x64, compile, std-c99] - commands: - - func: find-cmake-latest - - func: std-compile - vars: - CMAKE_GENERATOR: Visual Studio 17 2022 - CMAKE_GENERATOR_PLATFORM: x64 - C_STD_VERSION: 99 - - name: std-clatest-windows-2019-vs2017-x64-compile + - name: std-c99-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large - tags: [std-matrix, windows-vsCurrent, vs2017x64, compile, std-clatest] + tags: [std-matrix, windows-vsCurrent, vs2017x64, compile, std-c99] commands: - func: find-cmake-latest - func: std-compile vars: CMAKE_GENERATOR: Visual Studio 15 2017 CMAKE_GENERATOR_PLATFORM: x64 - C_STD_VERSION: latest - - name: std-clatest-windows-2019-vs2019-x64-compile + C_STD_VERSION: 99 + - name: std-c99-windows-2019-vs2019-x64-compile run_on: windows-vsCurrent-large - tags: [std-matrix, windows-vsCurrent, vs2019x64, compile, std-clatest] + tags: [std-matrix, windows-vsCurrent, vs2019x64, compile, std-c99] commands: - func: find-cmake-latest - func: std-compile vars: CMAKE_GENERATOR: Visual Studio 16 2019 CMAKE_GENERATOR_PLATFORM: x64 - C_STD_VERSION: latest - - name: std-clatest-windows-2019-vs2022-x64-compile + C_STD_VERSION: 99 + - name: std-c99-windows-2019-vs2022-x64-compile run_on: windows-vsCurrent-large - tags: [std-matrix, windows-vsCurrent, vs2022x64, compile, std-clatest] + tags: [std-matrix, windows-vsCurrent, vs2022x64, compile, std-c99] commands: - func: find-cmake-latest - func: std-compile vars: CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_GENERATOR_PLATFORM: x64 - C_STD_VERSION: latest - - name: tsan-sasl-cyrus-openssl-debian10-clang-compile - run_on: debian10-large - tags: [sanitizers-matrix-tsan, compile, debian10, clang, tsan, sasl-cyrus] + C_STD_VERSION: 99 + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, compile, rhel8-latest, clang, tsan, sasl-cyrus] commands: - func: find-cmake-latest - func: sasl-cyrus-openssl-compile @@ -5802,14 +6331,14 @@ tasks: CC: clang CXX: clang++ - func: upload-build - - name: tsan-sasl-cyrus-openssl-debian10-clang-test-4.2-replica-auth - run_on: debian10-small - tags: [sanitizers-matrix-tsan, test, debian10, clang, sasl-cyrus, tsan, auth, replica, "4.2", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-debian10-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, replica, "4.2", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5823,14 +6352,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-debian10-clang-test-4.2-server-auth - run_on: debian10-small - tags: [sanitizers-matrix-tsan, test, debian10, clang, sasl-cyrus, tsan, auth, server, "4.2", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-debian10-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, server, "4.2", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5844,14 +6373,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-debian10-clang-test-4.2-sharded-auth - run_on: debian10-small - tags: [sanitizers-matrix-tsan, test, debian10, clang, sasl-cyrus, tsan, auth, sharded, "4.2", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-debian10-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.2-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, sharded, "4.2", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-debian10-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5865,24 +6394,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile - run_on: ubuntu2004-large - tags: [sanitizers-matrix-tsan, compile, ubuntu2004, clang, tsan, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: sasl-cyrus-openssl-compile - vars: - CC: clang - CXX: clang++ - - func: upload-build - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, replica, "4.4", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, replica, "4.4", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5896,14 +6415,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, server, "4.4", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, server, "4.4", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5917,14 +6436,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, sharded, "4.4", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-4.4-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, sharded, "4.4", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5938,14 +6457,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, replica, "5.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, replica, "5.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5959,14 +6478,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, server, "5.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, server, "5.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -5980,14 +6499,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-5.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, sharded, "5.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-5.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, sharded, "5.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6001,14 +6520,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, replica, "6.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, replica, "6.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6022,14 +6541,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, server, "6.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, server, "6.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6043,14 +6562,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-6.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, sharded, "6.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-6.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, sharded, "6.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6064,14 +6583,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, replica, "7.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, replica, "7.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6085,14 +6604,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, server, "7.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, server, "7.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6106,14 +6625,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-7.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, sharded, "7.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-7.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, sharded, "7.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6127,14 +6646,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, replica, "8.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, replica, "8.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6148,14 +6667,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, server, "8.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, server, "8.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6169,14 +6688,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-8.0-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, sharded, "8.0", openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-8.0-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, sharded, "8.0", openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6190,14 +6709,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-replica-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, replica, latest, openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-replica-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, replica, latest, openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6211,14 +6730,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-server-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, server, latest, openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-server-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, server, latest, openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6232,14 +6751,14 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-sharded-auth - run_on: ubuntu2004-small - tags: [sanitizers-matrix-tsan, test, ubuntu2004, clang, sasl-cyrus, tsan, auth, sharded, latest, openssl] - depends_on: [{ name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile }] + - name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-test-latest-sharded-auth + run_on: rhel8-latest-large + tags: [sanitizers-matrix-tsan, test, rhel8-latest, clang, sasl-cyrus, tsan, auth, sharded, latest, openssl] + depends_on: [{ name: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile }] commands: - func: fetch-build vars: - BUILD_NAME: tsan-sasl-cyrus-openssl-ubuntu2004-clang-compile + BUILD_NAME: tsan-sasl-cyrus-openssl-rhel8-latest-clang-compile - command: expansions.update params: updates: @@ -6253,3 +6772,24 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests + - name: verify-headers + run_on: + - amazon2 + - debian11-large + - debian12-large + - ubuntu2204-large + - ubuntu2404-large + tags: [pr-merge-gate] + commands: + - func: docker-login-amazon-ecr + - command: subprocess.exec + type: test + params: + binary: ./tools/earthly.sh + working_dir: mongoc + include_expansions_in_env: + - DOCKER_CONFIG + args: + - --buildkit-image=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/earthly/buildkitd:v0.8.3 + - +verify-headers + - --default_search_registry=901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub diff -pruN 2.0.2-1/.evergreen/generated_configs/variants.yml 2.1.0-1/.evergreen/generated_configs/variants.yml --- 2.0.2-1/.evergreen/generated_configs/variants.yml 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/generated_configs/variants.yml 2025-08-14 18:37:23.000000000 +0000 @@ -86,8 +86,7 @@ buildvariants: - name: clang-format display_name: clang-format run_on: - - ubuntu2204-large - - ubuntu2004-large + - ubuntu2204-small tasks: - name: .clang-format - name: cse-matrix-darwinssl @@ -101,69 +100,82 @@ buildvariants: expansions: CLIENT_SIDE_ENCRYPTION: "on" tasks: - - name: cse-sasl-cyrus-openssl-debian92-clang-compile - - name: cse-sasl-cyrus-openssl-debian92-gcc-compile - - name: cse-sasl-cyrus-openssl-debian10-clang-compile - - name: cse-sasl-cyrus-openssl-debian10-gcc-compile - name: cse-sasl-cyrus-openssl-debian11-clang-compile - name: cse-sasl-cyrus-openssl-debian11-gcc-compile - - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile + - name: cse-sasl-cyrus-openssl-debian12-clang-compile + - name: cse-sasl-cyrus-openssl-debian12-gcc-compile + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-compile + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.2-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.2-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.4-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-4.4-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-5.0-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-5.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-6.0-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-6.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-7.0-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-7.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-8.0-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-8.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-latest-replica-auth + - name: cse-sasl-cyrus-openssl-rhel8-latest-gcc-test-latest-server-auth - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile batchtime: 1440 - - name: cse-sasl-cyrus-openssl-ubuntu2004-clang-compile - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-replica-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.2-server-auth - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.4-server-auth - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-5.0-server-auth - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-6.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-5.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-6.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-7.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-8.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-latest-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-replica-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-5.0-replica-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-6.0-replica-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-7.0-replica-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-8.0-replica-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-latest-replica-auth - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-replica-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-server-auth batchtime: 1440 - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-replica-auth batchtime: 1440 + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-7.0-server-auth + batchtime: 1440 - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-replica-auth batchtime: 1440 + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-8.0-server-auth + batchtime: 1440 - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-replica-auth batchtime: 1440 - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-server-auth - - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-server-auth + - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth + batchtime: 1440 + - name: cse-sasl-cyrus-openssl-rhel80-gcc-compile + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-replica-auth + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-replica-auth + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-server-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-replica-auth + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-server-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-replica-auth + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-server-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-replica-auth + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-server-auth - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-replica-auth - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-7.0-server-auth - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-8.0-server-auth - - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-latest-server-auth + - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-server-auth + - name: cse-sasl-cyrus-openssl-ubuntu2004-clang-compile + - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile + - name: cse-sasl-cyrus-openssl-ubuntu2204-clang-12-compile + - name: cse-sasl-cyrus-openssl-ubuntu2204-gcc-compile + - name: cse-sasl-cyrus-openssl-ubuntu2404-clang-14-compile + - name: cse-sasl-cyrus-openssl-ubuntu2404-gcc-compile + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-compile + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.2-replica-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.2-server-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.4-replica-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.4-server-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-5.0-replica-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-5.0-server-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-6.0-replica-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-6.0-server-auth - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-7.0-replica-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-7.0-server-auth - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-8.0-replica-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-8.0-server-auth - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-latest-replica-auth - - name: cse-sasl-cyrus-openssl-debian10-gcc-test-4.2-server-auth - - name: cse-sasl-cyrus-openssl-debian10-gcc-test-4.2-replica-auth + - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-latest-server-auth - name: cse-matrix-winssl display_name: cse-matrix-winssl expansions: @@ -219,20 +231,22 @@ buildvariants: display_name: sasl-matrix-openssl expansions: {} tasks: - - name: sasl-cyrus-openssl-debian92-clang-compile - - name: sasl-cyrus-openssl-debian92-gcc-compile - - name: sasl-cyrus-openssl-debian10-gcc-compile + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-replica-auth + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-server-auth + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-sharded-auth - name: sasl-cyrus-openssl-debian11-gcc-compile - - name: sasl-cyrus-openssl-rhel80-gcc-compile + - name: sasl-cyrus-openssl-debian12-gcc-compile + - name: sasl-cyrus-openssl-rhel8-latest-gcc-compile + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-4.2-server-auth + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-4.4-server-auth + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-5.0-server-auth + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-6.0-server-auth + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-7.0-server-auth + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-8.0-server-auth + - name: sasl-cyrus-openssl-rhel8-latest-gcc-test-latest-server-auth - name: sasl-cyrus-openssl-rhel8-power-gcc-compile batchtime: 1440 - - name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile - batchtime: 1440 - - name: sasl-cyrus-openssl-ubuntu2004-clang-compile - - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - - name: sasl-cyrus-openssl-ubuntu2004-gcc-compile - - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-compile - - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.2-server-auth batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.4-server-auth @@ -247,6 +261,8 @@ buildvariants: batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-power-gcc-test-latest-server-auth batchtime: 1440 + - name: sasl-cyrus-openssl-rhel8-zseries-gcc-compile + batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-6.0-server-auth @@ -257,24 +273,21 @@ buildvariants: batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-latest-server-auth batchtime: 1440 + - name: sasl-cyrus-openssl-rhel80-gcc-compile + - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-5.0-server-auth - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-6.0-server-auth - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-7.0-server-auth - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-8.0-server-auth - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-latest-server-auth - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-server-auth - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-5.0-server-auth - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-6.0-server-auth - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-7.0-server-auth - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-8.0-server-auth - - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-latest-server-auth + - name: sasl-cyrus-openssl-ubuntu2004-clang-compile + - name: sasl-cyrus-openssl-ubuntu2204-clang-12-compile + - name: sasl-cyrus-openssl-ubuntu2204-gcc-compile + - name: sasl-cyrus-openssl-ubuntu2404-clang-14-compile + - name: sasl-cyrus-openssl-ubuntu2404-gcc-compile + - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-compile - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-test-latest-server-auth - - name: sasl-cyrus-openssl-debian10-gcc-test-4.2-server-auth - - name: sasl-cyrus-openssl-debian10-gcc-test-4.2-replica-auth - - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-server-auth - - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-replica-auth - - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-sharded-auth - name: sasl-matrix-winssl display_name: sasl-matrix-winssl expansions: {} diff -pruN 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_generator/__init__.py 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_generator/__init__.py --- 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_generator/__init__.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_generator/__init__.py 2025-08-14 18:37:23.000000000 +0000 @@ -36,12 +36,8 @@ ValueOrderedDict = OD[Scalar, Value] "An OrderedDict of YAML values" -try: - import yaml - import yamlordereddictloader # type: ignore -except ImportError: - sys.stderr.write("try 'poetry install --with=dev'\n") - raise +import yaml +import yamlloader class ConfigObject(object): @@ -68,7 +64,7 @@ class ConfigObject(object): # tag sets as lists. -class _Dumper(yamlordereddictloader.Dumper): +class _Dumper(yamlloader.ordereddict.Dumper): def __init__(self, *args: Value, **kwargs: Value): super().__init__(*args, **kwargs) # type: ignore self.add_representer(set, type(self).represent_set) diff -pruN 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py --- 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py 2025-08-14 18:37:23.000000000 +0000 @@ -156,11 +156,19 @@ all_functions = OD([ ''', add_expansions_to_env=True), )), ('build mongohouse', Function( + # Assume role to get AWS secrets. + { + "command": "ec2.assume_role", + "params": { + "role_arn": "${aws_test_secrets_role}" + } + }, + shell_exec(r''' cd drivers-evergreen-tools export DRIVERS_TOOLS=$(pwd) .evergreen/atlas_data_lake/pull-mongohouse-image.sh - '''), + ''', include_expansions_in_env=[ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]), )), ('run mongohouse', Function( shell_exec(r''' diff -pruN 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py --- 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py 2025-08-14 18:37:23.000000000 +0000 @@ -279,51 +279,6 @@ all_tasks = [ shell_mongoc("sudo rm -rf ../build ../mock-result ../rpm.tar.gz\n" "export MOCK_TARGET_CONFIG=rocky+epel-8-aarch64\n" ".evergreen/scripts/build_snapshot_rpm.sh"), ], ), - NamedTask( - "install-uninstall-check-mingw", - commands=[ - func("find-cmake-latest"), - shell_mongoc( - r""" - . .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""", - include_expansions_in_env=["distro_id"], - ) - ], - ), - NamedTask( - "install-uninstall-check-msvc", - commands=[ - func("find-cmake-latest"), - shell_mongoc( - r""" - . .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""", - include_expansions_in_env=["distro_id"], - ) - ], - ), - NamedTask( - "install-uninstall-check", - commands=[ - func("find-cmake-latest"), - shell_mongoc( - r""" - . .evergreen/scripts/find-cmake-latest.sh - export CMAKE="$(find_cmake_latest)" - DESTDIR="$(pwd)/dest" .evergreen/scripts/install-uninstall-check.sh - BSON_ONLY=1 .evergreen/scripts/install-uninstall-check.sh - .evergreen/scripts/install-uninstall-check.sh""", - include_expansions_in_env=["distro_id"], - ) - ], - ), CompileTask("debug-compile-with-warnings", CFLAGS="-Werror -Wno-cast-align"), CompileTask( "debug-compile-nosasl-openssl-1.0.1", diff -pruN 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/testazurekms.py 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/testazurekms.py --- 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/testazurekms.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/testazurekms.py 2025-08-14 18:37:23.000000000 +0000 @@ -18,8 +18,6 @@ from collections import OrderedDict as OD from typing import MutableSequence -from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest - from evergreen_config_generator.functions import shell_exec, func from evergreen_config_generator.tasks import NamedTask from evergreen_config_generator.variants import Variant @@ -105,7 +103,7 @@ def _create_variant(): name="testazurekms-variant", display_name="Azure KMS", # Azure Virtual Machine created is Debian 10. - run_on="debian10-small", + run_on="debian11-small", tasks=["testazurekms_task_group", "testazurekms-fail-task"], batchtime=20160, ) # Use a batchtime of 14 days as suggested by the CSFLE test README @@ -117,6 +115,13 @@ def _create_task_group(): task_group.setup_group_timeout_secs = 1800 # 30 minutes task_group.setup_group = [ func("fetch-det"), + # Assume role to get AWS secrets. + { + "command": "ec2.assume_role", + "params": { + "role_arn": "${aws_test_secrets_role}" + } + }, shell_exec( r""" DRIVERS_TOOLS=$(pwd)/drivers-evergreen-tools @@ -136,6 +141,7 @@ def _create_task_group(): $DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh """, test=False, + include_expansions_in_env=[ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ] ), # Load the AZUREKMS_VMNAME expansion. OD( diff -pruN 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py --- 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py 2025-08-14 18:37:23.000000000 +0000 @@ -50,8 +50,8 @@ all_variants = [ "link-with-cmake", "link-with-cmake-ssl", "link-with-cmake-snappy", + "verify-headers", OD([("name", "link-with-cmake-mac"), ("distros", ["macos-14-arm64"])]), - OD([("name", "link-with-cmake-mac-deprecated"), ("distros", ["macos-14-arm64"])]), OD([("name", "link-with-cmake-windows"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-windows-ssl"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-windows-snappy"), ("distros", ["windows-vsCurrent-large"])]), @@ -64,11 +64,8 @@ all_variants = [ OD([("name", "link-with-bson-mac"), ("distros", ["macos-14-arm64"])]), OD([("name", "link-with-bson-mingw"), ("distros", ["windows-vsCurrent-large"])]), "check-headers", - "install-uninstall-check", - OD([("name", "install-uninstall-check-mingw"), ("distros", ["windows-vsCurrent-large"])]), - OD([("name", "install-uninstall-check-msvc"), ("distros", ["windows-vsCurrent-large"])]), "debug-compile-with-warnings", - OD([("name", "build-and-test-with-toolchain"), ("distros", ["debian10-small"])]), + OD([("name", "build-and-test-with-toolchain"), ("distros", ["debian11-small"])]), "install-libmongoc-after-libbson", ], { @@ -85,7 +82,7 @@ all_variants = [ "build-and-run-authentication-tests-openssl-1.0.1", "build-and-run-authentication-tests-openssl-1.0.2", "build-and-run-authentication-tests-openssl-1.1.0", - "build-and-run-authentication-tests-openssl-1.0.1-fips" + "build-and-run-authentication-tests-openssl-1.0.1-fips", ], {}, ), @@ -130,13 +127,6 @@ all_variants = [ {"CC": "gcc"}, ), Variant( - "gcc83", - "GCC 8.3 (Debian 10.0)", - "debian10-test", - ["release-compile", "debug-compile-nosasl-nossl", ".latest .nossl"], - {"CC": "gcc"}, - ), - Variant( "gcc102", "GCC 10.2 (Debian 11.0)", "debian11-large", @@ -364,7 +354,7 @@ all_variants = [ "name": "ocsp-openssl-1.0.1", "execution_tasks": [".ocsp-openssl-1.0.1"], }, - ] + ], ), Variant( "packaging", @@ -388,7 +378,7 @@ all_variants = [ ".versioned-api .5.0", ".versioned-api .6.0", ".versioned-api .7.0", - ".versioned-api .8.0" + ".versioned-api .8.0", ], {}, ), diff -pruN 2.0.2-1/.evergreen/scripts/build-docs.sh 2.1.0-1/.evergreen/scripts/build-docs.sh --- 2.0.2-1/.evergreen/scripts/build-docs.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/build-docs.sh 2025-08-14 18:37:23.000000000 +0000 @@ -10,7 +10,7 @@ CMAKE=$(find_cmake_latest) grep "á" NEWS > /dev/null || (echo "NEWS file appears to have lost its UTF-8 encoding?" || exit 1) build_dir=$MONGOC_DIR/_build/for-docs -"$CMAKE" -S "$MONGOC_DIR" -B "$build_dir" \ +"$CMAKE" --fresh -S "$MONGOC_DIR" -B "$build_dir" \ -D ENABLE_MAN_PAGES=ON \ -D ENABLE_HTML_DOCS=ON \ -D ENABLE_ZLIB=BUNDLED diff -pruN 2.0.2-1/.evergreen/scripts/check-files.py 2.1.0-1/.evergreen/scripts/check-files.py --- 2.0.2-1/.evergreen/scripts/check-files.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/check-files.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Check that there are no missing .c or .h files in the release tarball. -""" -import os -import re -import sys - -if len(sys.argv) != 3: - print("Usage: python check_files.py" - " " - " ") - sys.exit(1) - -REPO_SRC_DIR = sys.argv[1] -TAR_SRC_DIR = sys.argv[2] - -pattern = re.compile(r".*\.(c|h)$") - -repo_src_files = set() -tar_src_files = set() - -# Files that are generated by cmake are expected not to be in the repository. -cmake_produced = [ - "libbson/src/bson/bson-version.h", - "libmongoc/src/mongoc/mongoc-version.h", - "zlib-1.2.13/zconf.h", -] - -for root, dirs, files in os.walk(REPO_SRC_DIR): - for file in files: - relpath = os.path.relpath(os.path.join(root, file), REPO_SRC_DIR) - - if pattern.match(relpath): - repo_src_files.add(relpath) - -for root, dirs, files in os.walk(TAR_SRC_DIR): - for file in files: - relpath = os.path.relpath(os.path.join(root, file), TAR_SRC_DIR) - if relpath in cmake_produced: - continue - if pattern.match(relpath): - tar_src_files.add(relpath) - -if tar_src_files != repo_src_files: - print("Files produced from tarball differ from repository") - print("Tarball produced the following files NOT in repository") - for file in sorted(tar_src_files.difference(repo_src_files)): - print(" " + file) - print("Repository has the following files NOT in tarball") - for file in sorted(repo_src_files.difference(tar_src_files)): - print(" " + file) - sys.exit(1) diff -pruN 2.0.2-1/.evergreen/scripts/check-preludes.py 2.1.0-1/.evergreen/scripts/check-preludes.py --- 2.0.2-1/.evergreen/scripts/check-preludes.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/check-preludes.py 2025-08-14 18:37:23.000000000 +0000 @@ -39,7 +39,7 @@ checks = [ }, { "name": "libbson", - "headers": list(BSON_PREFIX.glob("*.h")), + "headers": list(BSON_PREFIX.glob("bson-*.h")), "exclusions": [ BSON_PREFIX / "bson-prelude.h", BSON_PREFIX / "bson.h", diff -pruN 2.0.2-1/.evergreen/scripts/clang-format-all.sh 2.1.0-1/.evergreen/scripts/clang-format-all.sh --- 2.0.2-1/.evergreen/scripts/clang-format-all.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/clang-format-all.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# -# clang-format-all.sh -# -# Usage: -# ./tools/poetry.sh install --with=dev -# ./tools/poetry.sh run .evergreen/scripts/clang-format-all.sh -# DRYRUN=1 ./tools/poetry.sh run .evergreen/scripts/clang-format-all.sh -# ./tools/poetry.sh run env DRYRUN=1 .evergreen/scripts/clang-format-all.sh -# -# This script is meant to be run from the project root directory. - -: "${DRYRUN:-}" - -set -o errexit -set -o pipefail - -clang-format --version - -source_dirs=( - src/common - src/libbson - src/libmongoc -) - -exclude_patterns=( - -e src/libbson/src/jsonsl -) - -mapfile -t source_files < <( - find "${source_dirs[@]:?}" -name '*.[ch]' | - grep -E -v "${exclude_patterns[@]}" -) - -if [[ -n "${DRYRUN:-}" ]]; then - clang-format --dry-run -Werror "${source_files[@]:?}" -else - clang-format --verbose -i "${source_files[@]:?}" -fi diff -pruN 2.0.2-1/.evergreen/scripts/compile-std.sh 2.1.0-1/.evergreen/scripts/compile-std.sh --- 2.0.2-1/.evergreen/scripts/compile-std.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/compile-std.sh 2025-08-14 18:37:23.000000000 +0000 @@ -22,7 +22,7 @@ script_dir="$(to_absolute "$(dirname "${ declare mongoc_dir mongoc_dir="$(to_absolute "${script_dir}/../..")" -declare install_dir="${mongoc_dir}/install-dir" +declare libmongocrypt_install_dir="${mongoc_dir}/libmongocrypt-install-dir" declare -a configure_flags @@ -38,7 +38,7 @@ configure_flags_append_if_not_null() { fi } -configure_flags_append "-DCMAKE_PREFIX_PATH=${install_dir}" +configure_flags_append "-DCMAKE_PREFIX_PATH=${libmongocrypt_install_dir:?}" configure_flags_append "-DCMAKE_SKIP_RPATH=TRUE" # Avoid hardcoding absolute paths to dependency libraries. configure_flags_append "-DENABLE_CLIENT_SIDE_ENCRYPTION=ON" configure_flags_append "-DENABLE_DEBUG_ASSERTIONS=ON" @@ -90,15 +90,15 @@ CXXFLAGS+=" ${flags+${flags[*]}}" declare cmake_binary cmake_binary="$(find_cmake_latest)" -declare build_dir -build_dir="cmake-build" +declare mongoc_build_dir mongoc_install_dir +mongoc_build_dir="cmake-build" +mongoc_install_dir="cmake-install" + +configure_flags_append "-DCMAKE_INSTALL_PREFIX=${mongoc_install_dir:?}" # shellcheck source=.evergreen/scripts/add-build-dirs-to-paths.sh . "${script_dir}/add-build-dirs-to-paths.sh" -export PKG_CONFIG_PATH -PKG_CONFIG_PATH="${install_dir}/lib/pkgconfig:${PKG_CONFIG_PATH:-}" - if [[ "${OSTYPE}" == darwin* ]]; then # MacOS does not have nproc. nproc() { @@ -116,9 +116,55 @@ if [[ "${CMAKE_GENERATOR:-}" =~ "Visual export EnforceProcessCountAcrossBuilds=1 fi +echo "Checking requested C standard is supported..." +pushd "$(mktemp -d)" +cat >CMakeLists.txt <= version + else() + failure() # Both are old: latest < version + endif() + elseif(CMAKE_C_STANDARD_LATEST IN_LIST old_std_versions) + failure() # latest (old) < version (new) + elseif(c_std_version IN_LIST old_std_versions) + success() # latest (new) >= version (old) + elseif(CMAKE_C_STANDARD_LATEST GREATER_EQUAL c_std_version) + success() # Both are new: latest >= version. + else() + failure() # Both are new: latest < version. + endif() +endif() +DOC +"${cmake_binary:?}" -S . -B build +popd # "$(tmpfile -d)" +echo "Checking requested C standard is supported... done." + echo "Installing libmongocrypt..." # shellcheck source=.evergreen/scripts/compile-libmongocrypt.sh -"${script_dir}/compile-libmongocrypt.sh" "${cmake_binary}" "${mongoc_dir}" "${install_dir}" &>output.txt || { +"${script_dir}/compile-libmongocrypt.sh" "${cmake_binary}" "${mongoc_dir}" "${libmongocrypt_install_dir:?}" &>output.txt || { cat output.txt 1>&2 exit 1 } @@ -141,9 +187,39 @@ else all_target="all" fi -"${cmake_binary}" -S . -B "${build_dir:?}" "${configure_flags[@]}" -"${cmake_binary}" --build "${build_dir:?}" --config Debug \ +# Ensure we're starting with a clean slate. +rm -rf "${mongoc_build_dir:?}" "${mongoc_install_dir:?}" + +"${cmake_binary}" -S . -B "${mongoc_build_dir:?}" "${configure_flags[@]}" +"${cmake_binary}" --build "${mongoc_build_dir:?}" --config Debug \ --target mongo_c_driver_tests \ --target mongo_c_driver_examples \ --target public-header-warnings \ --target "${all_target:?}" +"${cmake_binary}" --install "${mongoc_build_dir:?}" --config Debug + +# "lib" vs. "lib64" +if [[ -d "${mongoc_install_dir:?}/lib64" ]]; then + lib_dir="lib64" +else + lib_dir="lib" +fi + +# This file should not be deleted! +touch "${mongoc_install_dir:?}/${lib_dir:?}/canary.txt" + +# Linux/MacOS: uninstall.sh +# Windows: uninstall.cmd +"${cmake_binary}" --build "${mongoc_build_dir:?}" --target uninstall + +# No files should remain except canary.txt. +# No directories except top-level directories should remain. +echo "Checking results of uninstall..." +diff <(cd "${mongoc_install_dir:?}" && find . -mindepth 1 | sort) <( + echo "./bin" + echo "./include" + echo "./${lib_dir:?}" + echo "./${lib_dir:?}/canary.txt" + echo "./share" +) +echo "Checking results of uninstall... done." diff -pruN 2.0.2-1/.evergreen/scripts/compile-windows.sh 2.1.0-1/.evergreen/scripts/compile-windows.sh --- 2.0.2-1/.evergreen/scripts/compile-windows.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/compile-windows.sh 2025-08-14 18:37:23.000000000 +0000 @@ -56,7 +56,6 @@ IFS=' ' read -ra extra_configure_flags < configure_flags_append "-DCMAKE_INSTALL_PREFIX=$(native-path "${install_dir}")" configure_flags_append "-DCMAKE_PREFIX_PATH=$(native-path "${install_dir}")" -configure_flags_append "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" configure_flags_append "-DENABLE_MAINTAINER_FLAGS=ON" configure_flags_append_if_not_null C_STD_VERSION "-DCMAKE_C_STANDARD=${C_STD_VERSION:-}" @@ -98,17 +97,15 @@ CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" declare build_dir build_dir="cmake-build" -if [[ "${CC}" =~ mingw ]]; then +if [[ "${CC}" =~ 'gcc' ]]; then # MinGW has trouble compiling src/cpp-check.cpp without some assistance. configure_flags_append "-DCMAKE_CXX_STANDARD=11" env \ - "CC=gcc" \ - "CXX=g++" \ "${cmake_binary:?}" \ -S . \ -B "${build_dir:?}" \ - -G "MinGW Makefiles" \ + -G "Ninja" \ "${configure_flags[@]}" \ "${extra_configure_flags[@]}" diff -pruN 2.0.2-1/.evergreen/scripts/debian_package_build.sh 2.1.0-1/.evergreen/scripts/debian_package_build.sh --- 2.0.2-1/.evergreen/scripts/debian_package_build.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/debian_package_build.sh 2025-08-14 18:37:23.000000000 +0000 @@ -66,7 +66,7 @@ sudo chroot ./unstable-chroot /bin/bash LANG=C /bin/bash ./debian/build_snapshot.sh && \ debc ../*.changes && \ dpkg -i ../*.deb && \ - gcc -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -o example-client src/libmongoc/examples/example-client.c -lmongoc-1.0 -lbson-1.0 )' + gcc $(pkgconf --cflags bson2 mongoc2) -o example-client src/libmongoc/examples/example-client.c -lmongoc2 -lbson2 )' [ -e ./unstable-chroot/tmp/mongoc/example-client ] || (echo "Example was not built!" ; exit 1) (cd ./unstable-chroot/tmp/ ; tar zcvf ../../deb.tar.gz *.dsc *.orig.tar.gz *.debian.tar.xz *.build *.deb) @@ -98,7 +98,7 @@ sudo chroot ./unstable-i386-chroot /bin/ LANG=C /bin/bash ./debian/build_snapshot.sh && \ debc ../*.changes && \ dpkg -i ../*.deb && \ - gcc -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -o example-client src/libmongoc/examples/example-client.c -lmongoc-1.0 -lbson-1.0 )' + gcc $(pkgconf --cflags bson2 mongoc2) -o example-client src/libmongoc/examples/example-client.c -lmongoc2 -lbson2 )' [ -e ./unstable-i386-chroot/tmp/mongoc/example-client ] || (echo "Example was not built!" ; exit 1) (cd ./unstable-i386-chroot/tmp/ ; tar zcvf ../../deb-i386.tar.gz *.dsc *.orig.tar.gz *.debian.tar.xz *.build *.deb) diff -pruN 2.0.2-1/.evergreen/scripts/install-uninstall-check-windows.cmd 2.1.0-1/.evergreen/scripts/install-uninstall-check-windows.cmd --- 2.0.2-1/.evergreen/scripts/install-uninstall-check-windows.cmd 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/install-uninstall-check-windows.cmd 1970-01-01 00:00:00.000000000 +0000 @@ -1,231 +0,0 @@ -REM Supported/used environment variables: -REM CC Compiler, "mingw" or "Visual Studio 14 2015 Win64". -REM BSON_ONLY Whether to build only the BSON library. - -rem Ensure Cygwin executables like sh.exe are not in PATH -rem set PATH=C:\Windows\system32;C:\Windows - -echo on -echo - -set SRCROOT=%CD% -set TAR=C:\cygwin\bin\tar -set CMAKE=C:\cmake\bin\cmake -set CMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin\mingw32-make.exe -rem Ensure Cygwin executables like sh.exe are not in PATH -set PATH=C:\cygwin\bin;C:\Windows\system32;C:\Windows;C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin;C:\mongoc;src\libbson;src\libmongoc - -set version=1.31.0 -set major=1 - -if "%BSON_ONLY%"=="1" ( - set BUILD_DIR=%CD%\build-dir-bson - set INSTALL_DIR=%CD%\install-dir-bson -) else ( - set BUILD_DIR=%CD%\build-dir-mongoc - set INSTALL_DIR=%CD%\install-dir-mongoc -) -rmdir /S /Q %BUILD_DIR% -mkdir %BUILD_DIR% - -rmdir /S /Q %INSTALL_DIR% -mkdir %INSTALL_DIR% - -set PATH=%PATH%;%INSTALL_DIR%\bin - -cd %BUILD_DIR% -robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL - -if "%BSON_ONLY%"=="1" ( - set BSON_ONLY_OPTION=-DENABLE_MONGOC=OFF -) else ( - set BSON_ONLY_OPTION=-DENABLE_MONGOC=ON -) - -echo.%CC%| findstr /I "gcc">Nul && ( - rem Build libmongoc, with flags that the downstream R driver mongolite uses - %CMAKE% -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake %BSON_ONLY_OPTION% . - %CMAKE% --build . - if errorlevel 1 ( - exit /B 1 - ) - %CMAKE% --build . --target install - if errorlevel 1 ( - exit /B 1 - ) - - REM no kms-message components should be installed - if exist %INSTALL_DIR%\include\kms_message\kms_message.h ( - echo kms_message.h found! - exit /B 1 - ) else ( - echo kms_message.h check ok - ) - if exist %INSTALL_DIR%\lib\libkms_message-static.a ( - echo libkms_message-static.a found! - exit /B 1 - ) else ( - echo libkms_message-static.a check ok - ) - if exist %INSTALL_DIR%\lib\cmake\kms_message\kms_message-config.cmake ( - echo kms_message-config.cmake found! - exit /B 1 - ) else ( - echo kms_message-config.cmake check ok - ) - - echo > %INSTALL_DIR%\lib\canary.txt - - dir %INSTALL_DIR%\share\mongo-c-driver - - %CMAKE% --build . --target uninstall - if errorlevel 1 ( - exit /B 1 - ) -) || ( - %CMAKE% -G "%CC%" "-DCMAKE_INSTALL_PREFIX=%INSTALL_DIR%" "-DCMAKE_BUILD_TYPE=Debug" %BSON_ONLY_OPTION% . - %CMAKE% --build . --config Debug - if errorlevel 1 ( - exit /B 1 - ) - %CMAKE% --build . --config Debug --target install - if errorlevel 1 ( - exit /B 1 - ) - - echo > %INSTALL_DIR%\lib\canary.txt - - REM no kms-message components should be installed - if exist %INSTALL_DIR%\include\kms_message\kms_message.h ( - echo kms_message.h found! - exit /B 1 - ) else ( - echo kms_message.h check ok - ) - if exist %INSTALL_DIR%\lib\libkms_message-static.a ( - echo libkms_message-static.a found! - exit /B 1 - ) else ( - echo libkms_message-static.a check ok - ) - if exist %INSTALL_DIR%\lib\cmake\kms_message\kms_message-config.cmake ( - echo kms_message-config.cmake found! - exit /B 1 - ) else ( - echo kms_message-config.cmake check ok - ) - - dir %INSTALL_DIR%\share\mongo-c-driver - - %CMAKE% --build . --target uninstall - if errorlevel 1 ( - exit /B 1 - ) -) - -if exist %INSTALL_DIR%\lib\pkgconfig\bson%major%.pc ( - echo bson%major%.pc found! - exit /B 1 -) else ( - echo bson%major%.pc check ok -) -if not exist %INSTALL_DIR%\lib\canary.txt ( - echo canary.txt not found! - exit /B 1 -) else ( - echo canary.txt check ok -) -if not exist %INSTALL_DIR%\lib ( - echo %INSTALL_DIR%\lib not found! - exit /B 1 -) else ( - echo %INSTALL_DIR%\lib check ok -) -if "%BSON_ONLY%" NEQ "1" ( - if exist %INSTALL_DIR%\lib\pkgconfig\mongoc%major%.pc ( - echo mongoc%major%.pc found! - exit /B 1 - ) else ( - echo mongoc%major%.pc check ok - ) - if exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-1.0-config.cmake ( - echo mongoc-1.0-config.cmake found! - exit /B 1 - ) else ( - echo mongoc-1.0-config.cmake check ok - ) - if exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-1.0-config-version.cmake ( - echo mongoc-1.0-config-version.cmake found! - exit /B 1 - ) else ( - echo mongoc-1.0-config-version.cmake check ok - ) - if exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-targets.cmake ( - echo mongoc-targets.cmake found! - exit /B 1 - ) else ( - echo mongoc-targets.cmake check ok - ) -) -if exist %INSTALL_DIR%\include\bson-%version%\bson\bson.h ( - echo bson\bson.h found! - exit /B 1 -) else ( - echo bson\bson.h check ok -) -if exist %INSTALL_DIR%\include\bson-%version% ( - echo $INSTALL_DIR\include\bson-%version% found! - exit /B 1 -) else ( - echo $INSTALL_DIR\include\bson-%version% check ok -) -if "%BSON_ONLY%" NEQ "1" ( - if exist %INSTALL_DIR%\include\libmongoc-1.0\mongoc\mongoc.h ( - echo mongoc\mongoc.h found! - exit /B 1 - ) else ( - echo mongoc\mongoc.h check ok - ) - if exist %INSTALL_DIR%\include\libmongoc-1.0\mongoc.h ( - echo mongoc.h found! - exit /B 1 - ) else ( - echo mongoc.h check ok - ) - if exist %INSTALL_DIR%\include\libmongoc-1.0 ( - echo $INSTALL_DIR\include\libmongoc-1.0 found! - exit /B 1 - ) else ( - echo $INSTALL_DIR\include\libmongoc-1.0 check ok - ) -) -if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall-bson.cmd ( - echo uninstall-bson.cmd found! - exit /B 1 -) else ( - echo uninstall-bson.cmd check ok -) -if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall.cmd ( - echo uninstall.cmd found! - exit /B 1 -) else ( - echo uninstall.cmd check ok -) -if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall-bson.sh ( - echo uninstall-bson.sh found! - exit /B 1 -) else ( - echo uninstall-bson.sh check ok -) -if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall.sh ( - echo uninstall.sh found! - exit /B 1 -) else ( - echo uninstall.sh check ok -) -if exist %INSTALL_DIR%\share\mongo-c-driver ( - echo $INSTALL_DIR\share\mongo-c-driver found! - exit /B 1 -) else ( - echo $INSTALL_DIR\share\mongo-c-driver check ok -) diff -pruN 2.0.2-1/.evergreen/scripts/install-uninstall-check.sh 2.1.0-1/.evergreen/scripts/install-uninstall-check.sh --- 2.0.2-1/.evergreen/scripts/install-uninstall-check.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/install-uninstall-check.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,202 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit # Exit the script with error if any of the commands fail - -# Supported/used environment variables: -# CMAKE Path to cmake executable. -# BSON_ONLY Whether to build only the BSON library. - - -DIR=$(dirname $0) -. $DIR/find-cmake-latest.sh -CMAKE=$(find_cmake_latest) -. $DIR/check-symlink.sh -SRCROOT=$(pwd) - -# The major version of the project. Appears in certain install filenames. -_full_version=$(cat "$DIR/../../VERSION_CURRENT") -version="${_full_version%-*}" # 1.2.3-dev → 1.2.3 -major="${version%%.*}" # 1.2.3 → 1 -echo "major version: $major" -echo " full version: $version" - -# Use ccache if able. -. $DIR/find-ccache.sh -find_ccache_and_export_vars "$(pwd)" || true - -SCRATCH_DIR=$(pwd)/.scratch -rm -rf "$SCRATCH_DIR" -mkdir -p "$SCRATCH_DIR" -cp -r -- "$SRCROOT"/* "$SCRATCH_DIR" - -if [ "$BSON_ONLY" ]; then - BUILD_DIR=$SCRATCH_DIR/build-dir-bson - INSTALL_PREFIX=$SCRATCH_DIR/install-dir-bson -else - BUILD_DIR=$SCRATCH_DIR/build-dir-mongoc - INSTALL_PREFIX=$SCRATCH_DIR/install-dir-mongoc -fi - -if [ "$DESTDIR" ]; then - INSTALL_DIR="${DESTDIR}/${INSTALL_PREFIX}" -else - INSTALL_DIR=$INSTALL_PREFIX -fi - -rm -rf $BUILD_DIR -mkdir $BUILD_DIR - -rm -rf $INSTALL_DIR -mkdir -p $INSTALL_DIR - -cd $BUILD_DIR - -cp -r -- "$SRCROOT"/* "$SCRATCH_DIR" - -if [ "$BSON_ONLY" ]; then - BSON_ONLY_OPTION="-DENABLE_MONGOC=OFF" -else - BSON_ONLY_OPTION="-DENABLE_MONGOC=ON" -fi - -# Use ccache if able. -if [[ -f $DIR/find-ccache.sh ]]; then - . $DIR/find-ccache.sh - find_ccache_and_export_vars "$SCRATCH_DIR" || true -fi - -$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DBUILD_TESTING=OFF -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $BSON_ONLY_OPTION "$SCRATCH_DIR" -$CMAKE --build . --parallel -if [ "$DESTDIR" ]; then - DESTDIR=$DESTDIR $CMAKE --build . --target install -else - $CMAKE --build . --target install -fi -touch $INSTALL_DIR/lib/canary.txt - -# no kms-message components should be installed -if test -f $INSTALL_DIR/include/kms_message/kms_message.h; then - echo "kms_message.h found!" - exit 1 -else - echo "kms_message.h check ok" -fi -if test -f $INSTALL_DIR/lib/libkms_message-static.a; then - echo "libkms_message-static.a found!" - exit 1 -else - echo "libkms_message-static.a check ok" -fi -if test -f $INSTALL_DIR/lib/cmake/kms_message/kms_message-config.cmake; then - echo "kms_message-config.cmake found!" - exit 1 -else - echo "kms_message-config.cmake check ok" -fi - -ls -l $INSTALL_DIR/share/mongo-c-driver - -$CMAKE --build . --target uninstall - -set +o xtrace - -if test -f $INSTALL_DIR/lib/pkgconfig/bson$major.pc; then - echo "bson$major.pc found!" - exit 1 -else - echo "bson$major.pc check ok" -fi -if test -f $INSTALL_DIR/lib/cmake/bson-$version/bsonConfig.cmake; then - echo "bsonConfig.cmake found!" - exit 1 -else - echo "bsonConfig.cmake check ok" -fi -if test -f $INSTALL_DIR/lib/cmake/bson-$version/bsonConfigVersion.cmake; then - echo "bsonConfigVersion.cmake found!" - exit 1 -else - echo "bsonConfigVersion.cmake check ok" -fi -if test ! -f $INSTALL_DIR/lib/canary.txt; then - echo "canary.txt not found!" - exit 1 -else - echo "canary.txt check ok" -fi -if test ! -d $INSTALL_DIR/lib; then - echo "$INSTALL_DIR/lib not found!" - exit 1 -else - echo "$INSTALL_DIR/lib check ok" -fi -if [ -z "$BSON_ONLY" ]; then - if test -f $INSTALL_DIR/lib/pkgconfig/mongoc$major.pc; then - echo "mongoc$major.pc found!" - exit 1 - else - echo "mongoc$major.pc check ok" - fi - if test -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake; then - echo "mongoc-1.0-config.cmake found!" - exit 1 - else - echo "mongoc-1.0-config.cmake check ok" - fi - if test -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake; then - echo "mongoc-1.0-config-version.cmake found!" - exit 1 - else - echo "mongoc-1.0-config-version.cmake check ok" - fi - if test -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-targets.cmake; then - echo "mongoc-targets.cmake found!" - exit 1 - else - echo "mongoc-targets.cmake check ok" - fi -fi -if test -f $INSTALL_DIR/include/bson-$version/bson/bson.h; then - echo "bson/bson.h found!" - exit 1 -else - echo "bson/bson.h check ok" -fi -if test -d $INSTALL_DIR/include/bson-$version; then - echo "$INSTALL_DIR/include/bson-$version found!" - exit 1 -else - echo "$INSTALL_DIR/include/bson-$version check ok" -fi -if [ -z "$BSON_ONLY" ]; then - if test -f $INSTALL_DIR/include/libmongoc-1.0/mongoc/mongoc.h; then - echo "mongoc/mongoc.h found!" - exit 1 - else - echo "mongoc/mongoc.h check ok" - fi - if test -d $INSTALL_DIR/include/libmongoc-1.0; then - echo "$INSTALL_DIR/include/libmongoc-1.0 found!" - exit 1 - else - echo "$INSTALL_DIR/include/libmongoc-1.0 check ok" - fi -fi -if test -f $INSTALL_DIR/share/mongo-c-driver/uninstall-bson.sh; then - echo "uninstall-bson.sh found!" - exit 1 -else - echo "uninstall-bson.sh check ok" -fi -if test -f $INSTALL_DIR/share/mongo-c-driver/uninstall.sh; then - echo "uninstall.sh found!" - exit 1 -else - echo "uninstall.sh check ok" -fi -if test -d $INSTALL_DIR/share/mongo-c-driver; then - echo "$INSTALL_DIR/share/mongo-c-driver found!" - exit 1 -else - echo "$INSTALL_DIR/share/mongo-c-driver check ok" -fi diff -pruN 2.0.2-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd 2.1.0-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd --- 2.0.2-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd 2025-08-14 18:37:23.000000000 +0000 @@ -1,45 +1,37 @@ +rem Load environment for Visual Studio 15 2017. +rem https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-150 +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat" || goto :error + echo on echo set TAR=C:\cygwin\bin\tar -set CMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin\mingw32-make.exe -set CC=C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin\gcc.exe -rem Ensure Cygwin executables like sh.exe are not in PATH -set "PATH=C:\cygwin\bin;C:\Windows\system32;C:\Windows;C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin;C:\mongoc;src\libbson;src\libmongoc;C:\Program Files\Git\cmd" set LINK_STATIC=1 set SRCROOT=%CD% set BUILD_DIR=%CD%\build-dir -rmdir /S /Q %BUILD_DIR% -mkdir %BUILD_DIR% +rmdir /S /Q %BUILD_DIR% 2>nul || true +mkdir %BUILD_DIR% || goto :error set INSTALL_DIR=%CD%\install-dir -rmdir /S /Q %INSTALL_DIR% -mkdir %INSTALL_DIR% +rmdir /S /Q %INSTALL_DIR% 2>nul || true +mkdir %INSTALL_DIR% || goto :error set PATH=%PATH%;%INSTALL_DIR%\bin set major=1 set version=1.31.0 -cd %BUILD_DIR% -robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL +cd %BUILD_DIR% || goto :error rem Build libmongoc, with flags that the downstream R driver mongolite uses -%CMAKE% -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_CFLAGS="-pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DENABLE_STATIC=ON . -%CMAKE% --build . --parallel -if errorlevel 1 ( - exit /B 1 -) - -%CMAKE% --build . --target install -if errorlevel 1 ( - exit /B 1 -) +%CMAKE% -G "Ninja" DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_C_FLAGS="-pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DENABLE_STATIC=ON .. || goto :error +%CMAKE% --build . --parallel || goto :error +%CMAKE% --build . --target install || goto :error rem Test our pkg-config file set EXAMPLE_DIR=%SRCROOT%\src\libbson\examples\ -cd %EXAMPLE_DIR% +cd %EXAMPLE_DIR% || goto :error rem Proceed from here once we have pkg-config on Windows exit /B 0 @@ -51,13 +43,15 @@ for /f %%i in ('pkg-config --libs --cfla echo PKG_CONFIG_OUT is %PKG_CONFIG_OUT% -%CC% -o hello_bson hello_bson.c %PKG_CONFIG_OUT% +%CC% -o hello_bson hello_bson.c %PKG_CONFIG_OUT% || goto :error -rem Works on windows-64-vs2013-compile, VS 2013 is a.k.a. "Visual Studio 12" -rem And yes, they should've named the flag "dependencies". -"c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\dumpbin.exe" /dependents Debug\hello_bson.exe +dumpbin.exe /dependents Debug\hello_bson.exe || goto :error rem Add DLLs to PATH set PATH=%PATH%;%INSTALL_DIR%\bin -Debug\hello_bson.exe %MONGODB_EXAMPLE_URI% +Debug\hello_bson.exe %MONGODB_EXAMPLE_URI% || goto :error + +goto :EOF +:error +exit /B %errorlevel% diff -pruN 2.0.2-1/.evergreen/scripts/link-sample-program-mingw.cmd 2.1.0-1/.evergreen/scripts/link-sample-program-mingw.cmd --- 2.0.2-1/.evergreen/scripts/link-sample-program-mingw.cmd 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/link-sample-program-mingw.cmd 2025-08-14 18:37:23.000000000 +0000 @@ -1,45 +1,37 @@ +rem Load environment for Visual Studio 15 2017. +rem https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-150 +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat" || goto :error + echo on echo rem Use DENABLE_SSL=OFF. Windows hosts do not have a MinGW ABI compatible OpenSSL install. set CMAKE_FLAGS=-DENABLE_SSL=OFF -DENABLE_SASL=CYRUS set TAR=C:\cygwin\bin\tar -set CMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin\mingw32-make.exe -set CC=C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin\gcc.exe -rem Ensure Cygwin executables like sh.exe are not in PATH -set "PATH=C:\cygwin\bin;C:\Windows\system32;C:\Windows;C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin;C:\mongoc;src\libbson;src\libmongoc;C:\Program Files\Git\cmd" set SRCROOT=%CD% set BUILD_DIR=%CD%\build-dir -rmdir /S /Q %BUILD_DIR% -mkdir %BUILD_DIR% +rmdir /S /Q %BUILD_DIR% 2>nul || true +mkdir %BUILD_DIR% || goto :error set INSTALL_DIR=%CD%\install-dir -rmdir /S /Q %INSTALL_DIR% -mkdir %INSTALL_DIR% +rmdir /S /Q %INSTALL_DIR% 2>nul || true +mkdir %INSTALL_DIR% || goto :error set PATH=%PATH%;%INSTALL_DIR%\bin set major=1 -cd %BUILD_DIR% -robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL +cd %BUILD_DIR% || goto :error rem Build libmongoc, with flags that the downstream R driver mongolite uses -%CMAKE% -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_CFLAGS="-pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake %CMAKE_FLAGS% . -%CMAKE% --build . --parallel -if errorlevel 1 ( - exit /B 1 -) - -%CMAKE% --build . --target install -if errorlevel 1 ( - exit /B 1 -) +%CMAKE% -G "Ninja" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_C_FLAGS="-pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake %CMAKE_FLAGS% .. || goto :error +%CMAKE% --build . --parallel || goto :error +%CMAKE% --build . --target install || goto :error rem Test our pkg-config file set EXAMPLE_DIR=%SRCROOT%\src\libmongoc\examples\ -cd %EXAMPLE_DIR% +cd %EXAMPLE_DIR% || goto :error rem Proceed from here once we have pkg-config on Windows exit /B 0 @@ -51,13 +43,15 @@ for /f %%i in ('pkg-config --libs --cfla echo PKG_CONFIG_OUT is %PKG_CONFIG_OUT% -%CC% -o hello_mongoc hello_mongoc.c %PKG_CONFIG_OUT% +%CC% -o hello_mongoc hello_mongoc.c %PKG_CONFIG_OUT% || goto :error -rem Works on windows-64-vs2013-compile, VS 2013 is a.k.a. "Visual Studio 12" -rem And yes, they should've named the flag "dependencies". -"c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\dumpbin.exe" /dependents Debug\hello_mongoc.exe +dumpbin.exe /dependents Debug\hello_mongoc.exe || goto :error rem Add DLLs to PATH set PATH=%PATH%;%INSTALL_DIR%\bin -Debug\hello_mongoc.exe %MONGODB_EXAMPLE_URI% +Debug\hello_mongoc.exe %MONGODB_EXAMPLE_URI% || goto :error + +goto :EOF +:error +exit /B %errorlevel% diff -pruN 2.0.2-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd 2.1.0-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd --- 2.0.2-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd 2025-08-14 18:37:23.000000000 +0000 @@ -4,6 +4,10 @@ REM LINK_STATIC Whether t rem Ensure Cygwin executables like sh.exe are not in PATH rem set PATH=C:\Windows\system32;C:\Windows +rem Load environment for Visual Studio 15 2017. +rem https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-150 +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat" || goto :error + echo on echo @@ -11,28 +15,25 @@ set TAR=C:\cygwin\bin\tar set SRCROOT=%CD% set BUILD_DIR=%CD%\build-dir -rmdir /S /Q %BUILD_DIR% -mkdir %BUILD_DIR% +rmdir /S /Q %BUILD_DIR% 2>nul || true +mkdir %BUILD_DIR% || goto :error set INSTALL_DIR=%CD%\install-dir -rmdir /S /Q %INSTALL_DIR% -mkdir %INSTALL_DIR% +rmdir /S /Q %INSTALL_DIR% 2>nul || true +mkdir %INSTALL_DIR% || goto :error set PATH=%PATH%;%INSTALL_DIR%\bin -rem Set path to dumpbin.exe and other VS tools. -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat" -cd %BUILD_DIR% -robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL +cd %BUILD_DIR% || goto :error if "%LINK_STATIC%"=="1" ( - %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF .. || goto :error ) else ( - %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_STATIC=OFF . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_STATIC=OFF .. || goto :error ) -%CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m -%CMAKE% --build . --target INSTALL --config "Debug" -- /m +%CMAKE% --build . --config "Debug" --target ALL_BUILD -- /m || goto :error +%CMAKE% --build . --config "Debug" --target INSTALL -- /m || goto :error rem Test our CMake package config file with CMake's find_package command. set EXAMPLE_DIR=%SRCROOT%\src\libbson\examples\cmake\find_package @@ -41,11 +42,15 @@ if "%LINK_STATIC%"=="1" ( set EXAMPLE_DIR="%EXAMPLE_DIR%_static" ) -cd %EXAMPLE_DIR% -%CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . -%CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m +cd %EXAMPLE_DIR% || goto :error +%CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . || goto :error +%CMAKE% --build . --config "Debug" --target ALL_BUILD -- /m || goto :error rem Yes, they should've named it "dependencies". -dumpbin.exe /dependents Debug\hello_bson.exe +dumpbin.exe /dependents Debug\hello_bson.exe || goto :error + +Debug\hello_bson.exe || goto :error -Debug\hello_bson.exe +goto :EOF +:error +exit /B %errorlevel% diff -pruN 2.0.2-1/.evergreen/scripts/link-sample-program-msvc.cmd 2.1.0-1/.evergreen/scripts/link-sample-program-msvc.cmd --- 2.0.2-1/.evergreen/scripts/link-sample-program-msvc.cmd 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/link-sample-program-msvc.cmd 2025-08-14 18:37:23.000000000 +0000 @@ -6,6 +6,10 @@ REM ENABLE_SNAPPY Enable Sn rem Ensure Cygwin executables like sh.exe are not in PATH rem set PATH=C:\Windows\system32;C:\Windows +rem Load environment for Visual Studio 15 2017. +rem https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-150 +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat" || goto :error + echo on echo @@ -13,44 +17,40 @@ set TAR=C:\cygwin\bin\tar set SRCROOT=%CD% set BUILD_DIR=%CD%\build-dir -rmdir /S /Q %BUILD_DIR% -mkdir %BUILD_DIR% +rmdir /S /Q %BUILD_DIR% 2>nul || true +mkdir %BUILD_DIR% || goto :error set INSTALL_DIR=%CD%\install-dir -rmdir /S /Q %INSTALL_DIR% -mkdir %INSTALL_DIR% +rmdir /S /Q %INSTALL_DIR% 2>nul || true +mkdir %INSTALL_DIR% || goto :error set PATH=%PATH%;%INSTALL_DIR%\bin -rem Set path to dumpbin.exe and other VS tools. -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" - -cd %BUILD_DIR% -robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL +cd %BUILD_DIR% || goto :error if "%ENABLE_SNAPPY%"=="1" ( rem Enable Snappy - curl -sS --retry 5 -LO https://github.com/google/snappy/archive/1.1.7.tar.gz - %TAR% xzf 1.1.7.tar.gz - cd snappy-1.1.7 - %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% . - %CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m - %CMAKE% --build . --target INSTALL --config "Debug" -- /m + curl -sS --retry 5 -LO https://github.com/google/snappy/archive/1.1.7.tar.gz || goto :error + %TAR% xzf 1.1.7.tar.gz || goto :error + cd snappy-1.1.7 || goto :error + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -S snappy-1.1.7 -B snappy-1.1.7-build || goto :error + %CMAKE% --build snappy-1.1.7-build --config "Debug" --target ALL_BUILD -- /m || goto :error + %CMAKE% --build snappy-1.1.7-build --config "Debug" --target INSTALL -- /m || goto :error set SNAPPY_OPTION=-DENABLE_SNAPPY=ON ) else ( set SNAPPY_OPTION=-DENABLE_SNAPPY=OFF ) -cd %BUILD_DIR% +cd %BUILD_DIR% || goto :error rem Build libmongoc if "%ENABLE_SSL%"=="1" ( - %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=WINDOWS %ENABLE_SNAPPY_OPTION% . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=WINDOWS %ENABLE_SNAPPY_OPTION% .. || goto :error ) else ( - %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=OFF %ENABLE_SNAPPY_OPTION% . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=OFF %ENABLE_SNAPPY_OPTION% .. || goto :error ) -%CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m -%CMAKE% --build . --target INSTALL --config "Debug" -- /m +%CMAKE% --build . --config "Debug" --target ALL_BUILD -- /m || goto :error +%CMAKE% --build . --config "Debug" --target INSTALL -- /m || goto :error rem Test our CMake package config file with CMake's find_package command. set EXAMPLE_DIR=%SRCROOT%\src\libmongoc\examples\cmake\find_package @@ -59,18 +59,22 @@ if "%LINK_STATIC%"=="1" ( set EXAMPLE_DIR="%EXAMPLE_DIR%_static" ) -cd %EXAMPLE_DIR% +cd %EXAMPLE_DIR% || goto :error if "%ENABLE_SSL%"=="1" ( - cp ..\..\..\tests\x509gen\client.pem . - cp ..\..\..\tests\x509gen\ca.pem . + cp ..\..\..\tests\x509gen\client.pem . || goto :error + cp ..\..\..\tests\x509gen\ca.pem . || goto :error set MONGODB_EXAMPLE_URI="mongodb://localhost/?ssl=true&sslclientcertificatekeyfile=client.pem&sslcertificateauthorityfile=ca.pem&sslallowinvalidhostnames=true" ) -%CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . -%CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m +%CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . || goto :error +%CMAKE% --build . --config "Debug" --target ALL_BUILD -- /m || goto :error rem Yes, they should've named it "dependencies". -dumpbin.exe /dependents Debug\hello_mongoc.exe +dumpbin.exe /dependents Debug\hello_mongoc.exe || goto :error + +Debug\hello_mongoc.exe %MONGODB_EXAMPLE_URI% || goto :error -Debug\hello_mongoc.exe %MONGODB_EXAMPLE_URI% +goto :EOF +:error +exit /B %errorlevel% diff -pruN 2.0.2-1/.evergreen/scripts/run-auth-tests.sh 2.1.0-1/.evergreen/scripts/run-auth-tests.sh --- 2.0.2-1/.evergreen/scripts/run-auth-tests.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/run-auth-tests.sh 2025-08-14 18:37:23.000000000 +0000 @@ -7,7 +7,7 @@ set +o xtrace # Don't echo commands # shellcheck source=.evergreen/scripts/env-var-utils.sh . "$(dirname "${BASH_SOURCE[0]}")/env-var-utils.sh" -. "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" paths +. "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" platform paths declare script_dir script_dir="$(to_absolute "$(dirname "${BASH_SOURCE[0]}")")" @@ -24,12 +24,20 @@ secrets_dir="$(to_absolute "${mongoc_dir mkdir -p "${secrets_dir}" chmod 700 "${secrets_dir}" -# Create certificate to test X509 auth with Atlas: +# Create certificate to test X509 auth with Atlas on cloud-prod: atlas_x509_path="${secrets_dir:?}/atlas_x509.pem" echo "${atlas_x509_cert_base64:?}" | base64 --decode > "${secrets_dir:?}/atlas_x509.pem" # Fix path on Windows: if $IS_WINDOWS; then - atlas_x509_path="$(cygpath -m "${secrets_dir:?}/atlas_x509.pem")" + atlas_x509_path="$(cygpath -m "${atlas_x509_path}")" +fi + +# Create certificate to test X509 auth with Atlas on cloud-dev +atlas_x509_dev_path="${secrets_dir:?}/atlas_x509_dev.pem" +echo "${atlas_x509_dev_cert_base64:?}" | base64 --decode > "${atlas_x509_dev_path:?}" +# Fix path on Windows: +if $IS_WINDOWS; then + atlas_x509_dev_path="$(cygpath -m "${atlas_x509_dev_path}")" fi # Create Kerberos config and keytab files. @@ -127,11 +135,27 @@ elif command -v otool >/dev/null; then LD_LIBRARY_PATH="${openssl_lib_prefix}" otool -L "${test_gssapi}" | grep "libssl" || true fi +maybe_skip() { + if true; then + # TODO: Remove if-block when resolving CDRIVER-5995. + echo "Skipping test until DEVPROD-9029 is resolved." + return + fi + + if $IS_ZSERIES; then + # TODO: Remove if-block when resolving CDRIVER-5990. + echo "Skipping test until DEVPROD-16954 is resolved." + return + fi + # Run the test command: + "$@" +} + if [[ "${ssl}" != "OFF" ]]; then # FIXME: CDRIVER-2008 for the cygwin check if [[ "${OSTYPE}" != "cygwin" ]]; then echo "Authenticating using X.509" - LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US@${auth_host}/?ssl=true&authMechanism=MONGODB-X509&sslClientCertificateKeyFile=src/libmongoc/tests/x509gen/ldaptest-client-key-and-cert.pem&sslCertificateAuthorityFile=src/libmongoc/tests/x509gen/ldaptest-ca-cert.crt&sslAllowInvalidHostnames=true&${c_timeout}" + LD_LIBRARY_PATH="${openssl_lib_prefix}" maybe_skip "${ping}" "mongodb://CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US@${auth_host}/?ssl=true&authMechanism=MONGODB-X509&sslClientCertificateKeyFile=src/libmongoc/tests/x509gen/ldaptest-client-key-and-cert.pem&sslCertificateAuthorityFile=src/libmongoc/tests/x509gen/ldaptest-ca-cert.crt&sslAllowInvalidHostnames=true&${c_timeout}" fi echo "Connecting to Atlas Free Tier" LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "${atlas_free:?}&${c_timeout}" @@ -171,24 +195,27 @@ if [[ "${ssl}" != "OFF" ]]; then LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "${atlas_serverless:?}&${c_timeout}" fi - echo "Connecting to Atlas with X509" + echo "Connecting to Atlas (cloud-prod) with X509" LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "${atlas_x509:?}&tlsCertificateKeyFile=${atlas_x509_path}&${c_timeout}" + echo "Connecting to Atlas (cloud-dev) with X509" + LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "${atlas_x509_dev:?}&tlsCertificateKeyFile=${atlas_x509_dev_path}&${c_timeout}" + fi echo "Authenticating using PLAIN" -LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_plain:?}@${auth_host}/?authMechanism=PLAIN&${c_timeout}" +LD_LIBRARY_PATH="${openssl_lib_prefix}" maybe_skip "${ping}" "mongodb://${auth_plain:?}@${auth_host}/?authMechanism=PLAIN&${c_timeout}" echo "Authenticating using default auth mechanism" # Though the auth source is named "mongodb-cr", authentication uses the default mechanism (currently SCRAM-SHA-1). -LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_mongodbcr:?}@${auth_host}/mongodb-cr?${c_timeout}" +LD_LIBRARY_PATH="${openssl_lib_prefix}" maybe_skip "${ping}" "mongodb://${auth_mongodbcr:?}@${auth_host}/mongodb-cr?${c_timeout}" if [[ "${sasl}" != "OFF" ]]; then echo "Authenticating using GSSAPI" - LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_gssapi:?}@${auth_host}/?authMechanism=GSSAPI&${c_timeout}" + LD_LIBRARY_PATH="${openssl_lib_prefix}" maybe_skip "${ping}" "mongodb://${auth_gssapi:?}@${auth_host}/?authMechanism=GSSAPI&${c_timeout}" echo "Authenticating with CANONICALIZE_HOST_NAME" - LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_gssapi:?}@${ip_addr}/?authMechanism=GSSAPI&authMechanismProperties=CANONICALIZE_HOST_NAME:true&${c_timeout}" + LD_LIBRARY_PATH="${openssl_lib_prefix}" maybe_skip "${ping}" "mongodb://${auth_gssapi:?}@${ip_addr}/?authMechanism=GSSAPI&authMechanismProperties=CANONICALIZE_HOST_NAME:true&${c_timeout}" declare ld_preload="${LD_PRELOAD:-}" if [[ "${ASAN:-}" == "on" ]]; then @@ -196,13 +223,13 @@ if [[ "${sasl}" != "OFF" ]]; then fi echo "Test threaded GSSAPI auth" - LD_LIBRARY_PATH="${openssl_lib_prefix}" MONGOC_TEST_GSSAPI_HOST="${auth_host}" MONGOC_TEST_GSSAPI_USER="${auth_gssapi}" LD_PRELOAD="${ld_preload:-}" "${test_gssapi}" + LD_LIBRARY_PATH="${openssl_lib_prefix}" MONGOC_TEST_GSSAPI_HOST="${auth_host}" MONGOC_TEST_GSSAPI_USER="${auth_gssapi}" LD_PRELOAD="${ld_preload:-}" maybe_skip "${test_gssapi}" echo "Threaded GSSAPI auth OK" if [[ "${OSTYPE}" == "cygwin" ]]; then echo "Authenticating using GSSAPI (service realm: LDAPTEST.10GEN.CC)" - LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_crossrealm:?}@${auth_host}/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_REALM:LDAPTEST.10GEN.CC&${c_timeout}" + LD_LIBRARY_PATH="${openssl_lib_prefix}" maybe_skip "${ping}" "mongodb://${auth_crossrealm:?}@${auth_host}/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_REALM:LDAPTEST.10GEN.CC&${c_timeout}" echo "Authenticating using GSSAPI (UTF-8 credentials)" - LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_gssapi_utf8:?}@${auth_host}/?authMechanism=GSSAPI&${c_timeout}" + LD_LIBRARY_PATH="${openssl_lib_prefix}" maybe_skip "${ping}" "mongodb://${auth_gssapi_utf8:?}@${auth_host}/?authMechanism=GSSAPI&${c_timeout}" fi fi diff -pruN 2.0.2-1/.evergreen/scripts/run-tests-mingw.bat 2.1.0-1/.evergreen/scripts/run-tests-mingw.bat --- 2.0.2-1/.evergreen/scripts/run-tests-mingw.bat 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/run-tests-mingw.bat 2025-08-14 18:37:23.000000000 +0000 @@ -1,17 +1,15 @@ -set PATH=C:\Windows\system32;C:\Windows;C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin;C:\mongo-c-driver\bin - -rem "make install" would work, except we run tests on different Evergreen hosts, -rem in different working directories, than where the driver was built. This -rem causes errors in "make install" like: -rem CMake Error at cmake_install cannot find -rem "C:/data/mci/d3ba3391950aca9119e841818a8884bc/mongoc/src/libbson/libbson-1.0.dll" -rem -rem So just copy files manually - -rmdir /Q /S C:\mongo-c-driver -md C:\mongo-c-driver -md C:\mongo-c-driver\bin -copy /Y libmongoc-1.0.dll C:\mongo-c-driver\bin -copy /Y cmake-build\src\libbson\libbson-1.0.dll C:\mongo-c-driver\bin - -.\cmake-build\src\libmongoc\test-libmongoc.exe --no-fork -d -F test-results.json --skip-tests .evergreen\etc\skip-tests.txt +rem "make install" would work, except we run tests on different Evergreen hosts, +rem in different working directories, than where the driver was built. This +rem causes errors in "make install" like: +rem CMake Error at cmake_install cannot find +rem "C:/data/mci/d3ba3391950aca9119e841818a8884bc/mongoc/src/libbson/libbson-1.0.dll" +rem +rem So just copy files manually + +rmdir /Q /S C:\mongo-c-driver +md C:\mongo-c-driver +md C:\mongo-c-driver\bin +copy /Y libmongoc-1.0.dll C:\mongo-c-driver\bin +copy /Y cmake-build\src\libbson\libbson-1.0.dll C:\mongo-c-driver\bin + +.\cmake-build\src\libmongoc\test-libmongoc.exe --no-fork -d -F test-results.json --skip-tests .evergreen\etc\skip-tests.txt diff -pruN 2.0.2-1/.evergreen/scripts/run-tests.sh 2.1.0-1/.evergreen/scripts/run-tests.sh --- 2.0.2-1/.evergreen/scripts/run-tests.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/run-tests.sh 2025-08-14 18:37:23.000000000 +0000 @@ -168,9 +168,9 @@ wait_for_server() { return 1 } -if [[ "${CC}" =~ mingw ]]; then +if [[ "${OSTYPE:?}" == cygwin && "${CC}" =~ gcc ]]; then echo "Waiting for simple HTTP server to start..." - wait_for_server "simple HTTP" 8000 + wait_for_server "simple HTTP" 18000 echo "Waiting for simple HTTP server to start... done." chmod -f +x ./cmake-build/src/libmongoc/test-libmongoc.exe diff -pruN 2.0.2-1/.evergreen/scripts/sbom.sh 2.1.0-1/.evergreen/scripts/sbom.sh --- 2.0.2-1/.evergreen/scripts/sbom.sh 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.evergreen/scripts/sbom.sh 2025-08-14 18:37:23.000000000 +0000 @@ -3,9 +3,8 @@ set -o errexit set -o pipefail -: "${artifactory_username:?}" -: "${artifactory_password:?}" : "${branch_name:?}" +: "${DOCKER_CONFIG:?}" : "${KONDUKTO_TOKEN:?}" command -v podman >/dev/null || { @@ -13,9 +12,7 @@ command -v podman >/dev/null || { exit 1 } -podman login --password-stdin --username "${artifactory_username:?}" artifactory.corp.mongodb.com <<<"${artifactory_password:?}" - -silkbomb="artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:2.0" +silkbomb="901841024863.dkr.ecr.us-east-1.amazonaws.com/release-infrastructure/silkbomb:2.0" # Ensure latest version of SilkBomb is being used. podman pull "${silkbomb:?}" diff -pruN 2.0.2-1/.gitattributes 2.1.0-1/.gitattributes --- 2.0.2-1/.gitattributes 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/.gitattributes 2025-08-14 18:37:23.000000000 +0000 @@ -1 +1,2 @@ tests/binary/* text eol=lf +*.bat text eol=crlf diff -pruN 2.0.2-1/CMakeLists.txt 2.1.0-1/CMakeLists.txt --- 2.0.2-1/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/CMakeLists.txt 2025-08-14 18:37:23.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.15) +cmake_minimum_required (VERSION 3.15...4.0) list (INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}/build/cmake") # Defines BUILD_VERSION, which we use throughout: @@ -28,6 +28,7 @@ include(FeatureSummary) include (MongoSettings) include (MongoPlatform) include (GeneratePkgConfig) +include (VerifyHeaders) # Subcomponents: mongo_bool_setting(ENABLE_MONGOC "Enable the build of libmongoc libraries (The MongoDB C database driver)") @@ -348,11 +349,6 @@ if(WIN32) set (CMAKE_IMPORT_LIBRARY_SUFFIX .dll.lib) endif() -# https://cmake.org/cmake/help/v3.11/policy/CMP0042.html -# Enable a CMake 3.0+ policy that sets CMAKE_MACOSX_RPATH by default, and -# silence a CMake 3.11 warning that the old behavior is deprecated. -cmake_policy (SET CMP0042 NEW) - # By default, ensure conformance with a minimum C standard. # Required extensions to the language (i.e. POSIX) are (re)enabled further below. if (NOT DEFINED CMAKE_C_STANDARD) diff -pruN 2.0.2-1/CONTRIBUTING.md 2.1.0-1/CONTRIBUTING.md --- 2.0.2-1/CONTRIBUTING.md 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/CONTRIBUTING.md 2025-08-14 18:37:23.000000000 +0000 @@ -111,27 +111,17 @@ a block comment like the following: Public functions do not need these comment blocks, since they are documented in the .rst files. -To build the documentation, it is recommended to use the Poetry-managed Python -project to ensure that the exact tooling versions match. If you do not have -Poetry installed, you can use the `poetry.sh` or `poetry.ps1` scripts in the -`tools/` directory. First, install dependencies: +To build the documentation, it is recommended to run Sphinx commands through `uv`: -```sh -./tools/poetry.sh install --with=docs -``` - -Then, execute `sphinx-build` in the Python environment, using the paths to the -documentation to be generated: - -```sh -./tools/poetry.sh run sphinx-build -WEn -bhtml src/libmongoc/doc/ src/libmongoc/doc/html +```bash +uv run --frozen sphinx-build -WEn -bhtml src/libmongoc/doc/ src/libmongoc/doc/html ``` `sphinx-autobuild` can be used to serve docs locally. This can be convenient when editing. Files are rebuilt when changes are detected: -```sh -./tools/poetry.sh run sphinx-autobuild -b html src/libmongoc/doc/ src/libmongoc/doc/html --re-ignore ".*.pickle" --re-ignore ".*.doctree" -j auto +```bash +uv run --frozen --with 'sphinx-autobuild' sphinx-autobuild -b html src/libmongoc/doc/ src/libmongoc/doc/html --re-ignore ".*.pickle" --re-ignore ".*.doctree" -j auto ``` ### Testing @@ -189,6 +179,13 @@ If you start `mongod` with SSL, set thes * `MONGOC_TEST_SSL_CRL_FILE`: path to a certificate revocation list. * `MONGOC_TEST_SSL_WEAK_CERT_VALIDATION`: set to `on` to relax the client's validation of the server's certificate. +* `MONGOC_TEST_SCHANNEL_CRL=on`: set to `on` to enable Windows Secure Channel tests loading CRL files. + * If CRL tests abort before deleting the CRL file, this may cause later test errors like `The certificate is revoked`. Manually remove the CRL file with: + ```powershell + $crl = ".\src\libmongoc\tests\x509gen\crl.pem" + $fingerprint = (openssl crl -in ".\src\libmongoc\tests\x509gen\crl.pem" -noout -fingerprint) -replace 'SHA1 Fingerprint=', '' -replace ':', '' + certutil -delstore Root $fingerprint + ``` The SASL / GSSAPI / Kerberos tests are skipped by default. To run them, set up a separate `mongod` with Kerberos and set its host and Kerberos principal name diff -pruN 2.0.2-1/Earthfile 2.1.0-1/Earthfile --- 2.0.2-1/Earthfile 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/Earthfile 2025-08-14 18:37:23.000000000 +0000 @@ -1,30 +1,19 @@ -VERSION --arg-scope-and-set --pass-args 0.7 +VERSION --arg-scope-and-set --pass-args --use-function-keyword 0.7 LOCALLY +# Allow setting the "default" container image registry to use for image short names (e.g. to Amazon ECR). +ARG --global default_search_registry=docker.io + IMPORT ./tools/ AS tools # For target names, descriptions, and build parameters, run the "doc" Earthly subcommand. # Example use: +build --env=u22 --sasl=off --tls=OpenSSL --c_compiler=gcc -# build : -# Build libmongoc and libbson using the specified environment. -# -# The --env argument specifies the build environment among the `+env.xyz` environment -# targets, using --purpose=build for the build environment. Refer to the target -# list for a list of available build environments. -build: - # env is an argument - ARG --required env - FROM --pass-args +env.$env --purpose=build - # The configuration to be built - ARG config=RelWithDebInfo - # The prefix at which to install the built result - ARG install_prefix=/opt/mongo-c-driver - # Build configuration parameters. Will be case-normalized for CMake usage. - ARG --required sasl - ARG --required tls - LET source_dir=/opt/mongoc/source - LET build_dir=/opt/mongoc/build +# COPY_SOURCE : +# Copy source files required for the build into the specified "--into" directory +COPY_SOURCE: + FUNCTION + ARG --required into COPY --dir \ build/ \ CMakeLists.txt \ @@ -34,8 +23,16 @@ build: src/ \ THIRD_PARTY_NOTICES \ VERSION_CURRENT \ - "$source_dir" - ENV CCACHE_HOME=/root/.cache/ccache + "$into" + +# CONFIGURE : +# Configure the project in $source_dir into $build_dir with a common set of configuration options +CONFIGURE: + FUNCTION + ARG --required source_dir + ARG --required build_dir + ARG --required tls + ARG --required sasl RUN cmake -S "$source_dir" -B "$build_dir" -G "Ninja Multi-Config" \ -D ENABLE_MAINTAINER_FLAGS=ON \ -D ENABLE_SHM_COUNTERS=ON \ @@ -47,6 +44,29 @@ build: -D ENABLE_COVERAGE=ON \ -D ENABLE_DEBUG_ASSERTIONS=ON \ -Werror + +# build : +# Build libmongoc and libbson using the specified environment. +# +# The --env argument specifies the build environment among the `+env.xyz` environment +# targets, using --purpose=build for the build environment. Refer to the target +# list for a list of available build environments. +build: + # env is an argument + ARG --required env + FROM --pass-args +env.$env --purpose=build + # The configuration to be built + ARG config=RelWithDebInfo + # The prefix at which to install the built result + ARG install_prefix=/opt/mongo-c-driver + # Build configuration parameters. Will be case-normalized for CMake usage. + ARG --required sasl + ARG --required tls + LET source_dir=/opt/mongoc/source + LET build_dir=/opt/mongoc/build + DO +COPY_SOURCE --into=$source_dir + ENV CCACHE_HOME=/root/.cache/ccache + DO --pass-args +CONFIGURE --source_dir=$source_dir --build_dir=$build_dir RUN --mount=type=cache,target=$CCACHE_HOME \ env CCACHE_BASE="$source_dir" \ cmake --build $build_dir --config $config @@ -114,7 +134,7 @@ test-cxx-driver: # PREP_CMAKE "warms up" the CMake installation cache for the current environment PREP_CMAKE: - COMMAND + FUNCTION LET scratch=/opt/mongoc-cmake # Copy the minimal amount that we need, as to avoid cache invalidation COPY tools/use.sh tools/platform.sh tools/paths.sh tools/base.sh tools/download.sh \ @@ -148,7 +168,7 @@ multibuild: # release-archive : # Create a release archive of the source tree. (Refer to dev docs) release-archive: - FROM alpine:3.20 + FROM $default_search_registry/library/alpine:3.20 RUN apk add git bash ARG --required prefix ARG --required ref @@ -193,7 +213,7 @@ release-archive: # Obtain the signing public key. Exported as an artifact /c-driver.pub signing-pubkey: - FROM alpine:3.20 + FROM $default_search_registry/library/alpine:3.20 RUN apk add curl RUN curl --location --silent --fail "https://pgp.mongodb.com/c-driver.pub" -o /c-driver.pub SAVE ARTIFACT /c-driver.pub @@ -203,7 +223,7 @@ signing-pubkey: # to be used to access them. (Refer to dev docs) sign-file: # Pull from Garasign: - FROM artifactory.corp.mongodb.com/release-tools-container-registry-local/garasign-gpg + FROM 901841024863.dkr.ecr.us-east-1.amazonaws.com/release-infrastructure/garasign-gpg # Copy the file to be signed ARG --required file COPY $file /s/file @@ -223,7 +243,7 @@ sign-file: # Generate a signed release artifact. Refer to the "Earthly" page of our dev docs for more information. # (Refer to dev docs) signed-release: - FROM alpine:3.20 + FROM $default_search_registry/library/alpine:3.20 RUN apk add git # The version of the release. This affects the filepaths of the output and is the default for --ref ARG --required version @@ -253,7 +273,7 @@ signed-release: # This target is simply an environment in which the SilkBomb executable is available. silkbomb: - FROM artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:2.0 + FROM 901841024863.dkr.ecr.us-east-1.amazonaws.com/release-infrastructure/silkbomb:2.0 # Alias the silkbomb executable to a simpler name: RUN ln -s /python/src/sbom/silkbomb/bin /usr/local/bin/silkbomb @@ -312,7 +332,7 @@ sbom-validate: --exclude jira snyk: - FROM --platform=linux/amd64 ubuntu:24.04 + FROM --platform=linux/amd64 $default_search_registry/library/ubuntu:24.04 RUN apt-get update && apt-get -y install curl RUN curl --location https://github.com/snyk/cli/releases/download/v1.1291.1/snyk-linux -o /usr/local/bin/snyk RUN chmod a+x /usr/local/bin/snyk @@ -384,7 +404,7 @@ test-vcpkg-manifest-mode: make test-manifest-mode vcpkg-base: - FROM alpine:3.18 + FROM $default_search_registry/library/alpine:3.18 RUN apk add cmake curl gcc g++ musl-dev ninja-is-really-ninja zip unzip tar \ build-base git pkgconf perl bash linux-headers ENV VCPKG_ROOT=/opt/vcpkg-git @@ -396,6 +416,34 @@ vcpkg-base: COPY src/libmongoc/examples/cmake/vcpkg/ $src_dir WORKDIR $src_dir +# verify-headers : +# Execute CMake header verification on the sources +# +# See `earthly.rst` for more details. +verify-headers: + # We test against multiple different platforms, because glibc/musl versions may + # rearrange their header contents and requirements, so we want to check against as + # many as possible. + BUILD +do-verify-headers-impl \ + --from +env.alpine3.19 \ + --from +env.u22 \ + --from +env.centos7 \ + --sasl=off --tls=off --cxx_compiler=gcc --c_compiler=gcc + +do-verify-headers-impl: + ARG --required from + # We don't really care about the specifics of the build env/settings, so set some + # reasonable defaults so the caller doesn't need to specify. In the future, it is + # possible that we will need to test other environments and build settings. + FROM --pass-args "$from" --purpose=build + # Add C++ so we can test as C++ headers + DO --pass-args tools+ADD_CXX_COMPILER + DO +COPY_SOURCE --into=/s + DO --pass-args +CONFIGURE --source_dir /s --build_dir /s/_build + # The "all_verify_interface_header_sets" target is created automatically + # by CMake for the VERIFY_INTERFACE_HEADER_SETS target property. + RUN cmake --build /s/_build --target all_verify_interface_header_sets + # run : # Run one or more targets simultaneously. # @@ -443,7 +491,7 @@ env.alpine3.19: DO --pass-args +ALPINE_ENV --version=3.19 env.archlinux: - FROM --pass-args tools+init-env --from archlinux + FROM --pass-args tools+init-env --from $default_search_registry/library/archlinux RUN pacman-key --init ARG --required purpose @@ -462,9 +510,9 @@ env.centos7: DO --pass-args +CENTOS_ENV --version=7 ALPINE_ENV: - COMMAND + FUNCTION ARG --required version - FROM --pass-args tools+init-env --from alpine:$version + FROM --pass-args tools+init-env --from $default_search_registry/library/alpine:$version # XXX: On Alpine, we just use the system's CMake. At time of writing, it is # very up-to-date and much faster than building our own from source (since # Kitware does not (yet) provide libmuslc builds of CMake) @@ -484,9 +532,9 @@ ALPINE_ENV: DO --pass-args tools+ADD_C_COMPILER --clang_pkg="gcc clang compiler-rt" UBUNTU_ENV: - COMMAND + FUNCTION ARG --required version - FROM --pass-args tools+init-env --from ubuntu:$version + FROM --pass-args tools+init-env --from $default_search_registry/library/ubuntu:$version RUN __install curl build-essential ARG --required purpose @@ -502,13 +550,13 @@ UBUNTU_ENV: DO +PREP_CMAKE CENTOS_ENV: - COMMAND + FUNCTION ARG --required version - FROM --pass-args tools+init-env --from centos:$version + FROM --pass-args tools+init-env --from $default_search_registry/library/centos:$version # Update repositories to use vault.centos.org RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* - RUN yum -y install epel-release && yum -y update + RUN yum -y --enablerepo=extras install epel-release && yum -y update RUN yum -y install curl gcc gcc-c++ make ARG --required purpose diff -pruN 2.0.2-1/NEWS 2.1.0-1/NEWS --- 2.0.2-1/NEWS 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/NEWS 2025-08-14 18:37:23.000000000 +0000 @@ -1,3 +1,35 @@ +libmongoc 2.1.0 +=============== + +## Fixes + +* The uninstall script for Windows is fixed so it no longer "succeeds" with a non-zero `%ERRORLABEL%` value. +* The uninstall script for non-Windows environments now calls `find "$dir" -maxdepth 1` instead of `ls --almost-all "$dir"` when detecting non-empty directories to fix macOS compatibility. + +## Notes + +* The minimum supported MongoDB Server version is raised from 4.0 to 4.2. This is in accordance with [MongoDB Software Lifecycle Schedules](https://www.mongodb.com/legal/support-policy/lifecycles). + +## Changes + +* The CMake project now sets a CMake policy max version of `4.0` (previously unset). + +## Removed + +* Support for Debian 9 and Debian 10. + +Thanks to everyone who contributed to the development of this release. + + * Kevin Albertson + * Ezra Chung + * Colby Pike + * Adrian Dole + * Azat Khuzhin + * Jeroen Ooms + * Roberto C. Sánchez + * Micah Scott + + libmongoc 2.0.2 =============== @@ -13,6 +45,20 @@ Thanks to everyone who contributed to th * Colby Pike +libmongoc 1.30.5 +================ + +Fixes: + + * Fix message of `bson_strerror_r` on Windows. + * Fix memory leaks with Windows Secure Channel. + * Fix loading PKCS#8 RSA keys with Windows Secure Channel. + +Thanks to everyone who contributed to the development of this release. + + * Kevin Albertson + * Colby Pike + libmongoc 2.0.1 =============== @@ -27,6 +73,45 @@ Thanks to everyone who contributed to th * Kevin Albertson +libmongoc 1.30.4 +================ + +Fixes: + + * Fix username handling for MONGODB-X509 authentication when C driver is configured to use Secure Transport (CMake option `ENABLE_SSL=DARWIN`) or Secure Channel (CMake option `ENABLE_SSL=WINDOWS`). + * Do not set empty partial result on client error for `mongoc_bulkwrite_execute`. + +Thanks to everyone who contributed to the development of this release. + + * Kevin Albertson + + +libmongoc 1.30.3 +================ + +New Features: + +* In anticipation of the 2.0 release of mongo-c-driver, new CMake packages and + imported targets have been defined (for both `bson` and `mongoc`). To import + `mongoc` with the new names, call `find_package` for the `mongoc` package. The + new imported targets are named `mongoc::static`, `mongoc::shared`, and + `mongoc::mongoc` (which points to either the static or the shared library, + depending on an import-time configuration option). + + The new package and target names will remain unchanged when upgrading to the + 2.0 release, allowing consumers to support both major versions without + modifying their CMake project. The current imported target names will be + removed from the 2.0 release, and should not be used for + forward-compatibility. + + Programs that link to BSON libraries directly should also use the new target + names `bson::static`, `bson::shared`, or `bson::bson`. + +Thanks to everyone who contributed to the development of this release. + + * Kevin Albertson + * Ezra Chung + * Colby Pike libmongoc 2.0.0 =============== diff -pruN 2.0.2-1/README.rst 2.1.0-1/README.rst --- 2.0.2-1/README.rst 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/README.rst 2025-08-14 18:37:23.000000000 +0000 @@ -12,6 +12,8 @@ mongo-c-driver is a project that include If libmongoc is not needed, it is possible to build and install only libbson. +This project uses `Semantic Versioning `_. + Documentation / Support / Feedback ================================== diff -pruN 2.0.2-1/VERSION_CURRENT 2.1.0-1/VERSION_CURRENT --- 2.0.2-1/VERSION_CURRENT 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/VERSION_CURRENT 2025-08-14 18:37:23.000000000 +0000 @@ -1 +1 @@ -2.0.2 +2.1.0 diff -pruN 2.0.2-1/build/bottle.py 2.1.0-1/build/bottle.py --- 2.0.2-1/build/bottle.py 2025-06-19 15:42:22.000000000 +0000 +++ 2.1.0-1/build/bottle.py 2025-08-14 18:37:23.000000000 +0000 @@ -2,78 +2,89 @@ # -*- coding: utf-8 -*- """ Bottle is a fast and simple micro-framework for small web applications. It -offers request dispatching (Routes) with url parameter support, templates, +offers request dispatching (Routes) with URL parameter support, templates, a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and template engines - all in a single file and with no dependencies other than the Python Standard Library. Homepage and documentation: http://bottlepy.org/ -Copyright (c) 2016, Marcel Hellkamp. +Copyright (c) 2009-2024, Marcel Hellkamp. License: MIT (see LICENSE for details) """ -from __future__ import with_statement +from __future__ import print_function +import sys __author__ = 'Marcel Hellkamp' -__version__ = '0.12.23' +__version__ = '0.13.2' __license__ = 'MIT' -# The gevent server adapter needs to patch some modules before they are imported -# This is why we parse the commandline parameters here but handle them later +############################################################################### +# Command-line interface ###################################################### +############################################################################### +# INFO: Some server adapters need to monkey-patch std-lib modules before they +# are imported. This is why some of the command-line handling is done here, but +# the actual call to _main() is at the end of the file. + + +def _cli_parse(args): # pragma: no coverage + from argparse import ArgumentParser + + parser = ArgumentParser(prog=args[0], usage="%(prog)s [options] package.module:app") + opt = parser.add_argument + opt("--version", action="store_true", help="show version number.") + opt("-b", "--bind", metavar="ADDRESS", help="bind socket to ADDRESS.") + opt("-s", "--server", default='wsgiref', help="use SERVER as backend.") + opt("-p", "--plugin", action="append", help="install additional plugin/s.") + opt("-c", "--conf", action="append", metavar="FILE", + help="load config values from FILE.") + opt("-C", "--param", action="append", metavar="NAME=VALUE", + help="override config values.") + opt("--debug", action="store_true", help="start server in debug mode.") + opt("--reload", action="store_true", help="auto-reload on file changes.") + opt('app', help='WSGI app entry point.', nargs='?') + + cli_args = parser.parse_args(args[1:]) + + return cli_args, parser + + +def _cli_patch(cli_args): # pragma: no coverage + parsed_args, _ = _cli_parse(cli_args) + opts = parsed_args + if opts.server: + if opts.server.startswith('gevent'): + import gevent.monkey + gevent.monkey.patch_all() + elif opts.server.startswith('eventlet'): + import eventlet + eventlet.monkey_patch() + + if __name__ == '__main__': - from optparse import OptionParser - _cmd_parser = OptionParser(usage="usage: %prog [options] package.module:app") - _opt = _cmd_parser.add_option - _opt("--version", action="store_true", help="show version number.") - _opt("-b", "--bind", metavar="ADDRESS", help="bind socket to ADDRESS.") - _opt("-s", "--server", default='wsgiref', help="use SERVER as backend.") - _opt("-p", "--plugin", action="append", help="install additional plugin/s.") - _opt("--debug", action="store_true", help="start server in debug mode.") - _opt("--reload", action="store_true", help="auto-reload on file changes.") - _cmd_options, _cmd_args = _cmd_parser.parse_args() - if _cmd_options.server and _cmd_options.server.startswith('gevent'): - import gevent.monkey; gevent.monkey.patch_all() + _cli_patch(sys.argv) -import base64, cgi, email.utils, functools, hmac, itertools, mimetypes,\ - os, re, subprocess, sys, tempfile, threading, time, warnings, hashlib +############################################################################### +# Imports and Python 2/3 unification ########################################## +############################################################################### +import base64, calendar, email.utils, functools, hmac, itertools,\ + mimetypes, os, re, tempfile, threading, time, warnings, weakref, hashlib + +from types import FunctionType from datetime import date as datedate, datetime, timedelta -from tempfile import TemporaryFile +from tempfile import NamedTemporaryFile from traceback import format_exc, print_exc from unicodedata import normalize - -try: from simplejson import dumps as json_dumps, loads as json_lds -except ImportError: # pragma: no cover - try: from json import dumps as json_dumps, loads as json_lds - except ImportError: - try: from django.utils.simplejson import dumps as json_dumps, loads as json_lds - except ImportError: - def json_dumps(data): - raise ImportError("JSON support requires Python 2.6 or simplejson.") - json_lds = json_dumps - - - -# We now try to fix 2.5/2.6/3.1/3.2 incompatibilities. -# It ain't pretty but it works... Sorry for the mess. - -py = sys.version_info -py3k = py >= (3, 0, 0) -py25 = py < (2, 6, 0) -py31 = (3, 1, 0) <= py < (3, 2, 0) - -# Workaround for the missing "as" keyword in py3k. -def _e(): return sys.exc_info()[1] - -# Workaround for the "print is a keyword/function" Python 2/3 dilemma -# and a fallback for mod_wsgi (resticts stdout/err attribute access) try: - _stdout, _stderr = sys.stdout.write, sys.stderr.write -except IOError: - _stdout = lambda x: sys.stdout.write(x) - _stderr = lambda x: sys.stderr.write(x) + from ujson import dumps as json_dumps, loads as json_lds +except ImportError: + from json import dumps as json_dumps, loads as json_lds + +py = sys.version_info +py3k = py.major > 2 # Lots of stdlib and builtin differences. if py3k: @@ -82,16 +93,16 @@ if py3k: from urllib.parse import urljoin, SplitResult as UrlSplitResult from urllib.parse import urlencode, quote as urlquote, unquote as urlunquote urlunquote = functools.partial(urlunquote, encoding='latin1') - from http.cookies import SimpleCookie - if py >= (3, 3, 0): - from collections.abc import MutableMapping as DictMixin - from types import ModuleType as new_module - else: - from collections import MutableMapping as DictMixin - from imp import new_module + from http.cookies import SimpleCookie, Morsel, CookieError + from collections.abc import MutableMapping as DictMixin + from types import ModuleType as new_module import pickle from io import BytesIO - from configparser import ConfigParser + import configparser + from datetime import timezone + UTC = timezone.utc + # getfullargspec was deprecated in 3.5 and un-deprecated in 3.6 + # getargspec was deprecated in 3.0 and removed in 3.11 from inspect import getfullargspec def getargspec(func): spec = getfullargspec(func) @@ -103,67 +114,92 @@ if py3k: json_loads = lambda s: json_lds(touni(s)) callable = lambda x: hasattr(x, '__call__') imap = map - def _raise(*a): raise a[0](a[1]).with_traceback(a[2]) -else: # 2.x + + def _raise(*a): + raise a[0](a[1]).with_traceback(a[2]) +else: # 2.x + warnings.warn("Python 2 support will be dropped in Bottle 0.14", DeprecationWarning) import httplib import thread from urlparse import urljoin, SplitResult as UrlSplitResult from urllib import urlencode, quote as urlquote, unquote as urlunquote - from Cookie import SimpleCookie + from Cookie import SimpleCookie, Morsel, CookieError from itertools import imap import cPickle as pickle from imp import new_module from StringIO import StringIO as BytesIO - from ConfigParser import SafeConfigParser as ConfigParser + import ConfigParser as configparser + from collections import MutableMapping as DictMixin from inspect import getargspec - if py25: - msg = "Python 2.5 support may be dropped in future versions of Bottle." - warnings.warn(msg, DeprecationWarning) - from UserDict import DictMixin - def next(it): return it.next() - bytes = str - else: # 2.6, 2.7 - from collections import MutableMapping as DictMixin + from datetime import tzinfo + + class _UTC(tzinfo): + def utcoffset(self, dt): return timedelta(0) + def tzname(self, dt): return "UTC" + def dst(self, dt): return timedelta(0) + UTC = _UTC() + unicode = unicode json_loads = json_lds - eval(compile('def _raise(*a): raise a[0], a[1], a[2]', '', 'exec')) + + exec(compile('def _raise(*a): raise a[0], a[1], a[2]', '', 'exec')) # Some helpers for string/byte handling def tob(s, enc='utf8'): - return s.encode(enc) if isinstance(s, unicode) else bytes(s) + if isinstance(s, unicode): + return s.encode(enc) + return b'' if s is None else bytes(s) + + def touni(s, enc='utf8', err='strict'): - return s.decode(enc, err) if isinstance(s, bytes) else unicode(s) + if isinstance(s, bytes): + return s.decode(enc, err) + return unicode("" if s is None else s) + + tonat = touni if py3k else tob -# 3.2 fixes cgi.FieldStorage to accept bytes (which makes a lot of sense). -# 3.1 needs a workaround. -if py31: - from io import TextIOWrapper - class NCTextIOWrapper(TextIOWrapper): - def close(self): pass # Keep wrapped buffer open. + +def _stderr(*args): + try: + print(*args, file=sys.stderr) + except (IOError, AttributeError): + pass # Some environments do not allow printing (mod_wsgi) # A bug in functools causes it to break if the wrapper is an instance method def update_wrapper(wrapper, wrapped, *a, **ka): - try: functools.update_wrapper(wrapper, wrapped, *a, **ka) - except AttributeError: pass - - + try: + functools.update_wrapper(wrapper, wrapped, *a, **ka) + except AttributeError: + pass # These helpers are used at module level and need to be defined first. # And yes, I know PEP-8, but sometimes a lower-case classname makes more sense. -def depr(message, hard=False): - warnings.warn(message, DeprecationWarning, stacklevel=3) -def makelist(data): # This is just to handy - if isinstance(data, (tuple, list, set, dict)): return list(data) - elif data: return [data] - else: return [] +def depr(major, minor, cause, fix, stacklevel=3): + text = "Warning: Use of deprecated feature or API. (Deprecated in Bottle-%d.%d)\n"\ + "Cause: %s\n"\ + "Fix: %s\n" % (major, minor, cause, fix) + if DEBUG == 'strict': + raise DeprecationWarning(text) + warnings.warn(text, DeprecationWarning, stacklevel=stacklevel) + return DeprecationWarning(text) + + +def makelist(data): # This is just too handy + if isinstance(data, (tuple, list, set, dict)): + return list(data) + elif data: + return [data] + else: + return [] class DictProperty(object): - ''' Property that maps to a key in a local dict-like attribute. ''' + """ Property that maps to a key in a local dict-like attribute. """ + def __init__(self, attr, key=None, read_only=False): self.attr, self.key, self.read_only = attr, key, read_only @@ -188,12 +224,12 @@ class DictProperty(object): class cached_property(object): - ''' A property that is only computed once per instance and then replaces + """ A property that is only computed once per instance and then replaces itself with an ordinary attribute. Deleting the attribute resets the - property. ''' + property. """ def __init__(self, func): - self.__doc__ = getattr(func, '__doc__') + update_wrapper(self, func) self.func = func def __get__(self, obj, cls): @@ -203,7 +239,8 @@ class cached_property(object): class lazy_attribute(object): - ''' A property that caches itself to the class object. ''' + """ A property that caches itself to the class object. """ + def __init__(self, func): functools.update_wrapper(self, func, updated=[]) self.getter = func @@ -214,12 +251,8 @@ class lazy_attribute(object): return value - - - - ############################################################################### -# Exceptions and Events ######################################################## +# Exceptions and Events ####################################################### ############################################################################### @@ -227,11 +260,6 @@ class BottleException(Exception): """ A base class for exceptions used by bottle. """ pass - - - - - ############################################################################### # Routing ###################################################################### ############################################################################### @@ -245,7 +273,10 @@ class RouteReset(BottleException): """ If raised by a plugin or request handler, the route is reset and all plugins are re-applied. """ -class RouterUnknownModeError(RouteError): pass + +class RouterUnknownModeError(RouteError): + + pass class RouteSyntaxError(RouteError): @@ -257,15 +288,16 @@ class RouteBuildError(RouteError): def _re_flatten(p): - ''' Turn all capturing groups in a regular expression pattern into - non-capturing groups. ''' - if '(' not in p: return p - return re.sub(r'(\\*)(\(\?P<[^>]+>|\((?!\?))', - lambda m: m.group(0) if len(m.group(1)) % 2 else m.group(1) + '(?:', p) + """ Turn all capturing groups in a regular expression pattern into + non-capturing groups. """ + if '(' not in p: + return p + return re.sub(r'(\\*)(\(\?P<[^>]+>|\((?!\?))', lambda m: m.group(0) if + len(m.group(1)) % 2 else m.group(1) + '(?:', p) class Router(object): - ''' A Router is an ordered collection of route->target pairs. It is used to + """ A Router is an ordered collection of route->target pairs. It is used to efficiently match WSGI requests against a number of routes and return the first target that satisfies the request. The target may be anything, usually a string, ID or callable object. A route consists of a path-rule @@ -274,48 +306,53 @@ class Router(object): The path-rule is either a static path (e.g. `/contact`) or a dynamic path that contains wildcards (e.g. `/wiki/`). The wildcard syntax and details on the matching order are described in docs:`routing`. - ''' + """ default_pattern = '[^/]+' - default_filter = 're' + default_filter = 're' #: The current CPython regexp implementation does not allow more #: than 99 matching groups per regular expression. _MAX_GROUPS_PER_PATTERN = 99 def __init__(self, strict=False): - self.rules = [] # All rules in order - self._groups = {} # index of regexes to find them in dyna_routes - self.builder = {} # Data structure for the url builder - self.static = {} # Search structure for static routes - self.dyna_routes = {} - self.dyna_regexes = {} # Search structure for dynamic routes + self.rules = [] # All rules in order + self._groups = {} # index of regexes to find them in dyna_routes + self.builder = {} # Data structure for the url builder + self.static = {} # Search structure for static routes + self.dyna_routes = {} + self.dyna_regexes = {} # Search structure for dynamic routes #: If true, static routes are no longer checked first. self.strict_order = strict self.filters = { - 're': lambda conf: - (_re_flatten(conf or self.default_pattern), None, None), - 'int': lambda conf: (r'-?\d+', int, lambda x: str(int(x))), + 're': lambda conf: (_re_flatten(conf or self.default_pattern), + None, None), + 'int': lambda conf: (r'-?\d+', int, lambda x: str(int(x))), 'float': lambda conf: (r'-?[\d.]+', float, lambda x: str(float(x))), - 'path': lambda conf: (r'.+?', None, None)} + 'path': lambda conf: (r'.+?', None, None) + } def add_filter(self, name, func): - ''' Add a filter. The provided function is called with the configuration + """ Add a filter. The provided function is called with the configuration string as parameter and must return a (regexp, to_python, to_url) tuple. - The first element is a string, the last two are callables or None. ''' + The first element is a string, the last two are callables or None. """ self.filters[name] = func - rule_syntax = re.compile('(\\\\*)'\ - '(?:(?::([a-zA-Z_][a-zA-Z_0-9]*)?()(?:#(.*?)#)?)'\ - '|(?:<([a-zA-Z_][a-zA-Z_0-9]*)?(?::([a-zA-Z_]*)'\ - '(?::((?:\\\\.|[^\\\\>]+)+)?)?)?>))') + rule_syntax = re.compile('(\\\\*)' + '(?:(?::([a-zA-Z_][a-zA-Z_0-9]*)?()(?:#(.*?)#)?)' + '|(?:<([a-zA-Z_][a-zA-Z_0-9]*)?(?::([a-zA-Z_]*)' + '(?::((?:\\\\.|[^\\\\>])+)?)?)?>))') def _itertokens(self, rule): offset, prefix = 0, '' for match in self.rule_syntax.finditer(rule): prefix += rule[offset:match.start()] g = match.groups() - if len(g[0])%2: # Escaped wildcard + if g[2] is not None: + depr(0, 13, "Use of old route syntax.", + "Use instead of :name in routes.", + stacklevel=4) + if len(g[0]) % 2: # Escaped wildcard prefix += match.group(0)[len(g[0]):] offset = match.end() continue @@ -325,15 +362,15 @@ class Router(object): yield name, filtr or 'default', conf or None offset, prefix = match.end(), '' if offset <= len(rule) or prefix: - yield prefix+rule[offset:], None, None + yield prefix + rule[offset:], None, None def add(self, rule, method, target, name=None): - ''' Add a new rule or replace the target for an existing rule. ''' - anons = 0 # Number of anonymous wildcards found - keys = [] # Names of keys - pattern = '' # Regular expression pattern with named groups - filters = [] # Lists of wildcard input filters - builder = [] # Data structure for the URL builder + """ Add a new rule or replace the target for an existing rule. """ + anons = 0 # Number of anonymous wildcards found + keys = [] # Names of keys + pattern = '' # Regular expression pattern with named groups + filters = [] # Lists of wildcard input filters + builder = [] # Data structure for the URL builder is_static = True for key, mode, conf in self._itertokens(rule): @@ -365,10 +402,11 @@ class Router(object): try: re_pattern = re.compile('^(%s)$' % pattern) re_match = re_pattern.match - except re.error: - raise RouteSyntaxError("Could not add Route: %s (%s)" % (rule, _e())) + except re.error as e: + raise RouteSyntaxError("Could not add Route: %s (%s)" % (rule, e)) if filters: + def getargs(path): url_args = re_match(path).groupdict() for name, wildcard_filter in filters: @@ -378,6 +416,7 @@ class Router(object): raise HTTPError(400, 'Path has wrong format.') return url_args elif re_pattern.groupindex: + def getargs(path): return re_match(path).groupdict() else: @@ -389,8 +428,9 @@ class Router(object): if (flatpat, method) in self._groups: if DEBUG: msg = 'Route <%s %s> overwrites a previously defined route' - warnings.warn(msg % (method, rule), RuntimeWarning) - self.dyna_routes[method][self._groups[flatpat, method]] = whole_rule + warnings.warn(msg % (method, rule), RuntimeWarning, stacklevel=3) + self.dyna_routes[method][ + self._groups[flatpat, method]] = whole_rule else: self.dyna_routes.setdefault(method, []).append(whole_rule) self._groups[flatpat, method] = len(self.dyna_routes[method]) - 1 @@ -402,7 +442,7 @@ class Router(object): comborules = self.dyna_regexes[method] = [] maxgroups = self._MAX_GROUPS_PER_PATTERN for x in range(0, len(all_rules), maxgroups): - some = all_rules[x:x+maxgroups] + some = all_rules[x:x + maxgroups] combined = (flatpat for (_, flatpat, _, _) in some) combined = '|'.join('(^%s$)' % flatpat for flatpat in combined) combined = re.compile(combined).match @@ -410,25 +450,24 @@ class Router(object): comborules.append((combined, rules)) def build(self, _name, *anons, **query): - ''' Build an URL by filling the wildcards in a rule. ''' + """ Build an URL by filling the wildcards in a rule. """ builder = self.builder.get(_name) - if not builder: raise RouteBuildError("No route with that name.", _name) + if not builder: + raise RouteBuildError("No route with that name.", _name) try: - for i, value in enumerate(anons): query['anon%d'%i] = value - url = ''.join([f(query.pop(n)) if n else f for (n,f) in builder]) - return url if not query else url+'?'+urlencode(query) - except KeyError: - raise RouteBuildError('Missing URL argument: %r' % _e().args[0]) + for i, value in enumerate(anons): + query['anon%d' % i] = value + url = ''.join([f(query.pop(n)) if n else f for (n, f) in builder]) + return url if not query else url + '?' + urlencode(query) + except KeyError as E: + raise RouteBuildError('Missing URL argument: %r' % E.args[0]) def match(self, environ): - ''' Return a (target, url_agrs) tuple or raise HTTPError(400/404/405). ''' + """ Return a (target, url_args) tuple or raise HTTPError(400/404/405). """ verb = environ['REQUEST_METHOD'].upper() path = environ['PATH_INFO'] or '/' - target = None - if verb == 'HEAD': - methods = ['PROXY', verb, 'GET', 'ANY'] - else: - methods = ['PROXY', verb, 'ANY'] + + methods = ('PROXY', 'HEAD', 'GET', 'ANY') if verb == 'HEAD' else ('PROXY', verb, 'ANY') for method in methods: if method in self.static and path in self.static[method]: @@ -460,21 +499,19 @@ class Router(object): raise HTTPError(404, "Not found: " + repr(path)) - - - - class Route(object): - ''' This class wraps a route callback along with route specific metadata and + """ This class wraps a route callback along with route specific metadata and configuration and applies Plugins on demand. It is also responsible for - turing an URL path rule into a regular expression usable by the Router. - ''' + turning an URL path rule into a regular expression usable by the Router. + """ - def __init__(self, app, rule, method, callback, name=None, - plugins=None, skiplist=None, **config): + def __init__(self, app, rule, method, callback, + name=None, + plugins=None, + skiplist=None, **config): #: The application this route is installed to. self.app = app - #: The path-rule string (e.g. ``/wiki/:page``). + #: The path-rule string (e.g. ``/wiki/``). self.rule = rule #: The HTTP method as a string (e.g. ``GET``). self.method = method @@ -489,38 +526,26 @@ class Route(object): #: Additional keyword arguments passed to the :meth:`Bottle.route` #: decorator are stored in this dictionary. Used for route-specific #: plugin configuration and meta-data. - self.config = ConfigDict().load_dict(config, make_namespaces=True) - - def __call__(self, *a, **ka): - depr("Some APIs changed to return Route() instances instead of"\ - " callables. Make sure to use the Route.call method and not to"\ - " call Route instances directly.") #0.12 - return self.call(*a, **ka) + self.config = app.config._make_overlay() + self.config.load_dict(config) @cached_property def call(self): - ''' The route callback with all plugins applied. This property is - created on demand and then cached to speed up subsequent requests.''' + """ The route callback with all plugins applied. This property is + created on demand and then cached to speed up subsequent requests.""" return self._make_callback() def reset(self): - ''' Forget any cached values. The next time :attr:`call` is accessed, - all plugins are re-applied. ''' + """ Forget any cached values. The next time :attr:`call` is accessed, + all plugins are re-applied. """ self.__dict__.pop('call', None) def prepare(self): - ''' Do all on-demand work immediately (useful for debugging).''' + """ Do all on-demand work immediately (useful for debugging).""" self.call - @property - def _context(self): - depr('Switch to Plugin API v2 and access the Route object directly.') #0.12 - return dict(rule=self.rule, method=self.method, callback=self.callback, - name=self.name, app=self.app, config=self.config, - apply=self.plugins, skip=self.skiplist) - def all_plugins(self): - ''' Yield all Plugins affecting this route. ''' + """ Yield all Plugins affecting this route. """ unique = set() for p in reversed(self.app.plugins + self.plugins): if True in self.skiplist: break @@ -535,48 +560,50 @@ class Route(object): for plugin in self.all_plugins(): try: if hasattr(plugin, 'apply'): - api = getattr(plugin, 'api', 1) - context = self if api > 1 else self._context - callback = plugin.apply(callback, context) + callback = plugin.apply(callback, self) else: callback = plugin(callback) - except RouteReset: # Try again with changed configuration. + except RouteReset: # Try again with changed configuration. return self._make_callback() - if not callback is self.callback: + if callback is not self.callback: update_wrapper(callback, self.callback) return callback def get_undecorated_callback(self): - ''' Return the callback. If the callback is a decorated function, try to - recover the original function. ''' + """ Return the callback. If the callback is a decorated function, try to + recover the original function. """ func = self.callback func = getattr(func, '__func__' if py3k else 'im_func', func) closure_attr = '__closure__' if py3k else 'func_closure' while hasattr(func, closure_attr) and getattr(func, closure_attr): - func = getattr(func, closure_attr)[0].cell_contents + attributes = getattr(func, closure_attr) + func = attributes[0].cell_contents + + # in case of decorators with multiple arguments + if not isinstance(func, FunctionType): + # pick first FunctionType instance from multiple arguments + func = filter(lambda x: isinstance(x, FunctionType), + map(lambda x: x.cell_contents, attributes)) + func = list(func)[0] # py3 support return func def get_callback_args(self): - ''' Return a list of argument names the callback (most likely) accepts + """ Return a list of argument names the callback (most likely) accepts as keyword arguments. If the callback is a decorated function, try - to recover the original function before inspection. ''' + to recover the original function before inspection. """ return getargspec(self.get_undecorated_callback())[0] def get_config(self, key, default=None): - ''' Lookup a config field and return its value, first checking the - route.config, then route.app.config.''' - for conf in (self.config, self.app.conifg): - if key in conf: return conf[key] - return default + """ Lookup a config field and return its value, first checking the + route.config, then route.app.config.""" + depr(0, 13, "Route.get_config() is deprecated.", + "The Route.config property already includes values from the" + " application config for missing keys. Access it directly.") + return self.config.get(key, default) def __repr__(self): cb = self.get_undecorated_callback() - return '<%s %r %r>' % (self.method, self.rule, cb) - - - - - + return '<%s %s -> %s:%s>' % (self.method, self.rule, cb.__module__, cb.__name__) ############################################################################### # Application Object ########################################################### @@ -592,41 +619,59 @@ class Bottle(object): let debugging middleware handle exceptions. """ - def __init__(self, catchall=True, autojson=True): + @lazy_attribute + def _global_config(cls): + cfg = ConfigDict() + cfg.meta_set('catchall', 'validate', bool) + return cfg + def __init__(self, **kwargs): #: A :class:`ConfigDict` for app specific configuration. - self.config = ConfigDict() - self.config._on_change = functools.partial(self.trigger_hook, 'config') - self.config.meta_set('autojson', 'validate', bool) - self.config.meta_set('catchall', 'validate', bool) - self.config['catchall'] = catchall - self.config['autojson'] = autojson + self.config = self._global_config._make_overlay() + self.config._add_change_listener( + functools.partial(self.trigger_hook, 'config')) + + self.config.update({ + "catchall": True + }) + + if kwargs.get('catchall') is False: + depr(0, 13, "Bottle(catchall) keyword argument.", + "The 'catchall' setting is now part of the app " + "configuration. Fix: `app.config['catchall'] = False`") + self.config['catchall'] = False + if kwargs.get('autojson') is False: + depr(0, 13, "Bottle(autojson) keyword argument.", + "The 'autojson' setting is now part of the app " + "configuration. Fix: `app.config['json.enable'] = False`") + self.config['json.disable'] = True + + self._mounts = [] #: A :class:`ResourceManager` for application files self.resources = ResourceManager() - self.routes = [] # List of installed :class:`Route` instances. - self.router = Router() # Maps requests to :class:`Route` instances. + self.routes = [] # List of installed :class:`Route` instances. + self.router = Router() # Maps requests to :class:`Route` instances. self.error_handler = {} # Core plugins - self.plugins = [] # List of installed plugins. - if self.config['autojson']: - self.install(JSONPlugin()) + self.plugins = [] # List of installed plugins. + self.install(JSONPlugin()) self.install(TemplatePlugin()) #: If true, most exceptions are caught and returned as :exc:`HTTPError` catchall = DictProperty('config', 'catchall') __hook_names = 'before_request', 'after_request', 'app_reset', 'config' - __hook_reversed = 'after_request' + __hook_reversed = {'after_request'} @cached_property def _hooks(self): return dict((name, []) for name in self.__hook_names) def add_hook(self, name, func): - ''' Attach a callback to a hook. Three hooks are currently implemented: + """ Attach a callback to a hook. Three hooks are currently implemented: before_request Executed once before each request. The request context is @@ -635,65 +680,60 @@ class Bottle(object): Executed once after each request regardless of its outcome. app_reset Called whenever :meth:`Bottle.reset` is called. - ''' + """ if name in self.__hook_reversed: self._hooks[name].insert(0, func) else: self._hooks[name].append(func) def remove_hook(self, name, func): - ''' Remove a callback from a hook. ''' + """ Remove a callback from a hook. """ if name in self._hooks and func in self._hooks[name]: self._hooks[name].remove(func) return True def trigger_hook(self, __name, *args, **kwargs): - ''' Trigger a hook and return a list of results. ''' + """ Trigger a hook and return a list of results. """ return [hook(*args, **kwargs) for hook in self._hooks[__name][:]] def hook(self, name): """ Return a decorator that attaches a callback to a hook. See :meth:`add_hook` for details.""" + def decorator(func): self.add_hook(name, func) return func - return decorator - - def mount(self, prefix, app, **options): - ''' Mount an application (:class:`Bottle` or plain WSGI) to a specific - URL prefix. Example:: - - root_app.mount('/admin/', admin_app) - - :param prefix: path prefix or `mount-point`. If it ends in a slash, - that slash is mandatory. - :param app: an instance of :class:`Bottle` or a WSGI application. - All other parameters are passed to the underlying :meth:`route` call. - ''' - if isinstance(app, basestring): - depr('Parameter order of Bottle.mount() changed.', True) # 0.10 + return decorator + def _mount_wsgi(self, prefix, app, **options): segments = [p for p in prefix.split('/') if p] - if not segments: raise ValueError('Empty path prefix.') + if not segments: + raise ValueError('WSGI applications cannot be mounted to "/".') path_depth = len(segments) def mountpoint_wrapper(): try: request.path_shift(path_depth) rs = HTTPResponse([]) + def start_response(status, headerlist, exc_info=None): if exc_info: - try: - _raise(*exc_info) - finally: - exc_info = None + _raise(*exc_info) + if py3k: + # Errors here mean that the mounted WSGI app did not + # follow PEP-3333 (which requires latin1) or used a + # pre-encoding other than utf8 :/ + status = status.encode('latin1').decode('utf8') + headerlist = [(k, v.encode('latin1').decode('utf8')) + for (k, v) in headerlist] rs.status = status - for name, value in headerlist: rs.add_header(name, value) + for name, value in headerlist: + rs.add_header(name, value) return rs.body.append + body = app(request.environ, start_response) - if body and rs.body: body = itertools.chain(rs.body, body) - rs.body = body or rs.body + rs.body = itertools.chain(rs.body, body) if rs.body else body return rs finally: request.path_shift(-path_depth) @@ -707,21 +747,74 @@ class Bottle(object): if not prefix.endswith('/'): self.route('/' + '/'.join(segments), **options) + def _mount_app(self, prefix, app, **options): + if app in self._mounts or '_mount.app' in app.config: + depr(0, 13, "Application mounted multiple times. Falling back to WSGI mount.", + "Clone application before mounting to a different location.") + return self._mount_wsgi(prefix, app, **options) + + if options: + depr(0, 13, "Unsupported mount options. Falling back to WSGI mount.", + "Do not specify any route options when mounting bottle application.") + return self._mount_wsgi(prefix, app, **options) + + if not prefix.endswith("/"): + depr(0, 13, "Prefix must end in '/'. Falling back to WSGI mount.", + "Consider adding an explicit redirect from '/prefix' to '/prefix/' in the parent application.") + return self._mount_wsgi(prefix, app, **options) + + self._mounts.append(app) + app.config['_mount.prefix'] = prefix + app.config['_mount.app'] = self + for route in app.routes: + route.rule = prefix + route.rule.lstrip('/') + self.add_route(route) + + def mount(self, prefix, app, **options): + """ Mount an application (:class:`Bottle` or plain WSGI) to a specific + URL prefix. Example:: + + parent_app.mount('/prefix/', child_app) + + :param prefix: path prefix or `mount-point`. + :param app: an instance of :class:`Bottle` or a WSGI application. + + Plugins from the parent application are not applied to the routes + of the mounted child application. If you need plugins in the child + application, install them separately. + + While it is possible to use path wildcards within the prefix path + (:class:`Bottle` childs only), it is highly discouraged. + + The prefix path must end with a slash. If you want to access the + root of the child application via `/prefix` in addition to + `/prefix/`, consider adding a route with a 307 redirect to the + parent application. + """ + + if not prefix.startswith('/'): + raise ValueError("Prefix must start with '/'") + + if isinstance(app, Bottle): + return self._mount_app(prefix, app, **options) + else: + return self._mount_wsgi(prefix, app, **options) + def merge(self, routes): - ''' Merge the routes of another :class:`Bottle` application or a list of + """ Merge the routes of another :class:`Bottle` application or a list of :class:`Route` objects into this application. The routes keep their 'owner', meaning that the :data:`Route.app` attribute is not - changed. ''' + changed. """ if isinstance(routes, Bottle): routes = routes.routes for route in routes: self.add_route(route) def install(self, plugin): - ''' Add a plugin to the list of plugins and prepare it for being + """ Add a plugin to the list of plugins and prepare it for being applied to all routes of this application. A plugin may be a simple decorator or an object that implements the :class:`Plugin` API. - ''' + """ if hasattr(plugin, 'setup'): plugin.setup(self) if not callable(plugin) and not hasattr(plugin, 'apply'): raise TypeError("Plugins must be callable or implement .apply()") @@ -730,10 +823,10 @@ class Bottle(object): return plugin def uninstall(self, plugin): - ''' Uninstall plugins. Pass an instance to remove a specific plugin, a type + """ Uninstall plugins. Pass an instance to remove a specific plugin, a type object to remove all plugins that match that type, a string to remove all plugins with a matching ``name`` attribute or ``True`` to remove all - plugins. Return the list of removed plugins. ''' + plugins. Return the list of removed plugins. """ removed, remove = [], plugin for i, plugin in list(enumerate(self.plugins))[::-1]: if remove is True or remove is plugin or remove is type(plugin) \ @@ -745,29 +838,30 @@ class Bottle(object): return removed def reset(self, route=None): - ''' Reset all routes (force plugins to be re-applied) and clear all + """ Reset all routes (force plugins to be re-applied) and clear all caches. If an ID or route object is given, only that specific route - is affected. ''' + is affected. """ if route is None: routes = self.routes elif isinstance(route, Route): routes = [route] else: routes = [self.routes[route]] - for route in routes: route.reset() + for route in routes: + route.reset() if DEBUG: - for route in routes: route.prepare() + for route in routes: + route.prepare() self.trigger_hook('app_reset') def close(self): - ''' Close the application and all installed plugins. ''' + """ Close the application and all installed plugins. """ for plugin in self.plugins: if hasattr(plugin, 'close'): plugin.close() - self.stopped = True def run(self, **kwargs): - ''' Calls :func:`run` with the same parameters. ''' + """ Calls :func:`run` with the same parameters. """ run(self, **kwargs) def match(self, environ): - """ Search for a matching route and return a (:class:`Route` , urlargs) + """ Search for a matching route and return a (:class:`Route`, urlargs) tuple. The second value is a dictionary with parameters extracted from the URL. Raise :exc:`HTTPError` (404/405) on a non-match.""" return self.router.match(environ) @@ -779,21 +873,26 @@ class Bottle(object): return urljoin(urljoin('/', scriptname), location) def add_route(self, route): - ''' Add a route object, but do not change the :data:`Route.app` - attribute.''' + """ Add a route object, but do not change the :data:`Route.app` + attribute.""" self.routes.append(route) self.router.add(route.rule, route.method, route, name=route.name) if DEBUG: route.prepare() - def route(self, path=None, method='GET', callback=None, name=None, - apply=None, skip=None, **config): + def route(self, + path=None, + method='GET', + callback=None, + name=None, + apply=None, + skip=None, **config): """ A decorator to bind a function to a request URL. Example:: - @app.route('/hello/:name') + @app.route('/hello/') def hello(name): return 'Hello %s' % name - The ``:name`` part is a wildcard. See :class:`Router` for syntax + The ```` part is a wildcard. See :class:`Router` for syntax details. :param path: Request path or a list of paths to listen to. If no @@ -815,16 +914,19 @@ class Bottle(object): if callable(path): path, callback = None, path plugins = makelist(apply) skiplist = makelist(skip) + def decorator(callback): - # TODO: Documentation and tests if isinstance(callback, basestring): callback = load(callback) for rule in makelist(path) or yieldroutes(callback): for verb in makelist(method): verb = verb.upper() - route = Route(self, rule, verb, callback, name=name, - plugins=plugins, skiplist=skiplist, **config) + route = Route(self, rule, verb, callback, + name=name, + plugins=plugins, + skiplist=skiplist, **config) self.add_route(route) return callback + return decorator(callback) if callback else decorator def get(self, path=None, method='GET', **options): @@ -843,52 +945,84 @@ class Bottle(object): """ Equals :meth:`route` with a ``DELETE`` method parameter. """ return self.route(path, method, **options) - def error(self, code=500): - """ Decorator: Register an output handler for a HTTP error code""" - def wrapper(handler): - self.error_handler[int(code)] = handler - return handler - return wrapper + def patch(self, path=None, method='PATCH', **options): + """ Equals :meth:`route` with a ``PATCH`` method parameter. """ + return self.route(path, method, **options) + + def error(self, code=500, callback=None): + """ Register an output handler for a HTTP error code. Can + be used as a decorator or called directly :: + + def error_handler_500(error): + return 'error_handler_500' + + app.error(code=500, callback=error_handler_500) + + @app.error(404) + def error_handler_404(error): + return 'error_handler_404' + + """ + + def decorator(callback): + if isinstance(callback, basestring): callback = load(callback) + self.error_handler[int(code)] = callback + return callback + + return decorator(callback) if callback else decorator def default_error_handler(self, res): - return tob(template(ERROR_PAGE_TEMPLATE, e=res)) + return tob(template(ERROR_PAGE_TEMPLATE, e=res, template_settings=dict(name='__ERROR_PAGE_TEMPLATE'))) def _handle(self, environ): - try: + path = environ['bottle.raw_path'] = environ['PATH_INFO'] + if py3k: + environ['PATH_INFO'] = path.encode('latin1').decode('utf8', 'ignore') - environ['bottle.app'] = self - request.bind(environ) - response.bind() + environ['bottle.app'] = self + request.bind(environ) + response.bind() - path = environ['bottle.raw_path'] = environ['PATH_INFO'] - if py3k: + try: + while True: # Remove in 0.14 together with RouteReset + out = None try: - environ['PATH_INFO'] = path.encode('latin1').decode('utf8') - except UnicodeError: - return HTTPError(400, 'Invalid path string. Expected UTF-8') - - try: - self.trigger_hook('before_request') - route, args = self.router.match(environ) - environ['route.handle'] = route - environ['bottle.route'] = route - environ['route.url_args'] = args - return route.call(**args) - finally: - self.trigger_hook('after_request') - - except HTTPResponse: - return _e() - except RouteReset: - route.reset() - return self._handle(environ) + self.trigger_hook('before_request') + route, args = self.router.match(environ) + environ['route.handle'] = route + environ['bottle.route'] = route + environ['route.url_args'] = args + out = route.call(**args) + break + except HTTPResponse as E: + out = E + break + except RouteReset: + depr(0, 13, "RouteReset exception deprecated", + "Call route.call() after route.reset() and " + "return the result.") + route.reset() + continue + finally: + if isinstance(out, HTTPResponse): + out.apply(response) + try: + self.trigger_hook('after_request') + except HTTPResponse as E: + out = E + out.apply(response) except (KeyboardInterrupt, SystemExit, MemoryError): raise - except Exception: + except Exception as E: if not self.catchall: raise stacktrace = format_exc() environ['wsgi.errors'].write(stacktrace) - return HTTPError(500, "Internal Server Error", _e(), stacktrace) + environ['wsgi.errors'].flush() + environ['bottle.exc_info'] = sys.exc_info() + out = HTTPError(500, "Internal Server Error", E, stacktrace) + out.apply(response) + + return out def _cast(self, out, peek=None): """ Try to convert the parameter into something WSGI compatible and set @@ -905,7 +1039,7 @@ class Bottle(object): # Join lists of byte or unicode strings. Mixed lists are NOT supported if isinstance(out, (tuple, list))\ and isinstance(out[0], (bytes, unicode)): - out = out[0][0:0].join(out) # b'abc'[0:0] -> b'' + out = out[0][0:0].join(out) # b'abc'[0:0] -> b'' # Encode unicode strings if isinstance(out, unicode): out = out.encode(response.charset) @@ -918,7 +1052,8 @@ class Bottle(object): # TODO: Handle these explicitly in handle() or make them iterable. if isinstance(out, HTTPError): out.apply(response) - out = self.error_handler.get(out.status_code, self.default_error_handler)(out) + out = self.error_handler.get(out.status_code, + self.default_error_handler)(out) return self._cast(out) if isinstance(out, HTTPResponse): out.apply(response) @@ -939,13 +1074,13 @@ class Bottle(object): first = next(iout) except StopIteration: return self._cast('') - except HTTPResponse: - first = _e() + except HTTPResponse as E: + first = E except (KeyboardInterrupt, SystemExit, MemoryError): raise - except Exception: + except Exception as error: if not self.catchall: raise - first = HTTPError(500, 'Unhandled exception', _e(), format_exc()) + first = HTTPError(500, 'Unhandled exception', error, format_exc()) # These are the inner types allowed in iterator or generator objects. if isinstance(first, HTTPResponse): @@ -971,36 +1106,49 @@ class Bottle(object): or environ['REQUEST_METHOD'] == 'HEAD': if hasattr(out, 'close'): out.close() out = [] - start_response(response._status_line, response.headerlist) + exc_info = environ.get('bottle.exc_info') + if exc_info is not None: + del environ['bottle.exc_info'] + start_response(response._wsgi_status_line(), response.headerlist, exc_info) return out except (KeyboardInterrupt, SystemExit, MemoryError): raise - except Exception: + except Exception as E: if not self.catchall: raise err = '

Critical error while processing request: %s

' \ % html_escape(environ.get('PATH_INFO', '/')) if DEBUG: err += '

Error:

\n
\n%s\n
\n' \ '

Traceback:

\n
\n%s\n
\n' \ - % (html_escape(repr(_e())), html_escape(format_exc())) + % (html_escape(repr(E)), html_escape(format_exc())) environ['wsgi.errors'].write(err) + environ['wsgi.errors'].flush() headers = [('Content-Type', 'text/html; charset=UTF-8')] start_response('500 INTERNAL SERVER ERROR', headers, sys.exc_info()) return [tob(err)] def __call__(self, environ, start_response): - ''' Each instance of :class:'Bottle' is a WSGI application. ''' + """ Each instance of :class:'Bottle' is a WSGI application. """ return self.wsgi(environ, start_response) + def __enter__(self): + """ Use this application as default for all module-level shortcuts. """ + default_app.push(self) + return self + def __exit__(self, exc_type, exc_value, traceback): + default_app.pop() - - + def __setattr__(self, name, value): + if name in self.__dict__: + raise AttributeError("Attribute %s already defined. Plugin conflict?" % name) + object.__setattr__(self, name, value) ############################################################################### # HTTP and WSGI Tools ########################################################## ############################################################################### + class BaseRequest(object): """ A wrapper for WSGI environment dictionaries that adds a lot of convenient access methods and properties. Most of them are read-only. @@ -1010,7 +1158,7 @@ class BaseRequest(object): way to store and access request-specific data. """ - __slots__ = ('environ') + __slots__ = ('environ', ) #: Maximum size of memory buffer for :attr:`body` in bytes. MEMFILE_MAX = 102400 @@ -1024,7 +1172,7 @@ class BaseRequest(object): @DictProperty('environ', 'bottle.app', read_only=True) def app(self): - ''' Bottle application handling this request. ''' + """ Bottle application handling this request. """ raise RuntimeError('This request is not connected to an application.') @DictProperty('environ', 'bottle.route', read_only=True) @@ -1039,49 +1187,56 @@ class BaseRequest(object): @property def path(self): - ''' The value of ``PATH_INFO`` with exactly one prefixed slash (to fix - broken clients and avoid the "empty path" edge case). ''' - return '/' + self.environ.get('PATH_INFO','').lstrip('/') + """ The value of ``PATH_INFO`` with exactly one prefixed slash (to fix + broken clients and avoid the "empty path" edge case). """ + return '/' + self.environ.get('PATH_INFO', '').lstrip('/') @property def method(self): - ''' The ``REQUEST_METHOD`` value as an uppercase string. ''' + """ The ``REQUEST_METHOD`` value as an uppercase string. """ return self.environ.get('REQUEST_METHOD', 'GET').upper() @DictProperty('environ', 'bottle.request.headers', read_only=True) def headers(self): - ''' A :class:`WSGIHeaderDict` that provides case-insensitive access to - HTTP request headers. ''' + """ A :class:`WSGIHeaderDict` that provides case-insensitive access to + HTTP request headers. """ return WSGIHeaderDict(self.environ) def get_header(self, name, default=None): - ''' Return the value of a request header, or a given default value. ''' + """ Return the value of a request header, or a given default value. """ return self.headers.get(name, default) @DictProperty('environ', 'bottle.request.cookies', read_only=True) def cookies(self): """ Cookies parsed into a :class:`FormsDict`. Signed cookies are NOT decoded. Use :meth:`get_cookie` if you expect signed cookies. """ - cookies = SimpleCookie(self.environ.get('HTTP_COOKIE','')).values() + cookies = SimpleCookie(self.environ.get('HTTP_COOKIE', '')).values() return FormsDict((c.key, c.value) for c in cookies) - def get_cookie(self, key, default=None, secret=None): + def get_cookie(self, key, default=None, secret=None, digestmod=hashlib.sha256): """ Return the content of a cookie. To read a `Signed Cookie`, the `secret` must match the one used to create the cookie (see :meth:`BaseResponse.set_cookie`). If anything goes wrong (missing cookie or wrong signature), return a default value. """ value = self.cookies.get(key) - if secret and value: - dec = cookie_decode(value, secret) # (key, value) tuple or None - return dec[1] if dec and dec[0] == key else default + if secret: + # See BaseResponse.set_cookie for details on signed cookies. + if value and value.startswith('!') and '?' in value: + sig, msg = map(tob, value[1:].split('?', 1)) + hash = hmac.new(tob(secret), msg, digestmod=digestmod).digest() + if _lscmp(sig, base64.b64encode(hash)): + dst = pickle.loads(base64.b64decode(msg)) + if dst and dst[0] == key: + return dst[1] + return default return value or default @DictProperty('environ', 'bottle.request.query', read_only=True) def query(self): - ''' The :attr:`query_string` parsed into a :class:`FormsDict`. These + """ The :attr:`query_string` parsed into a :class:`FormsDict`. These values are sometimes called "URL arguments" or "GET parameters", but not to be confused with "URL wildcards" as they are provided by the - :class:`Router`. ''' + :class:`Router`. """ get = self.environ['bottle.get'] = FormsDict() pairs = _parse_qsl(self.environ.get('QUERY_STRING', '')) for key, value in pairs: @@ -1095,6 +1250,7 @@ class BaseRequest(object): :class:`FormsDict`. All keys and values are strings. File uploads are stored separately in :attr:`files`. """ forms = FormsDict() + forms.recode_unicode = self.POST.recode_unicode for name, item in self.POST.allitems(): if not isinstance(item, FileUpload): forms[name] = item @@ -1118,6 +1274,7 @@ class BaseRequest(object): """ files = FormsDict() + files.recode_unicode = self.POST.recode_unicode for name, item in self.POST.allitems(): if isinstance(item, FileUpload): files[name] = item @@ -1125,16 +1282,21 @@ class BaseRequest(object): @DictProperty('environ', 'bottle.request.json', read_only=True) def json(self): - ''' If the ``Content-Type`` header is ``application/json``, this - property holds the parsed content of the request body. Only requests - smaller than :attr:`MEMFILE_MAX` are processed to avoid memory - exhaustion. ''' + """ If the ``Content-Type`` header is ``application/json`` or + ``application/json-rpc``, this property holds the parsed content + of the request body. Only requests smaller than :attr:`MEMFILE_MAX` + are processed to avoid memory exhaustion. + Invalid JSON raises a 400 error response. + """ ctype = self.environ.get('CONTENT_TYPE', '').lower().split(';')[0] - if ctype == 'application/json': - b = self._get_body_string() + if ctype in ('application/json', 'application/json-rpc'): + b = self._get_body_string(self.MEMFILE_MAX) if not b: return None - return json_loads(b) + try: + return json_loads(b) + except (ValueError, TypeError): + raise HTTPError(400, 'Invalid JSON') return None def _iter_body(self, read, bufsize): @@ -1145,7 +1307,8 @@ class BaseRequest(object): yield part maxread -= len(part) - def _iter_chunked(self, read, bufsize): + @staticmethod + def _iter_chunked(read, bufsize): err = HTTPError(400, 'Error while parsing chunked transfer body.') rn, sem, bs = tob('\r\n'), tob(';'), tob('') while True: @@ -1174,14 +1337,18 @@ class BaseRequest(object): @DictProperty('environ', 'bottle.request.body', read_only=True) def _body(self): + try: + read_func = self.environ['wsgi.input'].read + except KeyError: + self.environ['wsgi.input'] = BytesIO() + return self.environ['wsgi.input'] body_iter = self._iter_chunked if self.chunked else self._iter_body - read_func = self.environ['wsgi.input'].read body, body_size, is_temp_file = BytesIO(), 0, False for part in body_iter(read_func, self.MEMFILE_MAX): body.write(part) body_size += len(part) if not is_temp_file and body_size > self.MEMFILE_MAX: - body, tmp = TemporaryFile(mode='w+b'), body + body, tmp = NamedTemporaryFile(mode='w+b'), body body.write(tmp.getvalue()) del tmp is_temp_file = True @@ -1189,16 +1356,14 @@ class BaseRequest(object): body.seek(0) return body - def _get_body_string(self): - ''' read body until content-length or MEMFILE_MAX into a string. Raise - HTTPError(413) on requests that are to large. ''' - clen = self.content_length - if clen > self.MEMFILE_MAX: - raise HTTPError(413, 'Request to large') - if clen < 0: clen = self.MEMFILE_MAX + 1 - data = self.body.read(clen) - if len(data) > self.MEMFILE_MAX: # Fail fast - raise HTTPError(413, 'Request to large') + def _get_body_string(self, maxread): + """ Read body into a string. Raise HTTPError(413) on requests that are + too large. """ + if self.content_length > maxread: + raise HTTPError(413, 'Request entity too large') + data = self.body.read(maxread + 1) + if len(data) > maxread: + raise HTTPError(413, 'Request entity too large') return data @property @@ -1213,8 +1378,9 @@ class BaseRequest(object): @property def chunked(self): - ''' True if Chunked transfer encoding was. ''' - return 'chunked' in self.environ.get('HTTP_TRANSFER_ENCODING', '').lower() + """ True if Chunked transfer encoding was. """ + return 'chunked' in self.environ.get( + 'HTTP_TRANSFER_ENCODING', '').lower() #: An alias for :attr:`query`. GET = query @@ -1223,35 +1389,35 @@ class BaseRequest(object): def POST(self): """ The values of :attr:`forms` and :attr:`files` combined into a single :class:`FormsDict`. Values are either strings (form values) or - instances of :class:`cgi.FieldStorage` (file uploads). + instances of :class:`FileUpload`. """ post = FormsDict() + content_type = self.environ.get('CONTENT_TYPE', '') + content_type, options = _parse_http_header(content_type)[0] # We default to application/x-www-form-urlencoded for everything that # is not multipart and take the fast path (also: 3.1 workaround) - if not self.content_type.startswith('multipart/'): - pairs = _parse_qsl(tonat(self._get_body_string(), 'latin1')) - for key, value in pairs: + if not content_type.startswith('multipart/'): + body = tonat(self._get_body_string(self.MEMFILE_MAX), 'latin1') + for key, value in _parse_qsl(body): post[key] = value return post - safe_env = {'QUERY_STRING':''} # Build a safe environment for cgi - for key in ('REQUEST_METHOD', 'CONTENT_TYPE', 'CONTENT_LENGTH'): - if key in self.environ: safe_env[key] = self.environ[key] - args = dict(fp=self.body, environ=safe_env, keep_blank_values=True) - if py31: - args['fp'] = NCTextIOWrapper(args['fp'], encoding='utf8', - newline='\n') - elif py3k: - args['encoding'] = 'utf8' - data = cgi.FieldStorage(**args) - self['_cgi.FieldStorage'] = data #http://bugs.python.org/issue18394#msg207958 - data = data.list or [] - for item in data: - if item.filename is None: - post[item.name] = item.value + post.recode_unicode = False + charset = options.get("charset", "utf8") + boundary = options.get("boundary") + if not boundary: + raise MultipartError("Invalid content type header, missing boundary") + parser = _MultipartParser(self.body, boundary, self.content_length, + mem_limit=self.MEMFILE_MAX, memfile_limit=self.MEMFILE_MAX, + charset=charset) + + for part in parser.parse(): + if not part.filename and part.is_buffered(): + post[part.name] = tonat(part.value, 'utf8') else: - post[item.name] = FileUpload(item.file, item.name, - item.filename, item.headers) + post[part.name] = FileUpload(part.file, part.name, + part.filename, part.headerlist) + return post @property @@ -1264,12 +1430,13 @@ class BaseRequest(object): @DictProperty('environ', 'bottle.request.urlparts', read_only=True) def urlparts(self): - ''' The :attr:`url` string as an :class:`urlparse.SplitResult` tuple. + """ The :attr:`url` string as an :class:`urlparse.SplitResult` tuple. The tuple contains (scheme, host, path, query_string and fragment), but the fragment is always empty because it is not visible to the - server. ''' + server. """ env = self.environ - http = env.get('HTTP_X_FORWARDED_PROTO') or env.get('wsgi.url_scheme', 'http') + http = env.get('HTTP_X_FORWARDED_PROTO') \ + or env.get('wsgi.url_scheme', 'http') host = env.get('HTTP_X_FORWARDED_HOST') or env.get('HTTP_HOST') if not host: # HTTP 1.1 requires a Host-header. This is for HTTP/1.0 clients. @@ -1293,46 +1460,46 @@ class BaseRequest(object): @property def script_name(self): - ''' The initial portion of the URL's `path` that was removed by a higher + """ The initial portion of the URL's `path` that was removed by a higher level (server or routing middleware) before the application was called. This script path is returned with leading and tailing - slashes. ''' + slashes. """ script_name = self.environ.get('SCRIPT_NAME', '').strip('/') return '/' + script_name + '/' if script_name else '/' def path_shift(self, shift=1): - ''' Shift path segments from :attr:`path` to :attr:`script_name` and + """ Shift path segments from :attr:`path` to :attr:`script_name` and vice versa. :param shift: The number of path segments to shift. May be negative to change the shift direction. (default: 1) - ''' - script = self.environ.get('SCRIPT_NAME','/') - self['SCRIPT_NAME'], self['PATH_INFO'] = path_shift(script, self.path, shift) + """ + script, path = path_shift(self.environ.get('SCRIPT_NAME', '/'), self.path, shift) + self['SCRIPT_NAME'], self['PATH_INFO'] = script, path @property def content_length(self): - ''' The request body length as an integer. The client is responsible to + """ The request body length as an integer. The client is responsible to set this header. Otherwise, the real length of the body is unknown - and -1 is returned. In this case, :attr:`body` will be empty. ''' + and -1 is returned. In this case, :attr:`body` will be empty. """ return int(self.environ.get('CONTENT_LENGTH') or -1) @property def content_type(self): - ''' The Content-Type header as a lowercase-string (default: empty). ''' + """ The Content-Type header as a lowercase-string (default: empty). """ return self.environ.get('CONTENT_TYPE', '').lower() @property def is_xhr(self): - ''' True if the request was triggered by a XMLHttpRequest. This only + """ True if the request was triggered by a XMLHttpRequest. This only works with JavaScript libraries that support the `X-Requested-With` - header (most of the popular libraries do). ''' - requested_with = self.environ.get('HTTP_X_REQUESTED_WITH','') + header (most of the popular libraries do). """ + requested_with = self.environ.get('HTTP_X_REQUESTED_WITH', '') return requested_with.lower() == 'xmlhttprequest' @property def is_ajax(self): - ''' Alias for :attr:`is_xhr`. "Ajax" is not the right term. ''' + """ Alias for :attr:`is_xhr`. "Ajax" is not the right term. """ return self.is_xhr @property @@ -1343,7 +1510,7 @@ class BaseRequest(object): front web-server or a middleware), the password field is None, but the user field is looked up from the ``REMOTE_USER`` environ variable. On any errors, None is returned. """ - basic = parse_auth(self.environ.get('HTTP_AUTHORIZATION','')) + basic = parse_auth(self.environ.get('HTTP_AUTHORIZATION', '')) if basic: return basic ruser = self.environ.get('REMOTE_USER') if ruser: return (ruser, None) @@ -1371,12 +1538,25 @@ class BaseRequest(object): """ Return a new :class:`Request` with a shallow :attr:`environ` copy. """ return Request(self.environ.copy()) - def get(self, value, default=None): return self.environ.get(value, default) - def __getitem__(self, key): return self.environ[key] - def __delitem__(self, key): self[key] = ""; del(self.environ[key]) - def __iter__(self): return iter(self.environ) - def __len__(self): return len(self.environ) - def keys(self): return self.environ.keys() + def get(self, value, default=None): + return self.environ.get(value, default) + + def __getitem__(self, key): + return self.environ[key] + + def __delitem__(self, key): + self[key] = "" + del (self.environ[key]) + + def __iter__(self): + return iter(self.environ) + + def __len__(self): + return len(self.environ) + + def keys(self): + return self.environ.keys() + def __setitem__(self, key, value): """ Change an environ value and clear all caches that depend on it. """ @@ -1394,22 +1574,32 @@ class BaseRequest(object): todelete = ('headers', 'cookies') for key in todelete: - self.environ.pop('bottle.request.'+key, None) + self.environ.pop('bottle.request.' + key, None) def __repr__(self): return '<%s: %s %s>' % (self.__class__.__name__, self.method, self.url) def __getattr__(self, name): - ''' Search in self.environ for additional user defined attributes. ''' + """ Search in self.environ for additional user defined attributes. """ try: - var = self.environ['bottle.request.ext.%s'%name] + var = self.environ['bottle.request.ext.%s' % name] return var.__get__(self) if hasattr(var, '__get__') else var except KeyError: raise AttributeError('Attribute %r not defined.' % name) def __setattr__(self, name, value): + """ Define new attributes that are local to the bound request environment. """ if name == 'environ': return object.__setattr__(self, name, value) - self.environ['bottle.request.ext.%s'%name] = value + key = 'bottle.request.ext.%s' % name + if hasattr(self, name): + raise AttributeError("Attribute already defined: %s" % name) + self.environ[key] = value + + def __delattr__(self, name): + try: + del self.environ['bottle.request.ext.%s' % name] + except KeyError: + raise AttributeError("Attribute not defined: %s" % name) def _hkey(key): @@ -1425,14 +1615,13 @@ def _hval(value): return value - class HeaderProperty(object): def __init__(self, name, reader=None, writer=None, default=''): self.name, self.default = name, default self.reader, self.writer = reader, writer self.__doc__ = 'Current value of the %r header.' % name.title() - def __get__(self, obj, cls): + def __get__(self, obj, _): if obj is None: return self value = obj.get_header(self.name, self.default) return self.reader(value) if self.reader else value @@ -1450,28 +1639,31 @@ class BaseResponse(object): This class does support dict-like case-insensitive item-access to headers, but is NOT a dict. Most notably, iterating over a response yields parts of the body and not the headers. - - :param body: The response body as one of the supported types. - :param status: Either an HTTP status code (e.g. 200) or a status line - including the reason phrase (e.g. '200 OK'). - :param headers: A dictionary or a list of name-value pairs. - - Additional keyword arguments are added to the list of headers. - Underscores in the header name are replaced with dashes. """ default_status = 200 default_content_type = 'text/html; charset=UTF-8' - # Header blacklist for specific response codes + # Header denylist for specific response codes # (rfc2616 section 10.2.3 and 10.3.5) bad_headers = { - 204: set(('Content-Type',)), - 304: set(('Allow', 'Content-Encoding', 'Content-Language', + 204: frozenset(('Content-Type', 'Content-Length')), + 304: frozenset(('Allow', 'Content-Encoding', 'Content-Language', 'Content-Length', 'Content-Range', 'Content-Type', - 'Content-Md5', 'Last-Modified'))} + 'Content-Md5', 'Last-Modified')) + } def __init__(self, body='', status=None, headers=None, **more_headers): + """ Create a new response object. + + :param body: The response body as one of the supported types. + :param status: Either an HTTP status code (e.g. 200) or a status line + including the reason phrase (e.g. '200 OK'). + :param headers: A dictionary or a list of name-value pairs. + + Additional keyword arguments are added to the list of headers. + Underscores in the header name are replaced with dashes. + """ self._cookies = None self._headers = {} self.body = body @@ -1486,15 +1678,17 @@ class BaseResponse(object): self.add_header(name, value) def copy(self, cls=None): - ''' Returns a copy of self. ''' + """ Returns a copy of self. """ cls = cls or BaseResponse assert issubclass(cls, BaseResponse) copy = cls() copy.status = self.status copy._headers = dict((k, v[:]) for (k, v) in self._headers.items()) if self._cookies: - copy._cookies = SimpleCookie() - copy._cookies.load(self._cookies.output(header='')) + cookies = copy._cookies = SimpleCookie() + for k,v in self._cookies.items(): + cookies[k] = v.value + cookies[k].update(v) # also copy cookie attributes return copy def __iter__(self): @@ -1506,30 +1700,34 @@ class BaseResponse(object): @property def status_line(self): - ''' The HTTP status line as a string (e.g. ``404 Not Found``).''' + """ The HTTP status line as a string (e.g. ``404 Not Found``).""" return self._status_line @property def status_code(self): - ''' The HTTP status code as an integer (e.g. 404).''' + """ The HTTP status code as an integer (e.g. 404).""" return self._status_code def _set_status(self, status): if isinstance(status, int): code, status = status, _HTTP_STATUS_LINES.get(status) elif ' ' in status: + if '\n' in status or '\r' in status or '\0' in status: + raise ValueError('Status line must not include control chars.') status = status.strip() - code = int(status.split()[0]) + code = int(status.split()[0]) else: raise ValueError('String status line without a reason phrase.') - if not 100 <= code <= 999: raise ValueError('Status code out of range.') + if not 100 <= code <= 999: + raise ValueError('Status code out of range.') self._status_code = code self._status_line = str(status or ('%d Unknown' % code)) def _get_status(self): return self._status_line - status = property(_get_status, _set_status, None, + status = property( + _get_status, _set_status, None, ''' A writeable property to change the HTTP response status. It accepts either a numeric code (100-999) or a string with a custom reason phrase (e.g. "404 Brain not found"). Both :data:`status_line` and @@ -1539,36 +1737,49 @@ class BaseResponse(object): @property def headers(self): - ''' An instance of :class:`HeaderDict`, a case-insensitive dict-like - view on the response headers. ''' + """ An instance of :class:`HeaderDict`, a case-insensitive dict-like + view on the response headers. """ hdict = HeaderDict() hdict.dict = self._headers return hdict - def __contains__(self, name): return _hkey(name) in self._headers - def __delitem__(self, name): del self._headers[_hkey(name)] - def __getitem__(self, name): return self._headers[_hkey(name)][-1] - def __setitem__(self, name, value): self._headers[_hkey(name)] = [_hval(value)] + def __contains__(self, name): + return _hkey(name) in self._headers + + def __delitem__(self, name): + del self._headers[_hkey(name)] + + def __getitem__(self, name): + return self._headers[_hkey(name)][-1] + + def __setitem__(self, name, value): + self._headers[_hkey(name)] = [_hval(value)] def get_header(self, name, default=None): - ''' Return the value of a previously defined header. If there is no - header with that name, return a default value. ''' + """ Return the value of a previously defined header. If there is no + header with that name, return a default value. """ return self._headers.get(_hkey(name), [default])[-1] def set_header(self, name, value): - ''' Create a new response header, replacing any previously defined - headers with the same name. ''' + """ Create a new response header, replacing any previously defined + headers with the same name. """ self._headers[_hkey(name)] = [_hval(value)] def add_header(self, name, value): - ''' Add an additional response header, not removing duplicates. ''' + """ Add an additional response header, not removing duplicates. """ self._headers.setdefault(_hkey(name), []).append(_hval(value)) def iter_headers(self): - ''' Yield (header, value) tuples, skipping headers that are not - allowed with the current response status code. ''' + """ Yield (header, value) tuples, skipping headers that are not + allowed with the current response status code. """ return self.headerlist + def _wsgi_status_line(self): + """ WSGI conform status line (latin1-encodeable) """ + if py3k: + return self._status_line.encode('utf8').decode('latin1') + return self._status_line + @property def headerlist(self): """ WSGI conform list of (header, value) tuples. """ @@ -1588,9 +1799,10 @@ class BaseResponse(object): return out content_type = HeaderProperty('Content-Type') - content_length = HeaderProperty('Content-Length', reader=int) - expires = HeaderProperty('Expires', - reader=lambda x: datetime.utcfromtimestamp(parse_date(x)), + content_length = HeaderProperty('Content-Length', reader=int, default=-1) + expires = HeaderProperty( + 'Expires', + reader=lambda x: datetime.fromtimestamp(parse_date(x), UTC), writer=lambda x: http_date(x)) @property @@ -1600,8 +1812,8 @@ class BaseResponse(object): return self.content_type.split('charset=')[-1].split(';')[0].strip() return default - def set_cookie(self, name, value, secret=None, **options): - ''' Create a new cookie or replace an old one. If the `secret` parameter is + def set_cookie(self, name, value, secret=None, digestmod=hashlib.sha256, **options): + """ Create a new cookie or replace an old one. If the `secret` parameter is set, create a `Signed Cookie` (described below). :param name: the name of the cookie. @@ -1611,7 +1823,7 @@ class BaseResponse(object): Additionally, this method accepts all RFC 2109 attributes that are supported by :class:`cookie.Morsel`, including: - :param max_age: maximum age in seconds. (default: None) + :param maxage: maximum age in seconds. (default: None) :param expires: a datetime object or UNIX timestamp. (default: None) :param domain: the domain that is allowed to read the cookie. (default: current domain) @@ -1619,8 +1831,10 @@ class BaseResponse(object): :param secure: limit the cookie to HTTPS connections (default: off). :param httponly: prevents client-side javascript to read this cookie (default: off, requires Python 2.6 or newer). + :param samesite: Control or disable third-party use for this cookie. + Possible values: `lax`, `strict` or `none` (default). - If neither `expires` nor `max_age` is set (default), the cookie will + If neither `expires` nor `maxage` is set (default), the cookie will expire at the end of the browser session (as soon as the browser window is closed). @@ -1628,37 +1842,60 @@ class BaseResponse(object): cryptographically signed to prevent manipulation. Keep in mind that cookies are limited to 4kb in most browsers. + Warning: Pickle is a potentially dangerous format. If an attacker + gains access to the secret key, he could forge cookies that execute + code on server side if unpickled. Using pickle is discouraged and + support for it will be removed in later versions of bottle. + Warning: Signed cookies are not encrypted (the client can still see the content) and not copy-protected (the client can restore an old cookie). The main intention is to make pickling and unpickling save, not to store secret information at client side. - ''' + """ if not self._cookies: self._cookies = SimpleCookie() + # Monkey-patch Cookie lib to support 'SameSite' parameter + # https://tools.ietf.org/html/draft-west-first-party-cookies-07#section-4.1 + if py < (3, 8, 0): + Morsel._reserved.setdefault('samesite', 'SameSite') + if secret: - value = touni(cookie_encode((name, value), secret)) + if not isinstance(value, basestring): + depr(0, 13, "Pickling of arbitrary objects into cookies is " + "deprecated.", "Only store strings in cookies. " + "JSON strings are fine, too.") + encoded = base64.b64encode(pickle.dumps([name, value], -1)) + sig = base64.b64encode(hmac.new(tob(secret), encoded, + digestmod=digestmod).digest()) + value = touni(tob('!') + sig + tob('?') + encoded) elif not isinstance(value, basestring): - raise TypeError('Secret key missing for non-string Cookie.') + raise TypeError('Secret key required for non-string cookies.') + + # Cookie size plus options must not exceed 4kb. + if len(name) + len(value) > 3800: + raise ValueError('Content does not fit into a cookie.') - if len(value) > 4096: raise ValueError('Cookie value to long.') self._cookies[name] = value for key, value in options.items(): - if key == 'max_age': + if key in ('max_age', 'maxage'): # 'maxage' variant added in 0.13 + key = 'max-age' if isinstance(value, timedelta): value = value.seconds + value.days * 24 * 3600 if key == 'expires': - if isinstance(value, (datedate, datetime)): - value = value.timetuple() - elif isinstance(value, (int, float)): - value = time.gmtime(value) - value = time.strftime("%a, %d %b %Y %H:%M:%S GMT", value) - self._cookies[name][key.replace('_', '-')] = value + value = http_date(value) + if key in ('same_site', 'samesite'): # 'samesite' variant added in 0.13 + key, value = 'samesite', (value or "none").lower() + if value not in ('lax', 'strict', 'none'): + raise CookieError("Invalid value for SameSite") + if key in ('secure', 'httponly') and not value: + continue + self._cookies[name][key] = value def delete_cookie(self, key, **kwargs): - ''' Delete a cookie. Be sure to use the same `domain` and `path` - settings as used to create the cookie. ''' + """ Delete a cookie. Be sure to use the same `domain` and `path` + settings as used to create the cookie. """ kwargs['max_age'] = -1 kwargs['expires'] = 0 self.set_cookie(key, '', **kwargs) @@ -1670,40 +1907,46 @@ class BaseResponse(object): return out -def local_property(name=None): - if name: depr('local_property() is deprecated and will be removed.') #0.12 +def _local_property(): ls = threading.local() - def fget(self): - try: return ls.var + + def fget(_): + try: + return ls.var except AttributeError: raise RuntimeError("Request context not initialized.") - def fset(self, value): ls.var = value - def fdel(self): del ls.var + + def fset(_, value): + ls.var = value + + def fdel(_): + del ls.var + return property(fget, fset, fdel, 'Thread-local property') class LocalRequest(BaseRequest): - ''' A thread-local subclass of :class:`BaseRequest` with a different + """ A thread-local subclass of :class:`BaseRequest` with a different set of attributes for each thread. There is usually only one global instance of this class (:data:`request`). If accessed during a request/response cycle, this instance always refers to the *current* - request (even on a multithreaded server). ''' + request (even on a multithreaded server). """ bind = BaseRequest.__init__ - environ = local_property() + environ = _local_property() class LocalResponse(BaseResponse): - ''' A thread-local subclass of :class:`BaseResponse` with a different + """ A thread-local subclass of :class:`BaseResponse` with a different set of attributes for each thread. There is usually only one global instance of this class (:data:`response`). Its attributes are used to build the HTTP response at the end of the request/response cycle. - ''' + """ bind = BaseResponse.__init__ - _status_line = local_property() - _status_code = local_property() - _cookies = local_property() - _headers = local_property() - body = local_property() + _status_line = _local_property() + _status_code = _local_property() + _cookies = _local_property() + _headers = _local_property() + body = _local_property() Request = BaseRequest @@ -1711,56 +1954,82 @@ Response = BaseResponse class HTTPResponse(Response, BottleException): + """ A subclass of :class:`Response` that can be raised or returned from request + handlers to short-curcuit request processing and override changes made to the + global :data:`request` object. This bypasses error handlers, even if the status + code indicates an error. Return or raise :class:`HTTPError` to trigger error + handlers. + """ + def __init__(self, body='', status=None, headers=None, **more_headers): super(HTTPResponse, self).__init__(body, status, headers, **more_headers) - def apply(self, response): - response._status_code = self._status_code - response._status_line = self._status_line - response._headers = self._headers - response._cookies = self._cookies - response.body = self.body + def apply(self, other): + """ Copy the state of this response to a different :class:`Response` object. """ + other._status_code = self._status_code + other._status_line = self._status_line + other._headers = self._headers + other._cookies = self._cookies + other.body = self.body class HTTPError(HTTPResponse): + """ A subclass of :class:`HTTPResponse` that triggers error handlers. """ + default_status = 500 - def __init__(self, status=None, body=None, exception=None, traceback=None, - **options): + + def __init__(self, + status=None, + body=None, + exception=None, + traceback=None, **more_headers): self.exception = exception self.traceback = traceback - super(HTTPError, self).__init__(body, status, **options) - - - - + super(HTTPError, self).__init__(body, status, **more_headers) ############################################################################### # Plugins ###################################################################### ############################################################################### -class PluginError(BottleException): pass + +class PluginError(BottleException): + pass class JSONPlugin(object): name = 'json' - api = 2 + api = 2 def __init__(self, json_dumps=json_dumps): self.json_dumps = json_dumps + def setup(self, app): + app.config._define('json.enable', default=True, validate=bool, + help="Enable or disable automatic dict->json filter.") + app.config._define('json.ascii', default=False, validate=bool, + help="Use only 7-bit ASCII characters in output.") + app.config._define('json.indent', default=True, validate=bool, + help="Add whitespace to make json more readable.") + app.config._define('json.dump_func', default=None, + help="If defined, use this function to transform" + " dict into json. The other options no longer" + " apply.") + def apply(self, callback, route): dumps = self.json_dumps - if not dumps: return callback + if not self.json_dumps: return callback + + @functools.wraps(callback) def wrapper(*a, **ka): try: rv = callback(*a, **ka) - except HTTPError: - rv = _e() + except HTTPResponse as resp: + rv = resp if isinstance(rv, dict): #Attempt to serialize, raises exception on failure json_response = dumps(rv) - #Set content type only if serialization succesful + #Set content type only if serialization successful response.content_type = 'application/json' return json_response elif isinstance(rv, HTTPResponse) and isinstance(rv.body, dict): @@ -1772,12 +2041,15 @@ class JSONPlugin(object): class TemplatePlugin(object): - ''' This plugin applies the :func:`view` decorator to all routes with a + """ This plugin applies the :func:`view` decorator to all routes with a `template` config parameter. If the parameter is a tuple, the second element must be a dict with additional options (e.g. `template_engine`) - or default variables for the template. ''' + or default variables for the template. """ name = 'template' - api = 2 + api = 2 + + def setup(self, app): + app.tpl = self def apply(self, callback, route): conf = route.config.get('template') @@ -1792,20 +2064,35 @@ class TemplatePlugin(object): #: Not a plugin, but part of the plugin API. TODO: Find a better place. class _ImportRedirect(object): def __init__(self, name, impmask): - ''' Create a virtual package that redirects imports (see PEP 302). ''' + """ Create a virtual package that redirects imports (see PEP 302). """ self.name = name self.impmask = impmask self.module = sys.modules.setdefault(name, new_module(name)) - self.module.__dict__.update({'__file__': __file__, '__path__': [], - '__all__': [], '__loader__': self}) + self.module.__dict__.update({ + '__file__': __file__, + '__path__': [], + '__all__': [], + '__loader__': self + }) sys.meta_path.append(self) + def find_spec(self, fullname, path, target=None): + if '.' not in fullname: return + if fullname.rsplit('.', 1)[0] != self.name: return + from importlib.util import spec_from_loader + return spec_from_loader(fullname, self) + def find_module(self, fullname, path=None): if '.' not in fullname: return - packname = fullname.rsplit('.', 1)[0] - if packname != self.name: return + if fullname.rsplit('.', 1)[0] != self.name: return return self + def create_module(self, spec): + return self.load_module(spec.name) + + def exec_module(self, module): + pass # This probably breaks importlib.reload() :/ + def load_module(self, fullname): if fullname in sys.modules: return sys.modules[fullname] modname = fullname.rsplit('.', 1)[1] @@ -1816,11 +2103,6 @@ class _ImportRedirect(object): module.__loader__ = self return module - - - - - ############################################################################### # Common Utilities ############################################################# ############################################################################### @@ -1835,38 +2117,68 @@ class MultiDict(DictMixin): def __init__(self, *a, **k): self.dict = dict((k, [v]) for (k, v) in dict(*a, **k).items()) - def __len__(self): return len(self.dict) - def __iter__(self): return iter(self.dict) - def __contains__(self, key): return key in self.dict - def __delitem__(self, key): del self.dict[key] - def __getitem__(self, key): return self.dict[key][-1] - def __setitem__(self, key, value): self.append(key, value) - def keys(self): return self.dict.keys() + def __len__(self): + return len(self.dict) + + def __iter__(self): + return iter(self.dict) + + def __contains__(self, key): + return key in self.dict + + def __delitem__(self, key): + del self.dict[key] + + def __getitem__(self, key): + return self.dict[key][-1] + + def __setitem__(self, key, value): + self.append(key, value) + + def keys(self): + return self.dict.keys() if py3k: - def values(self): return (v[-1] for v in self.dict.values()) - def items(self): return ((k, v[-1]) for k, v in self.dict.items()) + + def values(self): + return (v[-1] for v in self.dict.values()) + + def items(self): + return ((k, v[-1]) for k, v in self.dict.items()) + def allitems(self): return ((k, v) for k, vl in self.dict.items() for v in vl) + iterkeys = keys itervalues = values iteritems = items iterallitems = allitems else: - def values(self): return [v[-1] for v in self.dict.values()] - def items(self): return [(k, v[-1]) for k, v in self.dict.items()] - def iterkeys(self): return self.dict.iterkeys() - def itervalues(self): return (v[-1] for v in self.dict.itervalues()) + + def values(self): + return [v[-1] for v in self.dict.values()] + + def items(self): + return [(k, v[-1]) for k, v in self.dict.items()] + + def iterkeys(self): + return self.dict.iterkeys() + + def itervalues(self): + return (v[-1] for v in self.dict.itervalues()) + def iteritems(self): return ((k, v[-1]) for k, v in self.dict.iteritems()) + def iterallitems(self): return ((k, v) for k, vl in self.dict.iteritems() for v in vl) + def allitems(self): return [(k, v) for k, vl in self.dict.iteritems() for v in vl] def get(self, key, default=None, index=-1, type=None): - ''' Return the most recent value for a key. + """ Return the most recent value for a key. :param default: The default value to be returned if the key is not present or the type conversion fails. @@ -1874,7 +2186,7 @@ class MultiDict(DictMixin): :param type: If defined, this callable is used to cast the value into a specific type. Exception are suppressed and result in the default value to be returned. - ''' + """ try: val = self.dict[key][index] return type(val) if type else val @@ -1883,15 +2195,15 @@ class MultiDict(DictMixin): return default def append(self, key, value): - ''' Add a new value to the list of values for this key. ''' + """ Add a new value to the list of values for this key. """ self.dict.setdefault(key, []).append(value) def replace(self, key, value): - ''' Replace the list of values with a single value. ''' + """ Replace the list of values with a single value. """ self.dict[key] = [value] def getall(self, key): - ''' Return a (possibly empty) list of values for a key. ''' + """ Return a (possibly empty) list of values for a key. """ return self.dict.get(key) or [] #: Aliases for WTForms to mimic other multi-dict APIs (Django) @@ -1900,12 +2212,12 @@ class MultiDict(DictMixin): class FormsDict(MultiDict): - ''' This :class:`MultiDict` subclass is used to store request form data. + """ This :class:`MultiDict` subclass is used to store request form data. Additionally to the normal dict-like item access methods (which return unmodified data as native strings), this container also supports attribute-like access to its values. Attributes are automatically de- or recoded to match :attr:`input_encoding` (default: 'utf8'). Missing - attributes default to an empty string. ''' + attributes default to an empty string. """ #: Encoding used for attribute values. input_encoding = 'utf8' @@ -1914,17 +2226,17 @@ class FormsDict(MultiDict): recode_unicode = True def _fix(self, s, encoding=None): - if isinstance(s, unicode) and self.recode_unicode: # Python 3 WSGI + if isinstance(s, unicode) and self.recode_unicode: # Python 3 WSGI return s.encode('latin1').decode(encoding or self.input_encoding) - elif isinstance(s, bytes): # Python 2 WSGI + elif isinstance(s, bytes): # Python 2 WSGI return s.decode(encoding or self.input_encoding) else: return s def decode(self, encoding=None): - ''' Returns a copy with all keys and values de- or recoded to match + """ Returns a copy with all keys and values de- or recoded to match :attr:`input_encoding`. Some libraries (e.g. WTForms) want a - unicode dictionary. ''' + unicode dictionary. """ copy = FormsDict() enc = copy.input_encoding = encoding or self.input_encoding copy.recode_unicode = False @@ -1933,7 +2245,7 @@ class FormsDict(MultiDict): return copy def getunicode(self, name, default=None, encoding=None): - ''' Return the value as a unicode string, or the default. ''' + """ Return the value as a unicode string, or the default. """ try: return self._fix(self[name], encoding) except (UnicodeError, KeyError): @@ -1953,15 +2265,30 @@ class HeaderDict(MultiDict): self.dict = {} if a or ka: self.update(*a, **ka) - def __contains__(self, key): return _hkey(key) in self.dict - def __delitem__(self, key): del self.dict[_hkey(key)] - def __getitem__(self, key): return self.dict[_hkey(key)][-1] - def __setitem__(self, key, value): self.dict[_hkey(key)] = [_hval(value)] - def append(self, key, value): self.dict.setdefault(_hkey(key), []).append(_hval(value)) - def replace(self, key, value): self.dict[_hkey(key)] = [_hval(value)] - def getall(self, key): return self.dict.get(_hkey(key)) or [] + def __contains__(self, key): + return _hkey(key) in self.dict + + def __delitem__(self, key): + del self.dict[_hkey(key)] + + def __getitem__(self, key): + return self.dict[_hkey(key)][-1] + + def __setitem__(self, key, value): + self.dict[_hkey(key)] = [_hval(value)] + + def append(self, key, value): + self.dict.setdefault(_hkey(key), []).append(_hval(value)) + + def replace(self, key, value): + self.dict[_hkey(key)] = [_hval(value)] + + def getall(self, key): + return self.dict.get(_hkey(key)) or [] + def get(self, key, default=None, index=-1): return MultiDict.get(self, _hkey(key), default, index) + def filter(self, names): for name in (_hkey(n) for n in names): if name in self.dict: @@ -1969,7 +2296,7 @@ class HeaderDict(MultiDict): class WSGIHeaderDict(DictMixin): - ''' This dict-like class wraps a WSGI environ dict and provides convenient + """ This dict-like class wraps a WSGI environ dict and provides convenient access to HTTP_* fields. Keys and values are native strings (2.x bytes or 3.x unicode) and keys are case-insensitive. If the WSGI environment contains non-native string values, these are de- or encoded @@ -1978,7 +2305,7 @@ class WSGIHeaderDict(DictMixin): The API will remain stable even on changes to the relevant PEPs. Currently PEP 333, 444 and 3333 are supported. (PEP 444 is the only one that uses non-native strings.) - ''' + """ #: List of keys that do not have a ``HTTP_`` prefix. cgikeys = ('CONTENT_TYPE', 'CONTENT_LENGTH') @@ -1986,18 +2313,24 @@ class WSGIHeaderDict(DictMixin): self.environ = environ def _ekey(self, key): - ''' Translate header field name to CGI/WSGI environ key. ''' - key = key.replace('-','_').upper() + """ Translate header field name to CGI/WSGI environ key. """ + key = key.replace('-', '_').upper() if key in self.cgikeys: return key return 'HTTP_' + key def raw(self, key, default=None): - ''' Return the header value as is (may be bytes or unicode). ''' + """ Return the header value as is (may be bytes or unicode). """ return self.environ.get(self._ekey(key), default) def __getitem__(self, key): - return tonat(self.environ[self._ekey(key)], 'latin1') + val = self.environ[self._ekey(key)] + if py3k: + if isinstance(val, unicode): + val = val.encode('latin1').decode('utf8') + else: + val = val.decode('utf8') + return val def __setitem__(self, key, value): raise TypeError("%s is read-only." % self.__class__) @@ -2008,150 +2341,125 @@ class WSGIHeaderDict(DictMixin): def __iter__(self): for key in self.environ: if key[:5] == 'HTTP_': - yield key[5:].replace('_', '-').title() + yield _hkey(key[5:]) elif key in self.cgikeys: - yield key.replace('_', '-').title() + yield _hkey(key) - def keys(self): return [x for x in self] - def __len__(self): return len(self.keys()) - def __contains__(self, key): return self._ekey(key) in self.environ + def keys(self): + return [x for x in self] + def __len__(self): + return len(self.keys()) + def __contains__(self, key): + return self._ekey(key) in self.environ + +_UNSET = object() class ConfigDict(dict): - ''' A dict-like configuration storage with additional support for - namespaces, validators, meta-data, on_change listeners and more. + """ A dict-like configuration storage with additional support for + namespaces, validators, meta-data and overlays. - This storage is optimized for fast read access. Retrieving a key - or using non-altering dict methods (e.g. `dict.get()`) has no overhead - compared to a native dict. - ''' - __slots__ = ('_meta', '_on_change') + This dict-like class is heavily optimized for read access. + Read-only methods and item access should be as fast as a native dict. + """ - class Namespace(DictMixin): + __slots__ = ('_meta', '_change_listener', '_overlays', '_virtual_keys', '_source', '__weakref__') - def __init__(self, config, namespace): - self._config = config - self._prefix = namespace - - def __getitem__(self, key): - depr('Accessing namespaces as dicts is discouraged. ' - 'Only use flat item access: ' - 'cfg["names"]["pace"]["key"] -> cfg["name.space.key"]') #0.12 - return self._config[self._prefix + '.' + key] - - def __setitem__(self, key, value): - self._config[self._prefix + '.' + key] = value - - def __delitem__(self, key): - del self._config[self._prefix + '.' + key] - - def __iter__(self): - ns_prefix = self._prefix + '.' - for key in self._config: - ns, dot, name = key.rpartition('.') - if ns == self._prefix and name: - yield name - - def keys(self): return [x for x in self] - def __len__(self): return len(self.keys()) - def __contains__(self, key): return self._prefix + '.' + key in self._config - def __repr__(self): return '' % self._prefix - def __str__(self): return '' % self._prefix - - # Deprecated ConfigDict features - def __getattr__(self, key): - depr('Attribute access is deprecated.') #0.12 - if key not in self and key[0].isupper(): - self[key] = ConfigDict.Namespace(self._config, self._prefix + '.' + key) - if key not in self and key.startswith('__'): - raise AttributeError(key) - return self.get(key) - - def __setattr__(self, key, value): - if key in ('_config', '_prefix'): - self.__dict__[key] = value - return - depr('Attribute assignment is deprecated.') #0.12 - if hasattr(DictMixin, key): - raise AttributeError('Read-only attribute.') - if key in self and self[key] and isinstance(self[key], self.__class__): - raise AttributeError('Non-empty namespace attribute.') - self[key] = value + def __init__(self): + self._meta = {} + self._change_listener = [] + #: Weak references of overlays that need to be kept in sync. + self._overlays = [] + #: Config that is the source for this overlay. + self._source = None + #: Keys of values copied from the source (values we do not own) + self._virtual_keys = set() + + def load_module(self, name, squash=True): + """Load values from a Python module. + + Import a python module by name and add all upper-case module-level + variables to this config dict. + + :param name: Module name to import and load. + :param squash: If true (default), nested dicts are assumed to + represent namespaces and flattened (see :meth:`load_dict`). + """ + config_obj = load(name) + obj = {key: getattr(config_obj, key) + for key in dir(config_obj) if key.isupper()} - def __delattr__(self, key): - if key in self: - val = self.pop(key) - if isinstance(val, self.__class__): - prefix = key + '.' - for key in self: - if key.startswith(prefix): - del self[prefix+key] - - def __call__(self, *a, **ka): - depr('Calling ConfDict is deprecated. Use the update() method.') #0.12 - self.update(*a, **ka) - return self + if squash: + self.load_dict(obj) + else: + self.update(obj) + return self - def __init__(self, *a, **ka): - self._meta = {} - self._on_change = lambda name, value: None - if a or ka: - depr('Constructor does no longer accept parameters.') #0.12 - self.update(*a, **ka) - - def load_config(self, filename): - ''' Load values from an *.ini style config file. - - If the config file contains sections, their names are used as - namespaces for the values within. The two special sections - ``DEFAULT`` and ``bottle`` refer to the root namespace (no prefix). - ''' - conf = ConfigParser() + def load_config(self, filename, **options): + """ Load values from ``*.ini`` style config files using configparser. + + INI style sections (e.g. ``[section]``) are used as namespace for + all keys within that section. Both section and key names may contain + dots as namespace separators and are converted to lower-case. + + The special sections ``[bottle]`` and ``[ROOT]`` refer to the root + namespace and the ``[DEFAULT]`` section defines default values for all + other sections. + + :param filename: The path of a config file, or a list of paths. + :param options: All keyword parameters are passed to the underlying + :class:`python:configparser.ConfigParser` constructor call. + + """ + options.setdefault('allow_no_value', True) + if py3k: + options.setdefault('interpolation', + configparser.ExtendedInterpolation()) + conf = configparser.ConfigParser(**options) conf.read(filename) for section in conf.sections(): - for key, value in conf.items(section): - if section not in ('DEFAULT', 'bottle'): + for key in conf.options(section): + value = conf.get(section, key) + if section not in ('bottle', 'ROOT'): key = section + '.' + key - self[key] = value + self[key.lower()] = value return self - def load_dict(self, source, namespace='', make_namespaces=False): - ''' Import values from a dictionary structure. Nesting can be used to + def load_dict(self, source, namespace=''): + """ Load values from a dictionary structure. Nesting can be used to represent namespaces. - >>> ConfigDict().load_dict({'name': {'space': {'key': 'value'}}}) - {'name.space.key': 'value'} - ''' - stack = [(namespace, source)] - while stack: - prefix, source = stack.pop() - if not isinstance(source, dict): - raise TypeError('Source is not a dict (r)' % type(key)) - for key, value in source.items(): - if not isinstance(key, basestring): - raise TypeError('Key is not a string (%r)' % type(key)) - full_key = prefix + '.' + key if prefix else key + >>> c = ConfigDict() + >>> c.load_dict({'some': {'namespace': {'key': 'value'} } }) + {'some.namespace.key': 'value'} + """ + for key, value in source.items(): + if isinstance(key, basestring): + nskey = (namespace + '.' + key).strip('.') if isinstance(value, dict): - stack.append((full_key, value)) - if make_namespaces: - self[full_key] = self.Namespace(self, full_key) + self.load_dict(value, namespace=nskey) else: - self[full_key] = value + self[nskey] = value + else: + raise TypeError('Key has type %r (not a string)' % type(key)) return self def update(self, *a, **ka): - ''' If the first parameter is a string, all keys are prefixed with this + """ If the first parameter is a string, all keys are prefixed with this namespace. Apart from that it works just as the usual dict.update(). - Example: ``update('some.namespace', key='value')`` ''' + + >>> c = ConfigDict() + >>> c.update('some.namespace', key='value') + """ prefix = '' if a and isinstance(a[0], basestring): prefix = a[0].strip('.') + '.' a = a[1:] for key, value in dict(*a, **ka).items(): - self[prefix+key] = value + self[prefix + key] = value - def setdefault(self, key, value): + def setdefault(self, key, value=None): if key not in self: self[key] = value return self[key] @@ -2160,66 +2468,132 @@ class ConfigDict(dict): if not isinstance(key, basestring): raise TypeError('Key has type %r (not a string)' % type(key)) + self._virtual_keys.discard(key) + value = self.meta_get(key, 'filter', lambda x: x)(value) if key in self and self[key] is value: return + self._on_change(key, value) dict.__setitem__(self, key, value) + for overlay in self._iter_overlays(): + overlay._set_virtual(key, value) + def __delitem__(self, key): + if key not in self: + raise KeyError(key) + if key in self._virtual_keys: + raise KeyError("Virtual keys cannot be deleted: %s" % key) + + if self._source and key in self._source: + # Not virtual, but present in source -> Restore virtual value + dict.__delitem__(self, key) + self._set_virtual(key, self._source[key]) + else: # not virtual, not present in source. This is OUR value + self._on_change(key, None) + dict.__delitem__(self, key) + for overlay in self._iter_overlays(): + overlay._delete_virtual(key) + + def _set_virtual(self, key, value): + """ Recursively set or update virtual keys. """ + if key in self and key not in self._virtual_keys: + return # Do nothing for non-virtual keys. + + self._virtual_keys.add(key) + if key in self and self[key] is not value: + self._on_change(key, value) + dict.__setitem__(self, key, value) + for overlay in self._iter_overlays(): + overlay._set_virtual(key, value) + + def _delete_virtual(self, key): + """ Recursively delete virtual entry. """ + if key not in self._virtual_keys: + return # Do nothing for non-virtual keys. + + if key in self: + self._on_change(key, None) dict.__delitem__(self, key) + self._virtual_keys.discard(key) + for overlay in self._iter_overlays(): + overlay._delete_virtual(key) + + def _on_change(self, key, value): + for cb in self._change_listener: + if cb(self, key, value): + return True - def clear(self): - for key in self: - del self[key] + def _add_change_listener(self, func): + self._change_listener.append(func) + return func def meta_get(self, key, metafield, default=None): - ''' Return the value of a meta field for a key. ''' + """ Return the value of a meta field for a key. """ return self._meta.get(key, {}).get(metafield, default) def meta_set(self, key, metafield, value): - ''' Set the meta field for a key to a new value. This triggers the - on-change handler for existing keys. ''' + """ Set the meta field for a key to a new value. + + Meta-fields are shared between all members of an overlay tree. + """ self._meta.setdefault(key, {})[metafield] = value - if key in self: - self[key] = self[key] def meta_list(self, key): - ''' Return an iterable of meta field names defined for a key. ''' + """ Return an iterable of meta field names defined for a key. """ return self._meta.get(key, {}).keys() - # Deprecated ConfigDict features - def __getattr__(self, key): - depr('Attribute access is deprecated.') #0.12 - if key not in self and key[0].isupper(): - self[key] = self.Namespace(self, key) - if key not in self and key.startswith('__'): - raise AttributeError(key) - return self.get(key) - - def __setattr__(self, key, value): - if key in self.__slots__: - return dict.__setattr__(self, key, value) - depr('Attribute assignment is deprecated.') #0.12 - if hasattr(dict, key): - raise AttributeError('Read-only attribute.') - if key in self and self[key] and isinstance(self[key], self.Namespace): - raise AttributeError('Non-empty namespace attribute.') - self[key] = value + def _define(self, key, default=_UNSET, help=_UNSET, validate=_UNSET): + """ (Unstable) Shortcut for plugins to define own config parameters. """ + if default is not _UNSET: + self.setdefault(key, default) + if help is not _UNSET: + self.meta_set(key, 'help', help) + if validate is not _UNSET: + self.meta_set(key, 'validate', validate) + + def _iter_overlays(self): + for ref in self._overlays: + overlay = ref() + if overlay is not None: + yield overlay + + def _make_overlay(self): + """ (Unstable) Create a new overlay that acts like a chained map: Values + missing in the overlay are copied from the source map. Both maps + share the same meta entries. + + Entries that were copied from the source are called 'virtual'. You + can not delete virtual keys, but overwrite them, which turns them + into non-virtual entries. Setting keys on an overlay never affects + its source, but may affect any number of child overlays. + + Other than collections.ChainMap or most other implementations, this + approach does not resolve missing keys on demand, but instead + actively copies all values from the source to the overlay and keeps + track of virtual and non-virtual keys internally. This removes any + lookup-overhead. Read-access is as fast as a build-in dict for both + virtual and non-virtual keys. + + Changes are propagated recursively and depth-first. A failing + on-change handler in an overlay stops the propagation of virtual + values and may result in an partly updated tree. Take extra care + here and make sure that on-change handlers never fail. + + Used by Route.config + """ + # Cleanup dead references + self._overlays[:] = [ref for ref in self._overlays if ref() is not None] + + overlay = ConfigDict() + overlay._meta = self._meta + overlay._source = self + self._overlays.append(weakref.ref(overlay)) + for key in self: + overlay._set_virtual(key, self[key]) + return overlay - def __delattr__(self, key): - if key in self: - val = self.pop(key) - if isinstance(val, self.Namespace): - prefix = key + '.' - for key in self: - if key.startswith(prefix): - del self[prefix+key] - - def __call__(self, *a, **ka): - depr('Calling ConfDict is deprecated. Use the update() method.') #0.12 - self.update(*a, **ka) - return self @@ -2228,7 +2602,7 @@ class AppStack(list): def __call__(self): """ Return the current default application. """ - return self[-1] + return self.default def push(self, value=None): """ Add a new :class:`Bottle` instance to the stack """ @@ -2236,26 +2610,33 @@ class AppStack(list): value = Bottle() self.append(value) return value + new_app = push + + @property + def default(self): + try: + return self[-1] + except IndexError: + return self.push() class WSGIFileWrapper(object): - - def __init__(self, fp, buffer_size=1024*64): + def __init__(self, fp, buffer_size=1024 * 64): self.fp, self.buffer_size = fp, buffer_size - for attr in ('fileno', 'close', 'read', 'readlines', 'tell', 'seek'): + for attr in 'fileno', 'close', 'read', 'readlines', 'tell', 'seek': if hasattr(fp, attr): setattr(self, attr, getattr(fp, attr)) def __iter__(self): buff, read = self.buffer_size, self.read - while True: - part = read(buff) - if not part: return + part = read(buff) + while part: yield part + part = read(buff) class _closeiter(object): - ''' This only exists to be able to attach a .close method to iterators that - do not support attribute assignment (most of itertools). ''' + """ This only exists to be able to attach a .close method to iterators that + do not support attribute assignment (most of itertools). """ def __init__(self, iterator, close=None): self.iterator = iterator @@ -2270,17 +2651,17 @@ class _closeiter(object): class ResourceManager(object): - ''' This class manages a list of search paths and helps to find and open + """ This class manages a list of search paths and helps to find and open application-bound resources (files). :param base: default value for :meth:`add_path` calls. :param opener: callable used to open resources. :param cachemode: controls which lookups are cached. One of 'all', 'found' or 'none'. - ''' + """ def __init__(self, base='./', opener=open, cachemode='all'): - self.opener = open + self.opener = opener self.base = base self.cachemode = cachemode @@ -2290,7 +2671,7 @@ class ResourceManager(object): self.cache = {} def add_path(self, path, base=None, index=None, create=False): - ''' Add a new path to the list of search paths. Return False if the + """ Add a new path to the list of search paths. Return False if the path does not exist. :param path: The new search path. Relative paths are turned into @@ -2305,7 +2686,7 @@ class ResourceManager(object): along with a python module or package:: res.add_path('./resources/', __file__) - ''' + """ base = os.path.abspath(os.path.dirname(base or self.base)) path = os.path.abspath(os.path.join(base, os.path.dirname(path))) path += os.sep @@ -2321,7 +2702,7 @@ class ResourceManager(object): return os.path.exists(path) def __iter__(self): - ''' Iterate over all existing files in all registered paths. ''' + """ Iterate over all existing files in all registered paths. """ search = self.path[:] while search: path = search.pop() @@ -2332,11 +2713,11 @@ class ResourceManager(object): else: yield full def lookup(self, name): - ''' Search for a resource and return an absolute file path, or `None`. + """ Search for a resource and return an absolute file path, or `None`. The :attr:`path` list is searched in order. The first match is - returend. Symlinks are followed. The result is cached to speed up - future lookups. ''' + returned. Symlinks are followed. The result is cached to speed up + future lookups. """ if name not in self.cache or DEBUG: for path in self.path: fpath = os.path.join(path, name) @@ -2349,16 +2730,15 @@ class ResourceManager(object): return self.cache[name] def open(self, name, mode='r', *args, **kwargs): - ''' Find a resource and return a file object, or raise IOError. ''' + """ Find a resource and return a file object, or raise IOError. """ fname = self.lookup(name) if not fname: raise IOError("Resource %r not found." % name) return self.opener(fname, mode=mode, *args, **kwargs) class FileUpload(object): - def __init__(self, fileobj, name, filename, headers=None): - ''' Wrapper for file uploads. ''' + """ Wrapper for a single file uploaded via ``multipart/form-data``. """ #: Open file(-like) object (BytesIO buffer or temporary file) self.file = fileobj #: Name of the upload form field @@ -2372,29 +2752,30 @@ class FileUpload(object): content_length = HeaderProperty('Content-Length', reader=int, default=-1) def get_header(self, name, default=None): - """ Return the value of a header within the mulripart part. """ + """ Return the value of a header within the multipart part. """ return self.headers.get(name, default) @cached_property def filename(self): - ''' Name of the file on the client file system, but normalized to ensure + """ Name of the file on the client file system, but normalized to ensure file system compatibility. An empty filename is returned as 'empty'. Only ASCII letters, digits, dashes, underscores and dots are allowed in the final filename. Accents are removed, if possible. Whitespace is replaced by a single dash. Leading or tailing dots or dashes are removed. The filename is limited to 255 characters. - ''' + """ fname = self.raw_filename if not isinstance(fname, unicode): fname = fname.decode('utf8', 'ignore') - fname = normalize('NFKD', fname).encode('ASCII', 'ignore').decode('ASCII') + fname = normalize('NFKD', fname) + fname = fname.encode('ASCII', 'ignore').decode('ASCII') fname = os.path.basename(fname.replace('\\', os.path.sep)) fname = re.sub(r'[^a-zA-Z0-9-_.\s]', '', fname).strip() fname = re.sub(r'[-\s]+', '-', fname).strip('.-') return fname[:255] or 'empty' - def _copy_file(self, fp, chunk_size=2**16): + def _copy_file(self, fp, chunk_size=2 ** 16): read, write, offset = self.file.read, fp.write, self.file.tell() while 1: buf = read(chunk_size) @@ -2402,16 +2783,16 @@ class FileUpload(object): write(buf) self.file.seek(offset) - def save(self, destination, overwrite=False, chunk_size=2**16): - ''' Save file to disk or copy its content to an open file(-like) object. + def save(self, destination, overwrite=False, chunk_size=2 ** 16): + """ Save file to disk or copy its content to an open file(-like) object. If *destination* is a directory, :attr:`filename` is added to the path. Existing files are not overwritten by default (IOError). :param destination: File path, directory or file(-like) object. :param overwrite: If True, replace existing files. (default: False) :param chunk_size: Bytes to read at a time. (default: 64kb) - ''' - if isinstance(destination, basestring): # Except file-likes here + """ + if isinstance(destination, basestring): # Except file-likes here if os.path.isdir(destination): destination = os.path.join(destination, self.filename) if not overwrite and os.path.exists(destination): @@ -2421,11 +2802,6 @@ class FileUpload(object): else: self._copy_file(destination, chunk_size) - - - - - ############################################################################### # Application Helper ########################################################### ############################################################################### @@ -2448,39 +2824,58 @@ def redirect(url, code=None): raise res -def _file_iter_range(fp, offset, bytes, maxread=1024*1024): - ''' Yield chunks from a range in a file. No chunk is bigger than maxread.''' +def _rangeiter(fp, offset, limit, bufsize=1024 * 1024): + """ Yield chunks from a range in a file. """ fp.seek(offset) - while bytes > 0: - part = fp.read(min(bytes, maxread)) - if not part: break - bytes -= len(part) + while limit > 0: + part = fp.read(min(limit, bufsize)) + if not part: + break + limit -= len(part) yield part -def static_file(filename, root, mimetype='auto', download=False, charset='UTF-8'): - """ Open a file in a safe way and return :exc:`HTTPResponse` with status - code 200, 305, 403 or 404. The ``Content-Type``, ``Content-Encoding``, - ``Content-Length`` and ``Last-Modified`` headers are set if possible. - Special support for ``If-Modified-Since``, ``Range`` and ``HEAD`` - requests. +def static_file(filename, root, + mimetype=True, + download=False, + charset='UTF-8', + etag=None, + headers=None): + """ Open a file in a safe way and return an instance of :exc:`HTTPResponse` + that can be sent back to the client. - :param filename: Name or path of the file to send. + :param filename: Name or path of the file to send, relative to ``root``. :param root: Root path for file lookups. Should be an absolute directory path. - :param mimetype: Defines the content-type header (default: guess from + :param mimetype: Provide the content-type header (default: guess from file extension) :param download: If True, ask the browser to open a `Save as...` dialog instead of opening the file with the associated program. You can specify a custom filename as a string. If not specified, the original filename is used (default: False). - :param charset: The charset to use for files with a ``text/*`` - mime-type. (default: UTF-8) + :param charset: The charset for files with a ``text/*`` mime-type. + (default: UTF-8) + :param etag: Provide a pre-computed ETag header. If set to ``False``, + ETag handling is disabled. (default: auto-generate ETag header) + :param headers: Additional headers dict to add to the response. + + While checking user input is always a good idea, this function provides + additional protection against malicious ``filename`` parameters from + breaking out of the ``root`` directory and leaking sensitive information + to an attacker. + + Read-protected files or files outside of the ``root`` directory are + answered with ``403 Access Denied``. Missing files result in a + ``404 Not Found`` response. Conditional requests (``If-Modified-Since``, + ``If-None-Match``) are answered with ``304 Not Modified`` whenever + possible. ``HEAD`` and ``Range`` requests (used by download managers to + check or continue partial downloads) are also handled automatically. """ - root = os.path.abspath(root) + os.sep + root = os.path.join(os.path.abspath(root), '') filename = os.path.abspath(os.path.join(root, filename.strip('/\\'))) - headers = dict() + headers = headers.copy() if headers else {} + getenv = request.environ.get if not filename.startswith(root): return HTTPError(403, "Access denied.") @@ -2489,51 +2884,66 @@ def static_file(filename, root, mimetype if not os.access(filename, os.R_OK): return HTTPError(403, "You do not have permission to access this file.") - if mimetype == 'auto': - mimetype, encoding = mimetypes.guess_type(filename) - if encoding: headers['Content-Encoding'] = encoding + if mimetype is True: + name = download if isinstance(download, str) else filename + mimetype, encoding = mimetypes.guess_type(name) + if encoding == 'gzip': + mimetype = 'application/gzip' + elif encoding: # e.g. bzip2 -> application/x-bzip2 + mimetype = 'application/x-' + encoding + + if charset and mimetype and 'charset=' not in mimetype \ + and (mimetype[:5] == 'text/' or mimetype == 'application/javascript'): + mimetype += '; charset=%s' % charset if mimetype: - if mimetype[:5] == 'text/' and charset and 'charset' not in mimetype: - mimetype += '; charset=%s' % charset headers['Content-Type'] = mimetype + if download is True: + download = os.path.basename(filename) + if download: - download = os.path.basename(filename if download == True else download) + download = download.replace('"','') headers['Content-Disposition'] = 'attachment; filename="%s"' % download stats = os.stat(filename) headers['Content-Length'] = clen = stats.st_size - lm = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(stats.st_mtime)) - headers['Last-Modified'] = lm + headers['Last-Modified'] = email.utils.formatdate(stats.st_mtime, usegmt=True) + headers['Date'] = email.utils.formatdate(time.time(), usegmt=True) + + if etag is None: + etag = '%d:%d:%d:%d:%s' % (stats.st_dev, stats.st_ino, stats.st_mtime, + clen, filename) + etag = hashlib.sha1(tob(etag)).hexdigest() + + if etag: + headers['ETag'] = etag + check = getenv('HTTP_IF_NONE_MATCH') + if check and check == etag: + return HTTPResponse(status=304, **headers) - ims = request.environ.get('HTTP_IF_MODIFIED_SINCE') + ims = getenv('HTTP_IF_MODIFIED_SINCE') if ims: ims = parse_date(ims.split(";")[0].strip()) - if ims is not None and ims >= int(stats.st_mtime): - headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()) - return HTTPResponse(status=304, **headers) + if ims is not None and ims >= int(stats.st_mtime): + return HTTPResponse(status=304, **headers) body = '' if request.method == 'HEAD' else open(filename, 'rb') headers["Accept-Ranges"] = "bytes" - ranges = request.environ.get('HTTP_RANGE') - if 'HTTP_RANGE' in request.environ: - ranges = list(parse_range_header(request.environ['HTTP_RANGE'], clen)) + range_header = getenv('HTTP_RANGE') + if range_header: + ranges = list(parse_range_header(range_header, clen)) if not ranges: return HTTPError(416, "Requested Range Not Satisfiable") offset, end = ranges[0] - headers["Content-Range"] = "bytes %d-%d/%d" % (offset, end-1, clen) - headers["Content-Length"] = str(end-offset) - if body: body = _file_iter_range(body, offset, end-offset) + rlen = end - offset + headers["Content-Range"] = "bytes %d-%d/%d" % (offset, end - 1, clen) + headers["Content-Length"] = str(rlen) + if body: body = _closeiter(_rangeiter(body, offset, rlen), body.close) return HTTPResponse(body, status=206, **headers) return HTTPResponse(body, **headers) - - - - - ############################################################################### # HTTP Utilities and MISC (TODO) ############################################### ############################################################################### @@ -2546,51 +2956,98 @@ def debug(mode=True): if mode: warnings.simplefilter('default') DEBUG = bool(mode) + def http_date(value): - if isinstance(value, (datedate, datetime)): + if isinstance(value, basestring): + return value + if isinstance(value, datetime): + # aware datetime.datetime is converted to UTC time + # naive datetime.datetime is treated as UTC time value = value.utctimetuple() - elif isinstance(value, (int, float)): - value = time.gmtime(value) - if not isinstance(value, basestring): - value = time.strftime("%a, %d %b %Y %H:%M:%S GMT", value) - return value + elif isinstance(value, datedate): + # datetime.date is naive, and is treated as UTC time + value = value.timetuple() + if not isinstance(value, (int, float)): + # convert struct_time in UTC to UNIX timestamp + value = calendar.timegm(value) + return email.utils.formatdate(value, usegmt=True) + def parse_date(ims): """ Parse rfc1123, rfc850 and asctime timestamps and return UTC epoch. """ try: ts = email.utils.parsedate_tz(ims) - return time.mktime(ts[:8] + (0,)) - (ts[9] or 0) - time.timezone + return calendar.timegm(ts[:8] + (0, )) - (ts[9] or 0) except (TypeError, ValueError, IndexError, OverflowError): return None + def parse_auth(header): """ Parse rfc2617 HTTP authentication header string (basic) and return (user,pass) tuple or None""" try: method, data = header.split(None, 1) if method.lower() == 'basic': - user, pwd = touni(base64.b64decode(tob(data))).split(':',1) + user, pwd = touni(base64.b64decode(tob(data))).split(':', 1) return user, pwd except (KeyError, ValueError): return None + def parse_range_header(header, maxlen=0): - ''' Yield (start, end) ranges parsed from a HTTP Range header. Skip - unsatisfiable ranges. The end index is non-inclusive.''' + """ Yield (start, end) ranges parsed from a HTTP Range header. Skip + unsatisfiable ranges. The end index is non-inclusive.""" if not header or header[:6] != 'bytes=': return ranges = [r.split('-', 1) for r in header[6:].split(',') if '-' in r] for start, end in ranges: try: if not start: # bytes=-100 -> last 100 bytes - start, end = max(0, maxlen-int(end)), maxlen + start, end = max(0, maxlen - int(end)), maxlen elif not end: # bytes=100- -> all but the first 99 bytes start, end = int(start), maxlen - else: # bytes=100-200 -> bytes 100-200 (inclusive) - start, end = int(start), min(int(end)+1, maxlen) + else: # bytes=100-200 -> bytes 100-200 (inclusive) + start, end = int(start), min(int(end) + 1, maxlen) if 0 <= start < end <= maxlen: yield start, end except ValueError: pass + +#: Header tokenizer used by _parse_http_header() +_hsplit = re.compile('(?:(?:"((?:[^"\\\\]|\\\\.)*)")|([^;,=]+))([;,=]?)').findall + +def _parse_http_header(h): + """ Parses a typical multi-valued and parametrised HTTP header (e.g. Accept headers) and returns a list of values + and parameters. For non-standard or broken input, this implementation may return partial results. + :param h: A header string (e.g. ``text/html,text/plain;q=0.9,*/*;q=0.8``) + :return: List of (value, params) tuples. The second element is a (possibly empty) dict. + """ + values = [] + if '"' not in h: # INFO: Fast path without regexp (~2x faster) + for value in h.split(','): + parts = value.split(';') + values.append((parts[0].strip(), {})) + for attr in parts[1:]: + name, value = attr.split('=', 1) + values[-1][1][name.strip().lower()] = value.strip() + else: + lop, key, attrs = ',', None, {} + for quoted, plain, tok in _hsplit(h): + value = plain.strip() if plain else quoted.replace('\\"', '"') + if lop == ',': + attrs = {} + values.append((value, attrs)) + elif lop == ';': + if tok == '=': + key = value + else: + attrs[value.strip().lower()] = '' + elif lop == '=' and key: + attrs[key.strip().lower()] = value + key = None + lop = tok + return values + + def _parse_qsl(qs): r = [] for pair in qs.split('&'): @@ -2602,44 +3059,55 @@ def _parse_qsl(qs): r.append((key, value)) return r + def _lscmp(a, b): - ''' Compares two strings in a cryptographically safe way: - Runtime is not affected by length of common prefix. ''' - return not sum(0 if x==y else 1 for x, y in zip(a, b)) and len(a) == len(b) + """ Compares two strings in a cryptographically safe way: + Runtime is not affected by length of common prefix. """ + return not sum(0 if x == y else 1 + for x, y in zip(a, b)) and len(a) == len(b) -def cookie_encode(data, key): - ''' Encode and sign a pickle-able object. Return a (byte) string ''' +def cookie_encode(data, key, digestmod=None): + """ Encode and sign a pickle-able object. Return a (byte) string """ + depr(0, 13, "cookie_encode() will be removed soon.", + "Do not use this API directly.") + digestmod = digestmod or hashlib.sha256 msg = base64.b64encode(pickle.dumps(data, -1)) - sig = base64.b64encode(hmac.new(tob(key), msg, digestmod=hashlib.md5).digest()) + sig = base64.b64encode(hmac.new(tob(key), msg, digestmod=digestmod).digest()) return tob('!') + sig + tob('?') + msg -def cookie_decode(data, key): - ''' Verify and decode an encoded string. Return an object or None.''' +def cookie_decode(data, key, digestmod=None): + """ Verify and decode an encoded string. Return an object or None.""" + depr(0, 13, "cookie_decode() will be removed soon.", + "Do not use this API directly.") data = tob(data) if cookie_is_encoded(data): sig, msg = data.split(tob('?'), 1) - if _lscmp(sig[1:], base64.b64encode(hmac.new(tob(key), msg, digestmod=hashlib.md5).digest())): + digestmod = digestmod or hashlib.sha256 + hashed = hmac.new(tob(key), msg, digestmod=digestmod).digest() + if _lscmp(sig[1:], base64.b64encode(hashed)): return pickle.loads(base64.b64decode(msg)) return None def cookie_is_encoded(data): - ''' Return True if the argument looks like a encoded cookie.''' + """ Return True if the argument looks like a encoded cookie.""" + depr(0, 13, "cookie_is_encoded() will be removed soon.", + "Do not use this API directly.") return bool(data.startswith(tob('!')) and tob('?') in data) def html_escape(string): - ''' Escape HTML special characters ``&<>`` and quotes ``'"``. ''' - return string.replace('&','&').replace('<','<').replace('>','>')\ - .replace('"','"').replace("'",''') + """ Escape HTML special characters ``&<>`` and quotes ``'"``. """ + return string.replace('&', '&').replace('<', '<').replace('>', '>')\ + .replace('"', '"').replace("'", ''') def html_quote(string): - ''' Escape and quote a string to be used as an HTTP attribute.''' - return '"%s"' % html_escape(string).replace('\n',' ')\ - .replace('\r',' ').replace('\t',' ') + """ Escape and quote a string to be used as an HTTP attribute.""" + return '"%s"' % html_escape(string).replace('\n', ' ')\ + .replace('\r', ' ').replace('\t', ' ') def yieldroutes(func): @@ -2652,7 +3120,7 @@ def yieldroutes(func): c(x, y=5) -> '/c/' and '/c//' d(x=5, y=6) -> '/d' and '/d/' and '/d//' """ - path = '/' + func.__name__.replace('__','/').lstrip('/') + path = '/' + func.__name__.replace('__', '/').lstrip('/') spec = getargspec(func) argc = len(spec[0]) - len(spec[3] or []) path += ('/<%s>' * argc) % tuple(spec[0][:argc]) @@ -2663,24 +3131,24 @@ def yieldroutes(func): def path_shift(script_name, path_info, shift=1): - ''' Shift path fragments from PATH_INFO to SCRIPT_NAME and vice versa. + """ Shift path fragments from PATH_INFO to SCRIPT_NAME and vice versa. :return: The modified paths. :param script_name: The SCRIPT_NAME path. :param script_name: The PATH_INFO path. :param shift: The number of path fragments to shift. May be negative to change the shift direction. (default: 1) - ''' + """ if shift == 0: return script_name, path_info pathlist = path_info.strip('/').split('/') scriptlist = script_name.strip('/').split('/') if pathlist and pathlist[0] == '': pathlist = [] if scriptlist and scriptlist[0] == '': scriptlist = [] - if shift > 0 and shift <= len(pathlist): + if 0 < shift <= len(pathlist): moved = pathlist[:shift] scriptlist = scriptlist + moved pathlist = pathlist[shift:] - elif shift < 0 and shift >= -len(scriptlist): + elif 0 > shift >= -len(scriptlist): moved = scriptlist[shift:] pathlist = moved + pathlist scriptlist = scriptlist[:shift] @@ -2694,9 +3162,11 @@ def path_shift(script_name, path_info, s def auth_basic(check, realm="private", text="Access denied"): - ''' Callback decorator to require HTTP auth (basic). - TODO: Add route(check_auth=...) parameter. ''' + """ Callback decorator to require HTTP auth (basic). + TODO: Add route(check_auth=...) parameter. """ + def decorator(func): + @functools.wraps(func) def wrapper(*a, **ka): user, password = request.auth or (None, None) @@ -2705,25 +3175,31 @@ def auth_basic(check, realm="private", t err.add_header('WWW-Authenticate', 'Basic realm="%s"' % realm) return err return func(*a, **ka) + return wrapper - return decorator + return decorator # Shortcuts for common Bottle methods. # They all refer to the current default application. + def make_default_app_wrapper(name): - ''' Return a callable that relays calls to the current default app. ''' + """ Return a callable that relays calls to the current default app. """ + @functools.wraps(getattr(Bottle, name)) def wrapper(*a, **ka): return getattr(app(), name)(*a, **ka) + return wrapper + route = make_default_app_wrapper('route') get = make_default_app_wrapper('get') post = make_default_app_wrapper('post') put = make_default_app_wrapper('put') delete = make_default_app_wrapper('delete') +patch = make_default_app_wrapper('patch') error = make_default_app_wrapper('error') mount = make_default_app_wrapper('mount') hook = make_default_app_wrapper('hook') @@ -2732,78 +3208,337 @@ uninstall = make_default_app_wrapper('un url = make_default_app_wrapper('get_url') +############################################################################### +# Multipart Handling ########################################################### +############################################################################### +# cgi.FieldStorage was deprecated in Python 3.11 and removed in 3.13 +# This implementation is based on https://github.com/defnull/multipart/ +class MultipartError(HTTPError): + def __init__(self, msg): + HTTPError.__init__(self, 400, "MultipartError: " + msg) + + +class _MultipartParser(object): + def __init__( + self, + stream, + boundary, + content_length=-1, + disk_limit=2 ** 30, + mem_limit=2 ** 20, + memfile_limit=2 ** 18, + buffer_size=2 ** 16, + charset="latin1", + ): + self.stream = stream + self.boundary = boundary + self.content_length = content_length + self.disk_limit = disk_limit + self.memfile_limit = memfile_limit + self.mem_limit = min(mem_limit, self.disk_limit) + self.buffer_size = min(buffer_size, self.mem_limit) + self.charset = charset + + if not boundary: + raise MultipartError("No boundary.") + + if self.buffer_size - 6 < len(boundary): # "--boundary--\r\n" + raise MultipartError("Boundary does not fit into buffer_size.") + + def _lineiter(self): + """ Iterate over a binary file-like object (crlf terminated) line by + line. Each line is returned as a (line, crlf) tuple. Lines larger + than buffer_size are split into chunks where all but the last chunk + has an empty string instead of crlf. Maximum chunk size is twice the + buffer size. + """ + read = self.stream.read + maxread, maxbuf = self.content_length, self.buffer_size + partial = b"" # Contains the last (partial) line + while True: + chunk = read(maxbuf if maxread < 0 else min(maxbuf, maxread)) + maxread -= len(chunk) + if not chunk: + if partial: + yield partial, b'' + break + + if partial: + chunk = partial + chunk + + scanpos = 0 + while True: + i = chunk.find(b'\r\n', scanpos) + if i >= 0: + yield chunk[scanpos:i], b'\r\n' + scanpos = i + 2 + else: # CRLF not found + partial = chunk[scanpos:] if scanpos else chunk + break + + if len(partial) > maxbuf: + yield partial[:-1], b"" + partial = partial[-1:] + + def parse(self): + """ Return a MultiPart iterator. Can only be called once. """ + + lines, line = self._lineiter(), "" + separator = b"--" + tob(self.boundary) + terminator = separator + b"--" + mem_used, disk_used = 0, 0 # Track used resources to prevent DoS + is_tail = False # True if the last line was incomplete (cutted) + + # Consume first boundary. Ignore any preamble, as required by RFC + # 2046, section 5.1.1. + for line, nl in lines: + if line in (separator, terminator): + break + else: + raise MultipartError("Stream does not contain boundary") + + # First line is termainating boundary -> empty multipart stream + if line == terminator: + for _ in lines: + raise MultipartError("Found data after empty multipart stream") + return + + part_options = { + "buffer_size": self.buffer_size, + "memfile_limit": self.memfile_limit, + "charset": self.charset, + } + part = _MultipartPart(**part_options) + + for line, nl in lines: + if not is_tail and (line == separator or line == terminator): + part.finish() + if part.is_buffered(): + mem_used += part.size + else: + disk_used += part.size + yield part + if line == terminator: + break + part = _MultipartPart(**part_options) + else: + is_tail = not nl # The next line continues this one + try: + part.feed(line, nl) + if part.is_buffered(): + if part.size + mem_used > self.mem_limit: + raise MultipartError("Memory limit reached.") + elif part.size + disk_used > self.disk_limit: + raise MultipartError("Disk limit reached.") + except MultipartError: + part.close() + raise + else: + part.close() + + if line != terminator: + raise MultipartError("Unexpected end of multipart stream.") + + +class _MultipartPart(object): + def __init__(self, buffer_size=2 ** 16, memfile_limit=2 ** 18, charset="latin1"): + self.headerlist = [] + self.headers = None + self.file = False + self.size = 0 + self._buf = b"" + self.disposition = None + self.name = None + self.filename = None + self.content_type = None + self.charset = charset + self.memfile_limit = memfile_limit + self.buffer_size = buffer_size + + def feed(self, line, nl=""): + if self.file: + return self.write_body(line, nl) + return self.write_header(line, nl) + + def write_header(self, line, nl): + line = line.decode(self.charset) + + if not nl: + raise MultipartError("Unexpected end of line in header.") + + if not line.strip(): # blank line -> end of header segment + self.finish_header() + elif line[0] in " \t" and self.headerlist: + name, value = self.headerlist.pop() + self.headerlist.append((name, value + line.strip())) + else: + if ":" not in line: + raise MultipartError("Syntax error in header: No colon.") + + name, value = line.split(":", 1) + self.headerlist.append((name.strip(), value.strip())) + + def write_body(self, line, nl): + if not line and not nl: + return # This does not even flush the buffer + + self.size += len(line) + len(self._buf) + self.file.write(self._buf + line) + self._buf = nl + + if self.content_length > 0 and self.size > self.content_length: + raise MultipartError("Size of body exceeds Content-Length header.") + + if self.size > self.memfile_limit and isinstance(self.file, BytesIO): + self.file, old = NamedTemporaryFile(mode="w+b"), self.file + old.seek(0) + + copied, maxcopy, chunksize = 0, self.size, self.buffer_size + read, write = old.read, self.file.write + while copied < maxcopy: + chunk = read(min(chunksize, maxcopy - copied)) + write(chunk) + copied += len(chunk) + + def finish_header(self): + self.file = BytesIO() + self.headers = HeaderDict(self.headerlist) + content_disposition = self.headers.get("Content-Disposition") + content_type = self.headers.get("Content-Type") + + if not content_disposition: + raise MultipartError("Content-Disposition header is missing.") + + self.disposition, self.options = _parse_http_header(content_disposition)[0] + self.name = self.options.get("name") + if "filename" in self.options: + self.filename = self.options.get("filename") + if self.filename[1:3] == ":\\" or self.filename[:2] == "\\\\": + self.filename = self.filename.split("\\")[-1] # ie6 bug + + self.content_type, options = _parse_http_header(content_type)[0] if content_type else (None, {}) + self.charset = options.get("charset") or self.charset + + self.content_length = int(self.headers.get("Content-Length", "-1")) + + def finish(self): + if not self.file: + raise MultipartError("Incomplete part: Header section not closed.") + self.file.seek(0) + + def is_buffered(self): + """ Return true if the data is fully buffered in memory.""" + return isinstance(self.file, BytesIO) + + @property + def value(self): + """ Data decoded with the specified charset """ + + return self.raw.decode(self.charset) + + @property + def raw(self): + """ Data without decoding """ + pos = self.file.tell() + self.file.seek(0) + + try: + return self.file.read() + finally: + self.file.seek(pos) + + def close(self): + if self.file: + self.file.close() + self.file = False ############################################################################### # Server Adapter ############################################################### ############################################################################### +# Before you edit or add a server adapter, please read: +# - https://github.com/bottlepy/bottle/pull/647#issuecomment-60152870 +# - https://github.com/bottlepy/bottle/pull/865#issuecomment-242795341 class ServerAdapter(object): quiet = False + def __init__(self, host='127.0.0.1', port=8080, **options): self.options = options self.host = host self.port = int(port) - def run(self, handler): # pragma: no cover + def run(self, handler): # pragma: no cover pass def __repr__(self): - args = ', '.join(['%s=%s'%(k,repr(v)) for k, v in self.options.items()]) + args = ', '.join('%s=%s' % (k, repr(v)) + for k, v in self.options.items()) return "%s(%s)" % (self.__class__.__name__, args) class CGIServer(ServerAdapter): quiet = True - def run(self, handler): # pragma: no cover + + def run(self, handler): # pragma: no cover from wsgiref.handlers import CGIHandler + def fixed_environ(environ, start_response): environ.setdefault('PATH_INFO', '') return handler(environ, start_response) + CGIHandler().run(fixed_environ) class FlupFCGIServer(ServerAdapter): - def run(self, handler): # pragma: no cover + def run(self, handler): # pragma: no cover import flup.server.fcgi self.options.setdefault('bindAddress', (self.host, self.port)) flup.server.fcgi.WSGIServer(handler, **self.options).run() class WSGIRefServer(ServerAdapter): - def run(self, app): # pragma: no cover - from wsgiref.simple_server import WSGIRequestHandler, WSGIServer + def run(self, app): # pragma: no cover from wsgiref.simple_server import make_server + from wsgiref.simple_server import WSGIRequestHandler, WSGIServer import socket class FixedHandler(WSGIRequestHandler): - def address_string(self): # Prevent reverse DNS lookups please. + def address_string(self): # Prevent reverse DNS lookups please. return self.client_address[0] + def log_request(*args, **kw): if not self.quiet: return WSGIRequestHandler.log_request(*args, **kw) handler_cls = self.options.get('handler_class', FixedHandler) - server_cls = self.options.get('server_class', WSGIServer) + server_cls = self.options.get('server_class', WSGIServer) - if ':' in self.host: # Fix wsgiref for IPv6 addresses. + if ':' in self.host: # Fix wsgiref for IPv6 addresses. if getattr(server_cls, 'address_family') == socket.AF_INET: + class server_cls(server_cls): address_family = socket.AF_INET6 - srv = make_server(self.host, self.port, app, server_cls, handler_cls) - srv.serve_forever() + self.srv = make_server(self.host, self.port, app, server_cls, + handler_cls) + self.port = self.srv.server_port # update port actual port (0 means random) + try: + self.srv.serve_forever() + except KeyboardInterrupt: + self.srv.server_close() # Prevent ResourceWarning: unclosed socket + raise class CherryPyServer(ServerAdapter): - def run(self, handler): # pragma: no cover - depr("The wsgi server part of cherrypy was split into a new " - "project called 'cheroot'. Use the 'cheroot' server " - "adapter instead of cherrypy.") + def run(self, handler): # pragma: no cover + depr(0, 13, "The wsgi server part of cherrypy was split into a new " + "project called 'cheroot'.", "Use the 'cheroot' server " + "adapter instead of cherrypy.") from cherrypy import wsgiserver # This will fail for CherryPy >= 9 self.options['bind_addr'] = (self.host, self.port) @@ -2850,16 +3585,17 @@ class CherootServer(ServerAdapter): class WaitressServer(ServerAdapter): def run(self, handler): from waitress import serve - serve(handler, host=self.host, port=self.port) + serve(handler, host=self.host, port=self.port, _quiet=self.quiet, **self.options) class PasteServer(ServerAdapter): - def run(self, handler): # pragma: no cover + def run(self, handler): # pragma: no cover from paste import httpserver from paste.translogger import TransLogger handler = TransLogger(handler, setup_console_handler=(not self.quiet)) - httpserver.serve(handler, host=self.host, port=str(self.port), - **self.options) + httpserver.serve(handler, + host=self.host, + port=str(self.port), **self.options) class MeinheldServer(ServerAdapter): @@ -2870,8 +3606,10 @@ class MeinheldServer(ServerAdapter): class FapwsServer(ServerAdapter): - """ Extremely fast webserver using libev. See http://www.fapws.org/ """ - def run(self, handler): # pragma: no cover + """ Extremely fast webserver using libev. See https://github.com/william-os4y/fapws3 """ + + def run(self, handler): # pragma: no cover + depr(0, 13, "fapws3 is not maintained and support will be dropped.") import fapws._evwsgi as evwsgi from fapws import base, config port = self.port @@ -2881,30 +3619,36 @@ class FapwsServer(ServerAdapter): evwsgi.start(self.host, port) # fapws3 never releases the GIL. Complain upstream. I tried. No luck. if 'BOTTLE_CHILD' in os.environ and not self.quiet: - _stderr("WARNING: Auto-reloading does not work with Fapws3.\n") - _stderr(" (Fapws3 breaks python thread support)\n") + _stderr("WARNING: Auto-reloading does not work with Fapws3.") + _stderr(" (Fapws3 breaks python thread support)") evwsgi.set_base_module(base) + def app(environ, start_response): environ['wsgi.multiprocess'] = False return handler(environ, start_response) + evwsgi.wsgi_cb(('', app)) evwsgi.run() class TornadoServer(ServerAdapter): """ The super hyped asynchronous server by facebook. Untested. """ - def run(self, handler): # pragma: no cover + + def run(self, handler): # pragma: no cover import tornado.wsgi, tornado.httpserver, tornado.ioloop container = tornado.wsgi.WSGIContainer(handler) server = tornado.httpserver.HTTPServer(container) - server.listen(port=self.port,address=self.host) + server.listen(port=self.port, address=self.host) tornado.ioloop.IOLoop.instance().start() class AppEngineServer(ServerAdapter): """ Adapter for Google App Engine. """ quiet = True + def run(self, handler): + depr(0, 13, "AppEngineServer no longer required", + "Configure your application directly in your app.yaml") from google.appengine.ext.webapp import util # A main() function in the handler script enables 'App Caching'. # Lets makes sure it is there. This _really_ improves performance. @@ -2916,6 +3660,7 @@ class AppEngineServer(ServerAdapter): class TwistedServer(ServerAdapter): """ Untested. """ + def run(self, handler): from twisted.web import server, wsgi from twisted.python.threadpool import ThreadPool @@ -2925,12 +3670,15 @@ class TwistedServer(ServerAdapter): reactor.addSystemEventTrigger('after', 'shutdown', thread_pool.stop) factory = server.Site(wsgi.WSGIResource(reactor, thread_pool, handler)) reactor.listenTCP(self.port, factory, interface=self.host) - reactor.run() + if not reactor.running: + reactor.run() class DieselServer(ServerAdapter): """ Untested. """ + def run(self, handler): + depr(0, 13, "Diesel is not tested or supported and will be removed.") from diesel.protocols.wsgi import WSGIApplication app = WSGIApplication(handler, port=self.port) app.run() @@ -2939,17 +3687,14 @@ class DieselServer(ServerAdapter): class GeventServer(ServerAdapter): """ Untested. Options: - * `fast` (default: False) uses libevent's http server, but has some - issues: No streaming, no pipelining, no SSL. * See gevent.wsgi.WSGIServer() documentation for more options. """ + def run(self, handler): from gevent import pywsgi, local if not isinstance(threading.local(), local.local): msg = "Bottle requires gevent.monkey.patch_all() (before import)" raise RuntimeError(msg) - if self.options.pop('fast', None): - depr('The "fast" option has been deprecated and removed by Gevent.') if self.quiet: self.options['log'] = None address = (self.host, self.port) @@ -2960,24 +3705,23 @@ class GeventServer(ServerAdapter): server.serve_forever() -class GeventSocketIOServer(ServerAdapter): - def run(self,handler): - from socketio import server - address = (self.host, self.port) - server.SocketIOServer(address, handler, **self.options).serve_forever() - - class GunicornServer(ServerAdapter): """ Untested. See http://gunicorn.org/configure.html for options. """ + def run(self, handler): - from gunicorn.app.base import Application + from gunicorn.app.base import BaseApplication + + if self.host.startswith("unix:"): + config = {'bind': self.host} + else: + config = {'bind': "%s:%d" % (self.host, self.port)} - config = {'bind': "%s:%d" % (self.host, int(self.port))} config.update(self.options) - class GunicornApplication(Application): - def init(self, parser, opts, args): - return config + class GunicornApplication(BaseApplication): + def load_config(self): + for key, value in config.items(): + self.cfg.set(key, value) def load(self): return handler @@ -2986,31 +3730,77 @@ class GunicornServer(ServerAdapter): class EventletServer(ServerAdapter): - """ Untested """ + """ Untested. Options: + + * `backlog` adjust the eventlet backlog parameter which is the maximum + number of queued connections. Should be at least 1; the maximum + value is system-dependent. + * `family`: (default is 2) socket family, optional. See socket + documentation for available families. + """ + def run(self, handler): - from eventlet import wsgi, listen + from eventlet import wsgi, listen, patcher + if not patcher.is_monkey_patched(os): + msg = "Bottle requires eventlet.monkey_patch() (before import)" + raise RuntimeError(msg) + socket_args = {} + for arg in ('backlog', 'family'): + try: + socket_args[arg] = self.options.pop(arg) + except KeyError: + pass + address = (self.host, self.port) try: - wsgi.server(listen((self.host, self.port)), handler, + wsgi.server(listen(address, **socket_args), handler, log_output=(not self.quiet)) except TypeError: # Fallback, if we have old version of eventlet - wsgi.server(listen((self.host, self.port)), handler) - - -class RocketServer(ServerAdapter): - """ Untested. """ - def run(self, handler): - from rocket import Rocket - server = Rocket((self.host, self.port), 'wsgi', { 'wsgi_app' : handler }) - server.start() + wsgi.server(listen(address), handler) class BjoernServer(ServerAdapter): """ Fast server written in C: https://github.com/jonashaag/bjoern """ + def run(self, handler): from bjoern import run - run(handler, self.host, self.port) + run(handler, self.host, self.port, reuse_port=True) + +class AsyncioServerAdapter(ServerAdapter): + """ Extend ServerAdapter for adding custom event loop """ + def get_event_loop(self): + pass + +class AiohttpServer(AsyncioServerAdapter): + """ Asynchronous HTTP client/server framework for asyncio + https://pypi.python.org/pypi/aiohttp/ + https://pypi.org/project/aiohttp-wsgi/ + """ + def get_event_loop(self): + import asyncio + return asyncio.new_event_loop() + + def run(self, handler): + import asyncio + from aiohttp_wsgi.wsgi import serve + self.loop = self.get_event_loop() + asyncio.set_event_loop(self.loop) + + if 'BOTTLE_CHILD' in os.environ: + import signal + signal.signal(signal.SIGINT, lambda s, f: self.loop.stop()) + + serve(handler, host=self.host, port=self.port) + + +class AiohttpUVLoopServer(AiohttpServer): + """uvloop + https://github.com/MagicStack/uvloop + """ + def get_event_loop(self): + import uvloop + return uvloop.new_event_loop() class AutoServer(ServerAdapter): """ Untested. """ @@ -3024,6 +3814,7 @@ class AutoServer(ServerAdapter): except ImportError: pass + server_names = { 'cgi': CGIServer, 'flup': FlupFCGIServer, @@ -3041,17 +3832,12 @@ server_names = { 'gunicorn': GunicornServer, 'eventlet': EventletServer, 'gevent': GeventServer, - 'geventSocketIO':GeventSocketIOServer, - 'rocket': RocketServer, - 'bjoern' : BjoernServer, + 'bjoern': BjoernServer, + 'aiohttp': AiohttpServer, + 'uvloop': AiohttpUVLoopServer, 'auto': AutoServer, } - - - - - ############################################################################### # Application Control ########################################################## ############################################################################### @@ -3081,19 +3867,30 @@ def load_app(target): """ Load a bottle application from a module and make sure that the import does not affect the current default application, but returns a separate application object. See :func:`load` for the target parameter. """ - global NORUN; NORUN, nr_old = True, NORUN + global NORUN + NORUN, nr_old = True, NORUN + tmp = default_app.push() # Create a new "default application" try: - tmp = default_app.push() # Create a new "default application" - rv = load(target) # Import the target module + rv = load(target) # Import the target module return rv if callable(rv) else tmp finally: - default_app.remove(tmp) # Remove the temporary added default application + default_app.remove(tmp) # Remove the temporary added default application NORUN = nr_old + _debug = debug -def run(app=None, server='wsgiref', host='127.0.0.1', port=8080, - interval=1, reloader=False, quiet=False, plugins=None, - debug=None, **kargs): + + +def run(app=None, + server='wsgiref', + host='127.0.0.1', + port=8080, + interval=1, + reloader=False, + quiet=False, + plugins=None, + debug=None, + config=None, **kargs): """ Start a server instance. This method blocks until the server terminates. :param app: WSGI application or target string supported by @@ -3112,22 +3909,27 @@ def run(app=None, server='wsgiref', host """ if NORUN: return if reloader and not os.environ.get('BOTTLE_CHILD'): + import subprocess + fd, lockfile = tempfile.mkstemp(prefix='bottle.', suffix='.lock') + environ = os.environ.copy() + environ['BOTTLE_CHILD'] = 'true' + environ['BOTTLE_LOCKFILE'] = lockfile + args = [sys.executable] + sys.argv + # If a package was loaded with `python -m`, then `sys.argv` needs to be + # restored to the original value, or imports might break. See #1336 + if getattr(sys.modules.get('__main__'), '__package__', None): + args[1:1] = ["-m", sys.modules['__main__'].__package__] + try: - lockfile = None - fd, lockfile = tempfile.mkstemp(prefix='bottle.', suffix='.lock') - os.close(fd) # We only need this file to exist. We never write to it + os.close(fd) # We never write to this file while os.path.exists(lockfile): - args = [sys.executable] + sys.argv - environ = os.environ.copy() - environ['BOTTLE_CHILD'] = 'true' - environ['BOTTLE_LOCKFILE'] = lockfile p = subprocess.Popen(args, env=environ) - while p.poll() is None: # Busy wait... - os.utime(lockfile, None) # I am alive! + while p.poll() is None: + os.utime(lockfile, None) # Tell child we are still alive time.sleep(interval) - if p.poll() != 3: - if os.path.exists(lockfile): os.unlink(lockfile) - sys.exit(p.poll()) + if p.returncode == 3: # Child wants to be restarted + continue + sys.exit(p.returncode) except KeyboardInterrupt: pass finally: @@ -3144,8 +3946,13 @@ def run(app=None, server='wsgiref', host raise ValueError("Application is not callable: %r" % app) for plugin in plugins or []: + if isinstance(plugin, basestring): + plugin = load(plugin) app.install(plugin) + if config: + app.config.update(config) + if server in server_names: server = server_names.get(server) if isinstance(server, basestring): @@ -3157,9 +3964,14 @@ def run(app=None, server='wsgiref', host server.quiet = server.quiet or quiet if not server.quiet: - _stderr("Bottle v%s server starting up (using %s)...\n" % (__version__, repr(server))) - _stderr("Listening on http://%s:%d/\n" % (server.host, server.port)) - _stderr("Hit Ctrl-C to quit.\n\n") + _stderr("Bottle v%s server starting up (using %s)..." % + (__version__, repr(server))) + if server.host.startswith("unix:"): + _stderr("Listening on %s" % server.host) + else: + _stderr("Listening on http://%s:%d/" % + (server.host, server.port)) + _stderr("Hit Ctrl-C to quit.\n") if reloader: lockfile = os.environ.get('BOTTLE_LOCKFILE') @@ -3182,20 +3994,20 @@ def run(app=None, server='wsgiref', host sys.exit(3) - class FileCheckerThread(threading.Thread): - ''' Interrupt main-thread as soon as a changed module file is detected, - the lockfile gets deleted or gets to old. ''' + """ Interrupt main-thread as soon as a changed module file is detected, + the lockfile gets deleted or gets too old. """ def __init__(self, lockfile, interval): threading.Thread.__init__(self) + self.daemon = True self.lockfile, self.interval = lockfile, interval #: Is one of 'reload', 'error' or 'exit' self.status = None def run(self): exists = os.path.exists - mtime = lambda path: os.stat(path).st_mtime + mtime = lambda p: os.stat(p).st_mtime files = dict() for module in list(sys.modules.values()): @@ -3218,32 +4030,31 @@ class FileCheckerThread(threading.Thread def __enter__(self): self.start() - def __exit__(self, exc_type, exc_val, exc_tb): - if not self.status: self.status = 'exit' # silent exit + def __exit__(self, exc_type, *_): + if not self.status: self.status = 'exit' # silent exit self.join() return exc_type is not None and issubclass(exc_type, KeyboardInterrupt) - - - - ############################################################################### # Template Adapters ############################################################ ############################################################################### -class TemplateError(HTTPError): - def __init__(self, message): - HTTPError.__init__(self, 500, message) +class TemplateError(BottleException): + pass class BaseTemplate(object): """ Base class and minimal API for template adapters """ - extensions = ['tpl','html','thtml','stpl'] - settings = {} #used in prepare() - defaults = {} #used in render() - - def __init__(self, source=None, name=None, lookup=[], encoding='utf8', **settings): + extensions = ['tpl', 'html', 'thtml', 'stpl'] + settings = {} #used in prepare() + defaults = {} #used in render() + + def __init__(self, + source=None, + name=None, + lookup=None, + encoding='utf8', **settings): """ Create a new template. If the source parameter (str or buffer) is missing, the name argument is used to guess a template filename. Subclasses can assume that @@ -3257,10 +4068,10 @@ class BaseTemplate(object): self.name = name self.source = source.read() if hasattr(source, 'read') else source self.filename = source.filename if hasattr(source, 'filename') else None - self.lookup = [os.path.abspath(x) for x in lookup] + self.lookup = [os.path.abspath(x) for x in lookup] if lookup else [] self.encoding = encoding - self.settings = self.settings.copy() # Copy from class variable - self.settings.update(settings) # Apply + self.settings = self.settings.copy() # Copy from class variable + self.settings.update(settings) # Apply if not self.source and self.name: self.filename = self.search(self.name, self.lookup) if not self.filename: @@ -3270,16 +4081,15 @@ class BaseTemplate(object): self.prepare(**self.settings) @classmethod - def search(cls, name, lookup=[]): + def search(cls, name, lookup=None): """ Search name in all directories specified in lookup. First without, then with common extensions. Return first hit. """ if not lookup: - depr('The template lookup path list should not be empty.') #0.12 - lookup = ['.'] + raise depr(0, 12, "Empty template lookup path.", "Configure a template lookup path.") - if os.path.isabs(name) and os.path.isfile(name): - depr('Absolute template path names are deprecated.') #0.12 - return os.path.abspath(name) + if os.path.isabs(name): + raise depr(0, 12, "Use of absolute path for template name.", + "Refer to templates with names or paths relative to the lookup path.") for spath in lookup: spath = os.path.abspath(spath) + os.sep @@ -3292,9 +4102,9 @@ class BaseTemplate(object): @classmethod def global_config(cls, key, *args): - ''' This reads or sets the global settings stored in class.settings. ''' + """ This reads or sets the global settings stored in class.settings. """ if args: - cls.settings = cls.settings.copy() # Make settings local to class + cls.settings = cls.settings.copy() # Make settings local to class cls.settings[key] = args[0] else: return cls.settings[key] @@ -3320,16 +4130,19 @@ class MakoTemplate(BaseTemplate): def prepare(self, **options): from mako.template import Template from mako.lookup import TemplateLookup - options.update({'input_encoding':self.encoding}) + options.update({'input_encoding': self.encoding}) options.setdefault('format_exceptions', bool(DEBUG)) lookup = TemplateLookup(directories=self.lookup, **options) if self.source: self.tpl = Template(self.source, lookup=lookup, **options) else: - self.tpl = Template(uri=self.name, filename=self.filename, lookup=lookup, **options) + self.tpl = Template(uri=self.name, + filename=self.filename, + lookup=lookup, **options) def render(self, *args, **kwargs): - for dictarg in args: kwargs.update(dictarg) + for dictarg in args: + kwargs.update(dictarg) _defaults = self.defaults.copy() _defaults.update(kwargs) return self.tpl.render(**_defaults) @@ -3347,7 +4160,8 @@ class CheetahTemplate(BaseTemplate): self.tpl = Template(file=self.filename, **options) def render(self, *args, **kwargs): - for dictarg in args: kwargs.update(dictarg) + for dictarg in args: + kwargs.update(dictarg) self.context.vars.update(self.defaults) self.context.vars.update(kwargs) out = str(self.tpl) @@ -3358,9 +4172,6 @@ class CheetahTemplate(BaseTemplate): class Jinja2Template(BaseTemplate): def prepare(self, filters=None, tests=None, globals={}, **kwargs): from jinja2 import Environment, FunctionLoader - if 'prefix' in kwargs: # TODO: to be removed after a while - raise RuntimeError('The keyword argument `prefix` has been removed. ' - 'Use the full jinja2 environment name line_statement_prefix instead.') self.env = Environment(loader=FunctionLoader(self.loader), **kwargs) if filters: self.env.filters.update(filters) if tests: self.env.tests.update(tests) @@ -3368,24 +4179,30 @@ class Jinja2Template(BaseTemplate): if self.source: self.tpl = self.env.from_string(self.source) else: - self.tpl = self.env.get_template(self.filename) + self.tpl = self.env.get_template(self.name) def render(self, *args, **kwargs): - for dictarg in args: kwargs.update(dictarg) + for dictarg in args: + kwargs.update(dictarg) _defaults = self.defaults.copy() _defaults.update(kwargs) return self.tpl.render(**_defaults) def loader(self, name): - fname = self.search(name, self.lookup) + if name == self.filename: + fname = name + else: + fname = self.search(name, self.lookup) if not fname: return with open(fname, "rb") as f: - return f.read().decode(self.encoding) + return (f.read().decode(self.encoding), fname, lambda: False) class SimpleTemplate(BaseTemplate): - - def prepare(self, escape_func=html_escape, noescape=False, syntax=None, **ka): + def prepare(self, + escape_func=html_escape, + noescape=False, + syntax=None, **ka): self.cache = {} enc = self.encoding self._str = lambda x: touni(x, enc) @@ -3407,87 +4224,114 @@ class SimpleTemplate(BaseTemplate): try: source, encoding = touni(source), 'utf8' except UnicodeError: - depr('Template encodings other than utf8 are no longer supported.') #0.11 - source, encoding = touni(source, 'latin1'), 'latin1' + raise depr(0, 11, 'Unsupported template encodings.', 'Use utf-8 for templates.') parser = StplParser(source, encoding=encoding, syntax=self.syntax) code = parser.translate() self.encoding = parser.encoding return code def _rebase(self, _env, _name=None, **kwargs): - if _name is None: - depr('Rebase function called without arguments.' - ' You were probably looking for {{base}}?', True) #0.12 _env['_rebase'] = (_name, kwargs) def _include(self, _env, _name=None, **kwargs): - if _name is None: - depr('Rebase function called without arguments.' - ' You were probably looking for {{base}}?', True) #0.12 env = _env.copy() env.update(kwargs) if _name not in self.cache: - self.cache[_name] = self.__class__(name=_name, lookup=self.lookup) + self.cache[_name] = self.__class__(name=_name, lookup=self.lookup, syntax=self.syntax) return self.cache[_name].execute(env['_stdout'], env) def execute(self, _stdout, kwargs): env = self.defaults.copy() env.update(kwargs) - env.update({'_stdout': _stdout, '_printlist': _stdout.extend, + env.update({ + '_stdout': _stdout, + '_printlist': _stdout.extend, 'include': functools.partial(self._include, env), - 'rebase': functools.partial(self._rebase, env), '_rebase': None, - '_str': self._str, '_escape': self._escape, 'get': env.get, - 'setdefault': env.setdefault, 'defined': env.__contains__ }) - eval(self.co, env) + 'rebase': functools.partial(self._rebase, env), + '_rebase': None, + '_str': self._str, + '_escape': self._escape, + 'get': env.get, + 'setdefault': env.setdefault, + 'defined': env.__contains__ + }) + exec(self.co, env) if env.get('_rebase'): subtpl, rargs = env.pop('_rebase') - rargs['base'] = ''.join(_stdout) #copy stdout - del _stdout[:] # clear stdout + rargs['base'] = ''.join(_stdout) #copy stdout + del _stdout[:] # clear stdout return self._include(env, subtpl, **rargs) return env def render(self, *args, **kwargs): """ Render the template using keyword arguments as local variables. """ - env = {}; stdout = [] - for dictarg in args: env.update(dictarg) + env = {} + stdout = [] + for dictarg in args: + env.update(dictarg) env.update(kwargs) self.execute(stdout, env) return ''.join(stdout) -class StplSyntaxError(TemplateError): pass +class StplSyntaxError(TemplateError): + pass class StplParser(object): - ''' Parser for stpl templates. ''' - _re_cache = {} #: Cache for compiled re patterns + """ Parser for stpl templates. """ + _re_cache = {} #: Cache for compiled re patterns + # This huge pile of voodoo magic splits python code into 8 different tokens. - # 1: All kinds of python strings (trust me, it works) - _re_tok = '([urbURB]?(?:\'\'(?!\')|""(?!")|\'{6}|"{6}' \ - '|\'(?:[^\\\\\']|\\\\.)+?\'|"(?:[^\\\\"]|\\\\.)+?"' \ - '|\'{3}(?:[^\\\\]|\\\\.|\\n)+?\'{3}' \ - '|"{3}(?:[^\\\\]|\\\\.|\\n)+?"{3}))' - _re_inl = _re_tok.replace('|\\n','') # We re-use this string pattern later - # 2: Comments (until end of line, but not the newline itself) - _re_tok += '|(#.*)' - # 3,4: Open and close grouping tokens - _re_tok += '|([\\[\\{\\(])' - _re_tok += '|([\\]\\}\\)])' - # 5,6: Keywords that start or continue a python block (only start of line) - _re_tok += '|^([ \\t]*(?:if|for|while|with|try|def|class)\\b)' \ - '|^([ \\t]*(?:elif|else|except|finally)\\b)' - # 7: Our special 'end' keyword (but only if it stands alone) - _re_tok += '|((?:^|;)[ \\t]*end[ \\t]*(?=(?:%(block_close)s[ \\t]*)?\\r?$|;|#))' - # 8: A customizable end-of-code-block template token (only end of line) - _re_tok += '|(%(block_close)s[ \\t]*(?=\\r?$))' - # 9: And finally, a single newline. The 10th token is 'everything else' - _re_tok += '|(\\r?\\n)' + # We use the verbose (?x) regex mode to make this more manageable + + _re_tok = r'''( + [urbURB]* + (?: ''(?!') + |""(?!") + |'{6} + |"{6} + |'(?:[^\\']|\\.)+?' + |"(?:[^\\"]|\\.)+?" + |'{3}(?:[^\\]|\\.|\n)+?'{3} + |"{3}(?:[^\\]|\\.|\n)+?"{3} + ) + )''' + + _re_inl = _re_tok.replace(r'|\n', '') # We re-use this string pattern later + + _re_tok += r''' + # 2: Comments (until end of line, but not the newline itself) + |(\#.*) + + # 3: Open and close (4) grouping tokens + |([\[\{\(]) + |([\]\}\)]) + + # 5,6: Keywords that start or continue a python block (only start of line) + |^([\ \t]*(?:if|for|while|with|try|def|class)\b) + |^([\ \t]*(?:elif|else|except|finally)\b) + + # 7: Our special 'end' keyword (but only if it stands alone) + |((?:^|;)[\ \t]*end[\ \t]*(?=(?:%(block_close)s[\ \t]*)?\r?$|;|\#)) + + # 8: A customizable end-of-code-block template token (only end of line) + |(%(block_close)s[\ \t]*(?=\r?$)) + + # 9: And finally, a single newline. The 10th token is 'everything else' + |(\r?\n) + ''' # Match the start tokens of code areas in a template - _re_split = '(?m)^[ \t]*(\\\\?)((%(line_start)s)|(%(block_start)s))(%%?)' + _re_split = r'''(?m)^[ \t]*(\\?)((%(line_start)s)|(%(block_start)s))''' # Match inline statements (may contain python strings) - _re_inl = '(?m)%%(inline_start)s((?:%s|[^\'"\n]*?)+)%%(inline_end)s' % _re_inl - _re_tok = '(?m)' + _re_tok + _re_inl = r'''%%(inline_start)s((?:%s|[^'"\n])*?)%%(inline_end)s''' % _re_inl + + # add the flag in front of the regexp to avoid Deprecation warning (see Issue #949) + # verbose and dot-matches-newline mode + _re_tok = '(?mx)' + _re_tok + _re_inl = '(?mx)' + _re_inl + default_syntax = '<% %> % {{ }}' @@ -3500,18 +4344,18 @@ class StplParser(object): self.paren_depth = 0 def get_syntax(self): - ''' Tokens as a space separated string (default: <% %> % {{ }}) ''' + """ Tokens as a space separated string (default: <% %> % {{ }}) """ return self._syntax def set_syntax(self, syntax): self._syntax = syntax self._tokens = syntax.split() - if not syntax in self._re_cache: + if syntax not in self._re_cache: names = 'block_start block_close line_start inline_start inline_end' etokens = map(re.escape, self._tokens) pattern_vars = dict(zip(names.split(), etokens)) patterns = (self._re_split, self._re_tok, self._re_inl) - patterns = [re.compile(p%pattern_vars) for p in patterns] + patterns = [re.compile(p % pattern_vars) for p in patterns] self._re_cache[syntax] = patterns self.re_split, self.re_tok, self.re_inl = self._re_cache[syntax] @@ -3520,50 +4364,48 @@ class StplParser(object): def translate(self): if self.offset: raise RuntimeError('Parser is a one time instance.') while True: - m = self.re_split.search(self.source[self.offset:]) + m = self.re_split.search(self.source, pos=self.offset) if m: - text = self.source[self.offset:self.offset+m.start()] + text = self.source[self.offset:m.start()] self.text_buffer.append(text) - self.offset += m.end() - if m.group(1): # New escape syntax - line, sep, _ = self.source[self.offset:].partition('\n') - self.text_buffer.append(m.group(2)+m.group(5)+line+sep) - self.offset += len(line+sep)+1 - continue - elif m.group(5): # Old escape syntax - depr('Escape code lines with a backslash.') #0.12 + self.offset = m.end() + if m.group(1): # Escape syntax line, sep, _ = self.source[self.offset:].partition('\n') - self.text_buffer.append(m.group(2)+line+sep) - self.offset += len(line+sep)+1 + self.text_buffer.append(self.source[m.start():m.start(1)] + + m.group(2) + line + sep) + self.offset += len(line + sep) continue self.flush_text() - self.read_code(multiline=bool(m.group(4))) - else: break + self.offset += self.read_code(self.source[self.offset:], + multiline=bool(m.group(4))) + else: + break self.text_buffer.append(self.source[self.offset:]) self.flush_text() return ''.join(self.code_buffer) - def read_code(self, multiline): + def read_code(self, pysource, multiline): code_line, comment = '', '' + offset = 0 while True: - m = self.re_tok.search(self.source[self.offset:]) + m = self.re_tok.search(pysource, pos=offset) if not m: - code_line += self.source[self.offset:] - self.offset = len(self.source) + code_line += pysource[offset:] + offset = len(pysource) self.write_code(code_line.strip(), comment) - return - code_line += self.source[self.offset:self.offset+m.start()] - self.offset += m.end() + break + code_line += pysource[offset:m.start()] + offset = m.end() _str, _com, _po, _pc, _blk1, _blk2, _end, _cend, _nl = m.groups() - if (code_line or self.paren_depth > 0) and (_blk1 or _blk2): # a if b else c + if self.paren_depth > 0 and (_blk1 or _blk2): # a if b else c code_line += _blk1 or _blk2 continue - if _str: # Python string + if _str: # Python string code_line += _str elif _com: # Python comment (up to EOL) comment = _com if multiline and _com.strip().endswith(self._tokens[1]): - multiline = False # Allow end-of-block in comments + multiline = False # Allow end-of-block in comments elif _po: # open parenthesis self.paren_depth += 1 code_line += _po @@ -3573,28 +4415,33 @@ class StplParser(object): # easier to leave that to python - just check counts self.paren_depth -= 1 code_line += _pc - elif _blk1: # Start-block keyword (if/for/while/def/try/...) - code_line, self.indent_mod = _blk1, -1 + elif _blk1: # Start-block keyword (if/for/while/def/try/...) + code_line = _blk1 self.indent += 1 - elif _blk2: # Continue-block keyword (else/elif/except/...) - code_line, self.indent_mod = _blk2, -1 - elif _end: # The non-standard 'end'-keyword (ends a block) - self.indent -= 1 - elif _cend: # The end-code-block template token (usually '%>') + self.indent_mod -= 1 + elif _blk2: # Continue-block keyword (else/elif/except/...) + code_line = _blk2 + self.indent_mod -= 1 + elif _cend: # The end-code-block template token (usually '%>') if multiline: multiline = False else: code_line += _cend - else: # \n + elif _end: + self.indent -= 1 + self.indent_mod += 1 + else: # \n self.write_code(code_line.strip(), comment) self.lineno += 1 code_line, comment, self.indent_mod = '', '', 0 if not multiline: break + return offset + def flush_text(self): text = ''.join(self.text_buffer) del self.text_buffer[:] if not text: return - parts, pos, nl = [], 0, '\\\n'+' '*self.indent + parts, pos, nl = [], 0, '\\\n' + ' ' * self.indent for m in self.re_inl.finditer(text): prefix, pos = text[pos:m.start()], m.end() if prefix: @@ -3608,45 +4455,30 @@ class StplParser(object): elif lines[-1].endswith('\\\\\r\n'): lines[-1] = lines[-1][:-4] parts.append(nl.join(map(repr, lines))) code = '_printlist((%s,))' % ', '.join(parts) - self.lineno += code.count('\n')+1 + self.lineno += code.count('\n') + 1 self.write_code(code) - def process_inline(self, chunk): + @staticmethod + def process_inline(chunk): if chunk[0] == '!': return '_str(%s)' % chunk[1:] return '_escape(%s)' % chunk def write_code(self, line, comment=''): - line, comment = self.fix_backward_compatibility(line, comment) - code = ' ' * (self.indent+self.indent_mod) + code = ' ' * (self.indent + self.indent_mod) code += line.lstrip() + comment + '\n' self.code_buffer.append(code) - def fix_backward_compatibility(self, line, comment): - parts = line.strip().split(None, 2) - if parts and parts[0] in ('include', 'rebase'): - depr('The include and rebase keywords are functions now.') #0.12 - if len(parts) == 1: return "_printlist([base])", comment - elif len(parts) == 2: return "_=%s(%r)" % tuple(parts), comment - else: return "_=%s(%r, %s)" % tuple(parts), comment - if self.lineno <= 2 and not line.strip() and 'coding' in comment: - m = re.match(r"#.*coding[:=]\s*([-\w.]+)", comment) - if m: - depr('PEP263 encoding strings in templates are deprecated.') #0.12 - enc = m.group(1) - self.source = self.source.encode(self.encoding).decode(enc) - self.encoding = enc - return line, comment.replace('coding','coding*') - return line, comment - def template(*args, **kwargs): - ''' + """ Get a rendered template as a string iterator. You can use a name, a filename or a template string as first parameter. Template rendering arguments can be passed as dictionaries or directly (as keyword arguments). - ''' + """ tpl = args[0] if args else None + for dictarg in args[1:]: + kwargs.update(dictarg) adapter = kwargs.pop('template_adapter', SimpleTemplate) lookup = kwargs.pop('template_lookup', TEMPLATE_PATH) tplid = (id(lookup), tpl) @@ -3661,16 +4493,17 @@ def template(*args, **kwargs): TEMPLATES[tplid] = adapter(name=tpl, lookup=lookup, **settings) if not TEMPLATES[tplid]: abort(500, 'Template (%s) not found' % tpl) - for dictarg in args[1:]: kwargs.update(dictarg) return TEMPLATES[tplid].render(kwargs) + mako_template = functools.partial(template, template_adapter=MakoTemplate) -cheetah_template = functools.partial(template, template_adapter=CheetahTemplate) +cheetah_template = functools.partial(template, + template_adapter=CheetahTemplate) jinja2_template = functools.partial(template, template_adapter=Jinja2Template) def view(tpl_name, **defaults): - ''' Decorator: renders a template for a handler. + """ Decorator: renders a template for a handler. The handler can control its behavior like that: - return a dict of template vars to fill out the template @@ -3678,8 +4511,10 @@ def view(tpl_name, **defaults): process the template, but return the handler result as is. This includes returning a HTTPResponse(dict) to get, for instance, JSON with autojson or other castfilters. - ''' + """ + def decorator(func): + @functools.wraps(func) def wrapper(*args, **kwargs): result = func(*args, **kwargs) @@ -3690,48 +4525,46 @@ def view(tpl_name, **defaults): elif result is None: return template(tpl_name, **defaults) return result + return wrapper + return decorator + mako_view = functools.partial(view, template_adapter=MakoTemplate) cheetah_view = functools.partial(view, template_adapter=CheetahTemplate) jinja2_view = functools.partial(view, template_adapter=Jinja2Template) - - - - - ############################################################################### # Constants and Globals ######################################################## ############################################################################### - TEMPLATE_PATH = ['./', './views/'] TEMPLATES = {} DEBUG = False -NORUN = False # If set, run() does nothing. Used by load_app() +NORUN = False # If set, run() does nothing. Used by load_app() #: A dict to map HTTP status codes (e.g. 404) to phrases (e.g. 'Not Found') -HTTP_CODES = httplib.responses -HTTP_CODES[418] = "I'm a teapot" # RFC 2324 -HTTP_CODES[422] = "Unprocessable Entity" # RFC 4918 +HTTP_CODES = httplib.responses.copy() +HTTP_CODES[418] = "I'm a teapot" # RFC 2324 HTTP_CODES[428] = "Precondition Required" HTTP_CODES[429] = "Too Many Requests" HTTP_CODES[431] = "Request Header Fields Too Large" +HTTP_CODES[451] = "Unavailable For Legal Reasons" # RFC 7725 HTTP_CODES[511] = "Network Authentication Required" -_HTTP_STATUS_LINES = dict((k, '%d %s'%(k,v)) for (k,v) in HTTP_CODES.items()) +_HTTP_STATUS_LINES = dict((k, '%d %s' % (k, v)) + for (k, v) in HTTP_CODES.items()) #: The default template used for error pages. Override with @error() ERROR_PAGE_TEMPLATE = """ %%try: - %%from %s import DEBUG, HTTP_CODES, request, touni + %%from %s import DEBUG, request Error: {{e.status}}