wombatu-kun commented on code in PR #16875: URL: https://github.com/apache/iceberg/pull/16875#discussion_r3445323435
########## aws/src/test/java/org/apache/iceberg/aws/TestGlueCatalogIdInterceptor.java: ########## @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg.aws; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.core.SdkRequest; +import software.amazon.awssdk.core.interceptor.Context; +import software.amazon.awssdk.core.interceptor.ExecutionAttributes; +import software.amazon.awssdk.services.glue.model.CreateDatabaseRequest; +import software.amazon.awssdk.services.glue.model.CreateTableRequest; +import software.amazon.awssdk.services.glue.model.DeleteDatabaseRequest; +import software.amazon.awssdk.services.glue.model.DeleteTableRequest; +import software.amazon.awssdk.services.glue.model.GetDatabaseRequest; +import software.amazon.awssdk.services.glue.model.GetDatabasesRequest; +import software.amazon.awssdk.services.glue.model.GetTableRequest; +import software.amazon.awssdk.services.glue.model.GetTablesRequest; +import software.amazon.awssdk.services.glue.model.UpdateDatabaseRequest; +import software.amazon.awssdk.services.glue.model.UpdateTableRequest; + +class TestGlueCatalogIdInterceptor { + + private static final String CATALOG_ID = "testCatalogId"; + private static final ExecutionAttributes EMPTY_ATTRS = ExecutionAttributes.builder().build(); + + @Test + void getDatabaseRequest() { + SdkRequest result = intercept(GetDatabaseRequest.builder().name("db").build()); + assertThat(((GetDatabaseRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void getDatabasesRequest() { + SdkRequest result = intercept(GetDatabasesRequest.builder().build()); + assertThat(((GetDatabasesRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void createDatabaseRequest() { + SdkRequest result = intercept(CreateDatabaseRequest.builder().build()); + assertThat(((CreateDatabaseRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void deleteDatabaseRequest() { + SdkRequest result = intercept(DeleteDatabaseRequest.builder().name("db").build()); + assertThat(((DeleteDatabaseRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void updateDatabaseRequest() { + SdkRequest result = intercept(UpdateDatabaseRequest.builder().name("db").build()); + assertThat(((UpdateDatabaseRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void getTableRequest() { + SdkRequest result = intercept(GetTableRequest.builder().databaseName("db").name("t").build()); + assertThat(((GetTableRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void getTablesRequest() { + SdkRequest result = intercept(GetTablesRequest.builder().databaseName("db").build()); + assertThat(((GetTablesRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void createTableRequest() { + SdkRequest result = intercept(CreateTableRequest.builder().databaseName("db").build()); + assertThat(((CreateTableRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void updateTableRequest() { + SdkRequest result = intercept(UpdateTableRequest.builder().databaseName("db").build()); + assertThat(((UpdateTableRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void deleteTableRequest() { + SdkRequest result = + intercept(DeleteTableRequest.builder().databaseName("db").name("t").build()); + assertThat(((DeleteTableRequest) result).catalogId()).isEqualTo(CATALOG_ID); + } + + @Test + void nonGlueRequestPassedThrough() { Review Comment: The throw branch is the only path left uncovered: all 10 handled types, the non-Glue passthrough, and the invalid catalog id are tested, but not the `else` that throws `IllegalArgumentException` on an unhandled `GlueRequest`. Since that throw is the stated mechanism for catching future gaps, add a case feeding an unlisted `GlueRequest` (e.g. `GetPartitionRequest`) and asserting `IllegalArgumentException` with message "Unexpected request". -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
