Skip to content

Commit 22aae24

Browse files
Remove redundant properties (#519)
1 parent 13aa926 commit 22aae24

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

src/main/resources/application.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ sparkYarnSink.additionalConfs.spark.dynamicAllocation.enabled=true
108108
spark.emr.clusterId=
109109
spark.emr.filesToDeploy=
110110
spark.emr.additionalConfs=
111-
spark.emr.awsProfile=
112-
spark.emr.region=
113111

114112
#Postgresql properties for connection to trigger metastore
115113
db.driver=net.bull.javamelody.JdbcDriver

src/main/scala/za/co/absa/hyperdrive/trigger/scheduler/executors/spark/EmrClusterProviderService.scala

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,14 @@
1616

1717
package za.co.absa.hyperdrive.trigger.scheduler.executors.spark
1818

19-
import com.amazonaws.auth.profile.ProfileCredentialsProvider
2019
import com.amazonaws.services.elasticmapreduce.{AmazonElasticMapReduce, AmazonElasticMapReduceClientBuilder}
2120
import org.springframework.stereotype.Service
22-
import za.co.absa.hyperdrive.trigger.configuration.application.SparkConfig
23-
24-
import javax.inject.Inject
2521

2622
trait EmrClusterProviderService {
2723
def get(): AmazonElasticMapReduce
2824
}
2925

3026
@Service
31-
class EmrClusterProviderServiceImpl @Inject()(sparkConfig: SparkConfig) extends EmrClusterProviderService {
32-
override def get(): AmazonElasticMapReduce = {
33-
val emrBuilder = AmazonElasticMapReduceClientBuilder.standard()
34-
val emrWithRegion = sparkConfig.emr.region
35-
.map(region => emrBuilder.withRegion(region))
36-
.getOrElse(emrBuilder)
37-
sparkConfig.emr.awsProfile
38-
.map(profile => emrWithRegion.withCredentials(new ProfileCredentialsProvider(profile)))
39-
.getOrElse(emrWithRegion)
40-
.build()
41-
}
27+
class EmrClusterProviderServiceImpl extends EmrClusterProviderService {
28+
override def get(): AmazonElasticMapReduce = AmazonElasticMapReduceClientBuilder.standard().build()
4229
}

0 commit comments

Comments
 (0)