singhpk234 commented on a change in pull request #4280:
URL: https://github.com/apache/iceberg/pull/4280#discussion_r832906335
##########
File path: aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java
##########
@@ -389,6 +425,14 @@ public void setGlueCatalogSkipArchive(boolean skipArchive)
{
this.glueCatalogSkipArchive = skipArchive;
}
+ public boolean glueLakeFormationEnabled() {
+ return this.glueLakeFormationEnabled;
Review comment:
looks like this got missed
##########
File path:
aws/src/integration/java/org/apache/iceberg/aws/lakeformation/TestLakeFormationAwsClientFactory.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.lakeformation;
+
+import java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.aws.AwsIntegTestUtil;
+import org.apache.iceberg.aws.AwsProperties;
+import org.apache.iceberg.aws.glue.GlueCatalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.glue.model.AccessDeniedException;
+import software.amazon.awssdk.services.glue.model.GlueException;
+import software.amazon.awssdk.services.iam.IamClient;
+import software.amazon.awssdk.services.iam.model.CreateRoleRequest;
+import software.amazon.awssdk.services.iam.model.CreateRoleResponse;
+import software.amazon.awssdk.services.iam.model.DeleteRolePolicyRequest;
+import software.amazon.awssdk.services.iam.model.DeleteRoleRequest;
+import software.amazon.awssdk.services.iam.model.PutRolePolicyRequest;
+
+public class TestLakeFormationAwsClientFactory {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(TestLakeFormationAwsClientFactory.class);
+
+ private IamClient iam;
+ private String roleName;
+ private Map<String, String> assumeRoleProperties;
+ private String policyName;
+
+ @Before
+ public void before() {
+ roleName = UUID.randomUUID().toString();
+ iam = IamClient.builder()
+ .region(Region.AWS_GLOBAL)
+ .httpClientBuilder(UrlConnectionHttpClient.builder())
+ .build();
+ CreateRoleResponse response = iam.createRole(CreateRoleRequest.builder()
+ .roleName(roleName)
+ .assumeRolePolicyDocument("{" +
+ "\"Version\":\"2012-10-17\"," +
+ "\"Statement\":[{" +
+ "\"Effect\":\"Allow\"," +
+ "\"Principal\":{" +
+ "\"AWS\":\"arn:aws:iam::" + AwsIntegTestUtil.testAccountId() +
":root\"}," +
+ "\"Action\": [\"sts:AssumeRole\"," +
+ "\"sts:TagSession\"]}]}")
+ .maxSessionDuration(3600)
+ .build());
+ assumeRoleProperties = Maps.newHashMap();
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_REGION,
"us-east-1");
+ assumeRoleProperties.put(AwsProperties.GLUE_LAKEFORMATION_ENABLED, "true");
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_ARN,
response.role().arn());
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_TAGS_PREFIX +
+ LakeFormationAwsClientFactory.LF_AUTHORIZED_CALLER, "emr");
+ policyName = UUID.randomUUID().toString();
+ }
+
+ @After
+ public void after() {
+
iam.deleteRolePolicy(DeleteRolePolicyRequest.builder().roleName(roleName).policyName(policyName).build());
+ iam.deleteRole(DeleteRoleRequest.builder().roleName(roleName).build());
+ }
+
+ @Test
+ public void testLakeFormationEnabledGlueCatalog() throws Exception {
+ String glueArnPrefix = "arn:aws:glue:*:" +
AwsIntegTestUtil.testAccountId();
+ iam.putRolePolicy(PutRolePolicyRequest.builder()
+ .roleName(roleName)
+ .policyName(policyName)
+ .policyDocument("{" +
+ "\"Version\":\"2012-10-17\"," +
+ "\"Statement\":[{" +
+ "\"Sid\":\"policy1\"," +
+ "\"Effect\":\"Allow\"," +
+ "\"Action\":[\"glue:CreateDatabase\",\"glue:DeleteDatabase\"," +
+ "\"glue:Get*\",\"lakeformation:GetDataAccess\"]," +
+ "\"Resource\":[\"" + glueArnPrefix + ":catalog\"," +
+ "\"" + glueArnPrefix + ":database/allowed_*\"," +
+ "\"" + glueArnPrefix + ":table/allowed_*/*\"," +
+ "\"" + glueArnPrefix + ":userDefinedFunction/allowed_*/*\"]}]}")
+ .build());
+ waitForIamConsistency();
+
+ GlueCatalog glueCatalog = new GlueCatalog();
+ assumeRoleProperties.put("warehouse", "s3://path");
+ glueCatalog.initialize("test", assumeRoleProperties);
+ try {
+ glueCatalog.createNamespace(Namespace.of("denied_" +
UUID.randomUUID().toString().replace("-", "")));
+ Assert.fail("Access to Glue should be denied");
+ } catch (GlueException e) {
+ Assert.assertEquals(AccessDeniedException.class, e.getClass());
+ }
+
+ Namespace namespace = Namespace.of("allowed_" +
UUID.randomUUID().toString().replace("-", ""));
+ try {
+ glueCatalog.createNamespace(namespace);
+ } catch (GlueException e) {
+ LOG.error("fail to create or delete Glue database", e);
Review comment:
[minor] I believe we here are only creating namespace, I believe we can
remove delete
##########
File path:
aws/src/integration/java/org/apache/iceberg/aws/lakeformation/TestLakeFormationAwsClientFactory.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.lakeformation;
+
+import java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.aws.AwsIntegTestUtil;
+import org.apache.iceberg.aws.AwsProperties;
+import org.apache.iceberg.aws.glue.GlueCatalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.glue.model.AccessDeniedException;
+import software.amazon.awssdk.services.glue.model.GlueException;
+import software.amazon.awssdk.services.iam.IamClient;
+import software.amazon.awssdk.services.iam.model.CreateRoleRequest;
+import software.amazon.awssdk.services.iam.model.CreateRoleResponse;
+import software.amazon.awssdk.services.iam.model.DeleteRolePolicyRequest;
+import software.amazon.awssdk.services.iam.model.DeleteRoleRequest;
+import software.amazon.awssdk.services.iam.model.PutRolePolicyRequest;
+
+public class TestLakeFormationAwsClientFactory {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(TestLakeFormationAwsClientFactory.class);
+
+ private IamClient iam;
+ private String roleName;
+ private Map<String, String> assumeRoleProperties;
+ private String policyName;
+
+ @Before
+ public void before() {
+ roleName = UUID.randomUUID().toString();
+ iam = IamClient.builder()
+ .region(Region.AWS_GLOBAL)
+ .httpClientBuilder(UrlConnectionHttpClient.builder())
+ .build();
+ CreateRoleResponse response = iam.createRole(CreateRoleRequest.builder()
+ .roleName(roleName)
+ .assumeRolePolicyDocument("{" +
+ "\"Version\":\"2012-10-17\"," +
+ "\"Statement\":[{" +
+ "\"Effect\":\"Allow\"," +
+ "\"Principal\":{" +
+ "\"AWS\":\"arn:aws:iam::" + AwsIntegTestUtil.testAccountId() +
":root\"}," +
+ "\"Action\": [\"sts:AssumeRole\"," +
+ "\"sts:TagSession\"]}]}")
+ .maxSessionDuration(3600)
+ .build());
+ assumeRoleProperties = Maps.newHashMap();
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_REGION,
"us-east-1");
+ assumeRoleProperties.put(AwsProperties.GLUE_LAKEFORMATION_ENABLED, "true");
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_ARN,
response.role().arn());
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_TAGS_PREFIX +
+ LakeFormationAwsClientFactory.LF_AUTHORIZED_CALLER, "emr");
+ policyName = UUID.randomUUID().toString();
+ }
+
+ @After
+ public void after() {
+
iam.deleteRolePolicy(DeleteRolePolicyRequest.builder().roleName(roleName).policyName(policyName).build());
+ iam.deleteRole(DeleteRoleRequest.builder().roleName(roleName).build());
+ }
+
+ @Test
+ public void testLakeFormationEnabledGlueCatalog() throws Exception {
+ String glueArnPrefix = "arn:aws:glue:*:" +
AwsIntegTestUtil.testAccountId();
+ iam.putRolePolicy(PutRolePolicyRequest.builder()
+ .roleName(roleName)
+ .policyName(policyName)
+ .policyDocument("{" +
+ "\"Version\":\"2012-10-17\"," +
+ "\"Statement\":[{" +
+ "\"Sid\":\"policy1\"," +
+ "\"Effect\":\"Allow\"," +
+ "\"Action\":[\"glue:CreateDatabase\",\"glue:DeleteDatabase\"," +
+ "\"glue:Get*\",\"lakeformation:GetDataAccess\"]," +
+ "\"Resource\":[\"" + glueArnPrefix + ":catalog\"," +
+ "\"" + glueArnPrefix + ":database/allowed_*\"," +
+ "\"" + glueArnPrefix + ":table/allowed_*/*\"," +
+ "\"" + glueArnPrefix + ":userDefinedFunction/allowed_*/*\"]}]}")
+ .build());
+ waitForIamConsistency();
+
+ GlueCatalog glueCatalog = new GlueCatalog();
+ assumeRoleProperties.put("warehouse", "s3://path");
+ glueCatalog.initialize("test", assumeRoleProperties);
+ try {
+ glueCatalog.createNamespace(Namespace.of("denied_" +
UUID.randomUUID().toString().replace("-", "")));
+ Assert.fail("Access to Glue should be denied");
Review comment:
if an namespace is created we should drop that before failing our test,
WDYT ?
##########
File path:
aws/src/main/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactory.java
##########
@@ -117,4 +117,16 @@ private String genSessionName() {
.map(e -> Tag.builder().key(e.getKey()).value(e.getValue()).build())
.collect(Collectors.toSet());
}
+
+ protected Set<Tag> tags() {
+ return tags;
+ }
+
+ protected String region() {
+ return region;
+ }
+
+ protected String s3Endpoint() {
+ return s3Endpoint;
+ }
Review comment:
[minor] should we put protected member functions before private one's
WDYT ?
##########
File path: aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java
##########
@@ -104,13 +109,35 @@ public GlueCatalog() {
@Override
public void initialize(String name, Map<String, String> properties) {
+ AwsClientFactory awsClientFactory;
+ FileIO catalogFileIO;
+ if (PropertyUtil.propertyAsBoolean(
+ properties,
+ AwsProperties.GLUE_LAKEFORMATION_ENABLED,
+ AwsProperties.GLUE_LAKEFORMATION_ENABLED_DEFAULT)) {
+ String factoryImpl = PropertyUtil.propertyAsString(properties,
AwsProperties.CLIENT_FACTORY, null);
+ ImmutableMap.Builder<String, String> builder = ImmutableMap.<String,
String>builder().putAll(properties);
+ if (factoryImpl == null) {
+ builder.put(AwsProperties.CLIENT_FACTORY,
LakeFormationAwsClientFactory.class.getName());
+ }
Review comment:
can we just assign `LakeFormationAwsClientFactory.class.getName()` as
the defaultValue
```java
String factoryImpl = PropertyUtil.propertyAsString(properties,
AwsProperties.CLIENT_FACTORY, LakeFormationAwsClientFactory.class.getName());
ImmutableMap.Builder<String, String> builder = ImmutableMap.<String,
String>builder().putAll(properties);
builder.put(AwsProperties.CLIENT_FACTORY,
LakeFormationAwsClientFactory.class.getName());
```
in the log anyhow we are doing the instance of check on
`AwsClientFactories.from(catalogProperties);`
Am I missing something here ?
--
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]
