Address review feedback to remove _pb2 postfix for submodules

googleapis · Aug 20, 2021 · 4b29b3d · 4b29b3d
1 parent 2f0b221
commit 4b29b3d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/google/cloud/gkehub_v1/types/feature.py b/google/cloud/gkehub_v1/types/feature.py
@@ -15,8 +15,8 @@
 #
 import proto  # type: ignore
 
-from google.cloud.gkehub_v1 import configmanagement_v1 as configmanagement_pb2  # type: ignore
-from google.cloud.gkehub_v1 import multiclusteringress_v1 as multiclusteringress_pb2  # type: ignore
+from google.cloud.gkehub_v1 import configmanagement_v1  # type: ignore
+from google.cloud.gkehub_v1 import multiclusteringress_v1  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
 
 
@@ -175,15 +175,15 @@ class CommonFeatureSpec(proto.Message):
     r"""CommonFeatureSpec contains Hub-wide configuration informatio.
 
     Attributes:
-        multiclusteringress (google.cloud.gkehub.multiclusteringress.v1.multiclusteringress_pb2.FeatureSpec):
+        multiclusteringress (google.cloud.gkehub_v1.multiclusteringress_v1.FeatureSpec):
             Multicluster Ingress-specific spec.
     """
 
     multiclusteringress = proto.Field(
         proto.MESSAGE,
         number=102,
         oneof="feature_spec",
-        message=multiclusteringress_pb2.FeatureSpec,
+        message=multiclusteringress_v1.FeatureSpec,
     )
 
 
@@ -205,15 +205,15 @@ class MembershipFeatureSpec(proto.Message):
     a single Membership.
 
     Attributes:
-        configmanagement (google.cloud.gkehub.configmanagement.v1.configmanagement_pb2.MembershipSpec):
+        configmanagement (google.cloud.gkehub_v1.configmanagement_v1.MembershipSpec):
             Config Management-specific spec.
     """
 
     configmanagement = proto.Field(
         proto.MESSAGE,
         number=106,
         oneof="feature_spec",
-        message=configmanagement_pb2.MembershipSpec,
+        message=configmanagement_v1.MembershipSpec,
     )
 
 
@@ -222,7 +222,7 @@ class MembershipFeatureState(proto.Message):
     for a single Membership.
 
     Attributes:
-        configmanagement (google.cloud.gkehub.configmanagement.v1.configmanagement_pb2.MembershipState):
+        configmanagement (google.cloud.gkehub_v1.configmanagement_v1.MembershipState):
             Config Management-specific state.
         state (google.cloud.gkehub_v1.types.FeatureState):
             The high-level state of this Feature for a
@@ -233,7 +233,7 @@ class MembershipFeatureState(proto.Message):
         proto.MESSAGE,
         number=106,
         oneof="feature_state",
-        message=configmanagement_pb2.MembershipState,
+        message=configmanagement_v1.MembershipState,
     )
     state = proto.Field(proto.MESSAGE, number=1, message="FeatureState",)
 

diff --git a/owlbot.py b/owlbot.py
@@ -50,8 +50,20 @@
             library  / f"google/cloud/gkehub_{library.name}/**/*.py",
             library  / f"tests/unit/gapic/gkehub_{library.name}/**/*.py",
           ],
-          f"from google.cloud.gkehub.{submodule}.v1 import",
-          f"from google.cloud.gkehub_{library.name} import {submodule}_v1 as"
+          f"from google.cloud.gkehub.{submodule}.v1 import {submodule}_pb2",
+          f"from google.cloud.gkehub_{library.name} import {submodule}_v1"
+        )
+
+        s.replace(
+          library / f"google/cloud/gkehub_{library.name}/types/feature.py",
+          f"google.cloud.gkehub.{submodule}.v1.{submodule}_pb2",
+          f"google.cloud.gkehub_v1.{submodule}_v1"
+        )
+
+        s.replace(
+          library / f"google/cloud/gkehub_{library.name}/types/feature.py",
+          f"{submodule}_pb2",
+          f"{submodule}_v1"
         )
 
     # Work around gapic generator bug https://github.com/googleapis/gapic-generator-python/issues/902

diff --git a/tests/unit/gapic/gkehub_v1/test_gke_hub.py b/tests/unit/gapic/gkehub_v1/test_gke_hub.py
@@ -34,8 +34,8 @@
 from google.api_core import operations_v1
 from google.auth import credentials as ga_credentials
 from google.auth.exceptions import MutualTLSChannelError
-from google.cloud.gkehub_v1 import configmanagement_v1 as configmanagement_pb2  # type: ignore
-from google.cloud.gkehub_v1 import multiclusteringress_v1 as multiclusteringress_pb2  # type: ignore
+from google.cloud.gkehub_v1 import configmanagement_v1  # type: ignore
+from google.cloud.gkehub_v1 import multiclusteringress_v1  # type: ignore
 from google.cloud.gkehub_v1.services.gke_hub import GkeHubAsyncClient
 from google.cloud.gkehub_v1.services.gke_hub import GkeHubClient
 from google.cloud.gkehub_v1.services.gke_hub import pagers