fix: update gapic-generator-java with mock service generation fixes (#…

…491) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 457524730 Source-Link: googleapis/googleapis@917e7f2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9
googleapis · Jun 28, 2022 · 8145795 · 8145795
1 parent 6bad28c
commit 8145795
Show file tree

Hide file tree

Showing 67 changed files with 115 additions and 198 deletions.
diff --git a/...loud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigZonalServiceClient.java b/...loud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigZonalServiceClient.java
@@ -18,6 +18,7 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
+import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.httpjson.longrunning.OperationsClient;
 import com.google.api.gax.longrunning.OperationFuture;
@@ -197,6 +198,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi
   public final OperationsClient getHttpJsonOperationsClient() {
     return httpJsonOperationsClient;
   }

diff --git a/...os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceClient.java b/...os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceClient.java
@@ -199,6 +199,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi
   public final OperationsClient getHttpJsonOperationsClient() {
     return httpJsonOperationsClient;
   }

diff --git a/...deployment/SyncCreatePatchDeploymentProjectnamePatchdeploymentspatchdeploymentString.java b/...deployment/SyncCreatePatchDeploymentProjectnamePatchdeploymentspatchdeploymentString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
+// [START osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
 import com.google.cloud.osconfig.v1.OsConfigServiceClient;
 import com.google.cloud.osconfig.v1.PatchDeployments;
 import com.google.cloud.osconfig.v1.ProjectName;
@@ -42,5 +41,4 @@ public static void syncCreatePatchDeploymentProjectnamePatchdeploymentspatchdepl
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
+// [END osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
diff --git a/...patchdeployment/SyncCreatePatchDeploymentStringPatchdeploymentspatchdeploymentString.java b/...patchdeployment/SyncCreatePatchDeploymentStringPatchdeploymentspatchdeploymentString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
+// [START osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
 import com.google.cloud.osconfig.v1.OsConfigServiceClient;
 import com.google.cloud.osconfig.v1.PatchDeployments;
 import com.google.cloud.osconfig.v1.ProjectName;
@@ -42,5 +41,4 @@ public static void syncCreatePatchDeploymentStringPatchdeploymentspatchdeploymen
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
+// [END osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
diff --git a/...ud/osconfig/v1/osconfigserviceclient/deletepatchdeployment/SyncDeletePatchDeployment.java b/...ud/osconfig/v1/osconfigserviceclient/deletepatchdeployment/SyncDeletePatchDeployment.java
@@ -20,6 +20,7 @@
 import com.google.cloud.osconfig.v1.OsConfigServiceClient;
 import com.google.cloud.osconfig.v1.PatchDeploymentName;
 import com.google.cloud.osconfig.v1.PatchDeployments;
+import com.google.protobuf.Empty;
 
 public class SyncDeletePatchDeployment {
 

diff --git a/...nfigserviceclient/deletepatchdeployment/SyncDeletePatchDeploymentPatchdeploymentname.java b/...nfigserviceclient/deletepatchdeployment/SyncDeletePatchDeploymentPatchdeploymentname.java
@@ -16,10 +16,10 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigserviceclient_deletepatchdeployment_patchdeploymentname_sync]
+// [START osconfig_v1_generated_osconfigserviceclient_deletepatchdeployment_patchdeploymentname_sync]
 import com.google.cloud.osconfig.v1.OsConfigServiceClient;
 import com.google.cloud.osconfig.v1.PatchDeploymentName;
