fix: better compare for mixin package includes (#1219)

* fix: better compare for mixin package includes

Author: viacheslav-rostovtsev

gapic-generator/lib/gapic/model/mixins.rb

@@ -176,7 +176,11 @@ def self.mixin_service_address? service_address, gem_name: nil
       def self.mixin_message_field_address? message_field_address, gem_name: nil
         message_field_address = message_field_address.join "." unless message_field_address.is_a? String
         # NB: messages are checked against package, not service
-        service_address = MIXIN_GEM_NAMES.keys.find { |sn| message_field_address.start_with? MIXIN_PACKAGE_NAMES[sn] }
+        # The dot is added to the package name to ensure that e.g. `google.iam.v1` is not considered
+        # a parent package to messages and fields within `google.iam.v1beta1`
+        service_address = MIXIN_GEM_NAMES.keys.find do |sn|
+          message_field_address.start_with? "#{MIXIN_PACKAGE_NAMES[sn]}."
+        end
 
         !service_address.nil? && gem_name != MIXIN_GEM_NAMES[service_address]
       end

gapic-generator/test/gapic/mixins/mixins_test.rb

@@ -45,6 +45,21 @@ def test_mixin_service_address_checker
     refute Gapic::Model::Mixins.mixin_service_address? "testing.mixins.ServiceWithLoc"
   end
 
+  # This checks for service `WorkloadIdentityPools` in gem google.iam.v1beta which is not a mixin
+  def test_mixin_service_address_checker_beta
+    refute Gapic::Model::Mixins.mixin_service_address? "google.iam.v1beta.IAMPolicy"
+    refute Gapic::Model::Mixins.mixin_service_address? "google.iam.v1beta.IAMPolicy",
+                                                       gem_name: "google-iam-v1beta"
+    refute Gapic::Model::Mixins.mixin_service_address? "google.iam.v1beta.IAMPolicy",
+                                                       gem_name: "google-cloud-something else"
+    refute Gapic::Model::Mixins.mixin_service_address? ["google", "iam", "v1beta", "IAMPolicy"]
+
+    assert Gapic::Model::Mixins.mixin_service_address? "google.iam.v1.IAMPolicy"
+    assert Gapic::Model::Mixins.mixin_service_address? "google.iam.v1.IAMPolicy",
+                                                       gem_name: "google-cloud-something-else"
+    assert Gapic::Model::Mixins.mixin_service_address? ["google", "iam", "v1", "IAMPolicy"]
+  end
+
   def test_mixin_message_field_address_checker
     # sic. no `s` at the end, this is a message named `Location`, not service named `Locations`
     assert Gapic::Model::Mixins.mixin_message_field_address? "google.cloud.location.Location"
@@ -64,6 +79,41 @@ def test_mixin_message_field_address_checker
     refute Gapic::Model::Mixins.mixin_message_field_address? "testing.mixins.Request"
   end
 
+  # This checks for message `ListWorkloadIdentityPoolsRequest` in gem google.iam.v1beta which is not a mixin
+  def test_mixin_message_field_address_checker_beta
+    # sic. no `s` at the end, this is a message named `Location`, not service named `Locations`
+    refute Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1beta.SetIamPolicyRequest"
+    refute Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1beta.SetIamPolicyRequest.resource"
+
+    refute Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1beta.SetIamPolicyRequest",
+                                                             gem_name: "google-iam-v1beta"
+
+    refute Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1beta.SetIamPolicyRequest",
+                                                             gem_name: "google-cloud-something-else"
+
+    refute Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1beta.SetIamPolicyRequest.resource",
+                                                             gem_name: "google-iam-v1beta"
+
+    refute Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1beta.SetIamPolicyRequest.resource",
+                                                             gem_name: "google-cloud-something-else"
+
+    refute Gapic::Model::Mixins.mixin_message_field_address? ["google", "iam", "v1beta", "SetIamPolicyRequest"]
+    refute Gapic::Model::Mixins.mixin_message_field_address? ["google", "iam", "v1beta", "SetIamPolicyRequest",
+                                                              "resource"]
+
+    assert Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1.SetIamPolicyRequest"
+    assert Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1.SetIamPolicyRequest.resource"
+
+    assert Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1.SetIamPolicyRequest",
+                                                             gem_name: "google-cloud-something-else"
+
+    assert Gapic::Model::Mixins.mixin_message_field_address? "google.iam.v1.SetIamPolicyRequest.resource",
+                                                             gem_name: "google-cloud-something-else"
+
+    assert Gapic::Model::Mixins.mixin_message_field_address? ["google", "iam", "v1", "SetIamPolicyRequest"]
+    assert Gapic::Model::Mixins.mixin_message_field_address? ["google", "iam", "v1", "SetIamPolicyRequest", "resource"]
+  end
+
   # Test the `Garbage` library, which does NOT have mixins specified
   # in its service.yaml (or service.yaml at all)
   def test_garbage_mixins