googleapis · gcf-merge-on-green · Aug 20, 2021 · Aug 16, 2021 · Aug 17, 2021 · Aug 20, 2021
diff --git a/docs/configmanagement_v1/services.rst → ...kehub_v1/configmanagement_v1/services.rst b/docs/configmanagement_v1/services.rst → ...kehub_v1/configmanagement_v1/services.rst
diff --git a/docs/configmanagement_v1/types.rst → docs/gkehub_v1/configmanagement_v1/types.rst b/docs/configmanagement_v1/types.rst → docs/gkehub_v1/configmanagement_v1/types.rst
@@ -1,7 +1,7 @@
 Types for Google Cloud Gkehub Configmanagement v1 API
 =====================================================
 
-.. automodule:: google.cloud.gkehub.configmanagement_v1.types
+.. automodule:: google.cloud.gkehub_v1.configmanagement_v1.types
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/multiclusteringress_v1/services.rst → ...ub_v1/multiclusteringress_v1/services.rst b/docs/multiclusteringress_v1/services.rst → ...ub_v1/multiclusteringress_v1/services.rst
diff --git a/docs/multiclusteringress_v1/types.rst → ...kehub_v1/multiclusteringress_v1/types.rst b/docs/multiclusteringress_v1/types.rst → ...kehub_v1/multiclusteringress_v1/types.rst
@@ -1,7 +1,7 @@
 Types for Google Cloud Gkehub Multiclusteringress v1 API
 ========================================================
 
-.. automodule:: google.cloud.gkehub.multiclusteringress_v1.types
+.. automodule:: google.cloud.gkehub_v1.multiclusteringress_v1.types
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/index.rst b/docs/index.rst
@@ -9,10 +9,10 @@ API Reference
 
     gkehub_v1/services
     gkehub_v1/types
-    configmanagement_v1/services
-    configmanagement_v1/types
-    multiclusteringress_v1/services
-    multiclusteringress_v1/types
+    gkehub_v1/configmanagement_v1/services
+    gkehub_v1/configmanagement_v1/types
+    gkehub_v1/multiclusteringress_v1/services
+    gkehub_v1/multiclusteringress_v1/types
 
 API Reference
 -------------

diff --git a/...ud/gkehub/configmanagement_v1/__init__.py → ...gkehub_v1/configmanagement_v1/__init__.py b/...ud/gkehub/configmanagement_v1/__init__.py → ...gkehub_v1/configmanagement_v1/__init__.py
diff --git a/...b/configmanagement_v1/gapic_metadata.json → ...1/configmanagement_v1/gapic_metadata.json b/...b/configmanagement_v1/gapic_metadata.json → ...1/configmanagement_v1/gapic_metadata.json
diff --git a/...cloud/gkehub/configmanagement_v1/py.typed → ...ud/gkehub_v1/configmanagement_v1/py.typed b/...cloud/gkehub/configmanagement_v1/py.typed → ...ud/gkehub_v1/configmanagement_v1/py.typed
diff --git a/.../configmanagement_v1/services/__init__.py → .../configmanagement_v1/services/__init__.py b/.../configmanagement_v1/services/__init__.py → .../configmanagement_v1/services/__init__.py
diff --git a/...hub/configmanagement_v1/types/__init__.py → ..._v1/configmanagement_v1/types/__init__.py b/...hub/configmanagement_v1/types/__init__.py → ..._v1/configmanagement_v1/types/__init__.py
diff --git a/...igmanagement_v1/types/configmanagement.py → ...igmanagement_v1/types/configmanagement.py b/...igmanagement_v1/types/configmanagement.py → ...igmanagement_v1/types/configmanagement.py
diff --git a/...gkehub/multiclusteringress_v1/__init__.py → ...hub_v1/multiclusteringress_v1/__init__.py b/...gkehub/multiclusteringress_v1/__init__.py → ...hub_v1/multiclusteringress_v1/__init__.py
diff --git a/...ulticlusteringress_v1/gapic_metadata.json → ...ulticlusteringress_v1/gapic_metadata.json b/...ulticlusteringress_v1/gapic_metadata.json → ...ulticlusteringress_v1/gapic_metadata.json
diff --git a/...ud/gkehub/multiclusteringress_v1/py.typed → ...gkehub_v1/multiclusteringress_v1/py.typed b/...ud/gkehub/multiclusteringress_v1/py.typed → ...gkehub_v1/multiclusteringress_v1/py.typed
diff --git a/...lticlusteringress_v1/services/__init__.py → ...lticlusteringress_v1/services/__init__.py b/...lticlusteringress_v1/services/__init__.py → ...lticlusteringress_v1/services/__init__.py
diff --git a/.../multiclusteringress_v1/types/__init__.py → .../multiclusteringress_v1/types/__init__.py b/.../multiclusteringress_v1/types/__init__.py → .../multiclusteringress_v1/types/__init__.py
diff --git a/...eringress_v1/types/multiclusteringress.py → ...eringress_v1/types/multiclusteringress.py b/...eringress_v1/types/multiclusteringress.py → ...eringress_v1/types/multiclusteringress.py
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 import configmanagement_v1 as configmanagement_pb2  # type: ignore
-from google.cloud.gkehub import multiclusteringress_v1 as multiclusteringress_pb2  # 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.protobuf import timestamp_pb2  # type: ignore
 
 