+import com.google.protobuf.Empty;
 
 public class SyncDeletePatchDeploymentPatchdeploymentname {
 

diff --git a/...onfig/v1/osconfigserviceclient/deletepatchdeployment/SyncDeletePatchDeploymentString.java b/...onfig/v1/osconfigserviceclient/deletepatchdeployment/SyncDeletePatchDeploymentString.java
@@ -19,6 +19,7 @@
 // [START osconfig_v1_generated_osconfigserviceclient_deletepatchdeployment_string_sync]
 import com.google.cloud.osconfig.v1.OsConfigServiceClient;
 import com.google.cloud.osconfig.v1.PatchDeploymentName;
+import com.google.protobuf.Empty;
 
 public class SyncDeletePatchDeploymentString {
 

diff --git a/...nfigserviceclient/resumepatchdeployment/SyncResumePatchDeploymentPatchdeploymentname.java b/...nfigserviceclient/resumepatchdeployment/SyncResumePatchDeploymentPatchdeploymentname.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigserviceclient_resumepatchdeployment_patchdeploymentname_sync]
+// [START osconfig_v1_generated_osconfigserviceclient_resumepatchdeployment_patchdeploymentname_sync]
 import com.google.cloud.osconfig.v1.OsConfigServiceClient;
 import com.google.cloud.osconfig.v1.PatchDeploymentName;
 import com.google.cloud.osconfig.v1.PatchDeployments;

diff --git a/...atepatchdeployment/SyncUpdatePatchDeploymentPatchdeploymentspatchdeploymentFieldmask.java b/...atepatchdeployment/SyncUpdatePatchDeploymentPatchdeploymentspatchdeploymentFieldmask.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
+// [START osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
 import com.google.cloud.osconfig.v1.OsConfigServiceClient;
 import com.google.cloud.osconfig.v1.PatchDeployments;
 import com.google.protobuf.FieldMask;
@@ -41,5 +40,4 @@ public static void syncUpdatePatchDeploymentPatchdeploymentspatchdeploymentField
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
+// [END osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
diff --git a/...eospolicyassignment/SyncCreateOSPolicyAssignmentLocationnameOspolicyassignmentString.java b/...eospolicyassignment/SyncCreateOSPolicyAssignmentLocationnameOspolicyassignmentString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
 import com.google.cloud.osconfig.v1.LocationName;
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
@@ -44,5 +43,4 @@ public static void syncCreateOSPolicyAssignmentLocationnameOspolicyassignmentStr
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
diff --git a/.../createospolicyassignment/SyncCreateOSPolicyAssignmentStringOspolicyassignmentString.java b/.../createospolicyassignment/SyncCreateOSPolicyAssignmentStringOspolicyassignmentString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
 import com.google.cloud.osconfig.v1.LocationName;
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
@@ -43,5 +42,4 @@ public static void syncCreateOSPolicyAssignmentStringOspolicyassignmentString()
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
diff --git a/.../v1/osconfigzonalserviceclient/deleteospolicyassignment/SyncDeleteOSPolicyAssignment.java b/.../v1/osconfigzonalserviceclient/deleteospolicyassignment/SyncDeleteOSPolicyAssignment.java
@@ -20,6 +20,7 @@
 import com.google.cloud.osconfig.v1.DeleteOSPolicyAssignmentRequest;
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteOSPolicyAssignment {
 

diff --git a/...ceclient/deleteospolicyassignment/SyncDeleteOSPolicyAssignmentOspolicyassignmentname.java b/...ceclient/deleteospolicyassignment/SyncDeleteOSPolicyAssignmentOspolicyassignmentname.java
@@ -16,10 +16,10 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteOSPolicyAssignmentOspolicyassignmentname {
 
@@ -38,5 +38,4 @@ public static void syncDeleteOSPolicyAssignmentOspolicyassignmentname() throws E
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
diff --git a/...configzonalserviceclient/deleteospolicyassignment/SyncDeleteOSPolicyAssignmentString.java b/...configzonalserviceclient/deleteospolicyassignment/SyncDeleteOSPolicyAssignmentString.java
@@ -19,6 +19,7 @@
 // [START osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_string_sync]
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteOSPolicyAssignmentString {
 

diff --git a/...lserviceclient/getospolicyassignment/SyncGetOSPolicyAssignmentOspolicyassignmentname.java b/...lserviceclient/getospolicyassignment/SyncGetOSPolicyAssignmentOspolicyassignmentname.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
@@ -39,5 +38,4 @@ public static void syncGetOSPolicyAssignmentOspolicyassignmentname() throws Exce
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
diff --git a/...ospolicyassignmentreport/SyncGetOSPolicyAssignmentReportOspolicyassignmentreportname.java b/...ospolicyassignmentreport/SyncGetOSPolicyAssignmentReportOspolicyassignmentreportname.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentReport;
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentReportName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
@@ -41,5 +40,4 @@ public static void syncGetOSPolicyAssignmentReportOspolicyassignmentreportname()
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
diff --git a/...rviceclient/getvulnerabilityreport/SyncGetVulnerabilityReportVulnerabilityreportname.java b/...rviceclient/getvulnerabilityreport/SyncGetVulnerabilityReportVulnerabilityreportname.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
 import com.google.cloud.osconfig.v1.VulnerabilityReport;
 import com.google.cloud.osconfig.v1.VulnerabilityReportName;
@@ -39,5 +38,4 @@ public static void syncGetVulnerabilityReportVulnerabilityreportname() throws Ex
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
diff --git a/...lserviceclient/listospolicyassignmentreports/AsyncListOSPolicyAssignmentReportsPaged.java b/...lserviceclient/listospolicyassignmentreports/AsyncListOSPolicyAssignmentReportsPaged.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_paged_async]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_paged_async]
 import com.google.cloud.osconfig.v1.InstanceOSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentReportsRequest;
 import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentReportsResponse;

diff --git a/...icyassignmentreports/SyncListOSPolicyAssignmentReportsInstanceospolicyassignmentname.java b/...icyassignmentreports/SyncListOSPolicyAssignmentReportsInstanceospolicyassignmentname.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
 import com.google.cloud.osconfig.v1.InstanceOSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentReport;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
@@ -44,5 +43,4 @@ public static void syncListOSPolicyAssignmentReportsInstanceospolicyassignmentna
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
diff --git a/...lserviceclient/listospolicyassignmentreports/SyncListOSPolicyAssignmentReportsString.java b/...lserviceclient/listospolicyassignmentreports/SyncListOSPolicyAssignmentReportsString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_string_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_string_sync]
 import com.google.cloud.osconfig.v1.InstanceOSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentReport;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;

diff --git a/...viceclient/listospolicyassignmentrevisions/AsyncListOSPolicyAssignmentRevisionsPaged.java b/...viceclient/listospolicyassignmentrevisions/AsyncListOSPolicyAssignmentRevisionsPaged.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
 import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentRevisionsRequest;
 import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentRevisionsResponse;
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
@@ -60,5 +59,4 @@ public static void asyncListOSPolicyAssignmentRevisionsPaged() throws Exception
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
diff --git a/...spolicyassignmentrevisions/SyncListOSPolicyAssignmentRevisionsOspolicyassignmentname.java b/...spolicyassignmentrevisions/SyncListOSPolicyAssignmentRevisionsOspolicyassignmentname.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
@@ -42,5 +41,4 @@ public static void syncListOSPolicyAssignmentRevisionsOspolicyassignmentname() t
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
diff --git a/...viceclient/listospolicyassignmentrevisions/SyncListOSPolicyAssignmentRevisionsString.java b/...viceclient/listospolicyassignmentrevisions/SyncListOSPolicyAssignmentRevisionsString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
@@ -42,5 +41,4 @@ public static void syncListOSPolicyAssignmentRevisionsString() throws Exception
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
diff --git a/...igzonalserviceclient/listospolicyassignments/SyncListOSPolicyAssignmentsLocationname.java b/...igzonalserviceclient/listospolicyassignments/SyncListOSPolicyAssignmentsLocationname.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignments_locationname_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignments_locationname_sync]
 import com.google.cloud.osconfig.v1.LocationName;
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;

