Skip to content

Remove our custom credentials provider #212

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 1 commit into from
Sep 2, 2024
Merged

Remove our custom credentials provider #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 1 addition & 15 deletions migrator/src/main/scala/com/scylladb/migrator/DynamoUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ import org.apache.hadoop.dynamodb.write.DynamoDBOutputFormat
import org.apache.hadoop.dynamodb.{ DynamoDBConstants, DynamoDbClientBuilderTransformer }
import org.apache.hadoop.mapred.JobConf
import org.apache.log4j.LogManager
import software.amazon.awssdk.auth.credentials.{
AwsCredentials,
AwsCredentialsProvider,
ProfileCredentialsProvider
}
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider
import software.amazon.awssdk.services.dynamodb.{ DynamoDbClient, DynamoDbClientBuilder }
import software.amazon.awssdk.services.dynamodb.model.{
BillingMode,
Expand Down Expand Up @@ -243,9 +239,6 @@ object DynamoUtils {
DynamoDBConstants.CUSTOM_CLIENT_BUILDER_TRANSFORMER,
classOf[AlternatorLoadBalancingEnabler].getName)

jobConf.set(
DynamoDBConstants.CUSTOM_CREDENTIALS_PROVIDER_CONF,
classOf[ProfileCredentialsProvider].getName)
jobConf.set("mapred.output.format.class", classOf[DynamoDBOutputFormat].getName)
jobConf.set("mapred.input.format.class", classOf[DynamoDBInputFormat].getName)
}
Expand Down Expand Up @@ -278,13 +271,6 @@ object DynamoUtils {
DynamoDBConstants.DEFAULT_CAPACITY_FOR_ON_DEMAND
}

/** Reflection-friendly credentials provider used by the EMR DynamoDB connector */
class ProfileCredentialsProvider
extends software.amazon.awssdk.auth.credentials.AwsCredentialsProvider {
private lazy val delegate = ProfileCredentialsProvider.create()
def resolveCredentials(): AwsCredentials = delegate.resolveCredentials()
}

class AlternatorLoadBalancingEnabler extends DynamoDbClientBuilderTransformer with Configurable {
private var conf: Configuration = null

Expand Down
Loading