From c09459df069bb616738a9557da757eefe3d4e113 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Tue, 13 Apr 2021 12:36:56 -0700 Subject: [PATCH] chore: migrate osconfig/agentendpoint/{v1, v1beta} to the PHP microgenerator Committer: @miraleung PiperOrigin-RevId: 368272547 --- .../osconfig/agentendpoint/v1/BUILD.bazel | 13 +++--- .../osconfig/agentendpoint/v1beta/BUILD.bazel | 13 +++--- .../agentendpoint/v1beta/agentendpoint.proto | 40 ++++++++++--------- .../agentendpoint/v1beta/guest_policies.proto | 1 + .../agentendpoint/v1beta/patch_jobs.proto | 5 +-- .../osconfig/agentendpoint/v1beta/tasks.proto | 1 + 6 files changed, 38 insertions(+), 35 deletions(-) diff --git a/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel b/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel index de79a6ba9..9cb501ed2 100644 --- a/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel +++ b/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel @@ -172,13 +172,14 @@ py_gapic_assembly_pkg( ############################################################################## # PHP +# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules. ############################################################################## # load( # "@com_google_googleapis_imports//:imports.bzl", -# "php_gapic_assembly_pkg", -# "php_gapic_library", -# "php_grpc_library", -# "php_proto_library", +# php_gapic_assembly_pkg = "php_gapic_assembly_pkg2", +# php_gapic_library = "php_gapic_library2", +# php_grpc_library = "php_grpc_library2", +# php_proto_library = "php_proto_library2", # ) # # php_proto_library( @@ -194,10 +195,8 @@ py_gapic_assembly_pkg( # # php_gapic_library( # name = "agentendpoint_php_gapic", -# src = ":agentendpoint_proto_with_info", -# gapic_yaml = "osconfig_gapic.yaml", +# srcs = [":agentendpoint_proto_with_info"], # grpc_service_config = "agentendpoint_grpc_service_config.json", -# package = "google.cloud.osconfig.agentendpoint.v1", # service_yaml = "osconfig_v1.yaml", # deps = [ # ":agentendpoint_php_grpc", diff --git a/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel b/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel index 9d2207968..02d78f142 100644 --- a/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel +++ b/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel @@ -168,13 +168,14 @@ py_gapic_assembly_pkg( ############################################################################## # PHP +# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "php_gapic_assembly_pkg", - "php_gapic_library", - "php_grpc_library", - "php_proto_library", + php_gapic_assembly_pkg = "php_gapic_assembly_pkg2", + php_gapic_library = "php_gapic_library2", + php_grpc_library = "php_grpc_library2", + php_proto_library = "php_proto_library2", ) php_proto_library( @@ -192,11 +193,9 @@ php_grpc_library( # generation #php_gapic_library( # name = "agentendpoint_php_gapic", -# src = ":agentendpoint_proto_with_info", -# gapic_yaml = "osconfig_gapic.yaml", +# srcs = [":agentendpoint_proto_with_info"], # grpc_service_config = "agentendpoint_grpc_service_config.json", # package = "google.cloud.osconfig.agentendpoint.v1beta", -# service_yaml = "osconfig_v1beta.yaml", # deps = [ # ":agentendpoint_php_grpc", # ":agentendpoint_php_proto", diff --git a/google/cloud/osconfig/agentendpoint/v1beta/agentendpoint.proto b/google/cloud/osconfig/agentendpoint/v1beta/agentendpoint.proto index 88982c7c2..5a6ccaa74 100644 --- a/google/cloud/osconfig/agentendpoint/v1beta/agentendpoint.proto +++ b/google/cloud/osconfig/agentendpoint/v1beta/agentendpoint.proto @@ -25,13 +25,15 @@ option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/agente option java_multiple_files = true; option java_outer_classname = "AgentEndpointProto"; option java_package = "com.google.cloud.osconfig.agentendpoint.v1beta"; +option php_namespace = "Google\\Cloud\\OsConfig\\V1beta"; // OS Config agent endpoint API. service AgentEndpointService { option (google.api.default_host) = "osconfig.googleapis.com"; // Stream established by client to receive Task notifications. - rpc ReceiveTaskNotification(ReceiveTaskNotificationRequest) returns (stream ReceiveTaskNotificationResponse) { + rpc ReceiveTaskNotification(ReceiveTaskNotificationRequest) + returns (stream ReceiveTaskNotificationResponse) { option (google.api.method_signature) = "instance_id_token,agent_version"; } @@ -41,25 +43,32 @@ service AgentEndpointService { } // Signals an intermediary progress checkpoint in task execution. - rpc ReportTaskProgress(ReportTaskProgressRequest) returns (ReportTaskProgressResponse) { - option (google.api.method_signature) = "instance_id_token,task_id,task_type"; + rpc ReportTaskProgress(ReportTaskProgressRequest) + returns (ReportTaskProgressResponse) { + option (google.api.method_signature) = + "instance_id_token,task_id,task_type"; } // Signals that the task execution is complete and optionally returns the next // task. - rpc ReportTaskComplete(ReportTaskCompleteRequest) returns (ReportTaskCompleteResponse) { - option (google.api.method_signature) = "instance_id_token,task_id,task_type,error_message"; + rpc ReportTaskComplete(ReportTaskCompleteRequest) + returns (ReportTaskCompleteResponse) { + option (google.api.method_signature) = + "instance_id_token,task_id,task_type,error_message"; } // Lookup the effective guest policy that applies to a VM instance. This // lookup merges all policies that are assigned to the instance ancestry. - rpc LookupEffectiveGuestPolicy(LookupEffectiveGuestPolicyRequest) returns (EffectiveGuestPolicy) { - option (google.api.method_signature) = "instance_id_token,os_short_name,os_version,os_architecture"; + rpc LookupEffectiveGuestPolicy(LookupEffectiveGuestPolicyRequest) + returns (EffectiveGuestPolicy) { + option (google.api.method_signature) = + "instance_id_token,os_short_name,os_version,os_architecture"; } // Registers the agent running on the VM. rpc RegisterAgent(RegisterAgentRequest) returns (RegisterAgentResponse) { - option (google.api.method_signature) = "instance_id_token,agent_version,supported_capabilities"; + option (google.api.method_signature) = + "instance_id_token,agent_version,supported_capabilities"; } } @@ -76,9 +85,7 @@ message ReceiveTaskNotificationRequest { // The streaming rpc message that notifies the agent when it has a task // that it needs to perform on the VM instance. -message ReceiveTaskNotificationResponse { - -} +message ReceiveTaskNotificationResponse {} // A request message for signaling the start of a task execution. message StartNextTaskRequest { @@ -161,9 +168,7 @@ message ReportTaskCompleteRequest { } // The response message after the agent signaled the current task complete. -message ReportTaskCompleteResponse { - -} +message ReportTaskCompleteResponse {} // The request message for registering the agent. message RegisterAgentRequest { @@ -178,10 +183,9 @@ message RegisterAgentRequest { // Required. The capabilities supported by the agent. Supported values are: // PATCH_GA // GUEST_POLICY_BETA - repeated string supported_capabilities = 3 [(google.api.field_behavior) = REQUIRED]; + repeated string supported_capabilities = 3 + [(google.api.field_behavior) = REQUIRED]; } // The response message after the agent registered. -message RegisterAgentResponse { - -} +message RegisterAgentResponse {} diff --git a/google/cloud/osconfig/agentendpoint/v1beta/guest_policies.proto b/google/cloud/osconfig/agentendpoint/v1beta/guest_policies.proto index cb0d2fe83..c8d9dd6ff 100644 --- a/google/cloud/osconfig/agentendpoint/v1beta/guest_policies.proto +++ b/google/cloud/osconfig/agentendpoint/v1beta/guest_policies.proto @@ -21,6 +21,7 @@ import "google/api/field_behavior.proto"; option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta;agentendpoint"; option java_outer_classname = "GuestPolicies"; option java_package = "com.google.cloud.osconfig.agentendpoint.v1beta"; +option php_namespace = "Google\\Cloud\\OsConfig\\V1beta"; // The desired state that the OS Config agent will maintain on the VM. enum DesiredState { diff --git a/google/cloud/osconfig/agentendpoint/v1beta/patch_jobs.proto b/google/cloud/osconfig/agentendpoint/v1beta/patch_jobs.proto index 73d67305a..4c415c572 100644 --- a/google/cloud/osconfig/agentendpoint/v1beta/patch_jobs.proto +++ b/google/cloud/osconfig/agentendpoint/v1beta/patch_jobs.proto @@ -19,6 +19,7 @@ package google.cloud.osconfig.agentendpoint.v1beta; option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta;agentendpoint"; option java_outer_classname = "PatchJobs"; option java_package = "com.google.cloud.osconfig.agentendpoint.v1beta"; +option php_namespace = "Google\\Cloud\\OsConfig\\V1beta"; // Patch configuration specifications. Contains details on how to // apply patches to a VM instance. @@ -124,9 +125,7 @@ message YumSettings { } // Googet patching is performed by running `googet update`. -message GooSettings { - -} +message GooSettings {} // Zypper patching is performed by running `zypper patch`. // See also https://en.opensuse.org/SDB:Zypper_manual. diff --git a/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto b/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto index 3365a8f72..23dc42159 100644 --- a/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto +++ b/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto @@ -23,6 +23,7 @@ option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/agente option java_multiple_files = true; option java_outer_classname = "Tasks"; option java_package = "com.google.cloud.osconfig.agentendpoint.v1beta"; +option php_namespace = "Google\\Cloud\\OsConfig\\V1beta"; // Specifies the current agent behavior. enum TaskDirective {