Skip to content

Change auth type getters to fluent getters #5318

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
merged 2 commits into from
Jun 21, 2024
Merged

Change auth type getters to fluent getters #5318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb3b3cc
Change auth type getters to fluent getters
zoewangg Jun 20, 2024
6c252e5
Fix session credentials
zoewangg Jun 20, 2024
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
70 changes: 68 additions & 2 deletions migration-tool/src/main/resources/META-INF/rewrite/change-auth-types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,52 +21,118 @@ recipeList:
- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.DefaultAWSCredentialsProviderChain getInstance
newMethodName: create
- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.AWSCredentialsProviderChain getCredentials
newMethodName: resolveCredentials
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.DefaultAWSCredentialsProviderChain
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider

- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.AWSCredentials getAWSAccessKeyId
newMethodName: accessKeyId
- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.AWSCredentials getAWSSecretKey
newMethodName: secretAccessKey
- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.AWSSessionCredentials getSessionToken
newMethodName: sessionToken
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.AWSCredentials
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.AwsCredentials

- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.BasicAWSCredentials getAWSAccessKeyId
newMethodName: accessKeyId
- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.BasicAWSCredentials getAWSSecretKey
newMethodName: secretAccessKey
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.BasicAWSCredentials
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.AwsBasicCredentials

- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.BasicSessionCredentials getAWSAccessKeyId
newMethodName: accessKeyId
- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.BasicSessionCredentials getAWSSecretKey
newMethodName: secretAccessKey
- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.BasicSessionCredentials getSessionToken
newMethodName: sessionToken
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.BasicSessionCredentials
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.AwsSessionCredentials

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.AWSCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.AwsCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.AwsCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.AWSStaticCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.StaticCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.EnvironmentVariableCredentialsProvider getCredentials
newMethodName: resolveCredentials
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.EnvironmentVariableCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.profile.ProfileCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.ContainerCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.ContainerCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.ContainerCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeMethodName:
methodPattern: com.amazonaws.auth.InstanceProfileCredentialsProvider getInstance
newMethodName: create
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.InstanceProfileCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.StsAssumeRoleCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.STSSessionCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.services.sts.auth.StsGetSessionTokenCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.services.sts.auth.EnvironmentVariableCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.WebIdentityFederationSessionCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.services.sts.auth.StsAssumeRoleWithWebIdentityCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.StsAssumeRoleWithWebIdentityCredentialsProvider getCredentials
newMethodName: resolveCredentials

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.amazonaws.auth.ProcessCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.ProcessCredentialsProvider
newFullyQualifiedTypeName: software.amazon.awssdk.auth.credentials.ProcessCredentialsProvider
- org.openrewrite.java.ChangeMethodName:
methodPattern: software.amazon.awssdk.auth.credentials.ProcessCredentialsProvider getCredentials
newMethodName: resolveCredentials
79 changes: 73 additions & 6 deletions ...ation-tool/src/test/java/software/amazon/awssdk/migration/recipe/ChangeAuthTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,24 @@ void defaultCredentialsProviderChain_usingNew_isRewritten() {
void defaultCredentialsProviderChain_getInstance_isRewritten() {
rewriteRun(
java(
"import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;\n"
"import com.amazonaws.auth.AWSCredentials;\n"
+ "import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " DefaultAWSCredentialsProviderChain credentials = DefaultAWSCredentialsProviderChain.getInstance();\n"
+ " AWSCredentials awsCredentials = credentials.getCredentials();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;\n"
"import software.amazon.awssdk.auth.credentials.AwsCredentials;\n"
+ "import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " DefaultCredentialsProvider credentials = DefaultCredentialsProvider.create();\n"
+ " AwsCredentials awsCredentials = credentials.resolveCredentials();\n"
+ " }\n"
+ "}\n"
+ "}"
)
);
}
Expand All @@ -98,20 +102,83 @@ void defaultCredentialsProviderChain_getInstance_isRewritten() {
void instanceCredentialsProvider_getInstance_isRewritten() {
rewriteRun(
java(
"import com.amazonaws.auth.InstanceProfileCredentialsProvider;\n"
"import com.amazonaws.auth.AWSCredentials;\n"
+ "import com.amazonaws.auth.InstanceProfileCredentialsProvider;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " InstanceProfileCredentialsProvider credentials = InstanceProfileCredentialsProvider.getInstance();\n"
+ " AWSCredentials awsCredentials = credentials.getCredentials();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;\n"
"import software.amazon.awssdk.auth.credentials.AwsCredentials;\n"
+ "import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " InstanceProfileCredentialsProvider credentials = InstanceProfileCredentialsProvider.create();\n"
+ " AwsCredentials awsCredentials = credentials.resolveCredentials();\n"
+ " }\n"
+ "}\n"
+ "}"
)
);
}

@Test
@EnabledOnJre({JRE.JAVA_8})
void staticCredentials_getter_isRewritten() {
rewriteRun(
java(
"import com.amazonaws.auth.AWSStaticCredentialsProvider;\n"
+ "import com.amazonaws.auth.AWSCredentials;\n"
+ "import com.amazonaws.auth.BasicAWSCredentials;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " AWSCredentials credentials = new BasicAWSCredentials(\"foo\", \"bar\");\n"
+ " String accessKeyId = credentials.getAWSAccessKeyId();\n"
+ " String secreteKey = credentials.getAWSSecretKey();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;\n"
+ "import software.amazon.awssdk.auth.credentials.AwsCredentials;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " AwsCredentials credentials = new AwsBasicCredentials(\"foo\", \"bar\");\n"
+ " String accessKeyId = credentials.accessKeyId();\n"
+ " String secreteKey = credentials.secretAccessKey();\n"
+ " }\n"
+ "}"
)
);
}

@Test
@EnabledOnJre({JRE.JAVA_8})
void sessionStaticCredentials_getter_isRewritten() {
rewriteRun(
java("import com.amazonaws.auth.AWSCredentials;\n"
+ "import com.amazonaws.auth.BasicSessionCredentials;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " BasicSessionCredentials credentials = new BasicSessionCredentials(\"foo\", \"bar\", \"123\");\n"
+ " String accessKeyId = credentials.getAWSAccessKeyId();\n"
+ " String secreteKey = credentials.getAWSSecretKey();\n"
+ " String sessionToken = credentials.getSessionToken();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " AwsSessionCredentials credentials = new AwsSessionCredentials(\"foo\", \"bar\", \"123\");\n"
+ " String accessKeyId = credentials.accessKeyId();\n"
+ " String secreteKey = credentials.secretAccessKey();\n"
+ " String sessionToken = credentials.sessionToken();\n"
+ " }\n"
+ "}"
)
);
}
Expand Down
Loading