chore: override API mixins when needed

Google APIs · copybara-github · commit 4689c7380444 · 2022-09-27T12:42:03.000-07:00
PiperOrigin-RevId: 477248447
diff --git a/WORKSPACE b/WORKSPACE
@@ -314,9 +314,9 @@ gapic_generator_register_toolchains()
 # TypeScript
 ##############################################################################
 
-_gapic_generator_typescript_version = "2.18.0"
+_gapic_generator_typescript_version = "2.18.2"
 
-_gapic_generator_typescript_sha256 = "34f842a8bf587584c132c3f08b669ec880860762fa72066637326004626e7364"
+_gapic_generator_typescript_sha256 = "45dfd7f059f45f83352a2d9438c1ed021817d9c894220cbd9578b1580194b937"
 
 ### TypeScript generator
 http_archive(
diff --git a/google/cloud/dataplex/v1/BUILD.bazel b/google/cloud/dataplex/v1/BUILD.bazel
@@ -283,7 +283,7 @@ nodejs_gapic_library(
     package = "google.cloud.dataplex.v1",
     service_yaml = "dataplex_v1.yaml",
     # Content service defines IAM RPCs, force override mixins to remove IAM
-    mixins = "google.cloud.location.Locations,google.longrunning.Operations",
+    mixins = "google.cloud.location.Locations;google.longrunning.Operations",
     deps = [],
 )
 
diff --git a/google/cloud/dialogflow/cx/v3/BUILD.bazel b/google/cloud/dialogflow/cx/v3/BUILD.bazel
@@ -323,7 +323,7 @@ nodejs_gapic_library(
     package = "google.cloud.dialogflow.cx.v3",
     service_yaml = "dialogflow_v3.yaml",
     deps = [],
-    mixins = "google.longrunning.Operations,google.cloud.location.Locations",
+    mixins = "google.longrunning.Operations;google.cloud.location.Locations",
 )
 
 nodejs_gapic_assembly_pkg(
diff --git a/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel b/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel
@@ -323,7 +323,7 @@ nodejs_gapic_library(
     package = "google.cloud.dialogflow.cx.v3beta1",
     service_yaml = "dialogflow_v3beta1.yaml",
     deps = [],
-    mixins = "google.longrunning.Operations,google.cloud.location.Locations",
+    mixins = "google.longrunning.Operations;google.cloud.location.Locations",
 )
 
 nodejs_gapic_assembly_pkg(
diff --git a/google/cloud/dialogflow/v2/BUILD.bazel b/google/cloud/dialogflow/v2/BUILD.bazel
@@ -324,7 +324,7 @@ nodejs_gapic_library(
     package = "google.cloud.dialogflow.v2",
     service_yaml = "dialogflow_v2.yaml",
     deps = [],
-    mixins = "google.longrunning.Operations,google.cloud.location.Locations",
+    mixins = "google.longrunning.Operations;google.cloud.location.Locations",
 )
 
 nodejs_gapic_assembly_pkg(
diff --git a/google/cloud/dialogflow/v2beta1/BUILD.bazel b/google/cloud/dialogflow/v2beta1/BUILD.bazel
@@ -318,7 +318,7 @@ nodejs_gapic_library(
     package = "google.cloud.dialogflow.v2beta1",
     service_yaml = "dialogflow_v2beta1.yaml",
     deps = [],
-    mixins = "google.longrunning.Operations,google.cloud.location.Locations",
+    mixins = "google.longrunning.Operations;google.cloud.location.Locations",
 )
 
 nodejs_gapic_assembly_pkg(

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ nodejs_gapic_library(`
`283`	`283`	`package = "google.cloud.dataplex.v1",`
`284`	`284`	`service_yaml = "dataplex_v1.yaml",`
`285`	`285`	`# Content service defines IAM RPCs, force override mixins to remove IAM`
`286`		`- mixins = "google.cloud.location.Locations,google.longrunning.Operations",`
	`286`	`+ mixins = "google.cloud.location.Locations;google.longrunning.Operations",`
`287`	`287`	`deps = [],`
`288`	`288`	`)`
`289`	`289`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ nodejs_gapic_library(`
`323`	`323`	`package = "google.cloud.dialogflow.cx.v3",`
`324`	`324`	`service_yaml = "dialogflow_v3.yaml",`
`325`	`325`	`deps = [],`
`326`		`- mixins = "google.longrunning.Operations,google.cloud.location.Locations",`
	`326`	`+ mixins = "google.longrunning.Operations;google.cloud.location.Locations",`
`327`	`327`	`)`
`328`	`328`
`329`	`329`	`nodejs_gapic_assembly_pkg(`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ nodejs_gapic_library(`
`324`	`324`	`package = "google.cloud.dialogflow.v2",`
`325`	`325`	`service_yaml = "dialogflow_v2.yaml",`
`326`	`326`	`deps = [],`
`327`		`- mixins = "google.longrunning.Operations,google.cloud.location.Locations",`
	`327`	`+ mixins = "google.longrunning.Operations;google.cloud.location.Locations",`
`328`	`328`	`)`
`329`	`329`
`330`	`330`	`nodejs_gapic_assembly_pkg(`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ nodejs_gapic_library(`
`318`	`318`	`package = "google.cloud.dialogflow.v2beta1",`
`319`	`319`	`service_yaml = "dialogflow_v2beta1.yaml",`
`320`	`320`	`deps = [],`
`321`		`- mixins = "google.longrunning.Operations,google.cloud.location.Locations",`
	`321`	`+ mixins = "google.longrunning.Operations;google.cloud.location.Locations",`
`322`	`322`	`)`
`323`	`323`
`324`	`324`	`nodejs_gapic_assembly_pkg(`