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

AzureIntegrationTests share one billing profile #1702

Draft
wants to merge 11 commits into
base: develop
Choose a base branch
from
Draft

AzureIntegrationTests share one billing profile #1702

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9fa7762
AzureIntegrationTests share one billing profile
okotsopoulos Jun 5, 2024
82963c2
JUnit 5 supports Extensions, not Rules
okotsopoulos Jun 5, 2024
53412c7
Revert before merge: only run AzureIntegrationTest suite in CI
okotsopoulos Jun 5, 2024
1e76844
Also skip unit tests for now (will not merge)
okotsopoulos Jun 5, 2024
cf19624
Move blob IO test util initialization back to @BeforeEach methods
okotsopoulos Jun 5, 2024
b190687
@pshapiro4broad PR feedback
okotsopoulos Jun 10, 2024
4860ebd
Make UsersBase an injectable component
okotsopoulos Jun 10, 2024
6acbeaf
Fix typos in shell commands documented in render-configs.sh
okotsopoulos Jun 10, 2024
6c1199f
On Azure profile create, register association with deployed app
okotsopoulos Jun 10, 2024
8d659c4
Debug failing tests: disable AzureAuthService caching
okotsopoulos Jun 11, 2024
ad4aece
Explicitly null out resource identifiers on set-up
okotsopoulos Jun 12, 2024
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
4 changes: 3 additions & 1 deletion src/test/java/bio/terra/common/category/Integration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package bio.terra.common.category;

/** Integration test category. */
public interface Integration {}
public interface Integration {
String TAG = "bio.terra.common.category.Integration";
}
86 changes: 48 additions & 38 deletions src/test/java/bio/terra/integration/AzureIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,32 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpStatus;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.util.ResourceUtils;

