feat: Add new gcloud commands, API clients, and third-party libraries across various services.

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/__init__.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2021 Google LLC. All Rights Reserved.
+#
+# 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.
+"""The command group for Cloud Deploy."""
+
+
+from googlecloudsdk.calliope import base
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA, base.ReleaseTrack.BETA,
+                    base.ReleaseTrack.GA)
+@base.DefaultUniverseOnly
+class Rollouts(base.Group):
+  """Create and manage Rollout resources for Cloud Deploy."""
+
+  category = base.CI_CD_CATEGORY

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/advance.py

@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2022 Google LLC. All Rights Reserved.
+#
+# 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.
+"""Advances a Cloud Deploy rollout to the specified phase."""
+
+
+from googlecloudsdk.api_lib.clouddeploy import rollout
+from googlecloudsdk.api_lib.util import apis as core_apis
+from googlecloudsdk.api_lib.util import exceptions as gcloud_exception
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.deploy import delivery_pipeline_util
+from googlecloudsdk.command_lib.deploy import deploy_policy_util
+from googlecloudsdk.command_lib.deploy import exceptions as deploy_exceptions
+from googlecloudsdk.command_lib.deploy import flags
+from googlecloudsdk.command_lib.deploy import resource_args
+from googlecloudsdk.core import log
+from googlecloudsdk.core.console import console_io
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+    To advance a rollout `test-rollout` to phase `test-phase` for delivery pipeline `test-pipeline`, release `test-release` in region `us-central1`, run:
+
+      $ {command} test-rollout --phase-id=test-phase --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+""",
+}
+
+
+@base.ReleaseTracks(
+    base.ReleaseTrack.ALPHA, base.ReleaseTrack.BETA, base.ReleaseTrack.GA
+)
+@base.DefaultUniverseOnly
+class Advance(base.CreateCommand):
+  """Advances a rollout."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    resource_args.AddRolloutResourceArg(parser, positional=True)
+    # Phase ID does not need to be required. If not specified, then the latest
+    # Phase to be processed on the rollout will be calculated and a prompt will
+    # be surfaced to the user.
+    flags.AddPhaseId(parser, required=False)
+    flags.AddOverrideDeployPolicies(parser)
+
+  @gcloud_exception.CatchHTTPErrorRaiseHTTPException(
+      deploy_exceptions.HTTP_ERROR_FORMAT
+  )
+  def Run(self, args):
+    rollout_ref = args.CONCEPTS.rollout.Parse()
+    pipeline_ref = rollout_ref.Parent().Parent()
+    pipeline_obj = delivery_pipeline_util.GetPipeline(
+        pipeline_ref.RelativeName()
+    )
+    failed_activity_msg = 'Cannot advance rollout {}.'.format(
+        rollout_ref.RelativeName()
+    )
+    delivery_pipeline_util.ThrowIfPipelineSuspended(
+        pipeline_obj, failed_activity_msg
+    )
+    phase_id = args.phase_id
+    if phase_id is None:
+      phase_id = self._DetermineNextPhase(rollout_ref)
+
+    log.status.Print(
+        'Advancing rollout {} to phase {}.\n'.format(
+            rollout_ref.RelativeName(), phase_id
+        )
+    )
+    # On the command line deploy policy IDs are provided, but for the
+    # AdvanceRollout API we need to provide the full resource name.
+    policies = deploy_policy_util.CreateDeployPolicyNamesFromIDs(
+        pipeline_ref, args.override_deploy_policies
+    )
+    return rollout.RolloutClient().AdvanceRollout(
+        rollout_ref.RelativeName(),
+        phase_id,
+        override_deploy_policies=policies,
+    )
+
+  def _DetermineNextPhase(self, rollout_ref):
+    """Determines the phase in which the advance command should apply."""
+    messages = core_apis.GetMessagesModule('clouddeploy', 'v1')
+    ro = rollout.RolloutClient().Get(rollout_ref.RelativeName())
+    if ro.state != messages.Rollout.StateValueValuesEnum.IN_PROGRESS:
+      raise deploy_exceptions.RolloutNotInProgressError(
+          rollout_name=rollout_ref.RelativeName()
+      )
+    pending_phase_index = None
+    for index, phase in enumerate(ro.phases):
+      if phase.state == messages.Phase.StateValueValuesEnum.PENDING:
+        pending_phase_index = index
+        break
+    if pending_phase_index is None:
+      # There are no pending phases.
+      raise deploy_exceptions.RolloutCannotAdvanceError(
+          rollout_name=rollout_ref.RelativeName(),
+          failed_activity_msg='No pending phases.',
+      )
+    if pending_phase_index == 0:
+      # There is no need to advance the first phase, it is automatically done.
+      raise deploy_exceptions.RolloutCannotAdvanceError(
+          rollout_name=rollout_ref.RelativeName(),
+          failed_activity_msg='Cannot advance first phase of a rollout.',
+      )
+    advanceable_prior_phase_states = [
+        messages.Phase.StateValueValuesEnum.SUCCEEDED,
+        messages.Phase.StateValueValuesEnum.SKIPPED,
+    ]
+    prior_phase = ro.phases[pending_phase_index - 1]
+    if prior_phase.state not in advanceable_prior_phase_states:
+      # The previous state is not in a terminal state that is advanceable.
+      raise deploy_exceptions.RolloutCannotAdvanceError(
+          rollout_name=rollout_ref.RelativeName(),
+          failed_activity_msg=(
+              'Prior phase {} is in {} state which is not advanceable.'.format(
+                  prior_phase.id, prior_phase.state
+              )
+          ),
+      )
+    # Ask whether user would like to advance the rollout to the phase.
+    prompt = 'Are you sure you want to advance rollout {} to phase {}?'.format(
+        rollout_ref.RelativeName(), ro.phases[pending_phase_index].id
+    )
+    console_io.PromptContinue(prompt, cancel_on_no=True)
+    return ro.phases[pending_phase_index].id

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/approve.py

