Merge branch 'main' into th/no-git-list-files

Author: thomasrockhu-codecov

codecov_cli/commands/commit.py

@@ -24,7 +24,7 @@
     "--pr",
     "--pull-request-number",
     "pull_request_number",
-    help="Specify the pull request number mannually. Used to override pre-existing CI environment variables",
+    help="Specify the pull request number manually. Used to override pre-existing CI environment variables",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.pull_request_number,
 )

codecov_cli/commands/empty_upload.py

@@ -6,8 +6,8 @@
 
 from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
 from codecov_cli.helpers.args import get_cli_args
-from codecov_cli.helpers.git import GitService
 from codecov_cli.helpers.options import global_options
+from codecov_cli.services.commit import create_commit_logic
 from codecov_cli.services.empty_upload import empty_upload_logic
 from codecov_cli.types import CommandContext
 
@@ -16,6 +16,26 @@
 
 @click.command()
 @click.option("--force", is_flag=True, default=False)
+@click.option(
+    "--parent-sha",
+    help="SHA (with 40 chars) of what should be the parent of this commit",
+)
+@click.option(
+    "-P",
+    "--pr",
+    "--pull-request-number",
+    "pull_request_number",
+    help="Specify the pull request number manually. Used to override pre-existing CI environment variables",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.pull_request_number,
+)
+@click.option(
+    "-B",
+    "--branch",
+    help="Branch to which this commit belongs to",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.branch,
+)
 @global_options
 @click.pass_context
 def empty_upload(
@@ -26,11 +46,29 @@ def empty_upload(
     token: typing.Optional[str],
     git_service: typing.Optional[str],
     fail_on_error: typing.Optional[bool],
+    parent_sha: typing.Optional[str],
+    pull_request_number: typing.Optional[int],
+    branch: typing.Optional[str],
 ):
     with sentry_sdk.start_transaction(op="task", name="Empty Upload"):
         with sentry_sdk.start_span(name="empty_upload"):
             enterprise_url = ctx.obj.get("enterprise_url")
             args = get_cli_args(ctx)
+
+            logger.debug("Attempting to Create Commit before doing an empty upload.")
+            create_commit_logic(
+                commit_sha,
+                parent_sha,
+                pull_request_number,
+                branch,
+                slug,
+                token,
+                git_service,
+                enterprise_url,
+                fail_on_error,
+                args,
+            )
+
             logger.debug(
                 "Starting empty upload process",
                 extra=dict(

codecov_cli/commands/labelanalysis.py

@@ -23,7 +23,7 @@
 logger = logging.getLogger("codecovcli")
 
 
-@click.command()
+@click.command(hidden=True, deprecated=True)
 @click.option(
     "--token",
     required=True,
@@ -141,7 +141,9 @@ def label_analysis(
             logger.info(f"Collected {len(requested_labels)} test labels")
             logger.debug(
                 "Labels collected",
-                extra=dict(extra_log_attributes=dict(labels_collected=requested_labels)),
+                extra=dict(
+                    extra_log_attributes=dict(labels_collected=requested_labels)
+                ),
             )
             payload["requested_labels"] = requested_labels
 

codecov_cli/commands/report.py

@@ -21,7 +21,7 @@
     "--pr",
     "--pull-request-number",
     "pull_request_number",
-    help="Specify the pull request number mannually. Used to override pre-existing CI environment variables",
+    help="Specify the pull request number manually. Used to override pre-existing CI environment variables",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.pull_request_number,
 )

codecov_cli/commands/staticanalysis.py

@@ -15,7 +15,7 @@
 logger = logging.getLogger("codecovcli")
 
 
-@click.command()
+@click.command(hidden=True, deprecated=True)
 @click.option(
     "--foldertosearch",
     default=".",

codecov_cli/commands/upload.py

@@ -124,7 +124,7 @@ def _turn_env_vars_into_dict(ctx, params, value):
         "--pr",
         "--pull-request-number",
         "pull_request_number",
-        help="Specify the pull request number mannually. Used to override pre-existing CI environment variables",
+        help="Specify the pull request number manually. Used to override pre-existing CI environment variables",
         cls=CodecovOption,
         fallback_field=FallbackFieldEnum.pull_request_number,
     ),

codecovcli_commands

@@ -17,11 +17,9 @@ Commands:
   do-upload
   empty-upload
   get-report-results
-  label-analysis
   pr-base-picking
   process-test-results
   send-notifications
-  static-analysis
   upload-coverage
   upload-process
 
@@ -31,7 +29,7 @@ Options:
   --parent-sha TEXT               SHA (with 40 chars) of what should be the
                                   parent of this commit
   -P, --pr, --pull-request-number TEXT
-                                  Specify the pull request number mannually.
+                                  Specify the pull request number manually.
                                   Used to override pre-existing CI environment
                                   variables
   -B, --branch TEXT               Branch to which this commit belongs to
@@ -49,7 +47,7 @@ Options:
   --code TEXT                     The code of the report. If unsure, leave
                                   default
   -P, --pr, --pull-request-number TEXT
-                                  Specify the pull request number mannually.
+                                  Specify the pull request number manually.
                                   Used to override pre-existing CI environment
                                   variables
   -C, --sha, --commit-sha TEXT    Commit SHA (with 40 chars)  [required]
@@ -109,7 +107,7 @@ Options:
                                   in Codecov UI
   -B, --branch TEXT               Branch to which this commit belongs to
   -P, --pr, --pull-request-number TEXT
-                                  Specify the pull request number mannually.
+                                  Specify the pull request number manually.
                                   Used to override pre-existing CI environment
                                   variables
   -e, --env, --env-var TEXT       Specify environment variables to be included
@@ -151,6 +149,13 @@ Usage: codecovcli empty-upload [OPTIONS]
 
 Options:
   --force
+  --parent-sha TEXT               SHA (with 40 chars) of what should be the
+                                  parent of this commit
+  -P, --pr, --pull-request-number TEXT
+                                  Specify the pull request number manually.
+                                  Used to override pre-existing CI environment
+                                  variables
+  -B, --branch TEXT               Branch to which this commit belongs to
   -C, --sha, --commit-sha TEXT    Commit SHA (with 40 chars)  [required]
   -Z, --fail-on-error             Exit with non-zero code in case of error
   --git-service [github|gitlab|bitbucket|github_enterprise|gitlab_enterprise|bitbucket_server]
@@ -172,28 +177,6 @@ Options:
                                   repo token in Self-hosted
   -h, --help                      Show this message and exit.
 
-Usage: codecovcli label-analysis [OPTIONS]
-
-Options:
-  --token TEXT                    The static analysis token (NOT the same
-                                  token as upload)  [required]
-  --head-sha TEXT                 Commit SHA (with 40 chars)  [required]
-  --base-sha TEXT                 Commit SHA (with 40 chars)  [required]
-  --runner-name, --runner TEXT    Runner to use
-  --max-wait-time INTEGER         Max time (in seconds) to wait for the label
-                                  analysis result before falling back to
-                                  running all tests. Default is to wait
-                                  forever.
-  --dry-run                       Print list of tests to run AND tests skipped
-                                  AND options that need to be added to the
-                                  test runner to stdout. Choose format with
-                                  --dry-run-format option. Default is JSON.
-  --dry-run-format [json|space-separated-list]
-                                  Format in which --dry-run data is printed.
-                                  Default is JSON.
-  --runner-param TEXT
-  -h, --help                      Show this message and exit.
-
 Usage: codecovcli pr-base-picking [OPTIONS]
 
 Options:
@@ -238,19 +221,6 @@ Options:
                                   repo token in Self-hosted
   -h, --help                      Show this message and exit.
 
-Usage: codecovcli static-analysis [OPTIONS]
-
-Options:
-  --foldertosearch PATH      Folder to search
-  --numberprocesses INTEGER  number of processes to use
-  --pattern TEXT             file pattern to search for
-  --force / --no-force
-  --commit-sha TEXT          Commit SHA (with 40 chars)  [required]
-  --folders-to-exclude PATH  Folders not to search
-  --token TEXT               The static analysis token (NOT the same token as
-                             upload)  [required]
-  -h, --help                 Show this message and exit.
-
 Usage: codecovcli upload-coverage [OPTIONS]
 
 Options:
@@ -293,7 +263,7 @@ Options:
                                   in Codecov UI
   -B, --branch TEXT               Branch to which this commit belongs to
   -P, --pr, --pull-request-number TEXT
-                                  Specify the pull request number mannually.
+                                  Specify the pull request number manually.
                                   Used to override pre-existing CI environment
                                   variables
   -e, --env, --env-var TEXT       Specify environment variables to be included
@@ -369,7 +339,7 @@ Options:
                                   in Codecov UI
   -B, --branch TEXT               Branch to which this commit belongs to
   -P, --pr, --pull-request-number TEXT
-                                  Specify the pull request number mannually.
+                                  Specify the pull request number manually.
                                   Used to override pre-existing CI environment
                                   variables
   -e, --env, --env-var TEXT       Specify environment variables to be included

pyproject.toml

@@ -18,15 +18,15 @@ dependencies = [
     "regex",
     "responses==0.21.*",
     "sentry-sdk>=2.20.0",
-    "test-results-parser==0.5.*",
+    "test-results-parser==0.5.4",
     "tree-sitter==0.20.*",
     "wrapt>=1.17.2",
 ]
 license = {file = "LICENSE"}
 name = "codecov-cli"
 readme = "README.md"
 requires-python = ">= 3.9"
-version = "10.2.0"
+version = "10.2.1"
 
 [project.scripts]
 codecov = "codecov_cli.main:run"

requirements.txt

@@ -47,7 +47,7 @@ sniffio==1.3.1
     # via
     #   anyio
     #   httpx
-test-results-parser==0.5.1
+test-results-parser==0.5.4
     # via codecov-cli (pyproject.toml)
 tree-sitter==0.20.4
     # via codecov-cli (pyproject.toml)

tests/commands/test_invoke_empty_upload.py

@@ -0,0 +1,25 @@
+from click.testing import CliRunner
+
+from codecov_cli.fallbacks import FallbackFieldEnum
+from codecov_cli.main import cli
+from tests.factory import FakeProvider, FakeVersioningSystem
+
+def test_invoke_empty_upload_with_create_commit(mocker):
+    create_commit_mock = mocker.patch("codecov_cli.commands.empty_upload.create_commit_logic")
+    empty_upload_mock = mocker.patch("codecov_cli.commands.empty_upload.empty_upload_logic")
+
+    fake_ci_provider = FakeProvider({FallbackFieldEnum.commit_sha: None})
+    mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider)
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ["empty-upload",
+                    "-C", "command-sha",
+                    "--slug", "owner/repo",
+                    "--parent-sha", "asdf",
+                    "--branch", "main",
+                    "--pr", 1234], obj={})
+    assert result.exit_code == 0
+
+    create_commit_mock.assert_called_once()
+    empty_upload_mock.assert_called_once()
+