fix!: [batch] remove deprecated field enableOslogin (#10257)

* fix!: remove deprecated field enableOslogin PiperOrigin-RevId: 599921345 Source-Link: googleapis/googleapis@7cdfb2d Source-Link: googleapis/googleapis-gen@170f3b7 Copy-Tag: eyJwIjoiamF2YS1iYXRjaC8uT3dsQm90LnlhbWwiLCJoIjoiMTcwZjNiN2Q0MzgwMTYxM2ZiMWUxNDMxYzc3Yzg4MjUzZTVhOTZjZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Jan 22, 2024 · 2da4e3e · 2da4e3e
1 parent 088774b
commit 2da4e3e
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 267 deletions.
diff --git a/...c/main/resources/META-INF/native-image/com.google.cloud.batch.v1alpha/reflect-config.json b/...c/main/resources/META-INF/native-image/com.google.cloud.batch.v1alpha/reflect-config.json
@@ -116,6 +116,33 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.api.FieldInfo",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.FieldInfo$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.FieldInfo$Format",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.api.GoSettings",
     "queryAllDeclaredConstructors": true,

diff --git a/...o-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/BatchProto.java b/...o-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/BatchProto.java
@@ -75,75 +75,76 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
       "\n&google/cloud/batch/v1alpha/batch.proto"
           + "\022\032google.cloud.batch.v1alpha\032\034google/api"
           + "/annotations.proto\032\027google/api/client.pr"
-          + "oto\032\037google/api/field_behavior.proto\032\031go"
-          + "ogle/api/resource.proto\032$google/cloud/ba"
-          + "tch/v1alpha/job.proto\032%google/cloud/batc"
-          + "h/v1alpha/task.proto\032#google/longrunning"
-          + "/operations.proto\032\033google/protobuf/empty"
-          + ".proto\032\037google/protobuf/timestamp.proto\""
-          + "\243\001\n\020CreateJobRequest\0221\n\006parent\030\001 \001(\tB!\342A"
-          + "\001\002\372A\032\022\030batch.googleapis.com/Job\022\016\n\006job_i"
-          + "d\030\002 \001(\t\0222\n\003job\030\003 \001(\0132\037.google.cloud.batc"
-          + "h.v1alpha.JobB\004\342A\001\002\022\030\n\nrequest_id\030\004 \001(\tB"
-          + "\004\342A\001\001\"@\n\rGetJobRequest\022/\n\004name\030\001 \001(\tB!\342A"
-          + "\001\002\372A\032\n\030batch.googleapis.com/Job\"P\n\020Delet"
-          + "eJobRequest\022\014\n\004name\030\001 \001(\t\022\024\n\006reason\030\002 \001("
-          + "\tB\004\342A\001\001\022\030\n\nrequest_id\030\004 \001(\tB\004\342A\001\001\"p\n\017Lis"
-          + "tJobsRequest\022\016\n\006parent\030\001 \001(\t\022\016\n\006filter\030\004"
-          + " \001(\t\022\026\n\010order_by\030\005 \001(\tB\004\342A\001\001\022\021\n\tpage_siz"
-          + "e\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"o\n\020ListJobsR"
-          + "esponse\022-\n\004jobs\030\001 \003(\0132\037.google.cloud.bat"
-          + "ch.v1alpha.Job\022\027\n\017next_page_token\030\002 \001(\t\022"
-          + "\023\n\013unreachable\030\003 \003(\t\"\224\001\n\020ListTasksReques"
-          + "t\0227\n\006parent\030\001 \001(\tB\'\342A\001\002\372A \n\036batch.google"
-          + "apis.com/TaskGroup\022\016\n\006filter\030\002 \001(\t\022\020\n\010or"
-          + "der_by\030\005 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_"
-          + "token\030\004 \001(\t\"r\n\021ListTasksResponse\022/\n\005task"
-          + "s\030\001 \003(\0132 .google.cloud.batch.v1alpha.Tas"
-          + "k\022\027\n\017next_page_token\030\002 \001(\t\022\023\n\013unreachabl"
-          + "e\030\003 \003(\t\"B\n\016GetTaskRequest\0220\n\004name\030\001 \001(\tB"
-          + "\"\342A\001\002\372A\033\n\031batch.googleapis.com/Task\"\207\002\n\021"
-          + "OperationMetadata\0225\n\013create_time\030\001 \001(\0132\032"
-          + ".google.protobuf.TimestampB\004\342A\001\003\0222\n\010end_"
-          + "time\030\002 \001(\0132\032.google.protobuf.TimestampB\004"
-          + "\342A\001\003\022\024\n\006target\030\003 \001(\tB\004\342A\001\003\022\022\n\004verb\030\004 \001(\t"
-          + "B\004\342A\001\003\022\034\n\016status_message\030\005 \001(\tB\004\342A\001\003\022$\n\026"
-          + "requested_cancellation\030\006 \001(\010B\004\342A\001\003\022\031\n\013ap"
-          + "i_version\030\007 \001(\tB\004\342A\001\0032\221\t\n\014BatchService\022\252"
-          + "\001\n\tCreateJob\022,.google.cloud.batch.v1alph"
-          + "a.CreateJobRequest\032\037.google.cloud.batch."
-          + "v1alpha.Job\"N\332A\021parent,job,job_id\202\323\344\223\0024\""
-          + "-/v1alpha/{parent=projects/*/locations/*"
-          + "}/jobs:\003job\022\222\001\n\006GetJob\022).google.cloud.ba"
-          + "tch.v1alpha.GetJobRequest\032\037.google.cloud"
-          + ".batch.v1alpha.Job\"<\332A\004name\202\323\344\223\002/\022-/v1al"
-          + "pha/{name=projects/*/locations/*/jobs/*}"
-          + "\022\337\001\n\tDeleteJob\022,.google.cloud.batch.v1al"
-          + "pha.DeleteJobRequest\032\035.google.longrunnin"
-          + "g.Operation\"\204\001\312AE\n\025google.protobuf.Empty"
-          + "\022,google.cloud.batch.v1alpha.OperationMe"
-          + "tadata\332A\004name\202\323\344\223\002/*-/v1alpha/{name=proj"
-          + "ects/*/locations/*/jobs/*}\022\245\001\n\010ListJobs\022"
-          + "+.google.cloud.batch.v1alpha.ListJobsReq"
-          + "uest\032,.google.cloud.batch.v1alpha.ListJo"
-          + "bsResponse\">\332A\006parent\202\323\344\223\002/\022-/v1alpha/{p"
-          + "arent=projects/*/locations/*}/jobs\022\252\001\n\007G"
-          + "etTask\022*.google.cloud.batch.v1alpha.GetT"
-          + "askRequest\032 .google.cloud.batch.v1alpha."
-          + "Task\"Q\332A\004name\202\323\344\223\002D\022B/v1alpha/{name=proj"
-          + "ects/*/locations/*/jobs/*/taskGroups/*/t"
-          + "asks/*}\022\275\001\n\tListTasks\022,.google.cloud.bat"
-          + "ch.v1alpha.ListTasksRequest\032-.google.clo"
-          + "ud.batch.v1alpha.ListTasksResponse\"S\332A\006p"
-          + "arent\202\323\344\223\002D\022B/v1alpha/{parent=projects/*"
-          + "/locations/*/jobs/*/taskGroups/*}/tasks\032"
-          + "H\312A\024batch.googleapis.com\322A.https://www.g"
-          + "oogleapis.com/auth/cloud-platformB\304\001\n\036co"
-          + "m.google.cloud.batch.v1alphaB\nBatchProto"
-          + "P\001Z4cloud.google.com/go/batch/apiv1alpha"
-          + "/batchpb;batchpb\242\002\003GCB\252\002\032Google.Cloud.Ba"
-          + "tch.V1Alpha\312\002\032Google\\Cloud\\Batch\\V1alpha"
-          + "\352\002\035Google::Cloud::Batch::V1alphab\006proto3"
+          + "oto\032\037google/api/field_behavior.proto\032\033go"
+          + "ogle/api/field_info.proto\032\031google/api/re"
+          + "source.proto\032$google/cloud/batch/v1alpha"
+          + "/job.proto\032%google/cloud/batch/v1alpha/t"
+          + "ask.proto\032#google/longrunning/operations"
+          + ".proto\032\033google/protobuf/empty.proto\032\037goo"
+          + "gle/protobuf/timestamp.proto\"\243\001\n\020CreateJ"
+          + "obRequest\0221\n\006parent\030\001 \001(\tB!\342A\001\002\372A\032\022\030batc"
+          + "h.googleapis.com/Job\022\016\n\006job_id\030\002 \001(\t\0222\n\003"
+          + "job\030\003 \001(\0132\037.google.cloud.batch.v1alpha.J"
+          + "obB\004\342A\001\002\022\030\n\nrequest_id\030\004 \001(\tB\004\342A\001\001\"@\n\rGe"
+          + "tJobRequest\022/\n\004name\030\001 \001(\tB!\342A\001\002\372A\032\n\030batc"
+          + "h.googleapis.com/Job\"P\n\020DeleteJobRequest"
+          + "\022\014\n\004name\030\001 \001(\t\022\024\n\006reason\030\002 \001(\tB\004\342A\001\001\022\030\n\n"
+          + "request_id\030\004 \001(\tB\004\342A\001\001\"p\n\017ListJobsReques"
+          + "t\022\016\n\006parent\030\001 \001(\t\022\016\n\006filter\030\004 \001(\t\022\026\n\010ord"
+          + "er_by\030\005 \001(\tB\004\342A\001\001\022\021\n\tpage_size\030\002 \001(\005\022\022\n\n"
+          + "page_token\030\003 \001(\t\"o\n\020ListJobsResponse\022-\n\004"
+          + "jobs\030\001 \003(\0132\037.google.cloud.batch.v1alpha."
+          + "Job\022\027\n\017next_page_token\030\002 \001(\t\022\023\n\013unreacha"
+          + "ble\030\003 \003(\t\"\224\001\n\020ListTasksRequest\0227\n\006parent"
+          + "\030\001 \001(\tB\'\342A\001\002\372A \n\036batch.googleapis.com/Ta"
+          + "skGroup\022\016\n\006filter\030\002 \001(\t\022\020\n\010order_by\030\005 \001("
+          + "\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t"
+          + "\"r\n\021ListTasksResponse\022/\n\005tasks\030\001 \003(\0132 .g"
+          + "oogle.cloud.batch.v1alpha.Task\022\027\n\017next_p"
+          + "age_token\030\002 \001(\t\022\023\n\013unreachable\030\003 \003(\t\"B\n\016"
+          + "GetTaskRequest\0220\n\004name\030\001 \001(\tB\"\342A\001\002\372A\033\n\031b"
+          + "atch.googleapis.com/Task\"\207\002\n\021OperationMe"
+          + "tadata\0225\n\013create_time\030\001 \001(\0132\032.google.pro"
+          + "tobuf.TimestampB\004\342A\001\003\0222\n\010end_time\030\002 \001(\0132"
+          + "\032.google.protobuf.TimestampB\004\342A\001\003\022\024\n\006tar"
+          + "get\030\003 \001(\tB\004\342A\001\003\022\022\n\004verb\030\004 \001(\tB\004\342A\001\003\022\034\n\016s"
+          + "tatus_message\030\005 \001(\tB\004\342A\001\003\022$\n\026requested_c"
+          + "ancellation\030\006 \001(\010B\004\342A\001\003\022\031\n\013api_version\030\007"
+          + " \001(\tB\004\342A\001\0032\221\t\n\014BatchService\022\252\001\n\tCreateJo"
+          + "b\022,.google.cloud.batch.v1alpha.CreateJob"
+          + "Request\032\037.google.cloud.batch.v1alpha.Job"
+          + "\"N\332A\021parent,job,job_id\202\323\344\223\0024\"-/v1alpha/{"
+          + "parent=projects/*/locations/*}/jobs:\003job"
+          + "\022\222\001\n\006GetJob\022).google.cloud.batch.v1alpha"
+          + ".GetJobRequest\032\037.google.cloud.batch.v1al"
+          + "pha.Job\"<\332A\004name\202\323\344\223\002/\022-/v1alpha/{name=p"
+          + "rojects/*/locations/*/jobs/*}\022\337\001\n\tDelete"
+          + "Job\022,.google.cloud.batch.v1alpha.DeleteJ"
+          + "obRequest\032\035.google.longrunning.Operation"
+          + "\"\204\001\312AE\n\025google.protobuf.Empty\022,google.cl"
+          + "oud.batch.v1alpha.OperationMetadata\332A\004na"
+          + "me\202\323\344\223\002/*-/v1alpha/{name=projects/*/loca"
+          + "tions/*/jobs/*}\022\245\001\n\010ListJobs\022+.google.cl"
+          + "oud.batch.v1alpha.ListJobsRequest\032,.goog"
+          + "le.cloud.batch.v1alpha.ListJobsResponse\""
+          + ">\332A\006parent\202\323\344\223\002/\022-/v1alpha/{parent=proje"
+          + "cts/*/locations/*}/jobs\022\252\001\n\007GetTask\022*.go"
+          + "ogle.cloud.batch.v1alpha.GetTaskRequest\032"
+          + " .google.cloud.batch.v1alpha.Task\"Q\332A\004na"
+          + "me\202\323\344\223\002D\022B/v1alpha/{name=projects/*/loca"
+          + "tions/*/jobs/*/taskGroups/*/tasks/*}\022\275\001\n"
+          + "\tListTasks\022,.google.cloud.batch.v1alpha."
+          + "ListTasksRequest\032-.google.cloud.batch.v1"
+          + "alpha.ListTasksResponse\"S\332A\006parent\202\323\344\223\002D"
+          + "\022B/v1alpha/{parent=projects/*/locations/"
+          + "*/jobs/*/taskGroups/*}/tasks\032H\312A\024batch.g"
+          + "oogleapis.com\322A.https://www.googleapis.c"
+          + "om/auth/cloud-platformB\304\001\n\036com.google.cl"
+          + "oud.batch.v1alphaB\nBatchProtoP\001Z4cloud.g"
+          + "oogle.com/go/batch/apiv1alpha/batchpb;ba"
+          + "tchpb\242\002\003GCB\252\002\032Google.Cloud.Batch.V1Alpha"
+          + "\312\002\032Google\\Cloud\\Batch\\V1alpha\352\002\035Google::"
+          + "Cloud::Batch::V1alphab\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -152,6 +153,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.AnnotationsProto.getDescriptor(),
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
+              com.google.api.FieldInfoProto.getDescriptor(),
               com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.batch.v1alpha.JobProto.getDescriptor(),
               com.google.cloud.batch.v1alpha.TaskProto.getDescriptor(),
@@ -251,6 +253,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.AnnotationsProto.getDescriptor();
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
+    com.google.api.FieldInfoProto.getDescriptor();
     com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.batch.v1alpha.JobProto.getDescriptor();
     com.google.cloud.batch.v1alpha.TaskProto.getDescriptor();

diff --git a/...oto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobProto.java b/...oto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobProto.java
@@ -285,7 +285,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"`\n"
           + "\021ProvisioningModel\022\"\n\036PROVISIONING_MODEL"
           + "_UNSPECIFIED\020\000\022\014\n\010STANDARD\020\001\022\010\n\004SPOT\020\002\022\017"
-          + "\n\013PREEMPTIBLE\020\003\"\270\006\n\tTaskGroup\022\022\n\004name\030\001 "
+          + "\n\013PREEMPTIBLE\020\003\"\230\006\n\tTaskGroup\022\022\n\004name\030\001 "
           + "\001(\tB\004\342A\001\003\022=\n\ttask_spec\030\003 \001(\0132$.google.cl"
           + "oud.batch.v1alpha.TaskSpecB\004\342A\001\002\022\022\n\ntask"
           + "_count\030\004 \001(\003\022\023\n\013parallelism\030\005 \001(\003\022Q\n\021sch"
@@ -298,21 +298,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\003(\0132\'.google.cloud.batch.v1alpha.Environ"
           + "ment\022\033\n\023task_count_per_node\030\n \001(\003\022\032\n\022req"
           + "uire_hosts_file\030\013 \001(\010\022\026\n\016permissive_ssh\030"
-          + "\014 \001(\010\022\036\n\016enable_oslogin\030\r \001(\010B\006\030\001\342A\001\001\022\035\n"
-          + "\017run_as_non_root\030\016 \001(\010B\004\342A\001\001\032-\n\013LabelsEn"
-          + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\\\n\020S"
-          + "chedulingPolicy\022!\n\035SCHEDULING_POLICY_UNS"
-          + "PECIFIED\020\000\022\027\n\023AS_SOON_AS_POSSIBLE\020\001\022\014\n\010I"
-          + "N_ORDER\020\002:o\352Al\n\036batch.googleapis.com/Tas"
-          + "kGroup\022Jprojects/{project}/locations/{lo"
-          + "cation}/jobs/{job}/taskGroups/{task_grou"
-          + "p}\"/\n\016ServiceAccount\022\r\n\005email\030\001 \001(\t\022\016\n\006s"
-          + "copes\030\002 \003(\tB\302\001\n\036com.google.cloud.batch.v"
-          + "1alphaB\010JobProtoP\001Z4cloud.google.com/go/"
-          + "batch/apiv1alpha/batchpb;batchpb\242\002\003GCB\252\002"
-          + "\032Google.Cloud.Batch.V1Alpha\312\002\032Google\\Clo"
-          + "ud\\Batch\\V1alpha\352\002\035Google::Cloud::Batch:"
-          + ":V1alphab\006proto3"
+          + "\014 \001(\010\022\035\n\017run_as_non_root\030\016 \001(\010B\004\342A\001\001\032-\n\013"
+          + "LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:"
+          + "\0028\001\"\\\n\020SchedulingPolicy\022!\n\035SCHEDULING_PO"
+          + "LICY_UNSPECIFIED\020\000\022\027\n\023AS_SOON_AS_POSSIBL"
+          + "E\020\001\022\014\n\010IN_ORDER\020\002:o\352Al\n\036batch.googleapis"
+          + ".com/TaskGroup\022Jprojects/{project}/locat"
+          + "ions/{location}/jobs/{job}/taskGroups/{t"
+          + "ask_group}\"/\n\016ServiceAccount\022\r\n\005email\030\001 "
+          + "\001(\t\022\016\n\006scopes\030\002 \003(\tB\302\001\n\036com.google.cloud"
+          + ".batch.v1alphaB\010JobProtoP\001Z4cloud.google"
+          + ".com/go/batch/apiv1alpha/batchpb;batchpb"
+          + "\242\002\003GCB\252\002\032Google.Cloud.Batch.V1Alpha\312\002\032Go"
+          + "ogle\\Cloud\\Batch\\V1alpha\352\002\035Google::Cloud"
+          + "::Batch::V1alphab\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -595,7 +594,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "TaskCountPerNode",
               "RequireHostsFile",
               "PermissiveSsh",
-              "EnableOslogin",
               "RunAsNonRoot",
             });
     internal_static_google_cloud_batch_v1alpha_TaskGroup_LabelsEntry_descriptor =