diff --git a/owlbot.py b/owlbot.py
@@ -30,16 +30,26 @@
       "multiclusteringress",
     ]
 
-    # rename dependencies google.cloud.gkehub.dep.vX to google.cloud.gkehub.dep_vX
     for dep in dependencies:
+        # Copy v1 dependencies from google/cloud/gkehub to google/cloud/gkehub_vX
+        s.copy(library / f"google/cloud/gkehub/{dep}_v1", library / f"google/cloud/gkehub_{library.name}/{dep}_v1")
+        s.copy(library / f"docs/{dep}_v1", library / f"docs/gkehub_{library.name}/{dep}_v1")
+
+        # Adjust docs based on dependency locations
+        s.replace(
+          library  / f"docs/{dep}_v1",
+          f"google.cloud.gkehub_{library.name}.{dep}_v1.types",
+          f"google.cloud.gkehub_{library.name}.{dep}_v1.types",
+        )
+
+        # Rename v1 dependency imports from google.cloud.gkehub.dep.v1 to google.cloud.gkehub_vX.dep_v1
         s.replace(
           [
             library  / f"google/cloud/gkehub_{library.name}/**/*.py",
             library  / f"tests/unit/gapic/gkehub_{library.name}/**/*.py",
-            library  / f"google/cloud/gkehub/{dep}_{library.name}/**/*.py",
           ],
-          f"from google.cloud.gkehub.{dep}.{library.name} import",
-          f"from google.cloud.gkehub import {dep}_{library.name} as"
+          f"from google.cloud.gkehub.{dep}.v1 import",
+          f"from google.cloud.gkehub_{library.name} import {dep}_v1 as"
         )
 
     # Work around gapic generator bug https://github.com/googleapis/gapic-generator-python/issues/902
@@ -64,7 +74,7 @@
             //container.googleapis.com/projects/my-"""
     )
 
-    s.move(library, excludes=["setup.py", "README.rst", "docs/index.rst", "google/cloud/gkehub/configmanagement", "google/cloud/gkehub/multiclusteringress"])
+    s.move(library, excludes=["setup.py", "README.rst", "docs/index.rst", "google/cloud/gkehub/configmanagement*", "google/cloud/gkehub/multiclusteringress*"])
 
 s.remove_staging_dirs()
 

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 import configmanagement_v1 as configmanagement_pb2  # type: ignore
-from google.cloud.gkehub import multiclusteringress_v1 as multiclusteringress_pb2  # 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.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