diff --git a/...zonalserviceclient/listvulnerabilityreports/SyncListVulnerabilityReportsInstancename.java b/...zonalserviceclient/listvulnerabilityreports/SyncListVulnerabilityReportsInstancename.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_listvulnerabilityreports_instancename_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_listvulnerabilityreports_instancename_sync]
 import com.google.cloud.osconfig.v1.InstanceName;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
 import com.google.cloud.osconfig.v1.VulnerabilityReport;

diff --git a/...ent/updateospolicyassignment/SyncUpdateOSPolicyAssignmentOspolicyassignmentFieldmask.java b/...ent/updateospolicyassignment/SyncUpdateOSPolicyAssignmentOspolicyassignmentFieldmask.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1.samples;
 
-// [START
-// osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
+// [START osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
 import com.google.cloud.osconfig.v1.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
 import com.google.protobuf.FieldMask;
@@ -42,5 +41,4 @@ public static void syncUpdateOSPolicyAssignmentOspolicyassignmentFieldmask() thr
     }
   }
 }
-// [END
-// osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
+// [END osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
diff --git a/...eospolicyassignment/SyncCreateOSPolicyAssignmentLocationnameOspolicyassignmentString.java b/...eospolicyassignment/SyncCreateOSPolicyAssignmentLocationnameOspolicyassignmentString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1alpha.samples;
 
-// [START
-// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
+// [START osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
 import com.google.cloud.osconfig.v1alpha.LocationName;
 import com.google.cloud.osconfig.v1alpha.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1alpha.OsConfigZonalServiceClient;
@@ -44,5 +43,4 @@ public static void syncCreateOSPolicyAssignmentLocationnameOspolicyassignmentStr
     }
   }
 }
-// [END
-// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
+// [END osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
diff --git a/.../createospolicyassignment/SyncCreateOSPolicyAssignmentStringOspolicyassignmentString.java b/.../createospolicyassignment/SyncCreateOSPolicyAssignmentStringOspolicyassignmentString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.osconfig.v1alpha.samples;
 
-// [START
-// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
+// [START osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
 import com.google.cloud.osconfig.v1alpha.LocationName;
 import com.google.cloud.osconfig.v1alpha.OSPolicyAssignment;
 import com.google.cloud.osconfig.v1alpha.OsConfigZonalServiceClient;
@@ -43,5 +42,4 @@ public static void syncCreateOSPolicyAssignmentStringOspolicyassignmentString()
     }
   }
 }
-// [END
-// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
+// [END osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]