zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-02 18:48:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use @DefaultCredential for Cloud API access in GAE

Browse source 
This change completes the switch to @DefaultCredential for
all use cases in GAE.

Impacted modules:
- IcannReporting
- CreateCdnsTld command
- LoadSnapshot command.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213511730
This commit is contained in:
weiminyu 2018-09-18 14:01:10 -07:00 • committed by Ben McIlwain
parent 9bcd5579ef
commit 961e5cc7c7
20 changed files with 184 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

12
javatests/google/registry/export/LoadSnapshotActionTest.java
View file

@ -40,7 +40,7 @@ import com.google.api.services.bigquery.model.JobReference;
import com.google.appengine.api.taskqueue.QueueFactory;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import google.registry.bigquery.BigqueryFactory;
import google.registry.bigquery.CheckedBigquery;
import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer;
import google.registry.request.HttpException.BadRequestException;
import google.registry.request.HttpException.InternalServerErrorException;
@ -65,7 +65,7 @@ public class LoadSnapshotActionTest {
public final AppEngineRule appEngine = AppEngineRule.builder()
.withTaskQueue()
.build();
private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
private final CheckedBigquery checkedBigquery = mock(CheckedBigquery.class);
private final Bigquery bigquery = mock(Bigquery.class);
private final Bigquery.Jobs bigqueryJobs = mock(Bigquery.Jobs.class);
private final Bigquery.Jobs.Insert bigqueryJobsInsert = mock(Bigquery.Jobs.Insert.class);
@ -79,14 +79,14 @@ public class LoadSnapshotActionTest {
@Before
public void before() throws Exception {
when(bigqueryFactory.create("Project-Id", "snapshots")).thenReturn(bigquery);
when(checkedBigquery.ensureDataSetExists("Project-Id", "snapshots")).thenReturn(bigquery);
when(bigquery.jobs()).thenReturn(bigqueryJobs);
when(bigqueryJobs.insert(eq("Project-Id"), any(Job.class))).thenReturn(bigqueryJobsInsert);
when(bigquery.datasets()).thenReturn(bigqueryDatasets);
when(bigqueryDatasets.insert(eq("Project-Id"), any(Dataset.class)))
.thenReturn(bigqueryDatasetsInsert);
action = new LoadSnapshotAction();
action.bigqueryFactory = bigqueryFactory;
action.checkedBigquery = checkedBigquery;
action.bigqueryPollEnqueuer = bigqueryPollEnqueuer;
action.clock = clock;
action.projectId = "Project-Id";
@ -113,9 +113,9 @@ public class LoadSnapshotActionTest {
public void testSuccess_doPost() throws Exception {
action.run();
// Verify that bigqueryFactory was called in a way that would create the dataset if it didn't
// Verify that checkedBigquery was called in a way that would create the dataset if it didn't
// already exist.
verify(bigqueryFactory).create("Project-Id", "snapshots");
verify(checkedBigquery).ensureDataSetExists("Project-Id", "snapshots");
// Capture the load jobs we inserted to do additional checking on them.
ArgumentCaptor<Job> jobArgument = ArgumentCaptor.forClass(Job.class);