feat: add v1beta2 of secretmanager (#10577)

* feat: add `v1beta2` of `secretmanager` * add generated `v1beta2` files * add grpc-common-protos * remove deep-preserve for v1beta1 * correct preservation of ITs * remove v1beta1 manually * remove v1beta1 manually ii
googleapis · Mar 21, 2024 · b87dd72 · b87dd72
1 parent 206d790
commit b87dd72
Show file tree

Hide file tree

Showing 169 changed files with 43,808 additions and 15,382 deletions.
diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1537,6 +1537,7 @@ libraries:
   requires_billing: false
   GAPICs:
   - proto_path: google/cloud/secretmanager/v1
+  - proto_path: google/cloud/secretmanager/v1beta2
 
 - api_shortname: securesourcemanager
   name_pretty: Secure Source Manager API

diff --git a/java-secretmanager/.OwlBot.yaml b/java-secretmanager/.OwlBot.yaml
@@ -20,22 +20,18 @@ deep-remove-regex:
 - "/java-secretmanager/google-.*/src"
 
 deep-preserve-regex:
-- "/java-secretmanager/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
-- "/java-secretmanager/proto-google-cloud-secretmanager-v1beta1"
-- "/java-secretmanager/grpc-google-cloud-secretmanager-v1beta1"
-- "/java-secretmanager/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1"
-- "/java-secretmanager/google-cloud-secretmanager/src/test/java/com/google/cloud/secretmanager/v1beta1"
+- "/java-secretmanager/google-.*/src/test/java/com/google/cloud/.*/v1/it/IT.*Test.java"
 - "/java-secretmanager/proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/TopicName.java"
 
 
 deep-copy-regex:
-- source: "/google/cloud/secretmanager/(v\\d)/.*-java/proto-google-.*/src"
+- source: "/google/cloud/secretmanager/(v\\d.*)/.*-java/proto-google-.*/src"
   dest: "/owl-bot-staging/java-secretmanager/$1/proto-google-cloud-secretmanager-$1/src"
-- source: "/google/cloud/secretmanager/(v\\d)/.*-java/grpc-google-.*/src"
+- source: "/google/cloud/secretmanager/(v\\d.*)/.*-java/grpc-google-.*/src"
   dest: "/owl-bot-staging/java-secretmanager/$1/grpc-google-cloud-secretmanager-$1/src"
-- source: "/google/cloud/secretmanager/(v\\d)/.*-java/gapic-google-.*/src"
+- source: "/google/cloud/secretmanager/(v\\d.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-secretmanager/$1/google-cloud-secretmanager/src"
-- source: "/google/cloud/secretmanager/(v\\d)/.*-java/samples/snippets/generated"
+- source: "/google/cloud/secretmanager/(v\\d.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-secretmanager/$1/samples/snippets/generated"
 
 api-name: secretmanager
diff --git a/java-secretmanager/google-cloud-secretmanager-bom/pom.xml b/java-secretmanager/google-cloud-secretmanager-bom/pom.xml
@@ -32,8 +32,8 @@
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-secretmanager-v1beta1</artifactId>
-        <version>2.38.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-secretmanager-v1beta1:current} -->
+        <artifactId>grpc-google-cloud-secretmanager-v1beta2</artifactId>
+        <version>2.38.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-secretmanager-v1beta2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -42,8 +42,8 @@
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-secretmanager-v1beta1</artifactId>
-        <version>2.38.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-secretmanager-v1beta1:current} -->
+        <artifactId>proto-google-cloud-secretmanager-v1beta2</artifactId>
+        <version>2.38.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-secretmanager-v1beta2:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/java-secretmanager/google-cloud-secretmanager/pom.xml b/java-secretmanager/google-cloud-secretmanager/pom.xml
@@ -42,15 +42,15 @@
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-iam-v1</artifactId>
+      <artifactId>proto-google-cloud-secretmanager-v1beta2</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-secretmanager-v1</artifactId>
+      <artifactId>proto-google-iam-v1</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-secretmanager-v1beta1</artifactId>
+      <artifactId>proto-google-cloud-secretmanager-v1</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -72,6 +72,11 @@
       <groupId>org.threeten</groupId>
       <artifactId>threetenbp</artifactId>
     </dependency>
+    <dependency>
+     <groupId>com.google.api.grpc</groupId>
+     <artifactId>grpc-google-common-protos</artifactId>
+    </dependency>
+
 
     <!-- Test dependencies -->
     <dependency>
@@ -91,7 +96,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-secretmanager-v1beta1</artifactId>
+      <artifactId>grpc-google-cloud-secretmanager-v1beta2</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- Need testing utility classes for generated gRPC clients tests -->