From 19b0e627e9aa62a0cc5fc4d3629718379cbcd144 Mon Sep 17 00:00:00 2001 From: Julie Qiu Date: Sat, 2 Nov 2024 20:47:10 -0400 Subject: [PATCH] address code review --- .../google/cloud/secretmanager/BUILD.bazel | 40 -- .../secretmanager/logging/v1/BUILD.bazel | 161 -------- .../logging/v1/secret_event.proto | 71 ---- .../google/cloud/secretmanager/v1/BUILD.bazel | 388 ------------------ .../v1/secretmanager_grpc_service_config.json | 84 ---- 5 files changed, 744 deletions(-) delete mode 100644 generator/testdata/google/cloud/secretmanager/BUILD.bazel delete mode 100644 generator/testdata/google/cloud/secretmanager/logging/v1/BUILD.bazel delete mode 100644 generator/testdata/google/cloud/secretmanager/logging/v1/secret_event.proto delete mode 100644 generator/testdata/google/cloud/secretmanager/v1/BUILD.bazel delete mode 100644 generator/testdata/google/cloud/secretmanager/v1/secretmanager_grpc_service_config.json diff --git a/generator/testdata/google/cloud/secretmanager/BUILD.bazel b/generator/testdata/google/cloud/secretmanager/BUILD.bazel deleted file mode 100644 index d0c1ab5ec..000000000 --- a/generator/testdata/google/cloud/secretmanager/BUILD.bazel +++ /dev/null @@ -1,40 +0,0 @@ -# This build file includes a target for the Ruby wrapper library for -# google-cloud-secret_manager. - -# This is an API workspace, having public visibility by default makes perfect sense. -package(default_visibility = ["//visibility:public"]) - -# Export yaml configs. -exports_files(glob(["*.yaml"])) - -load( - "@com_google_googleapis_imports//:imports.bzl", - "ruby_cloud_gapic_library", - "ruby_gapic_assembly_pkg", -) - -# Generates a Ruby wrapper client for secretmanager. -# Ruby wrapper clients are versionless, but are generated from source protos -# for a particular service version, v1 in this case. -ruby_cloud_gapic_library( - name = "secretmanager_ruby_wrapper", - srcs = ["//google/cloud/secretmanager/v1:secretmanager_proto_with_info"], - extra_protoc_parameters = [ - "ruby-cloud-gem-name=google-cloud-secret_manager", - "ruby-cloud-env-prefix=SECRET_MANAGER", - "ruby-cloud-wrapper-of=v1:0.19;v1beta1:0.3", - "ruby-cloud-product-url=https://cloud.google.com/secret-manager", - "ruby-cloud-api-id=secretmanager.googleapis.com", - "ruby-cloud-api-shortname=secretmanager", - ], - ruby_cloud_description = "Secret Manager is a secure and convenient storage system for API keys, passwords, certificates, and other sensitive data. Secret Manager provides a central place and single source of truth to manage, access, and audit secrets across Google Cloud.", - ruby_cloud_title = "Secret Manager", -) - -# Open Source package. -ruby_gapic_assembly_pkg( - name = "google-cloud-secretmanager-ruby", - deps = [ - ":secretmanager_ruby_wrapper", - ], -) diff --git a/generator/testdata/google/cloud/secretmanager/logging/v1/BUILD.bazel b/generator/testdata/google/cloud/secretmanager/logging/v1/BUILD.bazel deleted file mode 100644 index 36453edab..000000000 --- a/generator/testdata/google/cloud/secretmanager/logging/v1/BUILD.bazel +++ /dev/null @@ -1,161 +0,0 @@ -# This file was automatically generated by BuildFileGenerator - -# This is an API workspace, having public visibility by default makes perfect sense. -package(default_visibility = ["//visibility:public"]) - -############################################################################## -# Common -############################################################################## -load("@rules_proto//proto:defs.bzl", "proto_library") - -proto_library( - name = "logging_proto", - srcs = [ - "secret_event.proto", - ], - deps = [ - ], -) - -############################################################################## -# Java -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "java_grpc_library", - "java_proto_library", -) - -java_proto_library( - name = "logging_java_proto", - deps = [":logging_proto"], -) - -java_grpc_library( - name = "logging_java_grpc", - srcs = [":logging_proto"], - deps = [":logging_java_proto"], -) - -############################################################################## -# Go -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "go_proto_library", -) - -go_proto_library( - name = "logging_go_proto", - compilers = ["@io_bazel_rules_go//proto:go_grpc"], - importpath = "cloud.google.com/go/secretmanager/logging/apiv1/loggingpb", - protos = [":logging_proto"], - deps = [ - ], -) - -############################################################################## -# Python -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "moved_proto_library", - "py_grpc_library", - "py_proto_library", -) - -moved_proto_library( - name = "logging_moved_proto", - srcs = [":logging_proto"], - deps = [ - ], -) - -py_proto_library( - name = "logging_py_proto", - deps = [":logging_moved_proto"], -) - -py_grpc_library( - name = "logging_py_grpc", - srcs = [":logging_moved_proto"], - deps = [":logging_py_proto"], -) - -############################################################################## -# PHP -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "php_proto_library", -) - -php_proto_library( - name = "logging_php_proto", - deps = [":logging_proto"], -) - -############################################################################## -# Node.js -############################################################################## - -############################################################################## -# Ruby -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "ruby_grpc_library", - "ruby_proto_library", -) - -ruby_proto_library( - name = "logging_ruby_proto", - deps = [":logging_proto"], -) - -ruby_grpc_library( - name = "logging_ruby_grpc", - srcs = [":logging_proto"], - deps = [":logging_ruby_proto"], -) - -############################################################################## -# C# -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "csharp_grpc_library", - "csharp_proto_library", -) - -csharp_proto_library( - name = "logging_csharp_proto", - deps = [":logging_proto"], -) - -csharp_grpc_library( - name = "logging_csharp_grpc", - srcs = [":logging_proto"], - deps = [":logging_csharp_proto"], -) - -############################################################################## -# C++ -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "cc_grpc_library", - "cc_proto_library", -) - -cc_proto_library( - name = "logging_cc_proto", - deps = [":logging_proto"], -) - -cc_grpc_library( - name = "logging_cc_grpc", - srcs = [":logging_proto"], - grpc_only = True, - deps = [":logging_cc_proto"], -) diff --git a/generator/testdata/google/cloud/secretmanager/logging/v1/secret_event.proto b/generator/testdata/google/cloud/secretmanager/logging/v1/secret_event.proto deleted file mode 100644 index c7dfd8c43..000000000 --- a/generator/testdata/google/cloud/secretmanager/logging/v1/secret_event.proto +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.cloud.secretmanager.logging.v1; - -option go_package = "cloud.google.com/go/secretmanager/logging/apiv1/loggingpb;loggingpb"; -option java_multiple_files = true; -option java_outer_classname = "SecretEventProto"; -option java_package = "com.google.cloud.secretmanager.logging.v1"; -option csharp_namespace = "Google.Cloud.SecretManager.Logging.V1"; -option php_namespace = "Google\\Cloud\\SecretManager\\Logging\\V1"; -option ruby_package = "Google::Cloud::SecretManager::Logging::V1"; - -// Logged event relating to a specific secret -message SecretEvent { - // Describes the type of event that is being logged. All logs have exactly one - // EventType. - enum EventType { - // An unrecognized event type. Should never be used. - EVENT_TYPE_UNSPECIFIED = 0; - - // The secret is scheduled to expire in 30 days. - EXPIRES_IN_30_DAYS = 1; - - // The secret is scheduled to expire in 7 days. - EXPIRES_IN_7_DAYS = 2; - - // The secret is scheduled to expire in 1 day. - EXPIRES_IN_1_DAY = 3; - - // The secret is scheduled to expire in 6 hours. - EXPIRES_IN_6_HOURS = 4; - - // The secret is scheduled to expire in 1 hour. - EXPIRES_IN_1_HOUR = 5; - - // The secret's expire-time has passed and it has expired. - EXPIRED = 6; - - // A Pub/Sub topic configured on the secret could not be found. - TOPIC_NOT_FOUND = 7; - - // A Pub/Sub topic configured on the secret does not have the needed - // permissions. The Secret Manager P4SA must be granted - // 'pubsub.topic.publish' permission (or 'roles/pubsub.publisher') on the - // topic. - TOPIC_PERMISSION_DENIED = 8; - } - - // Resource name of the secret in the format `projects/*/secrets/*` - string name = 1; - - // Type of event that is being logged for the secret - EventType type = 2; - - // Human readable message describing the event - string log_message = 3; -} diff --git a/generator/testdata/google/cloud/secretmanager/v1/BUILD.bazel b/generator/testdata/google/cloud/secretmanager/v1/BUILD.bazel deleted file mode 100644 index 96e89cf11..000000000 --- a/generator/testdata/google/cloud/secretmanager/v1/BUILD.bazel +++ /dev/null @@ -1,388 +0,0 @@ -# This file was automatically generated by BuildFileGenerator -# https://github.com/googleapis/rules_gapic/tree/master/bazel - -# Most of the manual changes to this file will be overwritten. -# It's **only** allowed to change the following rule attribute values: -# - names of *_gapic_assembly_* rules -# - certain parameters of *_gapic_library rules, including but not limited to: -# * extra_protoc_parameters -# * extra_protoc_file_parameters -# The complete list of preserved parameters can be found in the source code. - -# This is an API workspace, having public visibility by default makes perfect sense. -package(default_visibility = ["//visibility:public"]) - -############################################################################## -# Common -############################################################################## -load("@rules_proto//proto:defs.bzl", "proto_library") -load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info") - -proto_library( - name = "secretmanager_proto", - srcs = [ - "resources.proto", - "service.proto", - ], - deps = [ - "//google/api:annotations_proto", - "//google/api:client_proto", - "//google/api:field_behavior_proto", - "//google/api:resource_proto", - "//google/iam/v1:iam_policy_proto", - "//google/iam/v1:policy_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:timestamp_proto", - ], -) - -proto_library_with_info( - name = "secretmanager_proto_with_info", - deps = [ - ":secretmanager_proto", - "//google/cloud:common_resources_proto", - ], -) - -############################################################################## -# Java -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", - "java_grpc_library", - "java_proto_library", -) - -java_proto_library( - name = "secretmanager_java_proto", - deps = [":secretmanager_proto"], -) - -java_grpc_library( - name = "secretmanager_java_grpc", - srcs = [":secretmanager_proto"], - deps = [":secretmanager_java_proto"], -) - -java_gapic_library( - name = "secretmanager_java_gapic", - srcs = [":secretmanager_proto_with_info"], - grpc_service_config = "secretmanager_grpc_service_config.json", - rest_numeric_enums = True, - service_yaml = "secretmanager_v1.yaml", - test_deps = [ - ":secretmanager_java_grpc", - "//google/iam/v1:iam_java_grpc", - ], - transport = "grpc+rest", - deps = [ - ":secretmanager_java_proto", - "//google/iam/v1:iam_java_proto", - ], -) - -java_gapic_test( - name = "secretmanager_java_gapic_test_suite", - test_classes = [ - "com.google.cloud.secretmanager.v1.SecretManagerServiceClientHttpJsonTest", - "com.google.cloud.secretmanager.v1.SecretManagerServiceClientTest", - ], - runtime_deps = [":secretmanager_java_gapic_test"], -) - -# Open Source Packages -java_gapic_assembly_gradle_pkg( - name = "google-cloud-secretmanager-v1-java", - include_samples = True, - transport = "grpc+rest", - deps = [ - ":secretmanager_java_gapic", - ":secretmanager_java_grpc", - ":secretmanager_java_proto", - ":secretmanager_proto", - ], -) - -############################################################################## -# Go -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "go_gapic_assembly_pkg", - "go_gapic_library", - "go_proto_library", -) - -go_proto_library( - name = "secretmanager_go_proto", - compilers = ["@io_bazel_rules_go//proto:go_grpc"], - importpath = "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb", - protos = [":secretmanager_proto"], - deps = [ - "//google/api:annotations_go_proto", - "//google/iam/v1:iam_go_proto", - ], -) - -go_gapic_library( - name = "secretmanager_go_gapic", - srcs = [":secretmanager_proto_with_info"], - grpc_service_config = "secretmanager_grpc_service_config.json", - importpath = "cloud.google.com/go/secretmanager/apiv1;secretmanager", - metadata = True, - release_level = "ga", - rest_numeric_enums = True, - service_yaml = "secretmanager_v1.yaml", - transport = "grpc+rest", - deps = [ - ":secretmanager_go_proto", - "//google/iam/v1:iam_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - ], -) - -# Open Source Packages -go_gapic_assembly_pkg( - name = "gapi-cloud-secretmanager-v1-go", - deps = [ - ":secretmanager_go_gapic", - ":secretmanager_go_gapic_srcjar-metadata.srcjar", - ":secretmanager_go_gapic_srcjar-snippets.srcjar", - ":secretmanager_go_gapic_srcjar-test.srcjar", - ":secretmanager_go_proto", - ], -) - -############################################################################## -# Python -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "py_gapic_assembly_pkg", - "py_gapic_library", - "py_test", -) - -py_gapic_library( - name = "secretmanager_py_gapic", - srcs = [":secretmanager_proto"], - grpc_service_config = "secretmanager_grpc_service_config.json", - opt_args = [ - "warehouse-package-name=google-cloud-secret-manager", - ], - rest_numeric_enums = True, - service_yaml = "secretmanager_v1.yaml", - transport = "grpc+rest", - deps = [ - "//google/iam/v1:iam_policy_py_proto", - ], -) - -py_test( - name = "secretmanager_py_gapic_test", - srcs = [ - "secretmanager_py_gapic_pytest.py", - "secretmanager_py_gapic_test.py", - ], - legacy_create_init = False, - deps = [":secretmanager_py_gapic"], -) - -# Open Source Packages -py_gapic_assembly_pkg( - name = "secretmanager-v1-py", - deps = [ - ":secretmanager_py_gapic", - ], -) - -############################################################################## -# PHP -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "php_gapic_assembly_pkg", - "php_gapic_library", - "php_proto_library", -) - -php_proto_library( - name = "secretmanager_php_proto", - deps = [":secretmanager_proto"], -) - -php_gapic_library( - name = "secretmanager_php_gapic", - srcs = [":secretmanager_proto_with_info"], - grpc_service_config = "secretmanager_grpc_service_config.json", - migration_mode = "MIGRATING", - rest_numeric_enums = True, - service_yaml = "secretmanager_v1.yaml", - transport = "grpc+rest", - deps = [":secretmanager_php_proto"], -) - -# Open Source Packages -php_gapic_assembly_pkg( - name = "google-cloud-secretmanager-v1-php", - deps = [ - ":secretmanager_php_gapic", - ":secretmanager_php_proto", - ], -) - -############################################################################## -# Node.js -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "nodejs_gapic_assembly_pkg", - "nodejs_gapic_library", -) - -nodejs_gapic_library( - name = "secretmanager_nodejs_gapic", - package_name = "@google-cloud/secret-manager", - src = ":secretmanager_proto_with_info", - extra_protoc_parameters = ["metadata"], - grpc_service_config = "secretmanager_grpc_service_config.json", - package = "google.cloud.secretmanager.v1", - rest_numeric_enums = True, - service_yaml = "secretmanager_v1.yaml", - transport = "grpc+rest", - deps = [], -) - -nodejs_gapic_assembly_pkg( - name = "secretmanager-v1-nodejs", - deps = [ - ":secretmanager_nodejs_gapic", - ":secretmanager_proto", - ], -) - -############################################################################## -# Ruby -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "ruby_cloud_gapic_library", - "ruby_gapic_assembly_pkg", - "ruby_grpc_library", - "ruby_proto_library", -) - -ruby_proto_library( - name = "secretmanager_ruby_proto", - deps = [":secretmanager_proto"], -) - -ruby_grpc_library( - name = "secretmanager_ruby_grpc", - srcs = [":secretmanager_proto"], - deps = [":secretmanager_ruby_proto"], -) - -ruby_cloud_gapic_library( - name = "secretmanager_ruby_gapic", - srcs = [":secretmanager_proto_with_info"], - extra_protoc_parameters = [ - "ruby-cloud-api-id=secretmanager.googleapis.com", - "ruby-cloud-api-shortname=secretmanager", - "ruby-cloud-env-prefix=SECRET_MANAGER", - "ruby-cloud-gem-name=google-cloud-secret_manager-v1", - "ruby-cloud-product-url=https://cloud.google.com/secret-manager", - ], - grpc_service_config = "secretmanager_grpc_service_config.json", - rest_numeric_enums = True, - ruby_cloud_description = "Secret Manager is a secure and convenient storage system for API keys, passwords, certificates, and other sensitive data. Secret Manager provides a central place and single source of truth to manage, access, and audit secrets across Google Cloud.", - ruby_cloud_title = "Secret Manager V1", - service_yaml = "secretmanager_v1.yaml", - transport = "grpc+rest", - deps = [ - ":secretmanager_ruby_grpc", - ":secretmanager_ruby_proto", - ], -) - -# Open Source Packages -ruby_gapic_assembly_pkg( - name = "google-cloud-secretmanager-v1-ruby", - deps = [ - ":secretmanager_ruby_gapic", - ":secretmanager_ruby_grpc", - ":secretmanager_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 = "secretmanager_csharp_proto", - deps = [":secretmanager_proto"], -) - -csharp_grpc_library( - name = "secretmanager_csharp_grpc", - srcs = [":secretmanager_proto"], - deps = [":secretmanager_csharp_proto"], -) - -csharp_gapic_library( - name = "secretmanager_csharp_gapic", - srcs = [":secretmanager_proto_with_info"], - common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json", - grpc_service_config = "secretmanager_grpc_service_config.json", - rest_numeric_enums = True, - service_yaml = "secretmanager_v1.yaml", - transport = "grpc+rest", - deps = [ - ":secretmanager_csharp_grpc", - ":secretmanager_csharp_proto", - ], -) - -# Open Source Packages -csharp_gapic_assembly_pkg( - name = "google-cloud-secretmanager-v1-csharp", - deps = [ - ":secretmanager_csharp_gapic", - ":secretmanager_csharp_grpc", - ":secretmanager_csharp_proto", - ], -) - -############################################################################## -# C++ -############################################################################## -load( - "@com_google_googleapis_imports//:imports.bzl", - "cc_grpc_library", - "cc_proto_library", -) - -cc_proto_library( - name = "secretmanager_cc_proto", - deps = [":secretmanager_proto"], -) - -cc_grpc_library( - name = "secretmanager_cc_grpc", - srcs = [":secretmanager_proto"], - grpc_only = True, - deps = [":secretmanager_cc_proto"], -) diff --git a/generator/testdata/google/cloud/secretmanager/v1/secretmanager_grpc_service_config.json b/generator/testdata/google/cloud/secretmanager/v1/secretmanager_grpc_service_config.json deleted file mode 100644 index 7d86ab0b8..000000000 --- a/generator/testdata/google/cloud/secretmanager/v1/secretmanager_grpc_service_config.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "methodConfig": [ - { - "name": [ - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "ListSecrets" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "CreateSecret" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "AddSecretVersion" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "GetSecret" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "UpdateSecret" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "DeleteSecret" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "ListSecretVersions" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "GetSecretVersion" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "DisableSecretVersion" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "EnableSecretVersion" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "DestroySecretVersion" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "SetIamPolicy" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "GetIamPolicy" - }, - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "TestIamPermissions" - } - ], - "timeout": "60s" - }, - { - "name": [ - { - "service": "google.cloud.secretmanager.v1.SecretManagerService", - "method": "AccessSecretVersion" - } - ], - "timeout": "60s", - "retryPolicy": { - "maxAttempts": 5, - "initialBackoff": "2s", - "maxBackoff": "60s", - "backoffMultiplier": 2.0, - "retryableStatusCodes": [ - "UNAVAILABLE", - "RESOURCE_EXHAUSTED" - ] - } - } - ] -}