From caa64aa28cb47c89fc5f2ce0e202416786a435a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pra=C5=BCak?= <pprazak@virtuslab.com>
Date: Thu, 28 Sep 2023 14:49:20 +0200
Subject: [PATCH] Update aws-s3-folder example

---
 examples/aws-s3-folder/Main.scala             | 28 ++++++++++---------
 .../test/resources/logger-test/Pulumi.yaml    |  9 ------
 .../src/test/resources/logger-test/run.scala  | 12 --------
 3 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 integration-tests/src/test/resources/logger-test/Pulumi.yaml
 delete mode 100644 integration-tests/src/test/resources/logger-test/run.scala

diff --git a/examples/aws-s3-folder/Main.scala b/examples/aws-s3-folder/Main.scala
index 2cd501bf..0dc248e1 100644
--- a/examples/aws-s3-folder/Main.scala
+++ b/examples/aws-s3-folder/Main.scala
@@ -1,6 +1,5 @@
 import besom.*
-import besom.api.aws.*
-import besom.api.aws.s3.BucketObject
+import besom.api.aws.s3
 import besom.api.aws.s3.inputs.BucketWebsiteArgs
 import besom.types.Asset.FileAsset
 import besom.types.Output
@@ -62,18 +61,21 @@ val siteDir = "www"
   )
 
   // For each file in the directory, create an S3 object stored in `siteBucket`
-  val uploads: Array[Output[BucketObject]] = File(siteDir).listFiles().map { file =>
-    s3.BucketObject(
-      NonEmptyString(file.getName).get, // FIXME: https://github.com/VirtusLab/besom/issues/138
-      s3.BucketObjectArgs(
-        bucket = siteBucket.id, // reference the s3.Bucket object
-        source = FileAsset(file.getAbsolutePath), // use FileAsset to point to a file
-        contentType = Files.probeContentType(file.toPath) // set the MIME type of the file
-      ),
-      CustomResourceOptions(
-        dependsOn = siteBucket.map(List(_))
+  val uploads: Array[Output[s3.BucketObject]] = File(siteDir).listFiles().map {
+    case file if file.getName.nonEmpty =>
+      s3.BucketObject(
+        NonEmptyString(file.getName).get,
+        s3.BucketObjectArgs(
+          bucket = siteBucket.id, // reference the s3.Bucket object
+          source = FileAsset(file.getAbsolutePath), // use FileAsset to point to a file
+          contentType = Files.probeContentType(file.toPath) // set the MIME type of the file
+        ),
+        CustomResourceOptions(
+          dependsOn = siteBucket.map(List(_))
+        )
       )
-    )
+    case _ =>
+      throw new RuntimeException("Unexpected empty file name")
   }
 
   for
diff --git a/integration-tests/src/test/resources/logger-test/Pulumi.yaml b/integration-tests/src/test/resources/logger-test/Pulumi.yaml
deleted file mode 100644
index 04a3404f..00000000
--- a/integration-tests/src/test/resources/logger-test/Pulumi.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: logger-test
-description: Besom logger test
-runtime:
-  name: scala
-  options: # language host debugging options
-    logtostderr: true
-    alsologtostderr: true
-    log_dir: .
-    v: 5
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/logger-test/run.scala b/integration-tests/src/test/resources/logger-test/run.scala
deleted file mode 100644
index 55042145..00000000
--- a/integration-tests/src/test/resources/logger-test/run.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-//> using scala 3.3.1
-//> using plugin "org.virtuslab::besom-compiler-plugin:0.0.2-SNAPSHOT"
-//> using lib "org.virtuslab::besom-core:0.0.2-SNAPSHOT"
-
-import besom.*
-
-@main
-def main = Pulumi.run {
-  log.info("Nothing here yet. It's waiting for you!")
-  for _ <- log.info("Nothing here yet. It's waiting for you!")
-  yield Pulumi.exports()
-}