Merge pull request GoogleCloudPlatform#2682 from justinsb/streamingda…

…taflowflextemplatejob_revert_unrelated tests: fix streamingdataflowflextemplatejob
gemmahou · Sep 12, 2024 · f6ffa10 · f6ffa10
2 parents 49f9ae0 + 790f5b7
commit f6ffa10
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...ingdataflowflextemplatejob/_generated_object_streamingdataflowflextemplatejob.golden.yaml b/...ingdataflowflextemplatejob/_generated_object_streamingdataflowflextemplatejob.golden.yaml
@@ -3,7 +3,7 @@ kind: DataflowFlexTemplateJob
 metadata:
   annotations:
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
-    cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"containerSpecGcsPath":"gs://dataflow-templates/2020-08-31-00_RC00/flex/PubSub_Avro_to_BigQuery","parameters":{"createDisposition":"CREATE_NEVER","inputSubscription":"projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId}","outputTableSpec":"${projectId}:bigquerydataset${uniqueId}.bigquerytable${uniqueId}","outputTopic":"projects/${projectId}/topics/pubsubtopic1-${uniqueId}","schemaPath":"gs://config-connector-samples/dataflowflextemplate/numbers.avsc"}}}'
+    cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"containerSpecGcsPath":"gs://dataflow-templates/2020-08-31-00_RC00/flex/PubSub_Avro_to_BigQuery","parameters":{"createDisposition":"CREATE_NEVER","inputSubscription":"projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId}","outputTableSpec":"${projectId}:bigquerydataset${uniqueId}.bigquerytable${uniqueId}","outputTopic":"projects/${projectId}/topics/pubsubtopic0-${uniqueId}","schemaPath":"gs://config-connector-samples/dataflowflextemplate/numbers.avsc"}}}'
     cnrm.cloud.google.com/on-delete: cancel
     cnrm.cloud.google.com/project-id: ${projectId}
     cnrm.cloud.google.com/state-into-spec: absent
@@ -22,7 +22,7 @@ spec:
     createDisposition: CREATE_NEVER
     inputSubscription: projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId}
     outputTableSpec: ${projectId}:bigquerydataset${uniqueId}.bigquerytable${uniqueId}
-    outputTopic: projects/${projectId}/topics/pubsubtopic1-${uniqueId}
+    outputTopic: projects/${projectId}/topics/pubsubtopic0-${uniqueId}
     schemaPath: gs://config-connector-samples/dataflowflextemplate/numbers.avsc
   region: us-central1
 status:

diff --git a/...basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/_http.log b/...basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/_http.log
@@ -582,7 +582,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr
       "createDisposition": "CREATE_NEVER",
       "inputSubscription": "projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId}",
       "outputTableSpec": "${projectId}:bigquerydataset${uniqueId}.bigquerytable${uniqueId}",
-      "outputTopic": "projects/${projectId}/topics/pubsubtopic1-${uniqueId}",
+      "outputTopic": "projects/${projectId}/topics/pubsubtopic0-${uniqueId}",
       "schemaPath": "gs://config-connector-samples/dataflowflextemplate/numbers.avsc"
     }
   }

diff --git a/...sic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/create.yaml b/...sic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/create.yaml
@@ -28,6 +28,6 @@ spec:
     # This is maintained by us.
     schemaPath: gs://config-connector-samples/dataflowflextemplate/numbers.avsc
     inputSubscription: projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId}
-    outputTopic: projects/${projectId}/topics/pubsubtopic1-${uniqueId}
+    outputTopic: projects/${projectId}/topics/pubsubtopic0-${uniqueId}
     outputTableSpec: ${projectId}:bigquerydataset${uniqueId}.bigquerytable${uniqueId}
     createDisposition: CREATE_NEVER