From 9df18f9f195f76ea2f26c6f06c2ee2f61eed587a Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Mon, 30 Nov 2020 15:49:54 -0800
Subject: [PATCH] chore: migrate osconfig-agentendpoint to the Java
 microgenerator

Committer: @miraleung
PiperOrigin-RevId: 344904831
---
 google/cloud/osconfig/agentendpoint/v1/BUILD.bazel     | 10 +++++-----
 google/cloud/osconfig/agentendpoint/v1/tasks.proto     |  4 +++-
 google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel | 10 +++++-----
 google/cloud/osconfig/agentendpoint/v1beta/tasks.proto |  4 +++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel b/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel
index 453633544..310dcc4f6 100644
--- a/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel
+++ b/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel
@@ -43,12 +43,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -66,11 +67,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "agentendpoint_java_gapic",
-    src = ":agentendpoint_proto_with_info",
+    srcs = [":agentendpoint_proto_with_info"],
     gapic_yaml = "osconfig_gapic.yaml",
     grpc_service_config = "agentendpoint_grpc_service_config.json",
     package = "google.cloud.osconfig.agentendpoint.v1",
-    service_yaml = "osconfig_v1.yaml",
     test_deps = [
         ":agentendpoint_java_grpc",
     ],
diff --git a/google/cloud/osconfig/agentendpoint/v1/tasks.proto b/google/cloud/osconfig/agentendpoint/v1/tasks.proto
index 426dc22f1..a343065a8 100644
--- a/google/cloud/osconfig/agentendpoint/v1/tasks.proto
+++ b/google/cloud/osconfig/agentendpoint/v1/tasks.proto
@@ -20,6 +20,7 @@ import "google/api/field_behavior.proto";
 import "google/cloud/osconfig/agentendpoint/v1/patch_jobs.proto";
 
 option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1;agentendpoint";
+option java_multiple_files = true;
 option java_outer_classname = "Tasks";
 option java_package = "com.google.cloud.osconfig.agentendpoint.v1";
 
@@ -174,6 +175,7 @@ message ExecStepTaskOutput {
   // Required. The final state of the exec step.
   State state = 1 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The exit code received from the script which ran as part of the exec step.
+  // Required. The exit code received from the script which ran as part of the
+  // exec step.
   int32 exit_code = 2 [(google.api.field_behavior) = REQUIRED];
 }
diff --git a/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel b/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel
index 12a4ccfdc..396cdc542 100644
--- a/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel
+++ b/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel
@@ -42,12 +42,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -65,11 +66,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "agentendpoint_java_gapic",
-    src = ":agentendpoint_proto_with_info",
+    srcs = [":agentendpoint_proto_with_info"],
     gapic_yaml = "osconfig_gapic.yaml",
     grpc_service_config = "agentendpoint_grpc_service_config.json",
     package = "google.cloud.osconfig.agentendpoint.v1beta",
-    service_yaml = "osconfig_v1beta.yaml",
     test_deps = [
         ":agentendpoint_java_grpc",
     ],
diff --git a/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto b/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto
index e5ad39f83..3365a8f72 100644
--- a/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto
+++ b/google/cloud/osconfig/agentendpoint/v1beta/tasks.proto
@@ -20,6 +20,7 @@ import "google/api/field_behavior.proto";
 import "google/cloud/osconfig/agentendpoint/v1beta/patch_jobs.proto";
 
 option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta;agentendpoint";
+option java_multiple_files = true;
 option java_outer_classname = "Tasks";
 option java_package = "com.google.cloud.osconfig.agentendpoint.v1beta";
 
@@ -174,6 +175,7 @@ message ExecStepTaskOutput {
   // Required. The final state of the exec step.
   State state = 1 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The exit code received from the script which ran as part of the exec step.
+  // Required. The exit code received from the script which ran as part of the
+  // exec step.
   int32 exit_code = 2 [(google.api.field_behavior) = REQUIRED];
 }