ContainerAnalysis: Update topic id (GoogleCloudPlatform#1505)

daniel-sanche · web-flow · commit 3221baee7fd6 · 2019-07-09T10:05:28.000-07:00
updated container analysis topic id
diff --git a/container-registry/container-analysis/src/main/java/com/example/containeranalysis/Subscriptions.java b/container-registry/container-analysis/src/main/java/com/example/containeranalysis/Subscriptions.java
@@ -78,7 +78,7 @@ public synchronized void receiveMessage(PubsubMessage message, AckReplyConsumer
   public static Subscription createOccurrenceSubscription(String subId, String projectId) 
       throws IOException, StatusRuntimeException, InterruptedException {
     // This topic id will automatically receive messages when Occurrences are added or modified
-    String topicId = "container-analysis-occurrences-v1beta1";
+    String topicId = "container-analysis-occurrences-v1";
     ProjectTopicName topicName = ProjectTopicName.of(projectId, topicId);
     ProjectSubscriptionName subName = ProjectSubscriptionName.of(projectId, subId);
 
diff --git a/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTest.java b/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTest.java
@@ -23,7 +23,9 @@
 import com.google.cloud.devtools.containeranalysis.v1.ContainerAnalysisClient;
 import com.google.cloud.pubsub.v1.Subscriber;
 import com.google.cloud.pubsub.v1.SubscriptionAdminClient;
+import com.google.cloud.pubsub.v1.TopicAdminClient;
 import com.google.pubsub.v1.ProjectSubscriptionName;
+import com.google.pubsub.v1.ProjectTopicName;
 import io.grafeas.v1.DiscoveryNote;
 import io.grafeas.v1.DiscoveryOccurrence;
 import io.grafeas.v1.DiscoveryOccurrence.AnalysisStatus;
@@ -202,6 +204,14 @@ public void testOccurrencesForNote() throws Exception {
   public void testPubSub() throws Exception {
     int newCount;
     int tries;
+    // create new topic and subscription if needed
+    try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
+      String topicId = "container-analysis-occurrences-v1";
+      ProjectTopicName topicName = ProjectTopicName.of(PROJECT_ID, topicId);
+      topicAdminClient.createTopic(topicName);
+    } catch (StatusRuntimeException e) {
+      System.out.println("Topic already exists");
+    }
     ProjectSubscriptionName subName = ProjectSubscriptionName.of(PROJECT_ID, subId);
     try {
       Subscriptions.createOccurrenceSubscription(subId, PROJECT_ID);
