mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-02-05 12:31:15 +00:00
Code Issues Releases Wiki Activity

Switch to new Json credential provisioning

Browse Source 
As part of credential consolidation, update the credential provisioing
in StackDriver Module. This is the only module that will continue using
Json-based credential.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=211878151
This commit is contained in:
weiminyu
2018-09-06 15:16:06 -07:00
committed by jianglai
parent 22e1d905b6
commit be18f55640
3 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/google/registry/monitoring/whitebox/StackdriverModule.java
View File

@@ -15,10 +15,7 @@
package google.registry.monitoring.whitebox;
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.services.monitoring.v3.Monitoring;
import com.google.api.services.monitoring.v3.MonitoringScopes;
import com.google.api.services.monitoring.v3.model.MonitoredResource;
import com.google.appengine.api.modules.ModulesService;
import com.google.common.collect.ImmutableMap;
@@ -28,9 +25,8 @@ import com.google.monitoring.metrics.MetricWriter;
import com.google.monitoring.metrics.stackdriver.StackdriverWriter;
import dagger.Module;
import dagger.Provides;
import google.registry.config.CredentialModule.JsonCredential;
import google.registry.config.RegistryConfig.Config;
import java.util.Set;
import java.util.function.Function;
import org.joda.time.Duration;
/** Dagger module for Google Stackdriver service connection objects. */
@@ -43,11 +39,9 @@ public final class StackdriverModule {
@Provides
static Monitoring provideMonitoring(
NetHttpTransport transport,
JsonFactory jsonFactory,
Function<Set<String>, GoogleCredential> credential,
@Config("projectId") String projectId) {
return new Monitoring.Builder(transport, jsonFactory, credential.apply(MonitoringScopes.all()))
@JsonCredential GoogleCredential credential, @Config("projectId") String projectId) {
return new Monitoring.Builder(
credential.getTransport(), credential.getJsonFactory(), credential)
.setApplicationName(projectId)
.build();
}