-
Notifications
You must be signed in to change notification settings - Fork 71
[FLINK-36975][Connectors/AWS] Fix the AWS Config Option AWS_ROLE_CREDENTIALS_PROVIDER_OPTION to pick the right key #196
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.
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
Open
nageshvh
wants to merge
2
commits into
apache:main
Choose a base branch
from
nageshvh:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...or-aws-base/src/test/java/org/apache/flink/connector/aws/config/AWSConfigOptionsTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * 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.flink.connector.aws.config; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** Unit tests for {@link AWSConfigOptions}. */ | ||
| class AWSConfigOptionsTest { | ||
|
|
||
| @Test | ||
| void testConfigOptionKeys() { | ||
| // Test AWS_REGION_OPTION | ||
| assertThat(AWSConfigOptions.AWS_REGION_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.AWS_REGION); | ||
|
|
||
| // Test AWS_CREDENTIALS_PROVIDER_OPTION | ||
| assertThat(AWSConfigOptions.AWS_CREDENTIALS_PROVIDER_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.AWS_CREDENTIALS_PROVIDER); | ||
|
|
||
| // Test AWS_ACCESS_KEY_ID_OPTION | ||
| assertThat(AWSConfigOptions.AWS_ACCESS_KEY_ID_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.accessKeyId( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_SECRET_ACCESS_KEY_OPTION | ||
| assertThat(AWSConfigOptions.AWS_SECRET_ACCESS_KEY_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.secretKey(AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_PROFILE_PATH_OPTION | ||
| assertThat(AWSConfigOptions.AWS_PROFILE_PATH_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.profilePath( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_PROFILE_NAME_OPTION | ||
| assertThat(AWSConfigOptions.AWS_PROFILE_NAME_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.profileName( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_ROLE_STS_ENDPOINT_OPTION | ||
| assertThat(AWSConfigOptions.AWS_ROLE_STS_ENDPOINT_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.roleStsEndpoint( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test CUSTOM_CREDENTIALS_PROVIDER_CLASS_OPTION | ||
| assertThat(AWSConfigOptions.CUSTOM_CREDENTIALS_PROVIDER_CLASS_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.customCredentialsProviderClass( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_ROLE_ARN_OPTION | ||
| assertThat(AWSConfigOptions.AWS_ROLE_ARN_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.roleArn(AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_ROLE_SESSION_NAME | ||
| assertThat(AWSConfigOptions.AWS_ROLE_SESSION_NAME.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.roleSessionName( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_ROLE_EXTERNAL_ID_OPTION | ||
| assertThat(AWSConfigOptions.AWS_ROLE_EXTERNAL_ID_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.externalId(AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_WEB_IDENTITY_TOKEN_FILE | ||
| assertThat(AWSConfigOptions.AWS_WEB_IDENTITY_TOKEN_FILE.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.webIdentityTokenFile( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_ROLE_CREDENTIALS_PROVIDER_OPTION - this was the one with the bug | ||
| assertThat(AWSConfigOptions.AWS_ROLE_CREDENTIALS_PROVIDER_OPTION.key()) | ||
| .isEqualTo( | ||
| AWSConfigConstants.roleCredentialsProvider( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)) | ||
| .isNotEqualTo( | ||
| AWSConfigConstants.webIdentityTokenFile( | ||
| AWSConfigConstants.AWS_CREDENTIALS_PROVIDER)); | ||
|
|
||
| // Test AWS_ENDPOINT_OPTION | ||
| assertThat(AWSConfigOptions.AWS_ENDPOINT_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.AWS_ENDPOINT); | ||
|
|
||
| // Test TRUST_ALL_CERTIFICATES_OPTION | ||
| assertThat(AWSConfigOptions.TRUST_ALL_CERTIFICATES_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.TRUST_ALL_CERTIFICATES); | ||
|
|
||
| // Test HTTP_PROTOCOL_VERSION_OPTION | ||
| assertThat(AWSConfigOptions.HTTP_PROTOCOL_VERSION_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.HTTP_PROTOCOL_VERSION); | ||
|
|
||
| // Test HTTP_CLIENT_MAX_CONCURRENCY_OPTION | ||
| assertThat(AWSConfigOptions.HTTP_CLIENT_MAX_CONCURRENCY_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.HTTP_CLIENT_MAX_CONCURRENCY); | ||
|
|
||
| // Test HTTP_CLIENT_READ_TIMEOUT_MILLIS_OPTION | ||
| assertThat(AWSConfigOptions.HTTP_CLIENT_READ_TIMEOUT_MILLIS_OPTION.key()) | ||
| .isEqualTo(AWSConfigConstants.HTTP_CLIENT_READ_TIMEOUT_MILLIS); | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
...-streams/src/main/java/org/apache/flink/connector/kinesis/sink/KinesisClientProvider.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * 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.flink.connector.kinesis.sink; | ||
|
|
||
| import org.apache.flink.annotation.Internal; | ||
|
|
||
| import software.amazon.awssdk.services.kinesis.KinesisAsyncClient; | ||
|
|
||
| /** | ||
| * Provider interface for KinesisAsyncClient instances. This is primarily used for testing to inject | ||
| * mock clients. | ||
| */ | ||
| @Internal | ||
| interface KinesisClientProvider { | ||
| /** | ||
| * Returns a KinesisAsyncClient instance. | ||
| * | ||
| * @return The KinesisAsyncClient instance | ||
| */ | ||
| KinesisAsyncClient get(); | ||
|
|
||
| /** Closes any resources held by this provider. */ | ||
| void close(); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this also extend
SdkAutoCloseableso it's inline with the other resource impls?