fix: use gapic_version from versioned module (#1573)

parthea · web-flow · commit 4c097b5bc395 · 2023-01-23T20:51:17.000Z
* fix: use gapic_version from versioned module

* omit gapic_version.py from coverage

* update golden files
diff --git a/packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2 b/packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-{% set package_path = api.naming.module_namespace|join('.') + "." + api.naming.module_name %}
+{% set package_path = api.naming.module_namespace|join('.') + "." + api.naming.versioned_module_name %}
 from {{package_path}} import gapic_version as package_version
 
 __version__ = package_version.__version__
diff --git a/packages/gapic-generator/gapic/templates/.coveragerc.j2 b/packages/gapic-generator/gapic/templates/.coveragerc.j2
@@ -5,6 +5,7 @@ branch = True
 show_missing = True
 omit =
     {{ api.naming.module_namespace|join("/") }}/{{ api.naming.module_name }}/__init__.py
+    {{ api.naming.module_namespace|join("/") }}/{{ api.naming.module_name }}/gapic_version.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER
diff --git a/packages/gapic-generator/tests/integration/goldens/asset/.coveragerc b/packages/gapic-generator/tests/integration/goldens/asset/.coveragerc
@@ -5,6 +5,7 @@ branch = True
 show_missing = True
 omit =
     google/cloud/asset/__init__.py
+    google/cloud/asset/gapic_version.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER
diff --git a/packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from google.cloud.asset import gapic_version as package_version
+from google.cloud.asset_v1 import gapic_version as package_version
 
 __version__ = package_version.__version__
 
diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/.coveragerc b/packages/gapic-generator/tests/integration/goldens/credentials/.coveragerc
@@ -5,6 +5,7 @@ branch = True
 show_missing = True
 omit =
     google/iam/credentials/__init__.py
+    google/iam/credentials/gapic_version.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER
diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from google.iam.credentials import gapic_version as package_version
+from google.iam.credentials_v1 import gapic_version as package_version
 
 __version__ = package_version.__version__
 
diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/.coveragerc b/packages/gapic-generator/tests/integration/goldens/eventarc/.coveragerc
@@ -5,6 +5,7 @@ branch = True
 show_missing = True
 omit =
     google/cloud/eventarc/__init__.py
+    google/cloud/eventarc/gapic_version.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER
diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from google.cloud.eventarc import gapic_version as package_version
+from google.cloud.eventarc_v1 import gapic_version as package_version
 
 __version__ = package_version.__version__
 
diff --git a/packages/gapic-generator/tests/integration/goldens/logging/.coveragerc b/packages/gapic-generator/tests/integration/goldens/logging/.coveragerc
@@ -5,6 +5,7 @@ branch = True
 show_missing = True
 omit =
     google/cloud/logging/__init__.py
+    google/cloud/logging/gapic_version.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER
diff --git a/packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py b/packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from google.cloud.logging import gapic_version as package_version
+from google.cloud.logging_v2 import gapic_version as package_version
 
 __version__ = package_version.__version__
 
diff --git a/packages/gapic-generator/tests/integration/goldens/redis/.coveragerc b/packages/gapic-generator/tests/integration/goldens/redis/.coveragerc
@@ -5,6 +5,7 @@ branch = True
 show_missing = True
 omit =
     google/cloud/redis/__init__.py
+    google/cloud/redis/gapic_version.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER
diff --git a/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from google.cloud.redis import gapic_version as package_version
+from google.cloud.redis_v1 import gapic_version as package_version
 
 __version__ = package_version.__version__
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-from google.cloud.asset import gapic_version as package_version`
	`16`	`+from google.cloud.asset_v1 import gapic_version as package_version`
`17`	`17`
`18`	`18`	`__version__ = package_version.__version__`
`19`	`19`