Skip to content

Commit

Permalink
remove some aux stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
oguzhanunlu committed Jul 2, 2021
1 parent 1035dc9 commit 852bbed
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
*/

ThisBuild / version := "1.2.0-oguzhan-206488f-12"
ThisBuild / version := "1.1.0"

lazy val root = project.in(file("."))
.aggregate(common, aws, loader, shredder, streamShredder)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ object Alerting {
AWS[F]
.listS3(shredderOutput, recursive = false)
.map(_.key)
.evalTap(k => Sync[F].delay(println(s"listed key ${k}")))
.intersperse(AlertingScanResultSeparator)
.through(utf8Encode[F])
.through(s3Store.put(S3Path(S3.Key.bucketName(scanOutKey), S3.Key.keyName(scanOutKey), None), overwrite = true))
.evalTap(_ => Sync[F].delay(println("putting to s3 is successful")))
.compile
.drain
.as(scanOutKey)
Expand All @@ -59,7 +57,6 @@ object Alerting {
implicit val aws: AWS[F] = AWS.s3Interpreter(s3Store)
for {
s3Key <- LoaderAction.liftF(putAlertScanToS3(s3Store, shredderOutput))
_ <- LoaderAction.liftF(Sync[F].delay(println(s"putAlertScanToS3 finished with s3Key: ${s3Key}")))
_ <- JDBC[F].executeUpdate(CopyFromS3ToAlertingTemp(s3Key, redshiftConfig.roleArn))
onlyS3Batches <- JDBC[F].executeQueryList[S3.Folder](AlertingTempMinusManifest(redshiftConfig.schema))
foldersWithChecks <- LoaderAction.liftF(checkShreddingComplete(aws, onlyS3Batches))
Expand Down
1 change: 0 additions & 1 deletion project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ object BuildSettings {
dockerBaseImage := "snowplow/base-debian:0.2.2",
Docker / daemonUser := "snowplow",
dockerUpdateLatest := true,
version in Docker := version.value,
dockerVersion := Some(DockerVersion(18, 9, 0, Some("ce"))),
Docker / daemonUserUid := None,
Docker / defaultLinuxInstallLocation := "/home/snowplow" // must be home directory of daemonUser
Expand Down

0 comments on commit 852bbed

Please sign in to comment.