feat!: remove legacy resource name (#125)

* chore: Update gapic-generator version The updated version is required to migrate Python clients generation from artman to bazel. PiperOrigin-RevId: 307739946 Source-Author: Google APIs <noreply@google.com> Source-Date: Tue Apr 21 21:16:30 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 862cd840dbb0101a0630913217bf8b6d4101c84c Source-Link: googleapis/googleapis@862cd84 * chore: allow breaking resource name changes * chore: remove legacy resource name types Co-authored-by: Jeff Ching <chingor@google.com>
googleapis · Apr 27, 2020 · d5f88f6 · d5f88f6
1 parent 5d62223
commit d5f88f6
Show file tree

Hide file tree

Showing 11 changed files with 140 additions and 619 deletions.
diff --git a/...ritycenter/src/test/java/com/google/cloud/securitycenter/v1/SecurityCenterClientTest.java b/...ritycenter/src/test/java/com/google/cloud/securitycenter/v1/SecurityCenterClientTest.java
@@ -1285,7 +1285,8 @@ public void updateSourceExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateSecurityMarksTest() {
-    SecurityMarksName name = SecurityMarksName.ofOrganizationAssetName("[ORGANIZATION]", "[ASSET]");
+    SecurityMarksName name =
+        SecurityMarksName.ofOrganizationAssetSecurityMarksName("[ORGANIZATION]", "[ASSET]");
     SecurityMarks expectedResponse = SecurityMarks.newBuilder().setName(name.toString()).build();
     mockSecurityCenter.addResponse(expectedResponse);
 

diff --git a/...ter/src/test/java/com/google/cloud/securitycenter/v1p1beta1/SecurityCenterClientTest.java b/...ter/src/test/java/com/google/cloud/securitycenter/v1p1beta1/SecurityCenterClientTest.java
@@ -1374,7 +1374,8 @@ public void updateSourceExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateSecurityMarksTest() {
-    SecurityMarksName name = SecurityMarksName.ofOrganizationAssetName("[ORGANIZATION]", "[ASSET]");
+    SecurityMarksName name =
+        SecurityMarksName.ofOrganizationAssetSecurityMarksName("[ORGANIZATION]", "[ASSET]");
     SecurityMarks expectedResponse = SecurityMarks.newBuilder().setName(name.toString()).build();
     mockSecurityCenter.addResponse(expectedResponse);
 
@@ -1413,7 +1414,8 @@ public void updateSecurityMarksExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateSecurityMarksTest2() {
-    SecurityMarksName name = SecurityMarksName.ofOrganizationAssetName("[ORGANIZATION]", "[ASSET]");
+    SecurityMarksName name =
+        SecurityMarksName.ofOrganizationAssetSecurityMarksName("[ORGANIZATION]", "[ASSET]");
     SecurityMarks expectedResponse = SecurityMarks.newBuilder().setName(name.toString()).build();
     mockSecurityCenter.addResponse(expectedResponse);
 

diff --git a/proto-google-cloud-securitycenter-v1/clirr-ignored-differences.xml b/proto-google-cloud-securitycenter-v1/clirr-ignored-differences.xml
@@ -17,15 +17,55 @@
     <method>boolean has*(*)</method>
   </difference>
 
-  <!-- TODO: remove after 0.121.0 -->
+  <!-- TODO: remove after 0.122.0 -->
   <difference>
     <differenceType>7002</differenceType>
     <className>com/google/cloud/securitycenter/v1/SecurityMarksName</className>
-    <method>java.util.List parse(java.util.List)</method>
+    <method>java.lang.String formatOrganizationAssetName(java.lang.String, java.lang.String)</method>
   </difference>
   <difference>
     <differenceType>7002</differenceType>
     <className>com/google/cloud/securitycenter/v1/SecurityMarksName</className>
-    <method>java.util.List toStrings(java.util.List)</method>
+    <method>java.lang.String formatOrganizationSourceFindingName(java.lang.String, java.lang.String, java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/securitycenter/v1/SecurityMarksName</className>
+    <method>com.google.cloud.securitycenter.v1.SecurityMarksName$Builder newOrganizationAssetBuilder()</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/securitycenter/v1/SecurityMarksName</className>
+    <method>com.google.cloud.securitycenter.v1.SecurityMarksName$OrganizationSourceFindingBuilder newOrganizationSourceFindingBuilder()</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/securitycenter/v1/SecurityMarksName</className>
+    <method>com.google.cloud.securitycenter.v1.SecurityMarksName ofOrganizationAssetName(java.lang.String, java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/securitycenter/v1/SecurityMarksName</className>
+    <method>com.google.cloud.securitycenter.v1.SecurityMarksName ofOrganizationSourceFindingName(java.lang.String, java.lang.String, java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/securitycenter/v1/SecurityMarksName$OrganizationSourceFindingBuilder</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/securitycenter/v1/AssetSecurityMarksName*</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/securitycenter/v1/FindingSecurityMarksName*</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/securitycenter/v1/SecurityMarksNames</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/securitycenter/v1/UntypedSecurityMarksName</className>
   </difference>
 </differences>
diff --git a/...itycenter-v1/src/main/java/com/google/cloud/securitycenter/v1/AssetSecurityMarksName.java b/...itycenter-v1/src/main/java/com/google/cloud/securitycenter/v1/AssetSecurityMarksName.java