Merge branch 'main' into remove-unused-protobuf-dependency

Author: parthea

BUILD.bazel

@@ -7,20 +7,44 @@ toolchain_type(
     visibility = ["//visibility:public"],
 )
 
+pandoc_toolchain(
+    exec_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:arm64",
+    ],
+    platform = "linux_arm_64",
+)
+
 pandoc_toolchain(
     exec_compatible_with = [
         "@platforms//os:linux",
         "@platforms//cpu:x86_64",
     ],
-    platform = "linux",
+    platform = "linux_x86_64",
+)
+
+pandoc_toolchain(
+    exec_compatible_with = [
+        "@platforms//os:osx",
+        "@platforms//cpu:arm64",
+    ],
+    platform = "macOS_arm_64",
 )
 
 pandoc_toolchain(
     exec_compatible_with = [
         "@platforms//os:osx",
         "@platforms//cpu:x86_64",
     ],
-    platform = "macOS",
+    platform = "macOS_x86_64",
+)
+
+pandoc_toolchain(
+    exec_compatible_with = [
+        "@platforms//os:windows",
+        "@platforms//cpu:x86_64",
+    ],
+    platform = "windows_x86_64",
 )
 
 pandoc_binary(

repositories.bzl

@@ -28,18 +28,42 @@ def gapic_generator_python():
 
     _maybe(
         http_archive,
-        name = "pandoc_linux",
+        name = "pandoc_linux_arm_64",
         build_file_content = _PANDOC_BUILD_FILE,
-        strip_prefix = "pandoc-2.2.1",
-        url = "https://github.com/jgm/pandoc/releases/download/2.2.1/pandoc-2.2.1-linux.tar.gz",
+        strip_prefix = "pandoc-3.7.0.2",
+        url = "https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-linux-arm64.tar.gz",
     )
 
     _maybe(
         http_archive,
-        name = "pandoc_macOS",
+        name = "pandoc_linux_x86_64",
         build_file_content = _PANDOC_BUILD_FILE,
-        strip_prefix = "pandoc-2.2.1",
-        url = "https://github.com/jgm/pandoc/releases/download/2.2.1/pandoc-2.2.1-macOS.zip",
+        strip_prefix = "pandoc-3.7.0.2",
+        url = "https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-linux-amd64.tar.gz",
+    )
+
+    _maybe(
+        http_archive,
+        name = "pandoc_macOS_arm_64",
+        build_file_content = _PANDOC_BUILD_FILE,
+        strip_prefix = "pandoc-3.7.0.2",
+        url = "https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-arm64-macOS.zip",
+    )
+
+    _maybe(
+        http_archive,
+        name = "pandoc_macOS_x86_64",
+        build_file_content = _PANDOC_BUILD_FILE,
+        strip_prefix = "pandoc-3.7.0.2",
+        url = "https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-x86_64-macOS.zip",
+    )
+
+    _maybe(
+        http_archive,
+        name = "pandoc_windows_x86_64",
+        build_file_content = _PANDOC_BUILD_FILE,
+        strip_prefix = "pandoc-3.7.0.2",
+        url = "https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-windows-x86_64.zip",
     )
 
     _rules_gapic_version = "0.5.4"
@@ -59,8 +83,11 @@ def gapic_generator_python():
 
 def gapic_generator_register_toolchains():
     native.register_toolchains(
-        "@gapic_generator_python//:pandoc_toolchain_linux",
-        "@gapic_generator_python//:pandoc_toolchain_macOS",
+        "@gapic_generator_python//:pandoc_toolchain_linux_arm_64",
+        "@gapic_generator_python//:pandoc_toolchain_linux_x86_64",
+        "@gapic_generator_python//:pandoc_toolchain_macOS_arm_64",
+        "@gapic_generator_python//:pandoc_toolchain_macOS_x86_64",
+        "@gapic_generator_python//:pandoc_toolchain_windows_x86_64",
     )
 
 def _maybe(repo_rule, name, strip_repo_prefix = "", **kwargs):

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py

@@ -976,16 +976,16 @@ def analyze_org_policy_governed_assets(self) -> Callable[
         resources or policies) under a scope. This RPC supports custom
         constraints and the following 10 canned constraints:
 
-        -  storage.uniformBucketLevelAccess
-        -  iam.disableServiceAccountKeyCreation
-        -  iam.allowedPolicyMemberDomains
-        -  compute.vmExternalIpAccess
-        -  appengine.enforceServiceAccountActAsCheck
-        -  gcp.resourceLocations
-        -  compute.trustedImageProjects
-        -  compute.skipDefaultNetworkCreation
-        -  compute.requireOsLogin
-        -  compute.disableNestedVirtualization
+        - storage.uniformBucketLevelAccess
+        - iam.disableServiceAccountKeyCreation
+        - iam.allowedPolicyMemberDomains
+        - compute.vmExternalIpAccess
+        - appengine.enforceServiceAccountActAsCheck
+        - gcp.resourceLocations
+        - compute.trustedImageProjects
+        - compute.skipDefaultNetworkCreation
+        - compute.requireOsLogin
+        - compute.disableNestedVirtualization
 
         This RPC only returns either resources of types supported by
         `searchable asset

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py

@@ -982,16 +982,16 @@ def analyze_org_policy_governed_assets(self) -> Callable[
         resources or policies) under a scope. This RPC supports custom
         constraints and the following 10 canned constraints:
 
-        -  storage.uniformBucketLevelAccess
-        -  iam.disableServiceAccountKeyCreation
-        -  iam.allowedPolicyMemberDomains
-        -  compute.vmExternalIpAccess
-        -  appengine.enforceServiceAccountActAsCheck
-        -  gcp.resourceLocations
-        -  compute.trustedImageProjects
-        -  compute.skipDefaultNetworkCreation
-        -  compute.requireOsLogin
-        -  compute.disableNestedVirtualization
+        - storage.uniformBucketLevelAccess
+        - iam.disableServiceAccountKeyCreation
+        - iam.allowedPolicyMemberDomains
+        - compute.vmExternalIpAccess
+        - appengine.enforceServiceAccountActAsCheck
+        - gcp.resourceLocations
+        - compute.trustedImageProjects
+        - compute.skipDefaultNetworkCreation
+        - compute.requireOsLogin
+        - compute.disableNestedVirtualization
 
         This RPC only returns either resources of types supported by
         `searchable asset