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

Reduce permissions for pubsub #273

Merged
merged 2 commits into from
Mar 30, 2022
Merged

Reduce permissions for pubsub #273

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f082b
remove pubsub iam list requirement
noursaidi Mar 30, 2022
f5f0644
Empty commmit
noursaidi Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 6 additions & 19 deletions validator/src/main/java/com/google/daq/mqtt/util/PubSubClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.fasterxml.jackson.databind.SerializationFeature;
import com.google.api.client.util.Base64;
import com.google.api.core.ApiFuture;
import com.google.api.gax.rpc.NotFoundException;
import com.google.bos.iot.core.proxy.MessagePublisher;
import com.google.cloud.pubsub.v1.AckReplyConsumer;
import com.google.cloud.pubsub.v1.MessageReceiver;
Expand Down Expand Up @@ -154,31 +155,17 @@ public String getSubscriptionId() {

private void resetSubscription(ProjectSubscriptionName subscriptionName) {
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
if (subscriptionExists(subscriptionAdminClient, subscriptionName)) {
System.err.println("Resetting existing subscription " + subscriptionName);
subscriptionAdminClient.seek(getCurrentTimeSeekRequest(subscriptionName.toString()));
Thread.sleep(SUBSCRIPTION_RACE_DELAY_MS);
} else {
throw new RuntimeException("Missing subscription for " + subscriptionName);
}
System.err.println("Resetting existing subscription " + subscriptionName);
subscriptionAdminClient.seek(getCurrentTimeSeekRequest(subscriptionName.toString()));
Thread.sleep(SUBSCRIPTION_RACE_DELAY_MS);
} catch (NotFoundException e) {
throw new RuntimeException("Missing subscription for " + subscriptionName);
} catch (Exception e) {
throw new RuntimeException(
String.format(SUBSCRIPTION_ERROR_FORMAT, subscriptionName), e);
}
}

private boolean subscriptionExists(SubscriptionAdminClient subscriptionAdminClient,
ProjectSubscriptionName subscriptionName) {
ListSubscriptionsPagedResponse listSubscriptionsPagedResponse = subscriptionAdminClient
.listSubscriptions(ProjectName.of(projectId));
for (Subscription subscription : listSubscriptionsPagedResponse.iterateAll()) {
if (subscription.getName().equals(subscriptionName.toString())) {
return true;
}
}
return false;
}

static class ErrorContainer extends TreeMap<String, Object> {

ErrorContainer(Exception e, String message) {
Expand Down