@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest
@ActiveProfiles({"google", "integrationtest"})
@AutoConfigureMockMvc
@Category(Integration.class)
public class AzureIntegrationTest extends UsersBase {
@Tag(Integration.TAG)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This annotation is necessary to use @BeforeAll and @AfterAll annotations on non-static methods.

class AzureIntegrationTest extends UsersBase {
okotsopoulos marked this conversation as resolved.
Show resolved Hide resolved
private static final Logger logger = LoggerFactory.getLogger(AzureIntegrationTest.class);

private static final String omopDatasetName = "it_dataset_omop";
Expand Down Expand Up @@ -167,8 +171,8 @@ public class AzureIntegrationTest extends UsersBase {
private GcsBlobIOTestUtility gcsBlobIOTestUtility;
private Set<String> storageAccounts;

@Before
public void setup() throws Exception {
@BeforeAll
public void testClassSetup() throws Exception {
super.setup(false);
// Voldemort is required by this test since the application is deployed with his user authz'ed
steward = steward("voldemort");
Expand All @@ -190,34 +194,44 @@ public void setup() throws Exception {
null,
retryOptions);
gcsBlobIOTestUtility = new GcsBlobIOTestUtility(testConfig.getIngestbucket(), null);
}

@BeforeEach
public void testSetup() {
snapshotIds = new ArrayList<>();
snapshotAccessRequestIds = new ArrayList<>();
storageAccounts = new TreeSet<>();
}

@After
public void teardown() throws Exception {
@AfterEach
public void testTeardown() throws Exception {
if (releaseSnapshotId != null) {
snapshotIds.add(releaseSnapshotId);
}
logger.info(
"Teardown: trying to delete snapshots {}, dataset {}, billing profile {}",
snapshotIds,
datasetId,
profileId);
logger.info("Test teardown: trying to delete snapshots {}, dataset {}", snapshotIds, datasetId);

dataRepoFixtures.resetConfig(steward);

for (UUID snapshotAccessRequestId : snapshotAccessRequestIds) {
samFixtures.deleteSnapshotAccessRequest(steward, snapshotAccessRequestId);
}

for (UUID snapshotId : snapshotIds) {
dataRepoFixtures.deleteSnapshot(steward, snapshotId);
}
if (datasetId != null) {
dataRepoFixtures.deleteDataset(steward, datasetId);
}
for (String storageAccountName : storageAccounts) {
deleteCloudResources(storageAccountName);
}
if (dac != null) {
samFixtures.deleteGroup(steward, dac);
}
}

@AfterAll
public void testClassTeardown() throws Exception {
logger.info("Test class teardown: trying to delete billing profile {}", profileId);
if (profileId != null) {
// TODO - https://broadworkbench.atlassian.net/browse/DCJ-228
// As we move towards running smoke and integration tests in BEEs, we would like to do so
Expand All @@ -231,19 +245,16 @@ public void teardown() throws Exception {
// rather than needing an admin to do it.
dataRepoFixtures.deleteProfileWithCloudResourceDelete(admin, profileId);
}
if (storageAccounts != null) {
storageAccounts.forEach(this::deleteCloudResources);
if (azureBlobIOTestUtility != null) {
azureBlobIOTestUtility.teardown();
}
azureBlobIOTestUtility.teardown();
gcsBlobIOTestUtility.teardown();

if (dac != null) {
samFixtures.deleteGroup(steward, dac);
if (gcsBlobIOTestUtility != null) {
gcsBlobIOTestUtility.teardown();
}
}

@Test
public void datasetsHappyPath() throws Exception {
void datasetsHappyPath() throws Exception {
// Note: this region should not be the same as the default region in the application deployment
// (eastus by default)
AzureRegion region = AzureRegion.SOUTH_CENTRAL_US;
Expand Down Expand Up @@ -451,7 +462,7 @@ private void populateOmopTable() throws Exception {
}

@Test
public void testSnapshotCreateFromRequest() throws Exception {
void testSnapshotCreateFromRequest() throws Exception {
populateOmopTable();
UUID snapshotRequestId = makeSnapshotAccessRequest().getId();
SnapshotSummaryModel snapshotSummaryByRequest = makeSnapshotFromRequest(snapshotRequestId);
Expand Down Expand Up @@ -511,7 +522,7 @@ private SnapshotSummaryModel makeSnapshotFromRequest(UUID requestSnapshotId) thr
}

@Test
public void testSnapshotBuilder() throws Exception {
void testSnapshotBuilder() throws Exception {
populateOmopTable();

var concept1 =
Expand Down Expand Up @@ -620,7 +631,7 @@ private void testRollupCountsWithCriteriaAndExpected(
}

@Test
public void datasetIngestFileHappyPath() throws Exception {
void datasetIngestFileHappyPath() throws Exception {
String blobName = "myBlob";
long fileSize = MIB / 10;
String sourceFileAzure = azureBlobIOTestUtility.uploadSourceFile(blobName, fileSize);
Expand Down Expand Up @@ -1470,7 +1481,7 @@ sourceFileAzure, getSourceStorageAccountPrimarySharedKey()))
}

@Test
public void testDatasetFileIngestLoadHistory() throws Exception {
void testDatasetFileIngestLoadHistory() throws Exception {
String blobName = "myBlob";
long fileSize = MIB / 10;
String sourceFile = azureBlobIOTestUtility.uploadSourceFile(blobName, fileSize);
Expand Down Expand Up @@ -1586,7 +1597,7 @@ sourceFile, getSourceStorageAccountPrimarySharedKey()))
}

@Test
public void testDatasetFileRefValidation() throws Exception {
void testDatasetFileRefValidation() throws Exception {
DatasetSummaryModel summaryModel =
dataRepoFixtures.createDataset(
steward, profileId, "dataset-ingest-azure-fileref.json", CloudPlatform.AZURE);
Expand Down Expand Up @@ -1716,7 +1727,7 @@ public void testDatasetFileRefValidation() throws Exception {
}

@Test
public void testRequiredColumnsIngest() throws Exception {
void testRequiredColumnsIngest() throws Exception {
DatasetSummaryModel summaryModel =
dataRepoFixtures.createDataset(
steward,
Expand Down Expand Up @@ -1780,16 +1791,16 @@ public void testRequiredColumnsIngest() throws Exception {
}

@Test
public void testDatasetCombinedIngest() throws Exception {
void testDatasetCombinedIngest() throws Exception {
testDatasetCombinedIngest(true);
}

@Test
public void testDatasetCombinedIngestFromApi() throws Exception {
void testDatasetCombinedIngestFromApi() throws Exception {
testDatasetCombinedIngest(false);
}

public void testDatasetCombinedIngest(boolean ingestFromFile) throws Exception {
void testDatasetCombinedIngest(boolean ingestFromFile) throws Exception {
DatasetSummaryModel summaryModel =
dataRepoFixtures.createDataset(
steward, profileId, "dataset-ingest-combined-azure.json", CloudPlatform.AZURE);
Expand Down Expand Up @@ -1831,8 +1842,7 @@ public void testDatasetCombinedIngest(boolean ingestFromFile) throws Exception {
dataRepoFixtures.assertCombinedIngestCorrect(ingestResponse, steward);
}

public void testMetadataArrayIngest(String arrayIngestTableName, Object records)
throws Exception {
void testMetadataArrayIngest(String arrayIngestTableName, Object records) throws Exception {
IngestRequestModel arrayIngestRequest =
new IngestRequestModel()
.ignoreUnknownValues(false)
Expand Down
Loading