Skip to content

Use "aws_access_key_id" and "aws_secret_access_key" for reads, not just unload #32

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

Closed
koeninger wants to merge 2 commits into from
Closed

Use "aws_access_key_id" and "aws_secret_access_key" for reads, not just unload #32

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
d5628cc
fix errant paren in where clause
koeninger Jul 30, 2015
9fdd5b3
set access credentials on the Configuration, so reads can succeed
koeninger Jul 30, 2015
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
23 changes: 21 additions & 2 deletions src/main/scala/com/databricks/spark/redshift/Parameters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,28 @@ private [redshift] object Parameters extends Logging {
* use of standard system properties, environment variables, or IAM role configuration if available.
*/
def credentialsString(configuration: Configuration) = {
val ((_, accessKeyId), (_, secretAccessKey)) = credentialsTuple(configuration)

s"aws_access_key_id=$accessKeyId;aws_secret_access_key=$secretAccessKey"
}

/**
* Looks up "aws_access_key_id" and "aws_secret_access_key" in the parameter map
* and ensures they are set on the Configuration. If no credentials have been provided,
* this function will instead try using the Hadoop Configuration fs.* settings for the provided tempDir
* scheme, and if that also fails, it finally tries AWS DefaultCredentialsProviderChain, which makes
* use of standard system properties, environment variables, or IAM role configuration if available.
*/
def setCredentials(configuration: Configuration): Unit = {
val ((accessKeyIdProp, accessKeyId), (secretAccessKeyProp, secretAccessKey)) = credentialsTuple(configuration)

configuration.setIfUnset(accessKeyIdProp, accessKeyId)
configuration.setIfUnset(secretAccessKeyProp, secretAccessKey)
}

private def credentialsTuple(configuration: Configuration) = {
val scheme = new URI(tempDir).getScheme
val hadoopConfPrefix = s"fs.$scheme}"
val hadoopConfPrefix = s"fs.$scheme"

val (accessKeyId, secretAccessKey) =
if(parameters.contains("aws_access_key_id")) {
Expand All @@ -192,7 +211,7 @@ private [redshift] object Parameters extends Logging {
}
}

s"aws_access_key_id=$accessKeyId;aws_secret_access_key=$secretAccessKey"
((s"$hadoopConfPrefix.awsAccessKeyId", accessKeyId), (s"$hadoopConfPrefix.awsSecretAccessKey", secretAccessKey))
}
}
}
3 changes: 2 additions & 1 deletion src/main/scala/com/databricks/spark/redshift/RedshiftRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ case class RedshiftRelation(jdbcWrapper: JDBCWrapper, params: MergedParameters,

protected def makeRdd(schema: StructType): RDD[Row] = {
val sc = sqlContext.sparkContext
params.setCredentials(sc.hadoopConfiguration)
val rdd = sc.newAPIHadoopFile(params.tempPath, classOf[RedshiftInputFormat],
classOf[java.lang.Long], classOf[Array[String]], sc.hadoopConfiguration)
rdd.values.map(Conversions.rowConverter(schema))
Expand Down Expand Up @@ -107,7 +108,7 @@ case class RedshiftRelation(jdbcWrapper: JDBCWrapper, params: MergedParameters,
val filterClauses = filters map {
case EqualTo(attr, value) => s"${sqlQuote(attr)} = ${compileValue(value)}"
case LessThan(attr, value) => s"${sqlQuote(attr)} < ${compileValue(value)}"
Copy link
Contributor

@JoshRosen JoshRosen Jul 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another test coverage issue :(

Copy link
Contributor Author

@koeninger koeninger Jul 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, there's a separate earlier PR just for that one line... got pulled into this branch by accident as I'm trying to get things working

case GreaterThan(attr, value) => s"${sqlQuote(attr)}) > ${compileValue(value)}"
case GreaterThan(attr, value) => s"${sqlQuote(attr)} > ${compileValue(value)}"
case LessThanOrEqual(attr, value) => s"${sqlQuote(attr)} <= ${compileValue(value)}"
case GreaterThanOrEqual(attr, value) => s"${sqlQuote(attr)} >= ${compileValue(value)}"
} mkString "AND"
Expand Down