Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: Add Kinesis ingestion samples #1947

Merged
merged 10 commits into from
Mar 21, 2024
Merged

docs: Add Kinesis ingestion samples #1947

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63e67b6
docs: Adding samples for creating and updating Kinesis ingestion topics
michaelpri10 Mar 7, 2024
f198317
style: Format AdmitIT
michaelpri10 Mar 7, 2024
4d8a9d8
style: Re-format AdmitIT
michaelpri10 Mar 7, 2024
66f39c4
docs: Fix ingestion topic deletion in test
michaelpri10 Mar 7, 2024
e4c8a94
docs: Add test for updating existing ingestion settings and verify th…
michaelpri10 Mar 7, 2024
0496f52
docs: Use response to verify ingestion settings update
michaelpri10 Mar 13, 2024
adc9a3d
style: fix formatting in tests
michaelpri10 Mar 13, 2024
5336089
docs: Update AdminIT test to check for correct topic name
michaelpri10 Mar 15, 2024
ba6f728
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 18, 2024
7e81589
Merge branch 'main' into ingestion-samples
michaelpri10 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
docs: Add test for updating existing ingestion settings and verify th… 
…e actual results of topic creation and updating
  • Loading branch information
@michaelpri10
michaelpri10 committed Mar 7, 2024
commit e4c8a94a6fed9d3fe2fd4a6f4ba2369bd3d9b5f8
2 changes: 1 addition & 1 deletion samples/snippets/src/main/java/pubsub/CreateTopicWithKinesisIngestionExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static void createTopicWithKinesisIngestionExample(
.setIngestionDataSourceSettings(ingestionDataSourceSettings)
.build());

System.out.println("Created topic with Kinesis ingestion settings: " + topic.getName());
System.out.println("Created topic with Kinesis ingestion settings: " + topic.getAllFields());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/src/main/java/pubsub/UpdateTopicTypeExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static void updateTopicTypeExample(

Topic response = topicAdminClient.updateTopic(request);

System.out.println("Updated topic with Kinesis ingestion settings: " + topic.getName());
System.out.println("Updated topic with Kinesis ingestion settings: " + topic.getAllFields());
}
}
}
Expand Down
30 changes: 24 additions & 6 deletions samples/snippets/src/test/java/pubsub/AdminIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ public class AdminIT {
private static final String consumerArn =
"arn:aws:kinesis:us-west-2:111111111111:stream/fake-stream-name/"
+ "consumer/consumer-1:1111111111";
private static final String consumerArn2 =
"arn:aws:kinesis:us-west-2:111111111111:stream/fake-stream-name/"
+ "consumer/consumer-2:2222222222";
private static final String awsRoleArn = "arn:aws:iam::111111111111:role/fake-role-name";
private static final String gcpServiceAccount =
"[email protected]";
Expand Down Expand Up @@ -287,8 +290,11 @@ public void testAdmin() throws Exception {
// Update topic type to Kinesis ingestion.
UpdateTopicTypeExample.updateTopicTypeExample(
projectId, topicId, streamArn, consumerArn, awsRoleArn, gcpServiceAccount);
assertThat(bout.toString())
.contains("Updated topic with Kinesis ingestion settings: " + topicName.toString());
assertThat(bout.toString()).contains("google.pubsub.v1.Topic.name=" + ingestionTopicName.toString());
assertThat(bout.toString()).contains(streamArn);
assertThat(bout.toString()).contains(consumerArn);
assertThat(bout.toString()).contains(awsRoleArn);
assertThat(bout.toString()).contains(gcpServiceAccount);

bout.reset();
// Test delete topic.
Expand All @@ -299,12 +305,24 @@ public void testAdmin() throws Exception {
// Test create topic with Kinesis ingestion settings.
CreateTopicWithKinesisIngestionExample.createTopicWithKinesisIngestionExample(
projectId, ingestionTopicId, streamArn, consumerArn, awsRoleArn, gcpServiceAccount);
assertThat(bout.toString())
.contains(
"Created topic with Kinesis ingestion settings: " + ingestionTopicName.toString());
assertThat(bout.toString()).contains("google.pubsub.v1.Topic.name=" + ingestionTopicName.toString());
assertThat(bout.toString()).contains(streamArn);
assertThat(bout.toString()).contains(consumerArn);
assertThat(bout.toString()).contains(awsRoleArn);
assertThat(bout.toString()).contains(gcpServiceAccount);

bout.reset();
// Test update existing Kinesis ingestion settings.
UpdateTopicTypeExample.updateTopicTypeExample(
projectId, ingestionTopicId, streamArn, consumerArn2, awsRoleArn, gcpServiceAccount);
assertThat(bout.toString()).contains("google.pubsub.v1.Topic.name=" + ingestionTopicName.toString());
assertThat(bout.toString()).contains(streamArn);
assertThat(bout.toString()).contains(consumerArn2);
assertThat(bout.toString()).contains(awsRoleArn);
assertThat(bout.toString()).contains(gcpServiceAccount);

bout.reset();
// Test delete ingestion topic.
// Test delete Kinesis ingestion topic.
DeleteTopicExample.deleteTopicExample(projectId, ingestionTopicId);
assertThat(bout.toString()).contains("Deleted topic.");
}
Expand Down