Merge b38c4a1 into 8fcd228

src/python/pants/backend/awslambda/python/awslambda_python_rules_test.py

@@ -40,13 +40,13 @@ def create_python_awslambda(self, addr: str) -> Tuple[str, bytes]:
                 "--source-root-patterns=src/python",
             ]
         )
-        target = self.request_single_product(
+        target = self.request_product(
             WrappedTarget, Params(Address.parse(addr), bootstrapper)
         ).target
-        created_awslambda = self.request_single_product(
+        created_awslambda = self.request_product(
             CreatedAWSLambda, Params(PythonAwsLambdaFieldSet.create(target), bootstrapper)
         )
-        created_awslambda_digest_contents = self.request_single_product(
+        created_awslambda_digest_contents = self.request_product(
             DigestContents, created_awslambda.digest
         )
         assert len(created_awslambda_digest_contents) == 1

src/python/pants/backend/codegen/protobuf/python/rules_integration_test.py

@@ -51,13 +51,11 @@ def assert_files_generated(
                 f"--source-root-patterns={repr(source_roots)}",
             ]
         )
-        tgt = self.request_single_product(
-            WrappedTarget, Params(Address.parse(spec), bootstrapper)
-        ).target
-        protocol_sources = self.request_single_product(
+        tgt = self.request_product(WrappedTarget, Params(Address.parse(spec), bootstrapper)).target
+        protocol_sources = self.request_product(
             HydratedSources, Params(HydrateSourcesRequest(tgt[ProtobufSources]), bootstrapper),
         )
-        generated_sources = self.request_single_product(
+        generated_sources = self.request_product(
             GeneratedSources,
             Params(GeneratePythonFromProtobufRequest(protocol_sources.snapshot, tgt), bootstrapper),
         )

src/python/pants/backend/python/dependency_inference/module_mapper_test.py

@@ -105,7 +105,7 @@ def test_map_first_party_modules_to_addresses(self) -> None:
         # not generate subtargets.
         self.create_file("tests/python/project_test/demo_test/__init__.py")
         self.add_to_build_file("tests/python/project_test/demo_test", "python_library()")
-        result = self.request_single_product(FirstPartyModuleToAddressMapping, options_bootstrapper)
+        result = self.request_product(FirstPartyModuleToAddressMapping, options_bootstrapper)
         assert result.mapping == FrozenDict(
             {
                 "project.util.dirutil": Address(
@@ -145,7 +145,7 @@ def test_map_third_party_modules_to_addresses(self) -> None:
                 """
             ),
         )
-        result = self.request_single_product(
+        result = self.request_product(
             ThirdPartyModuleToAddressMapping, Params(create_options_bootstrapper())
         )
         assert result.mapping == FrozenDict(
@@ -162,7 +162,7 @@ def test_map_module_to_address(self) -> None:
         )
 
         def get_owner(module: str) -> Optional[Address]:
-            return self.request_single_product(
+            return self.request_product(
                 PythonModuleOwner, Params(PythonModule(module), options_bootstrapper)
             ).address
 

src/python/pants/backend/python/dependency_inference/rules_test.py

@@ -95,10 +95,10 @@ def run_dep_inference(
             if enable_string_imports:
                 args.append("--python-infer-string-imports")
             options_bootstrapper = create_options_bootstrapper(args=args)
-            target = self.request_single_product(
+            target = self.request_product(
                 WrappedTarget, Params(address, options_bootstrapper)
             ).target
-            return self.request_single_product(
+            return self.request_product(
                 InferredDependencies,
                 Params(InferPythonDependencies(target[PythonSources]), options_bootstrapper),
             )
@@ -145,10 +145,10 @@ def test_infer_python_inits(self) -> None:
         self.add_to_build_file("src/python/root/mid/leaf", "python_library()")
 
         def run_dep_inference(address: Address) -> InferredDependencies:
-            target = self.request_single_product(
+            target = self.request_product(
                 WrappedTarget, Params(address, options_bootstrapper)
             ).target
-            return self.request_single_product(
+            return self.request_product(
                 InferredDependencies,
                 Params(InferInitDependencies(target[PythonSources]), options_bootstrapper),
             )
@@ -177,10 +177,10 @@ def test_infer_python_conftests(self) -> None:
         self.add_to_build_file("src/python/root/mid/leaf", "python_tests()")
 
         def run_dep_inference(address: Address) -> InferredDependencies:
-            target = self.request_single_product(
+            target = self.request_product(
                 WrappedTarget, Params(address, options_bootstrapper)
             ).target
-            return self.request_single_product(
+            return self.request_product(
                 InferredDependencies,
                 Params(InferConftestDependencies(target[PythonSources]), options_bootstrapper),
             )

src/python/pants/backend/python/lint/bandit/rules_integration_test.py

@@ -57,7 +57,7 @@ def run_bandit(
             args.append("--bandit-skip")
         if additional_args:
             args.extend(additional_args)
-        results = self.request_single_product(
+        results = self.request_product(
             LintResults,
             Params(
                 BanditRequest(BanditFieldSet.create(tgt) for tgt in targets),
@@ -180,7 +180,7 @@ def test_report_file(self) -> None:
         assert result[0].exit_code == 1
         assert result[0].stdout.strip() == ""
         assert result[0].report is not None
-        report_files = self.request_single_product(DigestContents, result[0].report.digest)
+        report_files = self.request_product(DigestContents, result[0].report.digest)
         assert len(report_files) == 1
         assert (
             "Issue: [B303:blacklist] Use of insecure MD2, MD4, MD5"

src/python/pants/backend/python/lint/black/rules_integration_test.py

@@ -54,17 +54,17 @@ def run_black(
             args.append("--black-skip")
         options_bootstrapper = create_options_bootstrapper(args=args)
         field_sets = [BlackFieldSet.create(tgt) for tgt in targets]
-        lint_results = self.request_single_product(
+        lint_results = self.request_product(
             LintResults, Params(BlackRequest(field_sets), options_bootstrapper)
         )
-        input_sources = self.request_single_product(
+        input_sources = self.request_product(
             SourceFiles,
             Params(
                 SourceFilesRequest(field_set.sources for field_set in field_sets),
                 options_bootstrapper,
             ),
         )
-        fmt_result = self.request_single_product(
+        fmt_result = self.request_product(
             FmtResult,
             Params(
                 BlackRequest(field_sets, prior_formatter_result=input_sources.snapshot),
@@ -74,7 +74,7 @@ def run_black(
         return lint_results.results, fmt_result
 
     def get_digest(self, source_files: List[FileContent]) -> Digest:
-        return self.request_single_product(Digest, CreateDigest(source_files))
+        return self.request_product(Digest, CreateDigest(source_files))
 
     def test_passing_source(self) -> None:
         target = self.make_target([self.good_source])

src/python/pants/backend/python/lint/docformatter/rules_integration_test.py

@@ -43,17 +43,17 @@ def run_docformatter(
             args.append("--docformatter-skip")
         options_bootstrapper = create_options_bootstrapper(args=args)
         field_sets = [DocformatterFieldSet.create(tgt) for tgt in targets]
-        lint_results = self.request_single_product(
+        lint_results = self.request_product(
             LintResults, Params(DocformatterRequest(field_sets), options_bootstrapper)
         )
-        input_sources = self.request_single_product(
+        input_sources = self.request_product(
             SourceFiles,
             Params(
                 SourceFilesRequest(field_set.sources for field_set in field_sets),
                 options_bootstrapper,
             ),
         )
-        fmt_result = self.request_single_product(
+        fmt_result = self.request_product(
             FmtResult,
             Params(
                 DocformatterRequest(field_sets, prior_formatter_result=input_sources.snapshot),
@@ -63,7 +63,7 @@ def run_docformatter(
         return lint_results.results, fmt_result
 
     def get_digest(self, source_files: List[FileContent]) -> Digest:
-        return self.request_single_product(Digest, CreateDigest(source_files))
+        return self.request_product(Digest, CreateDigest(source_files))
 
     def test_passing_source(self) -> None:
         target = self.make_target([self.good_source])

src/python/pants/backend/python/lint/flake8/rules_integration_test.py

@@ -56,7 +56,7 @@ def run_flake8(
             args.append("--flake8-skip")
         if additional_args:
             args.extend(additional_args)
-        results = self.request_single_product(
+        results = self.request_product(
             LintResults,
             Params(
                 Flake8Request(Flake8FieldSet.create(tgt) for tgt in targets),
@@ -168,6 +168,6 @@ def test_report_file(self) -> None:
         assert result[0].exit_code == 1
         assert result[0].stdout.strip() == ""
         assert result[0].report is not None
-        report_files = self.request_single_product(DigestContents, result[0].report.digest)
+        report_files = self.request_product(DigestContents, result[0].report.digest)
         assert len(report_files) == 1
         assert "bad.py:1:1: F401" in report_files[0].content.decode()

src/python/pants/backend/python/lint/isort/rules_integration_test.py

@@ -61,17 +61,17 @@ def run_isort(
             args.append("--isort-skip")
         options_bootstrapper = create_options_bootstrapper(args=args)
         field_sets = [IsortFieldSet.create(tgt) for tgt in targets]
-        lint_results = self.request_single_product(
+        lint_results = self.request_product(
             LintResults, Params(IsortRequest(field_sets), options_bootstrapper)
         )
-        input_sources = self.request_single_product(
+        input_sources = self.request_product(
             SourceFiles,
             Params(
                 SourceFilesRequest(field_set.sources for field_set in field_sets),
                 options_bootstrapper,
             ),
         )
-        fmt_result = self.request_single_product(
+        fmt_result = self.request_product(
             FmtResult,
             Params(
                 IsortRequest(field_sets, prior_formatter_result=input_sources.snapshot),
@@ -81,7 +81,7 @@ def run_isort(
         return lint_results.results, fmt_result
 
     def get_digest(self, source_files: List[FileContent]) -> Digest:
-        return self.request_single_product(Digest, CreateDigest(source_files))
+        return self.request_product(Digest, CreateDigest(source_files))
 
     def test_passing_source(self) -> None:
         target = self.make_target_with_origin([self.good_source])

src/python/pants/backend/python/lint/pylint/rules_integration_test.py

@@ -69,7 +69,7 @@ def make_target(
                 """
             ),
         )
-        return self.request_single_product(
+        return self.request_product(
             WrappedTarget,
             Params(
                 Address(package, target_name=name),
@@ -96,7 +96,7 @@ def run_pylint(
             args.append("--pylint-skip")
         if additional_args:
             args.extend(additional_args)
-        results = self.request_single_product(
+        results = self.request_product(
             LintResults,
             Params(
                 PylintRequest(PylintFieldSet.create(tgt) for tgt in targets),

src/python/pants/backend/python/lint/python_fmt_integration_test.py

@@ -44,13 +44,13 @@ def run_black_and_isort(
             "--backend-packages=['pants.backend.python.lint.black', 'pants.backend.python.lint.isort']",
             *(extra_args or []),
         ]
-        results = self.request_single_product(
+        results = self.request_product(
             LanguageFmtResults, Params(targets, create_options_bootstrapper(args=args)),
         )
         return results
 
     def get_digest(self, source_files: List[FileContent]) -> Digest:
-        return self.request_single_product(Digest, CreateDigest(source_files))
+        return self.request_product(Digest, CreateDigest(source_files))
 
     def test_multiple_formatters_changing_the_same_file(self) -> None:
         original_source = FileContent(

src/python/pants/backend/python/pants_requirement_test.py

@@ -41,7 +41,7 @@ def assert_pants_requirement(
         expected_module: str = "pants",
     ) -> None:
         self.add_to_build_file("3rdparty/python", f"{build_file_entry}\n")
-        target = self.request_single_product(
+        target = self.request_product(
             WrappedTarget,
             Params(
                 Address("3rdparty/python", target_name=expected_target_name),

src/python/pants/backend/python/pipenv_requirements_test.py

@@ -40,7 +40,7 @@ def assert_pipenv_requirements(
     ) -> None:
         self.add_to_build_file("", f"{build_file_entry}\n")
         self.create_file(pipfile_lock_relpath, dumps(pipfile_lock))
-        targets = self.request_single_product(
+        targets = self.request_product(
             Targets,
             Params(
                 Specs(AddressSpecs([DescendantAddresses("")]), FilesystemSpecs([])),

src/python/pants/backend/python/python_requirements_test.py

@@ -41,7 +41,7 @@ def assert_python_requirements(
     ) -> None:
         self.add_to_build_file("", f"{build_file_entry}\n")
         self.create_file(requirements_txt_relpath, requirements_txt)
-        targets = self.request_single_product(
+        targets = self.request_product(
             Targets,
             Params(
                 Specs(AddressSpecs([DescendantAddresses("")]), FilesystemSpecs([])),

src/python/pants/backend/python/rules/ancestor_files_test.py

@@ -43,10 +43,10 @@ def assert_injected(
             "__init__.py", self.make_snapshot({fp: "# declared" for fp in original_declared_files}),
         )
         bootstrapper = create_options_bootstrapper(args=[f"--source-root-patterns={source_roots}"])
-        result = self.request_single_product(AncestorFiles, Params(request, bootstrapper)).snapshot
+        result = self.request_product(AncestorFiles, Params(request, bootstrapper)).snapshot
         assert list(result.files) == sorted(expected_discovered)
 
-        materialized_result = self.request_single_product(DigestContents, result.digest)
+        materialized_result = self.request_product(DigestContents, result.digest)
         for file_content in materialized_result:
             path = file_content.path
             if not path.endswith("__init__.py"):

src/python/pants/backend/python/rules/pex_from_targets_test.py

@@ -83,7 +83,7 @@ def get_pex_request(
                 args.append(f"--python-setup-resolve-all-constraints={resolve_all.value}")
             if constraints_file:
                 args.append(f"--python-setup-requirement-constraints={constraints_file}")
-            return self.request_single_product(
+            return self.request_product(
                 PexRequest, Params(request, create_options_bootstrapper(args=args))
             )
 

src/python/pants/backend/python/rules/pex_test.py

@@ -211,7 +211,7 @@ def create_pex_and_get_all_data(
             additional_inputs=additional_inputs,
             additional_args=additional_pex_args,
         )
-        pex = self.request_single_product(
+        pex = self.request_product(
             Pex,
             Params(
                 request,
@@ -258,7 +258,7 @@ def create_pex_and_get_pex_info(
         )
 
     def test_pex_execution(self) -> None:
-        sources = self.request_single_product(
+        sources = self.request_product(
             Digest,
             CreateDigest(
                 (
@@ -284,7 +284,7 @@ def test_pex_execution(self) -> None:
             input_digest=pex_output["pex"].digest,
             description="Run the pex and make sure it works",
         )
-        result = self.request_single_product(ProcessResult, process)
+        result = self.request_product(ProcessResult, process)
         assert result.stdout == b"from main\n"
 
     def test_resolves_dependencies(self) -> None:
@@ -355,7 +355,7 @@ def test_additional_inputs(self) -> None:
         # This verifies that the file was indeed provided as additional input to the pex call.
         preamble_file = "custom_preamble.txt"
         preamble = "#!CUSTOM PREAMBLE\n"
-        additional_inputs = self.request_single_product(
+        additional_inputs = self.request_product(
             Digest, CreateDigest([FileContent(path=preamble_file, content=preamble.encode())])
         )
         additional_pex_args = (f"--preamble-file={preamble_file}",)

src/python/pants/backend/python/rules/pytest_runner_integration_test.py

@@ -154,8 +154,8 @@ def run_pytest(
             PythonTestFieldSet.create(PythonTests({}, address=address)),
             create_options_bootstrapper(args=args),
         )
-        test_result = self.request_single_product(TestResult, params)
-        debug_request = self.request_single_product(TestDebugRequest, params)
+        test_result = self.request_product(TestResult, params)
+        debug_request = self.request_product(TestDebugRequest, params)
         if debug_request.process is not None:
             debug_result = InteractiveRunner(self.scheduler).run(debug_request.process)
             assert test_result.exit_code == debug_result.exit_code
@@ -341,7 +341,7 @@ def test_junit(self) -> None:
         assert result.exit_code == 0
         assert f"{self.package}/test_good.py ." in result.stdout
         assert result.xml_results is not None
-        digest_contents = self.request_single_product(DigestContents, result.xml_results)
+        digest_contents = self.request_product(DigestContents, result.xml_results)
         assert len(digest_contents) == 1
         file = digest_contents[0]
         assert file.path.startswith("dist/test-results")

src/python/pants/backend/python/rules/python_sources_test.py

@@ -62,7 +62,7 @@ def get_stripped_sources(
         source_roots: Optional[List[str]] = None,
         extra_args: Optional[List[str]] = None,
     ) -> StrippedPythonSourceFiles:
-        return self.request_single_product(
+        return self.request_product(
             StrippedPythonSourceFiles,
             Params(
                 PythonSourceFilesRequest(
@@ -87,7 +87,7 @@ def get_unstripped_sources(
         source_roots: Optional[List[str]] = None,
         extra_args: Optional[List[str]] = None,
     ) -> PythonSourceFiles:
-        return self.request_single_product(
+        return self.request_product(
             PythonSourceFiles,
             Params(
                 PythonSourceFilesRequest(