fix: PHP-related fixes in BUILD.bazel and service.yamls

This PR also adds the rules for all 7 langauges in OsLogin and Kms BUILD.bazel files. Those build files were missing rules for 5 langagues, including PHP. This PR is the prerequisite for migrating PHP synth.py scripts from artman to bazel. The fixes in service.yaml fix regression made during proto annotation migration. This became visible only during PHP generation, because only PHP depends on the affected sections of the service.yaml config. PiperOrigin-RevId: 305108224
2020-04-06 13:45:42 -07:00 · 2020-04-06 13:45:42 -07:00 · ff74d47d47
parent fdbc7b1f63
commit ff74d47d47
11 changed files with 607 additions and 79 deletions
--- a/google/cloud/automl/v1/automl_v1.yaml
+++ b/google/cloud/automl/v1/automl_v1.yaml
@ -72,6 +72,37 @@ backend:
  - selector: google.longrunning.Operations.WaitOperation
    deadline: 300.0

+http:
+  rules:
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v1/{name=projects/*/locations/*}/operations'
+
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1/{name=projects/*/locations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1/{name=projects/*/locations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1/{name=projects/*/locations/*/operations/*}:cancel'
+    body: '*'
+
+  - selector: google.iam.v1.IAMPolicy.SetIamPolicy
+    post: '/v1/{resource=projects/*/locations/*/datasets/*}:setIamPolicy'
+    body: '*'
+    additional_bindings:
+    - post: '/v1/{resource=projects/*/locations/*/models/*}:setIamPolicy'
+      body: '*'
+
+  - selector: google.iam.v1.IAMPolicy.GetIamPolicy
+    get: '/v1/{resource=projects/*/locations/*/datasets/*}:getIamPolicy'
+    additional_bindings:
+    - get: '/v1/{resource=projects/*/locations/*/models/*}:getIamPolicy'
+
+  - selector: google.iam.v1.IAMPolicy.TestIamPermissions
+    post: '/v1/{resource=projects/*/locations/*/**}:testIamPermissions'
+    body: '*'
+
 authentication:
  rules:
  - selector: 'google.cloud.automl.v1.AutoMl.*'
--- a/google/cloud/automl/v1beta1/automl_v1beta1.yaml
+++ b/google/cloud/automl/v1beta1/automl_v1beta1.yaml
@ -74,33 +74,33 @@ backend:

 http:
  rules:
-  - selector: google.iam.v1.IAMPolicy.GetIamPolicy
-    get: '/v1beta1/{resource=projects/*/locations/*}:getIamPolicy'
-    additional_bindings:
-    - get: '/v1beta1/{resource=projects/*/locations/*/datasets/*}:getIamPolicy'
-    - get: '/v1beta1/{resource=projects/*/locations/*/models/*}:getIamPolicy'
-  - selector: google.iam.v1.IAMPolicy.SetIamPolicy
-    post: '/v1beta1/{resource=projects/*/locations/*}:setIamPolicy'
-    body: '*'
-    additional_bindings:
-    - post: '/v1beta1/{resource=projects/*/locations/*/datasets/*}:setIamPolicy'
-      body: '*'
-    - post: '/v1beta1/{resource=projects/*/locations/*/models/*}:setIamPolicy'
-      body: '*'
-  - selector: google.iam.v1.IAMPolicy.TestIamPermissions
-    post: '/v1beta1/{resource=projects/*/locations/*/**}:testIamPermissions'
-    body: '*'
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v1beta1/{name=projects/*/locations/*}/operations'
+
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1beta1/{name=projects/*/locations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1beta1/{name=projects/*/locations/*/operations/*}'
+
  - selector: google.longrunning.Operations.CancelOperation
    post: '/v1beta1/{name=projects/*/locations/*/operations/*}:cancel'
    body: '*'
-  - selector: google.longrunning.Operations.DeleteOperation
-    delete: '/v1beta1/{name=projects/*/locations/*/operations/*}'
-  - selector: google.longrunning.Operations.GetOperation
-    get: '/v1beta1/{name=projects/*/locations/*/operations/*}'
-  - selector: google.longrunning.Operations.ListOperations
-    get: '/v1beta1/{name=projects/*/locations/*}/operations'
-  - selector: google.longrunning.Operations.WaitOperation
-    post: '/v1beta1/{name=projects/*/locations/*/operations/*}:wait'
+
+  - selector: google.iam.v1.IAMPolicy.SetIamPolicy
+    post: '/v1beta1/{resource=projects/*/locations/*/datasets/*}:setIamPolicy'
+    body: '*'
+    additional_bindings:
+    - post: '/v1beta1/{resource=projects/*/locations/*/models/*}:setIamPolicy'
+      body: '*'
+
+  - selector: google.iam.v1.IAMPolicy.GetIamPolicy
+    get: '/v1beta1/{resource=projects/*/locations/*/datasets/*}:getIamPolicy'
+    additional_bindings:
+    - get: '/v1beta1/{resource=projects/*/locations/*/models/*}:getIamPolicy'
+
+  - selector: google.iam.v1.IAMPolicy.TestIamPermissions
+    post: '/v1beta1/{resource=projects/*/locations/*/**}:testIamPermissions'
    body: '*'

 authentication:
--- a/google/cloud/dataproc/v1/dataproc_v1.yaml
+++ b/google/cloud/dataproc/v1/dataproc_v1.yaml
@ -43,63 +43,18 @@ documentation:

 http:
  rules:
-  - selector: google.iam.v1.IAMPolicy.GetIamPolicy
-    post: '/v1/{resource=projects/*/regions/*/clusters/*}:getIamPolicy'
-    body: '*'
-    additional_bindings:
-    - post: '/v1/{resource=projects/*/regions/*/jobs/*}:getIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/operations/*}:getIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/workflowTemplates/*}:getIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/locations/*/workflowTemplates/*}:getIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/autoscalingPolicies/*}:getIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/locations/*/autoscalingPolicies/*}:getIamPolicy'
-      body: '*'
-  - selector: google.iam.v1.IAMPolicy.SetIamPolicy
-    post: '/v1/{resource=projects/*/regions/*/clusters/*}:setIamPolicy'
-    body: '*'
-    additional_bindings:
-    - post: '/v1/{resource=projects/*/regions/*/jobs/*}:setIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/operations/*}:setIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/workflowTemplates/*}:setIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/locations/*/workflowTemplates/*}:setIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/autoscalingPolicies/*}:setIamPolicy'
-      body: '*'
-    - post: '/v1/{resource=projects/*/locations/*/autoscalingPolicies/*}:setIamPolicy'
-      body: '*'
-  - selector: google.iam.v1.IAMPolicy.TestIamPermissions
-    post: '/v1/{resource=projects/*/regions/*/clusters/*}:testIamPermissions'
-    body: '*'
-    additional_bindings:
-    - post: '/v1/{resource=projects/*/regions/*/jobs/*}:testIamPermissions'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/operations/*}:testIamPermissions'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/workflowTemplates/*}:testIamPermissions'
-      body: '*'
-    - post: '/v1/{resource=projects/*/locations/*/workflowTemplates/*}:testIamPermissions'
-      body: '*'
-    - post: '/v1/{resource=projects/*/regions/*/autoscalingPolicies/*}:testIamPermissions'
-      body: '*'
-    - post: '/v1/{resource=projects/*/locations/*/autoscalingPolicies/*}:testIamPermissions'
-      body: '*'
-  - selector: google.longrunning.Operations.CancelOperation
-    post: '/v1/{name=projects/*/regions/*/operations/*}:cancel'
-  - selector: google.longrunning.Operations.DeleteOperation
-    delete: '/v1/{name=projects/*/regions/*/operations/*}'
-  - selector: google.longrunning.Operations.GetOperation
-    get: '/v1/{name=projects/*/regions/*/operations/*}'
  - selector: google.longrunning.Operations.ListOperations
    get: '/v1/{name=projects/*/regions/*/operations}'

+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1/{name=projects/*/regions/*/operations/*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1/{name=projects/*/regions/*/operations/*}'
+
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1/{name=projects/*/regions/*/operations/*}:cancel'
+
 authentication:
  rules:
  - selector: 'google.cloud.dataproc.v1.AutoscalingPolicyService.*'
--- a/google/cloud/dataproc/v1beta2/dataproc_v1beta2.yaml
+++ b/google/cloud/dataproc/v1beta2/dataproc_v1beta2.yaml
@ -41,6 +41,31 @@ documentation:
      permission-aware UIs and command-line tools, not for authorization
      checking. This operation may "fail open" without warning.

+http:
+  rules:
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v1beta2/{name=projects/*/regions/*/operations}'
+
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1beta2/{name=projects/*/regions/*/operations/*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1beta2/{name=projects/*/regions/*/operations/*}'
+
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1beta2/{name=projects/*/regions/*/operations/*}:cancel'
+
+  - selector: google.iam.v1.IAMPolicy.SetIamPolicy
+    post: '/v1beta2/{resource=projects/*/regions/*/clusters/*}:setIamPolicy'
+    body: '*'
+
+  - selector: google.iam.v1.IAMPolicy.GetIamPolicy
+    get: '/v1beta2/{resource=projects/*/regions/*/clusters/*}:getIamPolicy'
+
+  - selector: google.iam.v1.IAMPolicy.TestIamPermissions
+    post: '/v1beta2/{resource=projects/*/regions/*/clusters/*}:testIamPermissions'
+    body: '*'
+
 authentication:
  rules:
  - selector: 'google.cloud.dataproc.v1beta2.AutoscalingPolicyService.*'
--- a/google/cloud/kms/v1/BUILD.bazel
+++ b/google/cloud/kms/v1/BUILD.bazel
@ -75,6 +75,7 @@ java_gapic_library(
    src = ":kms_proto_with_info",
    gapic_yaml = "cloudkms_gapic.yaml",
    gen_resource_name = False,
+    package = "google.cloud.kms.v1",
    service_yaml = "cloudkms_v1.yaml",
    test_deps = [
        ":kms_java_grpc",
@ -159,6 +160,224 @@ go_gapic_assembly_pkg(
    ],
 )

+##############################################################################
+# Python
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "moved_proto_library",
+    "py_gapic_assembly_pkg",
+    "py_gapic_library",
+    "py_grpc_library",
+    "py_proto_library",
+)
+
+moved_proto_library(
+    name = "kms_moved_proto",
+    srcs = [":kms_proto"],
+    deps = [
+        "//google/api:annotations_proto",
+        "//google/api:client_proto",
+        "//google/api:field_behavior_proto",
+        "//google/api:resource_proto",
+        "@com_google_protobuf//:duration_proto",
+        "@com_google_protobuf//:field_mask_proto",
+        "@com_google_protobuf//:timestamp_proto",
+    ],
+)
+
+py_proto_library(
+    name = "kms_py_proto",
+    plugin = "@protoc_docs_plugin//:docs_plugin",
+    deps = [":kms_moved_proto"],
+)
+
+py_grpc_library(
+    name = "kms_py_grpc",
+    srcs = [":kms_moved_proto"],
+    deps = [":kms_py_proto"],
+)
+
+py_gapic_library(
+    name = "kms_py_gapic",
+    src = ":kms_proto_with_info",
+    gapic_yaml = "cloudkms_gapic.yaml",
+    package = "google.cloud.kms.v1",
+    service_yaml = "cloudkms_v1.yaml",
+    deps = [
+        ":kms_py_grpc",
+        ":kms_py_proto",
+    ],
+)
+
+# Open Source Packages
+py_gapic_assembly_pkg(
+    name = "kms-v1-py",
+    deps = [
+        ":kms_py_gapic",
+        ":kms_py_grpc",
+        ":kms_py_proto",
+    ],
+)
+
+##############################################################################
+# PHP
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "php_gapic_assembly_pkg",
+    "php_gapic_library",
+    "php_grpc_library",
+    "php_proto_library",
+)
+
+php_proto_library(
+    name = "kms_php_proto",
+    deps = [":kms_proto"],
+)
+
+php_grpc_library(
+    name = "kms_php_grpc",
+    srcs = [":kms_proto"],
+    deps = [":kms_php_proto"],
+)
+
+php_gapic_library(
+    name = "kms_php_gapic",
+    src = ":kms_proto_with_info",
+    gapic_yaml = "cloudkms_gapic.yaml",
+    package = "google.cloud.kms.v1",
+    service_yaml = "cloudkms_v1.yaml",
+    deps = [
+        ":kms_php_grpc",
+        ":kms_php_proto",
+    ],
+)
+
+# Open Source Packages
+php_gapic_assembly_pkg(
+    name = "google-cloud-kms-v1-php",
+    deps = [
+        ":kms_php_gapic",
+        ":kms_php_grpc",
+        ":kms_php_proto",
+    ],
+)
+
+##############################################################################
+# Node.js
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "nodejs_gapic_assembly_pkg",
+    "nodejs_gapic_library",
+)
+
+nodejs_gapic_library(
+    name = "kms_nodejs_gapic",
+    src = ":kms_proto_with_info",
+    gapic_yaml = "cloudkms_gapic.yaml",
+    package = "google.cloud.kms.v1",
+    service_yaml = "cloudkms_v1.yaml",
+    deps = [],
+)
+
+nodejs_gapic_assembly_pkg(
+    name = "kms-v1-nodejs",
+    deps = [
+        ":kms_nodejs_gapic",
+        ":kms_proto",
+    ],
+)
+
+##############################################################################
+# Ruby
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "ruby_gapic_assembly_pkg",
+    "ruby_gapic_library",
+    "ruby_grpc_library",
+    "ruby_proto_library",
+)
+
+ruby_proto_library(
+    name = "kms_ruby_proto",
+    deps = [":kms_proto"],
+)
+
+ruby_grpc_library(
+    name = "kms_ruby_grpc",
+    srcs = [":kms_proto"],
+    deps = [":kms_ruby_proto"],
+)
+
+ruby_gapic_library(
+    name = "kms_ruby_gapic",
+    src = ":kms_proto_with_info",
+    gapic_yaml = "cloudkms_gapic.yaml",
+    package = "google.cloud.kms.v1",
+    service_yaml = "cloudkms_v1.yaml",
+    deps = [
+        ":kms_ruby_grpc",
+        ":kms_ruby_proto",
+    ],
+)
+
+# Open Source Packages
+ruby_gapic_assembly_pkg(
+    name = "google-cloud-kms-v1-ruby",
+    deps = [
+        ":kms_ruby_gapic",
+        ":kms_ruby_grpc",
+        ":kms_ruby_proto",
+    ],
+)
+
+##############################################################################
+# C#
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "csharp_gapic_assembly_pkg",
+    "csharp_gapic_library",
+    "csharp_grpc_library",
+    "csharp_proto_library",
+)
+
+csharp_proto_library(
+    name = "kms_csharp_proto",
+    deps = [":kms_proto"],
+)
+
+csharp_grpc_library(
+    name = "kms_csharp_grpc",
+    srcs = [":kms_proto"],
+    deps = [":kms_csharp_proto"],
+)
+
+csharp_gapic_library(
+    name = "kms_csharp_gapic",
+    src = ":kms_proto_with_info",
+    gapic_yaml = "cloudkms_gapic.yaml",
+    package = "google.cloud.kms.v1",
+    service_yaml = "cloudkms_v1.yaml",
+    deps = [
+        ":kms_csharp_grpc",
+        ":kms_csharp_proto",
+    ],
+)
+
+# Open Source Packages
+csharp_gapic_assembly_pkg(
+    name = "google-cloud-kms-v1-csharp",
+    deps = [
+        ":kms_csharp_gapic",
+        ":kms_csharp_grpc",
+        ":kms_csharp_proto",
+    ],
+)
+
 ##############################################################################
 # C++
 ##############################################################################
--- a/google/cloud/oslogin/v1beta/BUILD.bazel
+++ b/google/cloud/oslogin/v1beta/BUILD.bazel
@ -147,3 +147,245 @@ go_gapic_assembly_pkg(
        "//google/cloud/oslogin/common:common_go_proto",
    ],
 )
+
+##############################################################################
+# Python
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "moved_proto_library",
+    "py_gapic_assembly_pkg",
+    "py_gapic_library",
+    "py_grpc_library",
+    "py_proto_library",
+)
+
+_PY_SUBPACKAGE_DEPS = [
+    "//google/cloud/oslogin/common:common_py_proto",
+    "//google/cloud/oslogin/common:common_py_grpc",
+]
+
+moved_proto_library(
+    name = "oslogin_moved_proto",
+    srcs = [":oslogin_proto"],
+    deps = [
+        "//google/api:annotations_proto",
+        "//google/api:client_proto",
+        "//google/api:field_behavior_proto",
+        "//google/api:resource_proto",
+        "@com_google_protobuf//:empty_proto",
+        "@com_google_protobuf//:field_mask_proto",
+    ] + _PROTO_SUBPACKAGE_DEPS,
+)
+
+py_proto_library(
+    name = "oslogin_py_proto",
+    plugin = "@protoc_docs_plugin//:docs_plugin",
+    deps = [":oslogin_moved_proto"],
+)
+
+py_grpc_library(
+    name = "oslogin_py_grpc",
+    srcs = [":oslogin_moved_proto"],
+    deps = [":oslogin_py_proto"],
+)
+
+py_gapic_library(
+    name = "oslogin_py_gapic",
+    src = ":oslogin_proto_with_info",
+    gapic_yaml = "oslogin_gapic.yaml",
+    package = "google.cloud.oslogin.v1beta",
+    service_yaml = "oslogin_v1beta.yaml",
+    deps = [
+        ":oslogin_py_grpc",
+        ":oslogin_py_proto",
+    ] + _PY_SUBPACKAGE_DEPS,
+)
+
+# Open Source Packages
+py_gapic_assembly_pkg(
+    name = "oslogin-v1beta-py",
+    deps = [
+        ":oslogin_py_gapic",
+        ":oslogin_py_grpc",
+        ":oslogin_py_proto",
+    ] + _PY_SUBPACKAGE_DEPS,
+)
+
+##############################################################################
+# PHP
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "php_gapic_assembly_pkg",
+    "php_gapic_library",
+    "php_grpc_library",
+    "php_proto_library",
+)
+
+_PHP_SUBPACKAGE_DEPS = [
+    "//google/cloud/oslogin/common:common_php_proto",
+    "//google/cloud/oslogin/common:common_php_grpc",
+]
+
+php_proto_library(
+    name = "oslogin_php_proto",
+    deps = [":oslogin_proto"],
+)
+
+php_grpc_library(
+    name = "oslogin_php_grpc",
+    srcs = [":oslogin_proto"],
+    deps = [":oslogin_php_proto"],
+)
+
+php_gapic_library(
+    name = "oslogin_php_gapic",
+    src = ":oslogin_proto_with_info",
+    gapic_yaml = "oslogin_gapic.yaml",
+    package = "google.cloud.oslogin.v1beta",
+    service_yaml = "oslogin_v1beta.yaml",
+    deps = [
+        ":oslogin_php_grpc",
+        ":oslogin_php_proto",
+    ] + _PHP_SUBPACKAGE_DEPS,
+)
+
+# Open Source Packages
+php_gapic_assembly_pkg(
+    name = "google-cloud-oslogin-v1beta-php",
+    deps = [
+        ":oslogin_php_gapic",
+        ":oslogin_php_grpc",
+        ":oslogin_php_proto",
+    ] + _PHP_SUBPACKAGE_DEPS,
+)
+
+##############################################################################
+# Node.js
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "nodejs_gapic_assembly_pkg",
+    "nodejs_gapic_library",
+)
+
+nodejs_gapic_library(
+    name = "oslogin_nodejs_gapic",
+    src = ":oslogin_proto_with_info",
+    gapic_yaml = "oslogin_gapic.yaml",
+    package = "google.cloud.oslogin.v1beta",
+    service_yaml = "oslogin_v1beta.yaml",
+    deps = [],
+)
+
+nodejs_gapic_assembly_pkg(
+    name = "oslogin-v1beta-nodejs",
+    deps = [
+        ":oslogin_nodejs_gapic",
+        ":oslogin_proto",
+    ] + _PROTO_SUBPACKAGE_DEPS,
+)
+
+##############################################################################
+# Ruby
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "ruby_gapic_assembly_pkg",
+    "ruby_gapic_library",
+    "ruby_grpc_library",
+    "ruby_proto_library",
+)
+
+_RUBY_SUBPACKAGE_DEPS = [
+    "//google/cloud/oslogin/common:common_ruby_proto",
+    "//google/cloud/oslogin/common:common_ruby_grpc",
+]
+
+ruby_proto_library(
+    name = "oslogin_ruby_proto",
+    deps = [":oslogin_proto"],
+)
+
+ruby_grpc_library(
+    name = "oslogin_ruby_grpc",
+    srcs = [":oslogin_proto"],
+    deps = [":oslogin_ruby_proto"],
+)
+
+ruby_gapic_library(
+    name = "oslogin_ruby_gapic",
+    src = ":oslogin_proto_with_info",
+    gapic_yaml = "oslogin_gapic.yaml",
+    package = "google.cloud.oslogin.v1beta",
+    service_yaml = "oslogin_v1beta.yaml",
+    deps = [
+        ":oslogin_ruby_grpc",
+        ":oslogin_ruby_proto",
+    ] + _RUBY_SUBPACKAGE_DEPS,
+)
+
+# Open Source Packages
+ruby_gapic_assembly_pkg(
+    name = "google-cloud-oslogin-v1beta-ruby",
+    deps = [
+        ":oslogin_ruby_gapic",
+        ":oslogin_ruby_grpc",
+        ":oslogin_ruby_proto",
+    ] + _RUBY_SUBPACKAGE_DEPS,
+)
+
+##############################################################################
+# C#
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "csharp_gapic_assembly_pkg",
+    "csharp_gapic_library",
+    "csharp_grpc_library",
+    "csharp_proto_library",
+)
+
+_CSHARP_SUBPACKAGE_DEPS = [
+    "//google/cloud/oslogin/common:common_csharp_proto",
+    "//google/cloud/oslogin/common:common_csharp_grpc",
+]
+
+csharp_proto_library(
+    name = "oslogin_csharp_proto",
+    deps = [":oslogin_proto"],
+)
+
+csharp_grpc_library(
+    name = "oslogin_csharp_grpc",
+    srcs = [":oslogin_proto"],
+    deps = [":oslogin_csharp_proto"],
+)
+
+csharp_gapic_library(
+    name = "oslogin_csharp_gapic",
+    src = ":oslogin_proto_with_info",
+    gapic_yaml = "oslogin_gapic.yaml",
+    package = "google.cloud.oslogin.v1beta",
+    service_yaml = "oslogin_v1beta.yaml",
+    deps = [
+        ":oslogin_csharp_grpc",
+        ":oslogin_csharp_proto",
+    ] + _CSHARP_SUBPACKAGE_DEPS,
+)
+
+# Open Source Packages
+csharp_gapic_assembly_pkg(
+    name = "google-cloud-oslogin-v1beta-csharp",
+    deps = [
+        ":oslogin_csharp_gapic",
+        ":oslogin_csharp_grpc",
+        ":oslogin_csharp_proto",
+    ] + _CSHARP_SUBPACKAGE_DEPS,
+)
+
+##############################################################################
+# C++
+##############################################################################
+# Put your C++ rules here
--- a/google/cloud/redis/v1/redis_v1.yaml
+++ b/google/cloud/redis/v1/redis_v1.yaml
@ -21,6 +21,20 @@ backend:
  - selector: 'google.longrunning.Operations.*'
    deadline: 60.0

+http:
+  rules:
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v1/{name=projects/*/locations/*}/operations'
+
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1/{name=projects/*/locations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1/{name=projects/*/locations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1/{name=projects/*/locations/*/operations/*}:cancel'
+
 authentication:
  rules:
  - selector: 'google.cloud.redis.v1.CloudRedis.*'
--- a/google/cloud/redis/v1beta1/redis_v1beta1.yaml
+++ b/google/cloud/redis/v1beta1/redis_v1beta1.yaml
@ -20,6 +20,17 @@ backend:
  - selector: 'google.longrunning.Operations.*'
    deadline: 60.0

+http:
+  rules:
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1beta1/{name=projects/*/locations/*/operations/*}:cancel'
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1beta1/{name=projects/*/locations/*/operations/*}'
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1beta1/{name=projects/*/locations/*/operations/*}'
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v1beta1/{name=projects/*/locations/*}/operations'
+
 authentication:
  rules:
  - selector: 'google.cloud.redis.v1beta1.CloudRedis.*'
--- a/google/cloud/securitycenter/v1/securitycenter_v1.yaml
+++ b/google/cloud/securitycenter/v1/securitycenter_v1.yaml
@ -22,6 +22,21 @@ backend:
  - selector: 'google.longrunning.Operations.*'
    deadline: 60.0

+http:
+  rules:
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v1/{name=organizations/*/operations}'
+
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1/{name=organizations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1/{name=organizations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1/{name=organizations/*/operations/*}:cancel'
+    body: '*'
+
 authentication:
  rules:
  - selector: 'google.cloud.securitycenter.v1.SecurityCenter.*'
--- a/google/cloud/securitycenter/v1p1beta1/securitycenter_v1p1beta1.yaml
+++ b/google/cloud/securitycenter/v1p1beta1/securitycenter_v1p1beta1.yaml
@ -22,6 +22,21 @@ backend:
  - selector: 'google.longrunning.Operations.*'
    deadline: 60.0

+http:
+  rules:
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v1p1beta1/{name=organizations/*/operations}'
+
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1p1beta1/{name=organizations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1p1beta1/{name=organizations/*/operations/*}'
+
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1p1beta1/{name=organizations/*/operations/*}:cancel'
+    body: '*'
+
 authentication:
  rules:
  - selector: 'google.cloud.securitycenter.v1p1beta1.SecurityCenter.*'
--- a/google/cloud/videointelligence/v1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1/BUILD.bazel
@ -230,7 +230,8 @@ php_grpc_library(
 php_gapic_library(
    name = "videointelligence_php_gapic",
    src = ":videointelligence_proto_with_info",
-    gapic_yaml = "videointelligence_gapic.yaml",
+    #Do NOT override with videointelligence_gapic.yaml
+    gapic_yaml = "videointelligence_gapic.legacy.yaml",
    package = "google.cloud.videointelligence.v1",
    service_yaml = "videointelligence_v1.yaml",
    deps = [