use unless instead of if for real this time

Author: noahdietz

gapic-generator-ads/Gemfile.lock

@@ -60,6 +60,9 @@ GEM
     google-cloud-common (1.9.0)
       google-protobuf (>= 3.18, < 5.a)
       googleapis-common-protos-types (~> 1.20)
+    google-protobuf (4.33.0-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
     google-protobuf (4.33.0-x86_64-linux-gnu)
       bigdecimal
       rake (>= 13)
@@ -87,6 +90,8 @@ GEM
     minitest-server (1.0.8)
       drb (~> 2.0)
       minitest (~> 5.16)
+    nokogiri (1.18.10-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.27.0)
@@ -142,6 +147,7 @@ GEM
     yard (0.9.37)
 
 PLATFORMS
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
@@ -156,4 +162,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.9
+   2.7.2

gapic-generator-cloud/Gemfile.lock

@@ -60,6 +60,9 @@ GEM
     google-cloud-common (1.9.0)
       google-protobuf (>= 3.18, < 5.a)
       googleapis-common-protos-types (~> 1.20)
+    google-protobuf (4.33.0-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
     google-protobuf (4.33.0-x86_64-linux-gnu)
       bigdecimal
       rake (>= 13)
@@ -87,6 +90,8 @@ GEM
     minitest-server (1.0.8)
       drb (~> 2.0)
       minitest (~> 5.16)
+    nokogiri (1.18.10-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.27.0)
@@ -142,6 +147,7 @@ GEM
     yard (0.9.37)
 
 PLATFORMS
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
@@ -156,4 +162,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.9
+   2.7.2

gapic-generator/Gemfile.lock

@@ -54,6 +54,9 @@ GEM
     google-cloud-common (1.9.0)
       google-protobuf (>= 3.18, < 5.a)
       googleapis-common-protos-types (~> 1.20)
+    google-protobuf (4.33.0-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
     google-protobuf (4.33.0-x86_64-linux-gnu)
       bigdecimal
       rake (>= 13)
@@ -81,6 +84,8 @@ GEM
     minitest-server (1.0.8)
       drb (~> 2.0)
       minitest (~> 5.16)
+    nokogiri (1.18.10-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.27.0)
@@ -136,6 +141,7 @@ GEM
     yard (0.9.37)
 
 PLATFORMS
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
@@ -149,4 +155,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.9
+   2.7.2

gapic-generator/lib/gapic/presenters/service_presenter.rb

@@ -526,20 +526,30 @@ def grpc_full_name
       #
       # @return [Hash]
       def drift_manifest
-        h = {
+        unless @service.api_version.empty?
+          return {
+            apiVersion: @service.api_version,
+            clients: {
+              grpc: {
+                libraryClient: client_name_full,
+                # The methods should grouped by grpc_method_name and then
+                # their names are returned together in an array.
+                # For Ruby currently we have 1:1 proto to code
+                # correspondence for methods, so our generation is easier
+                rpcs:       methods.to_h { |m| [m.grpc_method_name, m.drift_manifest] }
+              }
+            }
+          }
+        end
+
+        {
           clients: {
             grpc: {
               libraryClient: client_name_full,
-              # The methods should grouped by grpc_method_name and then
-              # their names are returned together in an array.
-              # For Ruby currently we have 1:1 proto to code
-              # correspondence for methods, so our generation is easier
               rpcs:       methods.to_h { |m| [m.grpc_method_name, m.drift_manifest] }
             }
           }
         }
-        h[:apiVersion] = @service.api_version unless @service.api_version.empty?
-        return h
       end
 
       ##

shared/output/gapic/templates/showcase/gapic_metadata.json

@@ -65,6 +65,7 @@
       }
     },
     "Echo": {
+      "apiVersion": "v1_20240408",
       "clients": {
         "grpc": {
           "libraryClient": "::Google::Showcase::V1beta1::Echo::Client",
@@ -126,8 +127,7 @@
             }
           }
         }
-      },
-      "apiVersion": "v1_20240408"
+      }
     },
     "Identity": {
       "clients": {