You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by GitBox <gi...@apache.org> on 2020/12/29 02:45:53 UTC
[GitHub] [iceberg] jackye1995 opened a new pull request #2002: AWS: add client factory for assume role use case
jackye1995 opened a new pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002
@danielcweeks as discussed in #1844 , separated PR for assume role client factory support.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] danielcweeks commented on pull request #2002: AWS: add client factory for assume role use case
Posted by GitBox <gi...@apache.org>.
danielcweeks commented on pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002#issuecomment-754941743
This looks good to me as well, but I think @giovannifumarola comment might still need to be addressed. Let me know and I'll push it through.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] rdblue commented on pull request #2002: AWS: add client factory for assume role use case
Posted by GitBox <gi...@apache.org>.
rdblue commented on pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002#issuecomment-754934397
Looks good to me, but I haven't been following much of the config discussion so I'll defer to @danielcweeks.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] jackye1995 commented on a change in pull request #2002: AWS: add client factory for assume role use case
Posted by GitBox <gi...@apache.org>.
jackye1995 commented on a change in pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002#discussion_r549784020
##########
File path: aws/src/main/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactory.java
##########
@@ -0,0 +1,98 @@
+/*
+ * 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 java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.util.PropertyUtil;
+import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
+import software.amazon.awssdk.awscore.client.builder.AwsSyncClientBuilder;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.glue.GlueClient;
+import software.amazon.awssdk.services.kms.KmsClient;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.sts.StsClient;
+import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
+import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
+
+public class AssumeRoleAwsClientFactory implements AwsClientFactory {
+
+ private static final SdkHttpClient HTTP_CLIENT_DEFAULT = UrlConnectionHttpClient.create();
+
+ private String roleArn;
+ private String externalId;
+ private int timeout;
+ private String region;
+
+ @Override
+ public S3Client s3() {
+ return S3Client.builder().applyMutation(this::configure).build();
+ }
+
+ @Override
+ public GlueClient glue() {
+ return GlueClient.builder().applyMutation(this::configure).build();
+ }
+
+ @Override
+ public KmsClient kms() {
+ return KmsClient.builder().applyMutation(this::configure).build();
+ }
+
+ @Override
+ public void initialize(Map<String, String> properties) {
+ roleArn = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_ARN);
+ Preconditions.checkNotNull(roleArn,
+ "Cannot initialize AssumeRoleClientConfigFactory with null role ARN");
+ timeout = PropertyUtil.propertyAsInt(properties,
+ AwsProperties.CLIENT_ASSUME_ROLE_TIMEOUT_SEC, AwsProperties.CLIENT_ASSUME_ROLE_TIMEOUT_SEC_DEFAULT);
+ externalId = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_EXTERNAL_ID);
+
+ region = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_REGION);
+ Preconditions.checkNotNull(region, "Cannot initialize AssumeRoleClientConfigFactory with null region");
+ }
+
+ private <T extends AwsClientBuilder & AwsSyncClientBuilder> T configure(T clientBuilder) {
+ AssumeRoleRequest request = AssumeRoleRequest.builder()
+ .roleArn(roleArn)
+ .roleSessionName(genSessionName())
+ .durationSeconds(timeout)
+ .externalId(externalId)
+ .build();
+
+ clientBuilder.credentialsProvider(
+ StsAssumeRoleCredentialsProvider.builder()
+ .stsClient(StsClient.builder().httpClient(HTTP_CLIENT_DEFAULT).build())
Review comment:
I am not able to reproduce the case that a region must be provided for STS client, please let me know if there is a way to reproduce the scenario.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] jackye1995 commented on a change in pull request #2002: AWS: add client factory for assume role use case
Posted by GitBox <gi...@apache.org>.
jackye1995 commented on a change in pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002#discussion_r549928586
##########
File path: aws/src/integration/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactoryTest.java
##########
@@ -0,0 +1,164 @@
+/*
+ * 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 java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.aws.glue.GlueCatalog;
+import org.apache.iceberg.aws.s3.S3FileIO;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.io.InputFile;
+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;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+public class AssumeRoleAwsClientFactoryTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(AssumeRoleAwsClientFactoryTest.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)
+ .httpClient(UrlConnectionHttpClient.create())
+ .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\"}]}")
+ .maxSessionDuration(3600)
+ .build());
+ assumeRoleProperties = Maps.newHashMap();
+ assumeRoleProperties.put(AwsProperties.CLIENT_FACTORY, AssumeRoleAwsClientFactory.class.getName());
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_REGION, "us-east-1");
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_ARN, response.role().arn());
+ 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 testAssumeRole_glueCatalog() 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:GetDatabase\",\"glue:GetTables\"]," +
+ "\"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());
+ }
+
+ try {
+ Namespace namespace = Namespace.of("allowed_" + UUID.randomUUID().toString().replace("-", ""));
+ glueCatalog.createNamespace(namespace);
+ glueCatalog.dropNamespace(namespace);
+ } catch (GlueException e) {
+ LOG.error("fail to create or delete Glue database", e);
+ Assert.fail("create and delete namespace should succeed");
+ }
+ }
+
+ @Test
+ public void testAssumeRole_s3FileIO() throws Exception {
+ String bucketArn = "arn:aws:s3:::" + AwsIntegTestUtil.testBucketName();
+ iam.putRolePolicy(PutRolePolicyRequest.builder()
+ .roleName(roleName)
+ .policyName(policyName)
+ .policyDocument("{" +
+ "\"Version\":\"2012-10-17\"," +
+ "\"Statement\":[{" +
+ "\"Sid\":\"policy1\"," +
+ "\"Effect\":\"Allow\"," +
+ "\"Action\":\"s3:ListBucket\"," +
+ "\"Resource\":[\"" + bucketArn + "\"]," +
+ "\"Condition\":{\"StringLike\":{\"s3:prefix\":[\"allowed/*\"]}}} ,{" +
+ "\"Sid\":\"policy2\"," +
+ "\"Effect\":\"Allow\"," +
+ "\"Action\":\"s3:GetObject\"," +
+ "\"Resource\":[\"" + bucketArn + "/allowed/*\"]}]}")
+ .build());
+ waitForIamConsistency();
+
+ S3FileIO s3FileIO = new S3FileIO();
+ s3FileIO.initialize(assumeRoleProperties);
+ InputFile inputFile = s3FileIO.newInputFile("s3://" + AwsIntegTestUtil.testBucketName() + "/denied/file");
+ try {
+ inputFile.exists();
+ Assert.fail("Access to s3 should be denied");
+ } catch (S3Exception e) {
+ Assert.assertEquals("Should see 403 error code", 403, e.statusCode());
+ }
+
+ inputFile = s3FileIO.newInputFile("s3://" + AwsIntegTestUtil.testBucketName() + "/allowed/file");
Review comment:
This file does not exist, I call `inputFile.exsits()` just to check it has access permission.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] danielcweeks commented on a change in pull request #2002: AWS: add client factory for assume role use case
Posted by GitBox <gi...@apache.org>.
danielcweeks commented on a change in pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002#discussion_r552236729
##########
File path: aws/src/main/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactory.java
##########
@@ -0,0 +1,98 @@
+/*
+ * 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 java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.util.PropertyUtil;
+import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
+import software.amazon.awssdk.awscore.client.builder.AwsSyncClientBuilder;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.glue.GlueClient;
+import software.amazon.awssdk.services.kms.KmsClient;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.sts.StsClient;
+import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
+import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
+
+public class AssumeRoleAwsClientFactory implements AwsClientFactory {
+
+ private static final SdkHttpClient HTTP_CLIENT_DEFAULT = UrlConnectionHttpClient.create();
+
+ private String roleArn;
+ private String externalId;
+ private int timeout;
+ private String region;
+
+ @Override
+ public S3Client s3() {
+ return S3Client.builder().applyMutation(this::configure).build();
+ }
+
+ @Override
+ public GlueClient glue() {
+ return GlueClient.builder().applyMutation(this::configure).build();
+ }
+
+ @Override
+ public KmsClient kms() {
+ return KmsClient.builder().applyMutation(this::configure).build();
+ }
+
+ @Override
+ public void initialize(Map<String, String> properties) {
+ roleArn = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_ARN);
+ Preconditions.checkNotNull(roleArn,
+ "Cannot initialize AssumeRoleClientConfigFactory with null role ARN");
+ timeout = PropertyUtil.propertyAsInt(properties,
+ AwsProperties.CLIENT_ASSUME_ROLE_TIMEOUT_SEC, AwsProperties.CLIENT_ASSUME_ROLE_TIMEOUT_SEC_DEFAULT);
+ externalId = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_EXTERNAL_ID);
+
+ region = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_REGION);
+ Preconditions.checkNotNull(region, "Cannot initialize AssumeRoleClientConfigFactory with null region");
+ }
+
+ private <T extends AwsClientBuilder & AwsSyncClientBuilder> T configure(T clientBuilder) {
+ AssumeRoleRequest request = AssumeRoleRequest.builder()
+ .roleArn(roleArn)
+ .roleSessionName(genSessionName())
+ .durationSeconds(timeout)
+ .externalId(externalId)
+ .build();
+
+ clientBuilder.credentialsProvider(
+ StsAssumeRoleCredentialsProvider.builder()
+ .stsClient(StsClient.builder().httpClient(HTTP_CLIENT_DEFAULT).build())
Review comment:
I wouldn't worry about it then. We have a rather complicated account setup and I'm not sure I know well enough what is producing the issue internally for us.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] danielcweeks merged pull request #2002: AWS: add client factory for assume role use case
Posted by GitBox <gi...@apache.org>.
danielcweeks merged pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] giovannifumarola commented on a change in pull request #2002: AWS: add client factory for assume role use case
Posted by GitBox <gi...@apache.org>.
giovannifumarola commented on a change in pull request #2002:
URL: https://github.com/apache/iceberg/pull/2002#discussion_r549844141
##########
File path: aws/src/integration/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactoryTest.java
##########
@@ -0,0 +1,164 @@
+/*
+ * 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 java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.aws.glue.GlueCatalog;
+import org.apache.iceberg.aws.s3.S3FileIO;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.io.InputFile;
+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;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+public class AssumeRoleAwsClientFactoryTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(AssumeRoleAwsClientFactoryTest.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)
+ .httpClient(UrlConnectionHttpClient.create())
+ .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\"}]}")
+ .maxSessionDuration(3600)
+ .build());
+ assumeRoleProperties = Maps.newHashMap();
+ assumeRoleProperties.put(AwsProperties.CLIENT_FACTORY, AssumeRoleAwsClientFactory.class.getName());
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_REGION, "us-east-1");
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_ARN, response.role().arn());
+ 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 testAssumeRole_glueCatalog() 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:GetDatabase\",\"glue:GetTables\"]," +
+ "\"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());
+ }
+
+ try {
+ Namespace namespace = Namespace.of("allowed_" + UUID.randomUUID().toString().replace("-", ""));
+ glueCatalog.createNamespace(namespace);
+ glueCatalog.dropNamespace(namespace);
+ } catch (GlueException e) {
+ LOG.error("fail to create or delete Glue database", e);
+ Assert.fail("create and delete namespace should succeed");
+ }
Review comment:
you should add a finally to retry to drop the namespace.
##########
File path: aws/src/integration/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactoryTest.java
##########
@@ -0,0 +1,164 @@
+/*
+ * 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 java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.aws.glue.GlueCatalog;
+import org.apache.iceberg.aws.s3.S3FileIO;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.io.InputFile;
+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;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+public class AssumeRoleAwsClientFactoryTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(AssumeRoleAwsClientFactoryTest.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)
+ .httpClient(UrlConnectionHttpClient.create())
+ .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\"}]}")
+ .maxSessionDuration(3600)
+ .build());
+ assumeRoleProperties = Maps.newHashMap();
+ assumeRoleProperties.put(AwsProperties.CLIENT_FACTORY, AssumeRoleAwsClientFactory.class.getName());
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_REGION, "us-east-1");
+ assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_ARN, response.role().arn());
+ 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 testAssumeRole_glueCatalog() 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:GetDatabase\",\"glue:GetTables\"]," +
+ "\"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());
+ }
+
+ try {
+ Namespace namespace = Namespace.of("allowed_" + UUID.randomUUID().toString().replace("-", ""));
+ glueCatalog.createNamespace(namespace);
+ glueCatalog.dropNamespace(namespace);
+ } catch (GlueException e) {
+ LOG.error("fail to create or delete Glue database", e);
+ Assert.fail("create and delete namespace should succeed");
+ }
+ }
+
+ @Test
+ public void testAssumeRole_s3FileIO() throws Exception {
+ String bucketArn = "arn:aws:s3:::" + AwsIntegTestUtil.testBucketName();
+ iam.putRolePolicy(PutRolePolicyRequest.builder()
+ .roleName(roleName)
+ .policyName(policyName)
+ .policyDocument("{" +
+ "\"Version\":\"2012-10-17\"," +
+ "\"Statement\":[{" +
+ "\"Sid\":\"policy1\"," +
+ "\"Effect\":\"Allow\"," +
+ "\"Action\":\"s3:ListBucket\"," +
+ "\"Resource\":[\"" + bucketArn + "\"]," +
+ "\"Condition\":{\"StringLike\":{\"s3:prefix\":[\"allowed/*\"]}}} ,{" +
+ "\"Sid\":\"policy2\"," +
+ "\"Effect\":\"Allow\"," +
+ "\"Action\":\"s3:GetObject\"," +
+ "\"Resource\":[\"" + bucketArn + "/allowed/*\"]}]}")
+ .build());
+ waitForIamConsistency();
+
+ S3FileIO s3FileIO = new S3FileIO();
+ s3FileIO.initialize(assumeRoleProperties);
+ InputFile inputFile = s3FileIO.newInputFile("s3://" + AwsIntegTestUtil.testBucketName() + "/denied/file");
+ try {
+ inputFile.exists();
+ Assert.fail("Access to s3 should be denied");
+ } catch (S3Exception e) {
+ Assert.assertEquals("Should see 403 error code", 403, e.statusCode());
+ }
+
+ inputFile = s3FileIO.newInputFile("s3://" + AwsIntegTestUtil.testBucketName() + "/allowed/file");
Review comment:
do you delete this file?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org