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

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

@@ -0,0 +1,35 @@
+# -*- 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.
+"""The command group for the App Hub CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ApphubGA(base.Group):
+  """Manage App Hub resources."""
+  # See third_party/py/googlecloudsdk/calliope/base.py for a list of categories.
+  category = base.MANAGEMENT_TOOLS_CATEGORY
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ApphubAlpha(base.Group):
+  """Manage App Hub resources."""
+  # See third_party/py/googlecloudsdk/calliope/base.py for a list of categories.
+  category = base.MANAGEMENT_TOOLS_CATEGORY

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/__init__.py

@@ -0,0 +1,39 @@
+# -*- 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.
+"""The applications command group for the App Hub CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ApplicationsGA(base.Group):
+  """Manage App Hub Applications.
+
+  Commands for managing App Hub Applications.
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ApplicationsAlpha(base.Group):
+  """Manage App Hub Applications.
+
+  Commands for managing App Hub Applications.
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/add_iam_policy_binding.py

@@ -0,0 +1,76 @@
+# -*- 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.
+"""Add IAM policy binding to an application."""
+
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+from googlecloudsdk.command_lib.iam import iam_util
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """\
+        To add an IAM policy binding for the role of `roles/apphub.viewer`
+        for the user `test-user@gmail.com` to Application `my-app` in location
+        `us-east1`, run:
+
+          $ {command} my-app --location=us-east1 --role=roles/apphub.viewer --member=user:test-user@gmail.com
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class AddIamPolicyBindingGA(base.Command):
+  """Add IAM policy binding to an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddAddIamPolicyBindingFlags(parser)
+    iam_util.AddArgsForAddIamPolicyBinding(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.AddIamPolicyBinding(
+        app_id=app_ref.RelativeName(), member=args.member, role=args.role
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class AddIamPolicyBindingAlpha(base.Command):
+  """Add IAM policy binding to an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddAddIamPolicyBindingFlags(parser)
+    iam_util.AddArgsForAddIamPolicyBinding(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.AddIamPolicyBinding(
+        app_id=app_ref.RelativeName(), member=args.member, role=args.role
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/create.py

@@ -0,0 +1,97 @@
+# -*- 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.
+"""Create Command for Application."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To create the Application `my-app` with scope type `REGIONAL`
+        in location `us-east1`, run:
+
+          $ {command} my-app --location=us-east1 --scope-type=REGIONAL
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class CreateGA(base.CreateCommand):
+  """Create an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.CreateApplicationFlags(parser, release_track=base.ReleaseTrack.GA)
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    parent_ref = app_ref.Parent()
+
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.GA
+    )
+
+    return client.Create(
+        app_id=app_ref.Name(),
+        scope_type=args.scope_type,
+        display_name=args.display_name,
+        description=args.description,
+        attributes=attributes,
+        async_flag=args.async_,
+        parent=parent_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class CreateAlpha(base.CreateCommand):
+  """Create an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.CreateApplicationFlags(parser, release_track=base.ReleaseTrack.ALPHA)
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    parent_ref = app_ref.Parent()
+
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.ALPHA
+    )
+
+    return client.Create(
+        app_id=app_ref.Name(),
+        scope_type=args.scope_type,
+        display_name=args.display_name,
+        description=args.description,
+        attributes=attributes,
+        async_flag=args.async_,
+        parent=parent_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/delete.py

@@ -0,0 +1,68 @@
+# -*- 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.
+"""Command to delete an Application in the Project/Location."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To delete the Application `my-app` in location `us-east1`, run:
+
+          $ {command} my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DeleteGA(base.DeleteCommand):
+  """Delete an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDeleteApplicationFlags(parser)
+
+  def Run(self, args):
+    """Run the delete command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.Delete(app_id=app_ref.RelativeName(), async_flag=args.async_)
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DeleteAlpha(base.DeleteCommand):
+  """Delete an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDeleteApplicationFlags(parser)
+
+  def Run(self, args):
+    """Run the delete command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.Delete(app_id=app_ref.RelativeName(), async_flag=args.async_)

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/describe.py

@@ -0,0 +1,67 @@
+# -*- 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.
+"""Command to describe Applications."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe the Application `my-app` in location `us-east1`, run:
+
+          $ {command} my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeApplicationFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.Describe(app_id=app_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeApplicationFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.Describe(app_id=app_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/get_iam_policy.py

@@ -0,0 +1,74 @@
+# -*- 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.
+"""Fetch the IAM policy for an application."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To get the application IAM policy for the Application `my-app` in
+        in location `us-east1`, run:
+
+          $ {command} my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class GetIamPolicyGA(base.ListCommand):
+  """Get the IAM policy for an Apphub application.
+
+  Returns an empty policy if the application does not have
+  an existing IAM policy set.
+  """
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddGetIamPolicyFlags(parser)
+    base.URI_FLAG.RemoveFromParser(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.GetIamPolicy(app_id=app_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class GetIamPolicy(base.ListCommand):
+  """Get the IAM policy for an Apphub application.
+
+  Returns an empty policy if the application does not have
+  an existing IAM policy set.
+  """
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddGetIamPolicyFlags(parser)
+    base.URI_FLAG.RemoveFromParser(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.GetIamPolicy(app_id=app_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/list.py

@@ -0,0 +1,98 @@
+# -*- 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.
+"""Command to list applicationsin the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all applications in locations `us-east1`, run:
+
+          $ {command} --location=us-east1
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("applications"):label=ID,
+    displayName,
+    createTime.date(unit=1000, tz_default=UTC)
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ListGA(base.ListCommand):
+  """List Apphub applications."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListApplicationFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.applications',
+            release_track=base.ReleaseTrack.GA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ListAlpha(base.ListCommand):
+  """List Apphub applications."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListApplicationFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.applications',
+            release_track=base.ReleaseTrack.ALPHA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )
+

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/remove_iam_policy_binding.py

@@ -0,0 +1,76 @@
+# -*- 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.
+"""Remove IAM policy binding from an application."""
+
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+from googlecloudsdk.command_lib.iam import iam_util
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """\
+        To remove an IAM policy binding for the role of `roles/apphub.viewer`
+        for the user `test-user@gmail.com` from Application `my-app` in location
+        `us-east1`, run:
+
+          $ {command} my-app --location=us-east1 --role=roles/apphub.viewer --member=user:test-user@gmail.com
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class RemoveIamPolicyBindingGA(base.Command):
+  """Remove IAM policy binding from an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddRemoveIamPolicyBindingFlags(parser)
+    iam_util.AddArgsForRemoveIamPolicyBinding(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.RemoveIamPolicyBinding(
+        app_id=app_ref.RelativeName(), member=args.member, role=args.role
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class RemoveIamPolicyBindingAlpha(base.Command):
+  """Remove IAM policy binding from an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddRemoveIamPolicyBindingFlags(parser)
+    iam_util.AddArgsForRemoveIamPolicyBinding(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.RemoveIamPolicyBinding(
+        app_id=app_ref.RelativeName(), member=args.member, role=args.role
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/services/__init__.py

@@ -0,0 +1,39 @@
+# -*- 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.
+"""The application services command group for the App Hub CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ServicesGA(base.Group):
+  """Manage App Hub Application Services.
+
+  Commands for managing App Hub Application Services.
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ServicesAlpha(base.Group):
+  """Manage App Hub Application Services.
+
+  Commands for managing App Hub Application Services.
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/services/create.py

@@ -0,0 +1,102 @@
+# -*- 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.
+"""Create Command for Application Service."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import services as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+         To create the Service `my-service` with discovered service
+        `my-discovered-service` in the Application `my-app` in location
+        `us-east1`, run:
+
+          $ {command} my-service --application=my-app --location=us-east1 --discovered-service=my-discovered-service
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class CreateGA(base.CreateCommand):
+  """Create an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddCreateApplicationServiceFlags(
+        parser, release_track=base.ReleaseTrack.GA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.GA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    dis_service_ref = api_lib_utils.GetDiscoveredServiceRef(args)
+    parent_ref = service_ref.Parent()
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.GA
+    )
+
+    return client.Create(
+        service_id=service_ref.Name(),
+        parent=parent_ref.RelativeName(),
+        async_flag=args.async_,
+        discovered_service=dis_service_ref.RelativeName(),
+        display_name=args.display_name,
+        description=args.description,
+        attributes=attributes,
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class CreateAlpha(base.CreateCommand):
+  """Create an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddCreateApplicationServiceFlags(
+        parser, release_track=base.ReleaseTrack.ALPHA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.ALPHA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    dis_service_ref = api_lib_utils.GetDiscoveredServiceRef(args)
+    parent_ref = service_ref.Parent()
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.ALPHA
+    )
+
+    return client.Create(
+        service_id=service_ref.Name(),
+        parent=parent_ref.RelativeName(),
+        async_flag=args.async_,
+        discovered_service=dis_service_ref.RelativeName(),
+        display_name=args.display_name,
+        description=args.description,
+        attributes=attributes,
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/services/delete.py

@@ -0,0 +1,71 @@
+# -*- 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.
+"""Command to delete a Application service in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import services as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To delete the Service `my-service` from the Application `my-app` in
+        location `us-east1`, run:
+
+          $ {command} my-service --application=my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DeleteGA(base.DeleteCommand):
+  """Delete an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDeleteApplicationServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the delete command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.GA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    return client.Delete(
+        service=service_ref.RelativeName(), async_flag=args.async_
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DeleteAlpha(base.DeleteCommand):
+  """Delete an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDeleteApplicationServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the delete command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.ALPHA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    return client.Delete(
+        service=service_ref.RelativeName(), async_flag=args.async_
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/services/describe.py

@@ -0,0 +1,68 @@
+# -*- 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.
+"""Command to describe the application services."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import services as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe the Service `my-service` in the Application `my-app` in
+        location `us-east1`, run:
+
+          $ {command} my-service --application=my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeApplicationServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.GA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    return client.Describe(service=service_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeApplicationServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.ALPHA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    return client.Describe(service=service_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/services/list.py

@@ -0,0 +1,99 @@
+# -*- 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.
+"""Command to list a application service in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import services as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all Services in the Application `my-app` in location
+        `us-east1`, run:
+
+          $ {command} --application=my-app --location=us-east1
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.basename():label=ID,
+    displayName,
+    serviceReference,
+    createTime.date(unit=1000, tz_default=UTC)
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ListGA(base.ListCommand):
+  """List Apphub application services."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListApplicationServiceFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.applications.services',
+            release_track=base.ReleaseTrack.GA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.GA)
+    application_ref = args.CONCEPTS.application.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=application_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ListAlpha(base.ListCommand):
+  """List Apphub application services."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListApplicationServiceFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.applications.services',
+            release_track=base.ReleaseTrack.ALPHA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.ALPHA)
+    application_ref = args.CONCEPTS.application.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=application_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/services/update.py

@@ -0,0 +1,89 @@
+# -*- 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.
+"""Command to update a Application Service in the Project/Location."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import services as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To update the Service `my-service` with a new environment
+        `prod` in the Application `my-app` in location `us-east1`,
+        run:
+
+          $ {command} my-service --environment-type=TEST --application=my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class UpdateGA(base.UpdateCommand):
+  """Update an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddUpdateApplicationServiceFlags(
+        parser, release_track=base.ReleaseTrack.GA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.GA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.GA
+    )
+    return client.Update(
+        service_id=service_ref.RelativeName(),
+        async_flag=args.async_,
+        attributes=attributes,
+        args=args,
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class UpdateAlpha(base.UpdateCommand):
+  """Update an Apphub application service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddUpdateApplicationServiceFlags(
+        parser, release_track=base.ReleaseTrack.ALPHA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ServicesClient(release_track=base.ReleaseTrack.ALPHA)
+    service_ref = api_lib_utils.GetApplicationServiceRef(args)
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.ALPHA
+    )
+    return client.Update(
+        service_id=service_ref.RelativeName(),
+        async_flag=args.async_,
+        attributes=attributes,
+        args=args,
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/set_iam_policy.py

@@ -0,0 +1,84 @@
+# -*- 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.
+"""Set the IAM policy for an application."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+from googlecloudsdk.command_lib.iam import iam_util
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To set the application IAM policy using a json file 'my_policy.json' for
+        the Application `my-app` in location `us-east1`, run:
+
+          $ {command} my-app --location=us-east1 /path/to/my_policy.json
+
+        To set the application IAM policy using a yaml file 'my_policy.yaml` for
+        the Application `my-app` in location `us-east1`, run:
+
+          $ {command} my-app --location=us-east1 /path/to/my_policy.yaml
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class SetIamPolicyGA(base.Command):
+  """Set the IAM policy for an Apphub application as defined in a JSON/YAML file.
+
+     See https://cloud.google.com/iam/docs/managing-policies for details of
+        the policy file format and contents.
+  """
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddSetIamPolicyFlags(parser)
+    iam_util.AddArgForPolicyFile(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.SetIamPolicy(
+        app_id=app_ref.RelativeName(), policy_file=args.policy_file
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class SetIamPolicyAlpha(base.Command):
+  """Set the IAM policy for an Apphub application as defined in a JSON/YAML file.
+
+     See https://cloud.google.com/iam/docs/managing-policies for details of
+        the policy file format and contents.
+  """
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddSetIamPolicyFlags(parser)
+    iam_util.AddArgForPolicyFile(parser)
+
+  def Run(self, args):
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.SetIamPolicy(
+        app_id=app_ref.RelativeName(), policy_file=args.policy_file
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/update.py

@@ -0,0 +1,68 @@
+# -*- 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.
+"""Update Command for Application."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import client as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To update the Application `my-app` with a new environment
+        `prod` in location `us-east1`, run:
+
+          $ {command} my-app --location=us-east1 --environment-type=TEST
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class UpdateGA(base.UpdateCommand):
+  """Update an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.UpdateApplicationFlags(parser, release_track=base.ReleaseTrack.GA)
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.GA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.Update(args, app_ref, release_track=base.ReleaseTrack.GA)
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class UpdateAlpha(base.UpdateCommand):
+  """Update an Apphub application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.UpdateApplicationFlags(parser, release_track=base.ReleaseTrack.ALPHA)
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.ApplicationsClient(release_track=base.ReleaseTrack.ALPHA)
+    app_ref = api_lib_utils.GetApplicationRef(args)
+    return client.Update(args, app_ref, release_track=base.ReleaseTrack.ALPHA)

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/workloads/__init__.py

@@ -0,0 +1,39 @@
+# -*- 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.
+"""The application workloads command group for the App Hub CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class WorkloadsGA(base.Group):
+  """Manage App Hub Application Workloads.
+
+  Commands for managing App Hub Application Workloads.
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class WorkloadsAlpha(base.Group):
+  """Manage App Hub Application Workloads.
+
+  Commands for managing App Hub Application Workloads.
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/workloads/create.py

@@ -0,0 +1,102 @@
+# -*- 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.
+"""Create Command for Application Workload."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import workloads as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To create the Workload `my-workload` with discovered workload
+        `my-discovered-workload` in the Application `my-app` in location
+        `us-east1`, run:
+
+          $ {command} my-workload --application=my-app --location=us-east1 --discovered-workload=my-discovered-workload
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class CreateGA(base.CreateCommand):
+  """Create an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddCreateApplicationWorkloadFlags(
+        parser, release_track=base.ReleaseTrack.GA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.GA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    dis_workload_ref = api_lib_utils.GetDiscoveredWorkloadRef(args)
+    parent_ref = workload_ref.Parent()
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.GA
+    )
+
+    return client.Create(
+        workload_id=workload_ref.Name(),
+        parent=parent_ref.RelativeName(),
+        async_flag=args.async_,
+        discovered_workload=dis_workload_ref.RelativeName(),
+        display_name=args.display_name,
+        description=args.description,
+        attributes=attributes,
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class CreateAlpha(base.CreateCommand):
+  """Create an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddCreateApplicationWorkloadFlags(
+        parser, release_track=base.ReleaseTrack.ALPHA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.ALPHA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    dis_workload_ref = api_lib_utils.GetDiscoveredWorkloadRef(args)
+    parent_ref = workload_ref.Parent()
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.ALPHA
+    )
+
+    return client.Create(
+        workload_id=workload_ref.Name(),
+        parent=parent_ref.RelativeName(),
+        async_flag=args.async_,
+        discovered_workload=dis_workload_ref.RelativeName(),
+        display_name=args.display_name,
+        description=args.description,
+        attributes=attributes,
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/workloads/delete.py

@@ -0,0 +1,71 @@
+# -*- 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.
+"""Command to delete a Application workload in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import workloads as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To delete the Workload `my-workload` from the Application `my-app` in
+        location `us-east1`, run:
+
+          $ {command} my-workload --application=my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DeleteGA(base.DeleteCommand):
+  """Delete an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDeleteApplicationWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the delete command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.GA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    return client.Delete(
+        workload=workload_ref.RelativeName(), async_flag=args.async_
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DeleteAlpha(base.DeleteCommand):
+  """Delete an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDeleteApplicationWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the delete command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.ALPHA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    return client.Delete(
+        workload=workload_ref.RelativeName(), async_flag=args.async_
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/workloads/describe.py

@@ -0,0 +1,68 @@
+# -*- 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.
+"""Command to describe the application workloads."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import workloads as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe the Workload `my-workload` in the Application `my-app` in
+        location `us-east1`, run:
+
+          $ {command} my-workload --application=my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeApplicationWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.GA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    return client.Describe(workload=workload_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeApplicationWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.ALPHA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    return client.Describe(workload=workload_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/workloads/list.py

@@ -0,0 +1,99 @@
+# -*- 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.
+"""Command to list a application workload in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import workloads as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all Workloads in the Application `my-app` in location
+        `us-east1`, run:
+
+          $ {command} --application=my-app --location=us-east1
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.basename():label=ID,
+    displayName,
+    workloadReference,
+    createTime.date(unit=1000, tz_default=UTC)
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ListGA(base.ListCommand):
+  """List Apphub application workloads."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListApplicationWorkloadFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.applications.workloads',
+            release_track=base.ReleaseTrack.GA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.GA)
+    application_ref = args.CONCEPTS.application.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=application_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ListAlpha(base.ListCommand):
+  """List Apphub application workloads."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListApplicationWorkloadFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.applications.workloads',
+            release_track=base.ReleaseTrack.ALPHA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.ALPHA)
+    application_ref = args.CONCEPTS.application.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=application_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/applications/workloads/update.py

@@ -0,0 +1,89 @@
+# -*- 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.
+"""Command to update an application workload in the Project/Location."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.api_lib.apphub.applications import workloads as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To update the Workload `my-workload` with a new environment
+        `prod` in the Application `my-app` in location `us-east1`,
+        run:
+
+          $ {command} my-workload --environment-type=TEST --application=my-app --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class UpdateGA(base.UpdateCommand):
+  """Update an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddUpdateApplicationWorkloadFlags(
+        parser, release_track=base.ReleaseTrack.GA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.GA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.GA
+    )
+    return client.Update(
+        workload_id=workload_ref.RelativeName(),
+        async_flag=args.async_,
+        attributes=attributes,
+        args=args,
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class UpdateAlpha(base.UpdateCommand):
+  """Update an Apphub application workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddUpdateApplicationWorkloadFlags(
+        parser, release_track=base.ReleaseTrack.ALPHA
+    )
+
+  def Run(self, args):
+    """Run the create command."""
+    client = apis.WorkloadsClient(release_track=base.ReleaseTrack.ALPHA)
+    workload_ref = api_lib_utils.GetApplicationWorkloadRef(args)
+    attributes = api_lib_utils.PopulateAttributes(
+        args, release_track=base.ReleaseTrack.ALPHA
+    )
+    return client.Update(
+        workload_id=workload_ref.RelativeName(),
+        async_flag=args.async_,
+        attributes=attributes,
+        args=args,
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/boundary/__init__.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2025 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 gcloud apphub boundary."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class BoundaryGA(base.Group):
+  """Manage App Hub boundaries.
+
+  Commands for managing App Hub Boundaries.
+  """
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class BoundaryAlpha(base.Group):
+  """Manage App Hub boundaries."""

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/boundary/describe.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2025 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.
+"""gcloud apphub boundary describe."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import boundary as boundary_api
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Show metadata for an App Hub boundary."""
+
+  @staticmethod
+  def Args(parser):
+    """Register flags for this command."""
+    flags.AddDescribeBoundaryFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = boundary_api.BoundaryClient(self.ReleaseTrack())
+    # Parse the location reference from the --location flag
+    location_ref = args.CONCEPTS.location.Parse()
+    # Manually construct the full boundary resource name string
+    boundary_name = location_ref.RelativeName() + '/boundary'
+    return client.Describe(boundary_name)
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Show metadata for an App Hub boundary."""
+
+  @staticmethod
+  def Args(parser):
+    """Register flags for this command."""
+    flags.AddDescribeBoundaryFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = boundary_api.BoundaryClient(self.ReleaseTrack())
+    # Parse the location reference from the --location flag
+    location_ref = args.CONCEPTS.location.Parse()
+    # Manually construct the full boundary resource name string
+    boundary_name = location_ref.RelativeName() + '/boundary'
+    return client.Describe(boundary_name)

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/boundary/update.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2025 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.
+"""gcloud apphub boundary update."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import boundary as boundary_api
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class UpdateGA(base.UpdateCommand):
+  """Update an App Hub boundary."""
+
+  @staticmethod
+  def Args(parser):
+    """Register flags for this command."""
+    flags.AddUpdateBoundaryFlags(parser)
+
+  def Run(self, args):
+    """Run the update command."""
+    client = boundary_api.BoundaryClient(self.ReleaseTrack())
+    # Parse the location reference from the --location flag
+    location_ref = args.CONCEPTS.location.Parse()
+    # Manually construct the full boundary resource name string
+    boundary_name = location_ref.RelativeName() + '/boundary'
+    return client.Update(boundary_name, args)
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class UpdateAlpha(base.UpdateCommand):
+  """Update an App Hub boundary."""
+
+  @staticmethod
+  def Args(parser):
+    """Register flags for this command."""
+    flags.AddUpdateBoundaryFlags(parser)
+
+  def Run(self, args):
+    """Run the update command."""
+    client = boundary_api.BoundaryClient(self.ReleaseTrack())
+    # Parse the location reference from the --location flag
+    location_ref = args.CONCEPTS.location.Parse()
+    # Manually construct the full boundary resource name string
+    boundary_name = location_ref.RelativeName() + '/boundary'
+    return client.Update(boundary_name, args)

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_services/__init__.py

@@ -0,0 +1,39 @@
+# -*- 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.
+"""The discovered services command group for the App Hub CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DiscoveredServicesGA(base.Group):
+  """Manage App Hub Discovered Services.
+
+  Commands for managing App Hub Discovered Services.
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DiscoveredServicesAlpha(base.Group):
+  """Manage App Hub Discovered Services.
+
+  Commands for managing App Hub Discovered Services.
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_services/describe.py

@@ -0,0 +1,70 @@
+# -*- 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.
+"""Command to describe the Discovered Service."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_services as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe the DiscoveredService `my-discovered-service` in
+        location `us-east1`, run:
+
+          $ {command} my-discovered-service --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub discovered service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeDiscoveredServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.DiscoveredServicesClient(release_track=base.ReleaseTrack.GA)
+    dis_service_ref = api_lib_utils.GetDiscoveredServiceRef(args)
+    return client.Describe(discovered_service=dis_service_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub discovered service."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeDiscoveredServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.DiscoveredServicesClient(
+        release_track=base.ReleaseTrack.ALPHA
+    )
+    dis_service_ref = api_lib_utils.GetDiscoveredServiceRef(args)
+    return client.Describe(discovered_service=dis_service_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_services/find_unregistered.py

@@ -0,0 +1,68 @@
+# -*- 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.
+"""Command to list unregistered services in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_services as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all unregistered DiscoveredServices in location `us-east1`, run:
+
+          $ {command} --location=us-east1
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("discoveredServices"):label=ID,
+    serviceReference,
+    serviceProperties
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class FindUnregistered(base.ListCommand):
+  """List unregistered Apphub discovered services."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddFindUnregisteredServiceFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.discoveredServices'
+        )
+    )
+
+  def Run(self, args):
+    """Run the find unregistered service command."""
+    client = apis.DiscoveredServicesClient()
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.FindUnregistered(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_services/list.py

@@ -0,0 +1,102 @@
+# -*- 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.
+"""Command to list Discovered Services that can be added to an application in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_services as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+         To list DiscoveredServices that could be added to an application in
+         location `us-east1`, run:
+
+          $ {command} --location=us-east1
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("discoveredServices"):label=ID,
+    serviceReference,
+    serviceProperties
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ListGA(base.ListCommand):
+  """List Apphub discovered services."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListDiscoveredServiceFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    # parser.display_info.AddUriFunc(api_lib_utils.GetUri)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.discoveredServices',
+            release_track=base.ReleaseTrack.GA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.DiscoveredServicesClient(release_track=base.ReleaseTrack.GA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ListAlpha(base.ListCommand):
+  """List Apphub discovered services."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListDiscoveredServiceFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    # parser.display_info.AddUriFunc(api_lib_utils.GetUri)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.discoveredServices',
+            release_track=base.ReleaseTrack.ALPHA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.DiscoveredServicesClient(
+        release_track=base.ReleaseTrack.ALPHA
+    )
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_services/lookup.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2024 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.
+"""Command to lookup a Discovered Service."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_services as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To lookup a discovered service with uri `my-service-uri` in location `us-east1` run:
+
+          $ {command} --location=us-east1 --uri=my-service-uri
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class LookupGA(base.DescribeCommand):
+  """Lookup an Apphub discovered service with URI."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddLookupDiscoveredServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the lookup command."""
+    client = apis.DiscoveredServicesClient(release_track=base.ReleaseTrack.GA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.Lookup(
+        parent=location_ref.RelativeName(), uri=args.resource_uri
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class LookupAlpha(base.DescribeCommand):
+  """Lookup an Apphub discovered service with URI."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddLookupDiscoveredServiceFlags(parser)
+
+  def Run(self, args):
+    """Run the lookup command."""
+    client = apis.DiscoveredServicesClient(
+        release_track=base.ReleaseTrack.ALPHA
+    )
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.Lookup(
+        parent=location_ref.RelativeName(), uri=args.resource_uri
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_workloads/__init__.py

@@ -0,0 +1,39 @@
+# -*- 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.
+"""The discovered workloads command group for the App Hub CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DiscoveredWorkloadsGA(base.Group):
+  """Manage App Hub Discovered Workloads.
+
+  Commands for managing App Hub Discovered Workloads.
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DiscoveredWorkloadsAlpha(base.Group):
+  """Manage App Hub Discovered Workloads.
+
+  Commands for managing App Hub Discovered Workloads.
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_workloads/describe.py

@@ -0,0 +1,70 @@
+# -*- 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.
+"""Command to describe the Discovered Workload."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_workloads as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe the DiscoveredWorkload `my-discovered-workload` in location
+        `us-east1`, run:
+
+          $ {command} my-discovered-workload --location=us-east1
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub discovered workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeDiscoveredWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.DiscoveredWorkloadsClient(release_track=base.ReleaseTrack.GA)
+    dis_workload_ref = api_lib_utils.GetDiscoveredWorkloadRef(args)
+    return client.Describe(discovered_workload=dis_workload_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub discovered workload."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeDiscoveredWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.DiscoveredWorkloadsClient(
+        release_track=base.ReleaseTrack.ALPHA
+    )
+    dis_workload_ref = api_lib_utils.GetDiscoveredWorkloadRef(args)
+    return client.Describe(discovered_workload=dis_workload_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_workloads/find_unregistered.py

@@ -0,0 +1,69 @@
+# -*- 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.
+"""Command to list unregistered workloads in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_workloads as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all unregistered DiscoveredWorkloads in location `us-east1`,
+        run:
+
+          $ {command} --location=us-east1
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("discoveredWorkloads"):label=ID,
+    workloadReference,
+    workloadProperties
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class FindUnregistered(base.ListCommand):
+  """List unregistered Apphub discovered workloads."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddFindUnregisteredWorkloadFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.discoveredWorkloads'
+        )
+    )
+
+  def Run(self, args):
+    """Run the find unregistered workload command."""
+    client = apis.DiscoveredWorkloadsClient()
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.FindUnregistered(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_workloads/list.py

@@ -0,0 +1,100 @@
+# -*- 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.
+"""Command to list Discovered Workloads that can be added to an application in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_workloads as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list DiscoveredWorkloads that could be added to an application in
+        location `us-east1`, run:
+
+          $ {command} --location=us-east1
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("discoveredWorkloads"):label=ID,
+    workloadReference,
+    workloadProperties
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class List(base.ListCommand):
+  """List Apphub discovered workloads that could be added to an application."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListDiscoveredWorkloadFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.discoveredWorkloads',
+            release_track=base.ReleaseTrack.GA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.DiscoveredWorkloadsClient(release_track=base.ReleaseTrack.GA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ListAlpha(base.ListCommand):
+  """List Apphub discovered workloads."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListDiscoveredWorkloadFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.discoveredWorkloads',
+            release_track=base.ReleaseTrack.ALPHA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.DiscoveredWorkloadsClient(
+        release_track=base.ReleaseTrack.ALPHA
+    )
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/discovered_workloads/lookup.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2024 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.
+"""Command to lookup a Discovered Workload."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import discovered_workloads as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To lookup a discovered workload with uri `my-workload-uri` in location `us-east1` run:
+
+          $ {command} --location=us-east1 --uri=my-workload-uri
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class LookupGA(base.DescribeCommand):
+  """Lookup an Apphub discovered workload with URI."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddLookupDiscoveredWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the lookup command."""
+    client = apis.DiscoveredWorkloadsClient(release_track=base.ReleaseTrack.GA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.Lookup(
+        parent=location_ref.RelativeName(), uri=args.resource_uri
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class LookupAlpha(base.DescribeCommand):
+  """Lookup an Apphub discovered workload with URI."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddLookupDiscoveredWorkloadFlags(parser)
+
+  def Run(self, args):
+    """Run the lookup command."""
+    client = apis.DiscoveredWorkloadsClient(
+        release_track=base.ReleaseTrack.ALPHA
+    )
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.Lookup(
+        parent=location_ref.RelativeName(), uri=args.resource_uri
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/extended_metadata_schemas/__init__.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2025 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 the App Hub extended-metadata-schemas CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ExtendedMetadataSchemas(base.Group):
+  """Manage App Hub extended metadata schemas."""

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/extended_metadata_schemas/describe.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2025 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.
+"""gcloud apphub extended-metadata-schemas describe."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import extended_metadata_schemas as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class Describe(base.DescribeCommand):
+  """Describe an App Hub extended metadata schema."""
+
+  detailed_help = {
+      'EXAMPLES': """\
+          To describe the extended metadata schema `my-schema` in location
+          `us-east1`, run:
+
+            $ {command} my-schema --location=us-east1
+      """,
+  }
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeExtendedMetadataSchemaFlags(parser)
+
+  def Run(self, args):
+    """Runs the describe command."""
+    client = apis.ExtendedMetadataSchemasClient(self.ReleaseTrack())
+    return client.Describe(args.CONCEPTS.extended_metadata_schema.Parse())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/extended_metadata_schemas/list.py

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2025 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.
+"""gcloud apphub extended-metadata-schemas list."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import extended_metadata_schemas as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+@base.DefaultUniverseOnly
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class List(base.Command):
+  """List App Hub extended metadata schemas."""
+
+  detailed_help = {
+      'EXAMPLES': """\
+          To list extended metadata schemas in location `us-east1`, run:
+
+            $ {command} --location=us-east1
+      """,
+  }
+
+  @staticmethod
+  def Args(parser):
+    """Registers flags for this command."""
+    flags.AddListExtendedMetadataSchemaFlags(parser)
+    # Manually add back the flags we want to keep from the standard list flags.
+    base.PAGE_SIZE_FLAG.AddToParser(parser)
+    base.LIMIT_FLAG.AddToParser(parser)
+    base.URI_FLAG.AddToParser(parser)
+    parser.display_info.AddFormat('table(name, schema_version)')
+
+  def Run(self, args):
+    """Runs the list command."""
+    client = apis.ExtendedMetadataSchemasClient(self.ReleaseTrack())
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(location_ref.RelativeName(), limit=args.limit)

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/locations/__init__.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2024 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 locations command group for the App Hub CLI."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+@base.UniverseCompatible
+class LocationsGA(base.Group):
+  """Manage App Hub Locations.
+
+  Commands for getting and listing locations where App Hub is available.
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+@base.UniverseCompatible
+class LocationsAlpha(base.Group):
+  """Manage App Hub Locations.
+
+  Commands for getting and listing locations where App Hub is available.
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/locations/describe.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2024 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.
+"""Command to describe the location."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import locations as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe a specific apphub location with the name `my-location`, run:
+
+          $ {command} my-location
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+@base.UniverseCompatible
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub location."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeLocationFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.LocationsClient(release_track=base.ReleaseTrack.GA)
+    lo_ref = api_lib_utils.GetLocationRef(args)
+    return client.Describe(location=lo_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+@base.UniverseCompatible
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub location."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeLocationFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.LocationsClient(release_track=base.ReleaseTrack.ALPHA)
+    lo_ref = api_lib_utils.GetLocationRef(args)
+    return client.Describe(location=lo_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/locations/list.py

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*- #
+# Copyright 2024 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.
+"""Command to list locations in the Project."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import locations as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all apphub locations, run:
+
+          $ {command}
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("locations"):label=ID
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+@base.UniverseCompatible
+class ListGA(base.ListCommand):
+  """List Apphub locations."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations',
+            release_track=base.ReleaseTrack.GA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.LocationsClient(release_track=base.ReleaseTrack.GA)
+    project_ref = api_lib_utils.GetProjectRef()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=project_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+@base.UniverseCompatible
+class ListAlpha(base.ListCommand):
+  """List Apphub locations."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations',
+            release_track=base.ReleaseTrack.ALPHA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.LocationsClient(release_track=base.ReleaseTrack.ALPHA)
+    project_ref = api_lib_utils.GetProjectRef()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=project_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/operations/__init__.py

@@ -0,0 +1,40 @@
+
+# -*- 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.
+"""The operations command group for the App Hub CLI."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+@base.UniverseCompatible
+class OperationsGA(base.Group):
+  """Manage App Hub Operations (long-running operations).
+
+  Commands for managing App Hub Operations (long-running operations).
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+@base.UniverseCompatible
+class OperationsAlpha(base.Group):
+  """Manage App Hub Operations (long-running operations).
+
+  Commands for managing App Hub Operations (long-running operations).
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/operations/describe.py

@@ -0,0 +1,67 @@
+# -*- 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.
+"""Command to describe the operation."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import operations as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe a specific apphub operation with the name `my-operation`, run:
+
+          $ {command} my-operation
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub operation (long-running operation)."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeOperationFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.OperationsClient(release_track=base.ReleaseTrack.GA)
+    op_ref = api_lib_utils.GetOperationRef(args)
+    return client.Describe(operation=op_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub operation (long-running operation)."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeOperationFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.OperationsClient(release_track=base.ReleaseTrack.ALPHA)
+    op_ref = api_lib_utils.GetOperationRef(args)
+    return client.Describe(operation=op_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/operations/list.py

@@ -0,0 +1,98 @@
+# -*- 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.
+"""Command to list operations in the Project/Location."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import operations as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all operations, run:
+
+          $ {command}
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("operations"):label=ID,
+    metadata.verb,
+    metadata.target,
+    done
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ListGA(base.ListCommand):
+  """List Apphub operations (long-running operations)."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListOperationsFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.operations',
+            release_track=base.ReleaseTrack.GA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.OperationsClient(release_track=base.ReleaseTrack.GA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ListAlpha(base.ListCommand):
+  """List Apphub operations (long-running operations)."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListOperationsFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.operations',
+            release_track=base.ReleaseTrack.ALPHA,
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.OperationsClient(release_track=base.ReleaseTrack.ALPHA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/service_projects/__init__.py

@@ -0,0 +1,39 @@
+# -*- 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.
+"""The service projects command group for the App Hub CLI."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.calliope import base
+
+
+# NOTE: Release track decorators can be used here as well, and would propagate
+# to this group's children.
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ServiceProjectsGA(base.Group):
+  """Manage App Hub Service Projects.
+
+  Commands for managing App Hub Service Projects.
+  """
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ServiceProjectsAlpha(base.Group):
+  """Manage App Hub Service Projects.
+
+  Commands for managing App Hub Service Projects.
+  """

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/service_projects/add.py

@@ -0,0 +1,79 @@
+# -*- 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.
+"""Command to add a Service Project."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import service_projects as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To add the service project `my-service-project` to the host project
+        `my-host-project`, run:
+
+          $ {command} my-service-project --project=my-host-project
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class CreateGA(base.CreateCommand):
+  """Add an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddServiceProjectFlags(parser)
+
+  def Run(self, args):
+    """Run the add command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.GA)
+    service_project_ref = api_lib_utils.GetServiceProjectRef(args)
+    parent_ref = service_project_ref.Parent()
+    return client.Add(
+        service_project=service_project_ref.Name(),
+        async_flag=args.async_,
+        parent=parent_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class CreateAlpha(base.CreateCommand):
+  """Add an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddServiceProjectFlags(parser)
+
+  def Run(self, args):
+    """Run the add command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.ALPHA)
+    service_project_ref = api_lib_utils.GetServiceProjectRef(args)
+    parent_ref = service_project_ref.Parent()
+    return client.Add(
+        service_project=service_project_ref.Name(),
+        async_flag=args.async_,
+        parent=parent_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/service_projects/describe.py

@@ -0,0 +1,68 @@
+# -*- 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.
+"""Command to describe a Service Project."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import service_projects as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To describe the service project `my-service-project` attached to the
+        host project `my-host-project`, run:
+
+          $ {command} my-service-project --project=my-host-project
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DescribeGA(base.DescribeCommand):
+  """Describe an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeServiceProjectFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.GA)
+    service_project_ref = api_lib_utils.GetServiceProjectRef(args)
+    return client.Describe(service_project=service_project_ref.RelativeName())
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DescribeAlpha(base.DescribeCommand):
+  """Describe an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddDescribeServiceProjectFlags(parser)
+
+  def Run(self, args):
+    """Run the describe command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.ALPHA)
+    service_project_ref = api_lib_utils.GetServiceProjectRef(args)
+    return client.Describe(service_project=service_project_ref.RelativeName())

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/service_projects/detach.py

@@ -0,0 +1,57 @@
+# -*- 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.
+"""Command to detach a Service Project."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import service_projects as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.core import properties
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To detach the service project `my-service-project`, run:
+
+          $ {command} --project=my-service-project
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class DetachGA(base.SilentCommand):
+  """Detach an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  def Run(self, args):
+    """Run the detach command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.GA)
+    service_project = properties.VALUES.core.project.Get()
+    return client.Detach(service_project=service_project)
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class DetachAlpha(base.SilentCommand):
+  """Detach an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  def Run(self, args):
+    """Run the detach command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.ALPHA)
+    service_project = properties.VALUES.core.project.Get()
+    return client.Detach(service_project=service_project)

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/service_projects/list.py

@@ -0,0 +1,98 @@
+# -*- 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.
+"""Command to list Service Projects."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import service_projects as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To list all service projects attached to the host project
+        `my-host-project`, run:
+
+          $ {command} --project=my-host-project
+        """,
+}
+
+_FORMAT = """
+  table(
+    name.scope("serviceProjectAttachments"):label=ID,
+    service_project,
+    createTime.date(unit=1000, tz_default=UTC)
+  )
+"""
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class ListGA(base.ListCommand):
+  """List Apphub service projects."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListServiceProjectFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.serviceProjectAttachments',
+            release_track=base.ReleaseTrack.GA
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.GA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class ListAlpha(base.ListCommand):
+  """List Apphub service projects."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddListServiceProjectFlags(parser)
+    parser.display_info.AddFormat(_FORMAT)
+    parser.display_info.AddUriFunc(
+        api_lib_utils.MakeGetUriFunc(
+            'apphub.projects.locations.serviceProjectAttachments',
+            release_track=base.ReleaseTrack.ALPHA
+        )
+    )
+
+  def Run(self, args):
+    """Run the list command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.ALPHA)
+    location_ref = args.CONCEPTS.location.Parse()
+    return client.List(
+        limit=args.limit,
+        page_size=args.page_size,
+        parent=location_ref.RelativeName(),
+    )

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/service_projects/lookup.py

@@ -0,0 +1,57 @@
+# -*- 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.
+"""Command to lookup a Service Project."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import service_projects as apis
+from googlecloudsdk.calliope import base
+from googlecloudsdk.core import properties
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To lookup the service project `my-service-project`, run:
+
+          $ {command} --project=my-service-project
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class LookupGA(base.DescribeCommand):
+  """Lookup an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  def Run(self, args):
+    """Run the lookup command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.GA)
+    service_project = properties.VALUES.core.project.Get()
+    return client.Lookup(service_project=service_project)
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class LookupAlpha(base.DescribeCommand):
+  """Lookup an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  def Run(self, args):
+    """Run the lookup command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.ALPHA)
+    service_project = properties.VALUES.core.project.Get()
+    return client.Lookup(service_project=service_project)

gcloud auth application-default login/google-cloud-sdk/lib/surface/apphub/service_projects/remove.py

@@ -0,0 +1,73 @@
+# -*- 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.
+"""Command to remove a Service Project."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from googlecloudsdk.api_lib.apphub import service_projects as apis
+from googlecloudsdk.api_lib.apphub import utils as api_lib_utils
+from googlecloudsdk.calliope import base
+from googlecloudsdk.command_lib.apphub import flags
+
+_DETAILED_HELP = {
+    'DESCRIPTION': '{description}',
+    'EXAMPLES': """ \
+        To remove the service project `my-service-project` from the host project
+        `my-host-project`, run:
+
+          $ {command} my-service-project --project=my-host-project
+        """,
+}
+
+
+@base.ReleaseTracks(base.ReleaseTrack.GA)
+class RemoveGA(base.DeleteCommand):
+  """Remove an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddRemoveServiceProjectFlags(parser)
+
+  def Run(self, args):
+    """Run the remove command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.GA)
+    service_project_ref = api_lib_utils.GetServiceProjectRef(args)
+    return client.Remove(
+        service_project=service_project_ref.RelativeName(),
+        async_flag=args.async_,
+    )
+
+
+@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
+class RemoveAlpha(base.DeleteCommand):
+  """Remove an Apphub service project."""
+
+  detailed_help = _DETAILED_HELP
+
+  @staticmethod
+  def Args(parser):
+    flags.AddRemoveServiceProjectFlags(parser)
+
+  def Run(self, args):
+    """Run the remove command."""
+    client = apis.ServiceProjectsClient(release_track=base.ReleaseTrack.ALPHA)
+    service_project_ref = api_lib_utils.GetServiceProjectRef(args)
+    return client.Remove(
+        service_project=service_project_ref.RelativeName(),
+        async_flag=args.async_,
+    )