@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2021 Google LLC. All Rights Reserved.
+#
+# 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.
+"""Approves a Cloud Deploy rollout."""
+
+
+from apitools.base.py import exceptions as apitools_exceptions
+from googlecloudsdk.api_lib.clouddeploy import release
+from googlecloudsdk.api_lib.clouddeploy import rollout
+from googlecloudsdk.api_lib.util import exceptions as gcloud_exception
+from googlecloudsdk.calliope import base
+from googlecloudsdk.calliope import exceptions
+from googlecloudsdk.command_lib.deploy import delivery_pipeline_util
+from googlecloudsdk.command_lib.deploy import deploy_policy_util
+from googlecloudsdk.command_lib.deploy import exceptions as deploy_exceptions
+from googlecloudsdk.command_lib.deploy import flags
+from googlecloudsdk.command_lib.deploy import release_util
+from googlecloudsdk.command_lib.deploy import resource_args
+from googlecloudsdk.core import resources
+from googlecloudsdk.core.console import console_io
+
+_DETAILED_HELP = {
+    'DESCRIPTION':
+        '{description}',
+    'EXAMPLES':
+        """ \
+To approve a rollout 'test-rollout' for delivery pipeline 'test-pipeline', release 'test-release' in region 'us-central1', run:
+
+$ {command} test-rollout --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+""",
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA, base.ReleaseTrack.BETA,
+                    base.ReleaseTrack.GA)
+@base.DefaultUniverseOnly
+class Approve(base.CreateCommand):
+  """Approves a rollout having an Approval state of "Required"."""
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    resource_args.AddRolloutResourceArg(parser, positional=True)
+    flags.AddOverrideDeployPolicies(parser)
+
+  @gcloud_exception.CatchHTTPErrorRaiseHTTPException(
+      deploy_exceptions.HTTP_ERROR_FORMAT
+  )
+  def Run(self, args):
+    rollout_ref = args.CONCEPTS.rollout.Parse()
+    pipeline_ref = rollout_ref.Parent().Parent()
+    pipeline_obj = delivery_pipeline_util.GetPipeline(
+        pipeline_ref.RelativeName())
+    failed_activity_msg = 'Cannot approve rollout {}.'.format(
+        rollout_ref.RelativeName())
+    delivery_pipeline_util.ThrowIfPipelineSuspended(pipeline_obj,
+                                                    failed_activity_msg)
+    try:
+      rollout_obj = rollout.RolloutClient().Get(rollout_ref.RelativeName())
+    except apitools_exceptions.HttpError as error:
+      raise exceptions.HttpException(error)
+
+    release_ref = resources.REGISTRY.ParseRelativeName(
+        rollout_ref.Parent().RelativeName(),
+        collection='clouddeploy.projects.locations.deliveryPipelines.releases')
+    try:
+      release_obj = release.ReleaseClient().Get(release_ref.RelativeName())
+    except apitools_exceptions.HttpError as error:
+      raise exceptions.HttpException(error)
+
+    prompt = 'Approving rollout {} from {} to target {}.\n\n'.format(
+        rollout_ref.Name(), release_ref.Name(), rollout_obj.targetId)
+    release_util.PrintDiff(release_ref, release_obj, prompt=prompt)
+
+    console_io.PromptContinue(cancel_on_no=True)
+    # On the command line deploy policy IDs are provided, but for the Approve
+    # API we need to provide the full resource name.
+    policies = deploy_policy_util.CreateDeployPolicyNamesFromIDs(
+        pipeline_ref, args.override_deploy_policies
+    )
+
+    return rollout.RolloutClient().Approve(
+        rollout_ref.RelativeName(),
+        True,
+        policies,
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/cancel.py

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2023 Google LLC. All Rights Reserved.
+#
+# 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.
+"""Cancels a Cloud Deploy rollout."""
+
+
+from googlecloudsdk.api_lib.clouddeploy import rollout
+from googlecloudsdk.api_lib.util import exceptions as gcloud_exception
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.deploy import delivery_pipeline_util
+from googlecloudsdk.command_lib.deploy import deploy_policy_util
+from googlecloudsdk.command_lib.deploy import exceptions as deploy_exceptions
+from googlecloudsdk.command_lib.deploy import flags
+from googlecloudsdk.command_lib.deploy import resource_args
+from googlecloudsdk.core import log
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+    To cancel a rollout `test-rollout` for delivery pipeline `test-pipeline`, release `test-release` in region `us-central1`, run:
+
+      $ {command} test-rollout --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+""",
+}
+
+
+@base.ReleaseTracks(
+    base.ReleaseTrack.ALPHA, base.ReleaseTrack.BETA, base.ReleaseTrack.GA
+)
+@base.DefaultUniverseOnly
+class Cancel(base.CreateCommand):
+  """Cancel a Rollout."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    resource_args.AddRolloutResourceArg(parser, positional=True)
+    flags.AddOverrideDeployPolicies(parser)
+
+  @gcloud_exception.CatchHTTPErrorRaiseHTTPException(
+      deploy_exceptions.HTTP_ERROR_FORMAT
+  )
+  def Run(self, args):
+    rollout_ref = args.CONCEPTS.rollout.Parse()
+    pipeline_ref = rollout_ref.Parent().Parent()
+    pipeline_obj = delivery_pipeline_util.GetPipeline(
+        pipeline_ref.RelativeName()
+    )
+    failed_activity_msg = 'Cannot cancel rollout {}.'.format(
+        rollout_ref.RelativeName()
+    )
+    delivery_pipeline_util.ThrowIfPipelineSuspended(
+        pipeline_obj, failed_activity_msg
+    )
+
+    log.status.Print(
+        'Cancelling rollout {}.\n'.format(rollout_ref.RelativeName())
+    )
+    # On the command line deploy policy IDs are provided, but for the
+    # CancelRollout API we need to provide the full resource name.
+    policies = deploy_policy_util.CreateDeployPolicyNamesFromIDs(
+        pipeline_ref, args.override_deploy_policies
+    )
+
+    return rollout.RolloutClient().CancelRollout(
+        rollout_ref.RelativeName(), policies
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/describe.yaml

@@ -0,0 +1,19 @@
+- release_tracks: [ALPHA, BETA, GA]
+
+  help_text:
+    brief: Show details for a rollout.
+    description: Show details for a specified rollout.
+    examples: |
+      To show details about a rollout 'test-rollout', for delivery pipeline 'test-pipeline', and release 'test-release' in region 'us-central1', run:
+
+        $ {command} test-rollout --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+  request:
+    collection: clouddeploy.projects.locations.deliveryPipelines.releases.rollouts
+    api_version: v1
+
+  arguments:
+    resource:
+      help_text: The name of the rollout you want to describe.
+      spec: !REF googlecloudsdk.command_lib.deploy.resources:rollout
+      is_positional: true

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/ignore_job.py

@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2023 Google LLC. All Rights Reserved.
+#
+# 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.
+"""Ignores a job and phase combination on a Cloud Deploy rollout."""
+
+
+from googlecloudsdk.api_lib.clouddeploy import rollout
+from googlecloudsdk.api_lib.util import exceptions as gcloud_exception
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.deploy import delivery_pipeline_util
+from googlecloudsdk.command_lib.deploy import deploy_policy_util
+from googlecloudsdk.command_lib.deploy import exceptions as deploy_exceptions
+from googlecloudsdk.command_lib.deploy import flags
+from googlecloudsdk.command_lib.deploy import resource_args
+from googlecloudsdk.core import log
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+    To ignore a job `test-job` in phase `test-phase` on a rollout `test-rollout` for delivery pipeline `test-pipeline`, release `test-release` in region `us-central1`, run:
+
+      $ {command} test-rollout --job-id=test-job --phase-id=test-phase --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+""",
+}
+
+
+@base.ReleaseTracks(
+    base.ReleaseTrack.ALPHA, base.ReleaseTrack.BETA, base.ReleaseTrack.GA
+)
+@base.DefaultUniverseOnly
+class IgnoreJob(base.CreateCommand):
+  """Ignores a specified job and phase combination on a rollout."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    resource_args.AddRolloutResourceArg(parser, positional=True)
+    flags.AddJobId(parser)
+    flags.AddPhaseId(parser)
+    flags.AddOverrideDeployPolicies(parser)
+
+  @gcloud_exception.CatchHTTPErrorRaiseHTTPException(
+      deploy_exceptions.HTTP_ERROR_FORMAT
+  )
+  def Run(self, args):
+    rollout_ref = args.CONCEPTS.rollout.Parse()
+    pipeline_ref = rollout_ref.Parent().Parent()
+    pipeline_obj = delivery_pipeline_util.GetPipeline(
+        pipeline_ref.RelativeName()
+    )
+    failed_activity_msg = 'Cannot ignore job on rollout {}.'.format(
+        rollout_ref.RelativeName()
+    )
+    delivery_pipeline_util.ThrowIfPipelineSuspended(
+        pipeline_obj, failed_activity_msg
+    )
+
+    log.status.Print(
+        'Ignoring job {} in phase {} of rollout {}.\n'.format(
+            args.job_id, args.phase_id, rollout_ref.RelativeName()
+        )
+    )
+    # On the command line deploy policy IDs are provided, but for the
+    # IgnoreJob API we need to provide the full resource name.
+    policies = deploy_policy_util.CreateDeployPolicyNamesFromIDs(
+        pipeline_ref, args.override_deploy_policies
+    )
+    return rollout.RolloutClient().IgnoreJob(
+        rollout_ref.RelativeName(),
+        args.job_id,
+        args.phase_id,
+        override_deploy_policies=policies,
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/list.yaml

@@ -0,0 +1,23 @@
+- release_tracks: [ALPHA, BETA, GA]
+
+  help_text:
+    brief: List the rollouts.
+    description: |
+      List the rollouts for a specified delivery pipeline.
+    examples: |
+      To list the rollouts for delivery pipeline 'test-pipeline' and release 'test-release' in region 'us-central1', run:
+
+        $ {command} --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+  request:
+    collection: clouddeploy.projects.locations.deliveryPipelines.releases.rollouts
+    api_version: v1
+
+  response:
+    id_field: name
+
+  arguments:
+    resource:
+      help_text: The release for which you want to list the rollouts.
+      spec: !REF googlecloudsdk.command_lib.deploy.resources:release
+      is_positional: false

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/reject.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2021 Google LLC. All Rights Reserved.
+#
+# 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.
+"""Rejects a Cloud Deploy rollout."""
+
+
+from googlecloudsdk.api_lib.clouddeploy import rollout
+from googlecloudsdk.api_lib.util import exceptions as gcloud_exception
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.deploy import delivery_pipeline_util
+from googlecloudsdk.command_lib.deploy import deploy_policy_util
+from googlecloudsdk.command_lib.deploy import exceptions as deploy_exceptions
+from googlecloudsdk.command_lib.deploy import flags
+from googlecloudsdk.command_lib.deploy import resource_args
+from googlecloudsdk.core.console import console_io
+
+_DETAILED_HELP = {
+    'DESCRIPTION':
+        '{description}',
+    'EXAMPLES':
+        """ \
+    To reject a rollout 'test-rollout' for delivery pipeline 'test-pipeline', release 'test-release' in region 'us-central1', run:
+
+      $ {command} test-rollout --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+""",
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA, base.ReleaseTrack.BETA,
+                    base.ReleaseTrack.GA)
+@base.DefaultUniverseOnly
+class Reject(base.CreateCommand):
+  """Rejects a rollout having an Approval state of "Required"."""
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    resource_args.AddRolloutResourceArg(parser, positional=True)
+    flags.AddOverrideDeployPolicies(parser)
+
+  @gcloud_exception.CatchHTTPErrorRaiseHTTPException(
+      deploy_exceptions.HTTP_ERROR_FORMAT
+  )
+  def Run(self, args):
+    rollout_ref = args.CONCEPTS.rollout.Parse()
+    pipeline_ref = rollout_ref.Parent().Parent()
+    pipeline_obj = delivery_pipeline_util.GetPipeline(
+        pipeline_ref.RelativeName())
+    failed_activity_msg = 'Cannot reject rollout {}.'.format(
+        rollout_ref.RelativeName())
+    delivery_pipeline_util.ThrowIfPipelineSuspended(pipeline_obj,
+                                                    failed_activity_msg)
+
+    console_io.PromptContinue(
+        message='Rejecting rollout {}.\n'.format(rollout_ref.RelativeName()),
+        cancel_on_no=True)
+    # On the command line deploy policy IDs are provided, but for the Approve
+    # API we need to provide the full resource name.
+    policies = deploy_policy_util.CreateDeployPolicyNamesFromIDs(
+        pipeline_ref, args.override_deploy_policies
+    )
+
+    return rollout.RolloutClient().Approve(
+        rollout_ref.RelativeName(), False, policies
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/deploy/rollouts/retry_job.py

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2022 Google LLC. All Rights Reserved.
+#
+# 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.
+"""Retries a Cloud Deploy rollout job specified by job and phase."""
+
+
+from googlecloudsdk.api_lib.clouddeploy import rollout
+from googlecloudsdk.api_lib.util import exceptions as gcloud_exception
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.deploy import delivery_pipeline_util
+from googlecloudsdk.command_lib.deploy import deploy_policy_util
+from googlecloudsdk.command_lib.deploy import exceptions as deploy_exceptions
+from googlecloudsdk.command_lib.deploy import flags
+from googlecloudsdk.command_lib.deploy import resource_args
+from googlecloudsdk.core import log
+
+_DETAILED_HELP = {
+    'DESCRIPTION':
+        '{description}',
+    'EXAMPLES':
+        """ \
+    To retry a job 'test-job' in phase 'test-phase' on a rollout 'test-rollout' for delivery pipeline 'test-pipeline', release 'test-release' in region 'us-central1', run:
+
+      $ {command} test-rollout --job-id=test-job --phase-id=test-phase --delivery-pipeline=test-pipeline --release=test-release --region=us-central1
+
+""",
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA, base.ReleaseTrack.BETA,
+                    base.ReleaseTrack.GA)
+@base.DefaultUniverseOnly
+class RetryJob(base.CreateCommand):
+  """Retries a specified job, phase combination on a rollout."""
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    resource_args.AddRolloutResourceArg(parser, positional=True)
+    flags.AddJobId(parser)
+    flags.AddPhaseId(parser)
+    flags.AddOverrideDeployPolicies(parser)
+
+  @gcloud_exception.CatchHTTPErrorRaiseHTTPException(
+      deploy_exceptions.HTTP_ERROR_FORMAT
+  )
+  def Run(self, args):
+    rollout_ref = args.CONCEPTS.rollout.Parse()
+    pipeline_ref = rollout_ref.Parent().Parent()
+    pipeline_obj = delivery_pipeline_util.GetPipeline(
+        pipeline_ref.RelativeName())
+    failed_activity_msg = 'Cannot retry job on rollout {}.'.format(
+        rollout_ref.RelativeName())
+    delivery_pipeline_util.ThrowIfPipelineSuspended(pipeline_obj,
+                                                    failed_activity_msg)
+
+    log.status.Print('Retrying job {} in phase {} of rollout {}.\n'.format(
+        args.job_id, args.phase_id, rollout_ref.RelativeName()))
+    # On the command line deploy policy IDs are provided, but for the
+    # RetryJob API we need to provide the full resource name.
+    policies = deploy_policy_util.CreateDeployPolicyNamesFromIDs(
+        pipeline_ref, args.override_deploy_policies
+    )
+    return rollout.RolloutClient().RetryJob(
+        rollout_ref.RelativeName(),
+        args.job_id,
+        args.phase_id,
+        override_deploy_policies=policies,
+    )