Skip to content

AWS: Use provided glue catalog id in defaultWarehouseLocation #6223

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

Merged
rdblue merged 4 commits into from
Dec 19, 2022
Merged

AWS: Use provided glue catalog id in defaultWarehouseLocation #6223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e49267
Use provided glue catalog id when listing databases in defaultWarehou…
grbinho Nov 19, 2022
a3dbc60
Added unit test to validated catalogId gets set in defaultWarehouseLo…
grbinho Nov 20, 2022
94bdcb1
Changed how AwsProperties are initialized custom catalog id test. Set…
grbinho Nov 21, 2022
55b438d
Using equals for string comparison in Glue catalogId test
grbinho Nov 25, 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
1 change: 1 addition & 0 deletions aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ protected String defaultWarehouseLocation(TableIdentifier tableIdentifier) {
GetDatabaseResponse response =
glue.getDatabase(
GetDatabaseRequest.builder()
.catalogId(awsProperties.glueCatalogId())
.name(
IcebergToGlueConverter.getDatabaseName(
tableIdentifier, awsProperties.glueCatalogSkipNameValidation()))
Expand Down
27 changes: 27 additions & 0 deletions aws/src/test/java/org/apache/iceberg/aws/glue/TestGlueCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,33 @@ public void testDefaultWarehouseLocationDbUri() {
Assert.assertEquals("s3://bucket2/db/table", location);
}

@Test
public void testDefaultWarehouseLocationCustomCatalogId() {

@ajantha-bhat ajantha-bhat Nov 21, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The integration tests in TestGlueCatalogNamespace also don't set the catalogId, do we need to set it in those files also?

@grbinho grbinho Nov 21, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Are there multiple AWS accounts available for integration tests?
I could not find that setup either in AwsIntegTestUtil or TestAssumeRoleAwsClientFactory (as and obvious potential cross account example).

@ajantha-bhat ajantha-bhat Nov 21, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I presume it is a single account.
The Integration testcase can be executed by exporting the mentioned environment variables (#4855)

Thanks for the clarification. may be no need of catalog id for these tests.

GlueCatalog catalogWithCustomCatalogId = new GlueCatalog();
String catalogId = "myCatalogId";
AwsProperties awsProperties = new AwsProperties();
awsProperties.setGlueCatalogId(catalogId);
catalogWithCustomCatalogId.initialize(
CATALOG_NAME,
WAREHOUSE_PATH + "/",
awsProperties,
glue,
LockManagers.defaultLockManager(),
null,
ImmutableMap.of());

Mockito.doReturn(
GetDatabaseResponse.builder()
.database(Database.builder().name("db").locationUri("s3://bucket2/db").build())
.build())
.when(glue)
.getDatabase(Mockito.any(GetDatabaseRequest.class));
catalogWithCustomCatalogId.defaultWarehouseLocation(TableIdentifier.of("db", "table"));
Mockito.verify(glue)
.getDatabase(
Mockito.argThat((GetDatabaseRequest req) -> req.catalogId().equals(catalogId)));
}

@Test
public void testListTables() {
Mockito.doReturn(
Expand Down