feat!: Update containeranalysis v1beta1 with the latest protos (#11155)

Author: blakeli0

java-containeranalysis/.OwlBot-hermetic.yaml

@@ -17,22 +17,20 @@ deep-remove-regex:
 - "/java-containeranalysis/grpc-google-cloud-containeranalysis-v1/src"
 - "/java-containeranalysis/google-cloud-containeranalysis/src/.*/java/com/google/cloud/devtools/containeranalysis/v1"
 - "/java-containeranalysis/samples/snippets/generated"
-- "/java-containeranalysis/proto-google-cloud-containeranalysis-v1/src"
+- "/java-containeranalysis/proto-google-*/src"
 # TODO: remove resource name classes in next major update
 
 deep-preserve-regex:
 - "/java-containeranalysis/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
-- "/java-containeranalysis/google-cloud-containeranalysis/src/.*/java/com/google/cloud/devtools/containeranalysis/v1beta1"
-- "/java-containeranalysis/proto-google-cloud-containeranalysis-v.*/src/main/java/com/google/containeranalysis/v.*/.*Name.*.java"
 - "/java-containeranalysis/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java"
 - "/java-containeranalysis/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java"
 
 deep-copy-regex:
-- source: "/google/devtools/containeranalysis/v1/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-containeranalysis/v1/proto-google-cloud-containeranalysis-v1/src"
-- source: "/google/devtools/containeranalysis/v1/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/java-containeranalysis/v1/grpc-google-cloud-containeranalysis-v1/src"
-- source: "/google/devtools/containeranalysis/v1/.*-java/gapic-google-.*/src"
-  dest: "/owl-bot-staging/java-containeranalysis/v1/google-cloud-containeranalysis/src"
+- source: "/google/devtools/containeranalysis/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/java-containeranalysis/$1/proto-google-cloud-containeranalysis-$1/src"
+- source: "/google/devtools/containeranalysis/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/java-containeranalysis/$1/grpc-google-cloud-containeranalysis-$1/src"
+- source: "/google/devtools/containeranalysis/(v.*)/.*-java/gapic-google-.*/src"
+  dest: "/owl-bot-staging/java-containeranalysis/$1/google-cloud-containeranalysis/src"
 
 api-name: containeranalysis

java-containeranalysis/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1Client.java

@@ -1,39 +1,37 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2024 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
  *
- *     https://www.apache.org/licenses/LICENSE-2.0
+ *      https://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.
  */
-package com.google.cloud.devtools.containeranalysis.v1beta1;
 
-import static com.google.cloud.devtools.containeranalysis.v1beta1.ContainerAnalysisV1Beta1Client.ListScanConfigsPagedResponse;
+package com.google.cloud.devtools.containeranalysis.v1beta1;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
-import com.google.api.gax.rpc.PagedCallSettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.cloud.devtools.containeranalysis.v1beta1.stub.ContainerAnalysisV1Beta1StubSettings;
-import com.google.containeranalysis.v1beta1.GetScanConfigRequest;
-import com.google.containeranalysis.v1beta1.ListScanConfigsRequest;
-import com.google.containeranalysis.v1beta1.ListScanConfigsResponse;
-import com.google.containeranalysis.v1beta1.ScanConfig;
-import com.google.containeranalysis.v1beta1.UpdateScanConfigRequest;
+import com.google.containeranalysis.v1beta1.ExportSBOMRequest;
+import com.google.containeranalysis.v1beta1.ExportSBOMResponse;
+import com.google.containeranalysis.v1beta1.GeneratePackagesSummaryRequest;
+import com.google.containeranalysis.v1beta1.PackagesSummaryResponse;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.Policy;
 import com.google.iam.v1.SetIamPolicyRequest;
@@ -43,7 +41,7 @@
 import java.util.List;
 import javax.annotation.Generated;
 
-// AUTO-GENERATED DOCUMENTATION AND CLASS
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
  * Settings class to configure an instance of {@link ContainerAnalysisV1Beta1Client}.
  *
@@ -61,24 +59,32 @@
  *
  * <p>For example, to set the total timeout of setIamPolicy to 30 seconds:
  *
- * <pre>
- * <code>
+ * <pre>{@code
+ * // This snippet has been automatically generated and should be regarded as a code template only.
+ * // It will require modifications to work:
+ * // - It may require correct/in-range values for request initialization.
+ * // - It may require specifying regional endpoints when creating the service client as shown in
+ * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * ContainerAnalysisV1Beta1Settings.Builder containerAnalysisV1Beta1SettingsBuilder =
  *     ContainerAnalysisV1Beta1Settings.newBuilder();
  * containerAnalysisV1Beta1SettingsBuilder
  *     .setIamPolicySettings()
  *     .setRetrySettings(
- *         containerAnalysisV1Beta1SettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder()
+ *         containerAnalysisV1Beta1SettingsBuilder
+ *             .setIamPolicySettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
- * ContainerAnalysisV1Beta1Settings containerAnalysisV1Beta1Settings = containerAnalysisV1Beta1SettingsBuilder.build();
- * </code>
- * </pre>
+ * ContainerAnalysisV1Beta1Settings containerAnalysisV1Beta1Settings =
+ *     containerAnalysisV1Beta1SettingsBuilder.build();
+ * }</pre>
  */
-@Generated("by gapic-generator")
 @BetaApi
+@Generated("by gapic-generator-java")
 public class ContainerAnalysisV1Beta1Settings
     extends ClientSettings<ContainerAnalysisV1Beta1Settings> {
+
   /** Returns the object with the settings used for calls to setIamPolicy. */
   public UnaryCallSettings<SetIamPolicyRequest, Policy> setIamPolicySettings() {
     return ((ContainerAnalysisV1Beta1StubSettings) getStubSettings()).setIamPolicySettings();
@@ -95,21 +101,16 @@ public UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings() {
     return ((ContainerAnalysisV1Beta1StubSettings) getStubSettings()).testIamPermissionsSettings();
   }
 
-  /** Returns the object with the settings used for calls to getScanConfig. */
-  public UnaryCallSettings<GetScanConfigRequest, ScanConfig> getScanConfigSettings() {
-    return ((ContainerAnalysisV1Beta1StubSettings) getStubSettings()).getScanConfigSettings();
+  /** Returns the object with the settings used for calls to generatePackagesSummary. */
+  public UnaryCallSettings<GeneratePackagesSummaryRequest, PackagesSummaryResponse>
+      generatePackagesSummarySettings() {
+    return ((ContainerAnalysisV1Beta1StubSettings) getStubSettings())
+        .generatePackagesSummarySettings();
   }
 
-  /** Returns the object with the settings used for calls to listScanConfigs. */
-  public PagedCallSettings<
-          ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
-      listScanConfigsSettings() {
-    return ((ContainerAnalysisV1Beta1StubSettings) getStubSettings()).listScanConfigsSettings();
-  }
-
-  /** Returns the object with the settings used for calls to updateScanConfig. */
-  public UnaryCallSettings<UpdateScanConfigRequest, ScanConfig> updateScanConfigSettings() {
-    return ((ContainerAnalysisV1Beta1StubSettings) getStubSettings()).updateScanConfigSettings();
+  /** Returns the object with the settings used for calls to exportSBOM. */
+  public UnaryCallSettings<ExportSBOMRequest, ExportSBOMResponse> exportSBOMSettings() {
+    return ((ContainerAnalysisV1Beta1StubSettings) getStubSettings()).exportSBOMSettings();
   }
 
   public static final ContainerAnalysisV1Beta1Settings create(
@@ -137,25 +138,36 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
     return ContainerAnalysisV1Beta1StubSettings.defaultCredentialsProviderBuilder();
   }
 
-  /** Returns a builder for the default ChannelProvider for this service. */
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
     return ContainerAnalysisV1Beta1StubSettings.defaultGrpcTransportProviderBuilder();
   }
 
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return ContainerAnalysisV1Beta1StubSettings.defaultHttpJsonTransportProviderBuilder();
+  }
+
   public static TransportChannelProvider defaultTransportChannelProvider() {
     return ContainerAnalysisV1Beta1StubSettings.defaultTransportChannelProvider();
   }
 
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
   public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
     return ContainerAnalysisV1Beta1StubSettings.defaultApiClientHeaderProviderBuilder();
   }
 
-  /** Returns a new builder for this class. */
+  /** Returns a new gRPC builder for this class. */
   public static Builder newBuilder() {
     return Builder.createDefault();
   }
 
+  /** Returns a new REST builder for this class. */
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
   /** Returns a new builder for this class. */
   public static Builder newBuilder(ClientContext clientContext) {
     return new Builder(clientContext);
@@ -173,18 +185,15 @@ protected ContainerAnalysisV1Beta1Settings(Builder settingsBuilder) throws IOExc
   /** Builder for ContainerAnalysisV1Beta1Settings. */
   public static class Builder
       extends ClientSettings.Builder<ContainerAnalysisV1Beta1Settings, Builder> {
+
     protected Builder() throws IOException {
-      this((ClientContext) null);
+      this(((ClientContext) null));
     }
 
     protected Builder(ClientContext clientContext) {
       super(ContainerAnalysisV1Beta1StubSettings.newBuilder(clientContext));
     }
 
-    private static Builder createDefault() {
-      return new Builder(ContainerAnalysisV1Beta1StubSettings.newBuilder());
-    }
-
     protected Builder(ContainerAnalysisV1Beta1Settings settings) {
       super(settings.getStubSettings().toBuilder());
     }
@@ -193,18 +202,25 @@ protected Builder(ContainerAnalysisV1Beta1StubSettings.Builder stubSettings) {
       super(stubSettings);
     }
 
+    private static Builder createDefault() {
+      return new Builder(ContainerAnalysisV1Beta1StubSettings.newBuilder());
+    }
+
+    private static Builder createHttpJsonDefault() {
+      return new Builder(ContainerAnalysisV1Beta1StubSettings.newHttpJsonBuilder());
+    }
+
     public ContainerAnalysisV1Beta1StubSettings.Builder getStubSettingsBuilder() {
       return ((ContainerAnalysisV1Beta1StubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
@@ -226,22 +242,15 @@ public UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettin
       return getStubSettingsBuilder().testIamPermissionsSettings();
     }
 
-    /** Returns the builder for the settings used for calls to getScanConfig. */
-    public UnaryCallSettings.Builder<GetScanConfigRequest, ScanConfig> getScanConfigSettings() {
-      return getStubSettingsBuilder().getScanConfigSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to listScanConfigs. */
-    public PagedCallSettings.Builder<
-            ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
-        listScanConfigsSettings() {
-      return getStubSettingsBuilder().listScanConfigsSettings();
+    /** Returns the builder for the settings used for calls to generatePackagesSummary. */
+    public UnaryCallSettings.Builder<GeneratePackagesSummaryRequest, PackagesSummaryResponse>
+        generatePackagesSummarySettings() {
+      return getStubSettingsBuilder().generatePackagesSummarySettings();
     }
 
-    /** Returns the builder for the settings used for calls to updateScanConfig. */
-    public UnaryCallSettings.Builder<UpdateScanConfigRequest, ScanConfig>
-        updateScanConfigSettings() {
-      return getStubSettingsBuilder().updateScanConfigSettings();
+    /** Returns the builder for the settings used for calls to exportSBOM. */
+    public UnaryCallSettings.Builder<ExportSBOMRequest, ExportSBOMResponse> exportSBOMSettings() {
+      return getStubSettingsBuilder().exportSBOMSettings();
     }
 
     @Override