Reorganize and add tests.

awsdocs · Oct 17, 2023 · 375058e · 375058e
1 parent bd14e00
commit 375058e
Show file tree

Hide file tree

Showing 25 changed files with 52 additions and 522 deletions.
diff --git a/applications/feedback_sentiment_analyzer/cdk/lib/functions.ts b/applications/feedback_sentiment_analyzer/cdk/lib/functions.ts
@@ -214,49 +214,71 @@ const JAVA_FUNCTIONS: AppFunctionConfig[] = [
   },
 ];
 
-const DOTNET_FUNCTION_CONFIG = {
-  ...BASE_APP_FUNCTION,
-  runtime: Runtime.DOTNET_6,
-  codeAsset: () => {
-    const source = resolve("../../../dotnetv3/cross-service/FeedbackSentimentAnalyzer");
-    return Code.fromAsset(source, {
-      bundling: {
-        command: [
-          "/bin/sh",
-          "-c",
-          " dotnet tool install -g Amazon.Lambda.Tools" +
-          " && dotnet build" +
-          " && cd PamApi" +
-          " && dotnet lambda package --output-package /asset-output/function.zip",
-        ],
-        image: Runtime.DOTNET_6.bundlingImage,
-        user: "root",
-        outputType: BundlingOutput.ARCHIVED,
-      },
-    });
-  },
+const DOTNET_BUNDLING_CONFIG = {
+  command: [
+    "/bin/sh",
+    "-c",
+    " dotnet tool install -g Amazon.Lambda.Tools" +
+    " && dotnet build" +
+    " && dotnet lambda package --output-package /asset-output/function.zip",
+  ],
+  image: Runtime.DOTNET_6.bundlingImage,
+  user: "root",
+  outputType: BundlingOutput.ARCHIVED,
 };
 
-const DOTNET_FUNCTIONS: AppFunctionConfig[] = [
+const DOTNET_FUNCTIONS = [
   {
-    ...DOTNET_FUNCTION_CONFIG,
+    ...BASE_APP_FUNCTION,
     name: "ExtractText",
-    handler: "com.example.fsa.handlers.ExtractTextHandler::handleRequest",
+    handler: "FsaExtractText::FsaExtractText.Function::FunctionHandler",
+    codeAsset() {
+      const source = resolve(
+          "../../../dotnetv3/cross-service/FeedbackSentimentAnalyzer/FsaExtractText"
+      );
+      return Code.fromAsset(source, {
+        bundling: DOTNET_BUNDLING_CONFIG,
+      });
+    },
   },
   {
-    ...COMMON_JAVA_FUNCTION_CONFIG,
+    ...BASE_APP_FUNCTION,
     name: "AnalyzeSentiment",
-    handler: "com.example.fsa.handlers.AnalyzeSentimentHandler::handleRequest",
+    handler: "FsaAnalyzeSentiment::FsaAnalyzeSentiment.Function::FunctionHandler",
+    codeAsset() {
+      const source = resolve(
+          "../../../dotnetv3/cross-service/FeedbackSentimentAnalyzer/FsaExtractText"
+      );
+      return Code.fromAsset(source, {
+        bundling: DOTNET_BUNDLING_CONFIG,
+      });
+    },
   },
   {
-    ...COMMON_JAVA_FUNCTION_CONFIG,
+    ...BASE_APP_FUNCTION,
     name: "TranslateText",
-    handler: "com.example.fsa.handlers.TranslateTextHandler::handleRequest",
+    handler: "FsaTranslateText::FsaTranslateText.Function::FunctionHandler",
+    codeAsset() {
+      const source = resolve(
+          "../../../dotnetv3/cross-service/FeedbackSentimentAnalyzer/FsaTranslateText"
+      );
+      return Code.fromAsset(source, {
+        bundling: DOTNET_BUNDLING_CONFIG,
+      });
+    },
   },
   {
-    ...COMMON_JAVA_FUNCTION_CONFIG,
+    ...BASE_APP_FUNCTION,
     name: "SynthesizeAudio",
-    handler: "com.example.fsa.handlers.SynthesizeAudioHandler::handleRequest",
+    handler: "FsaSynthesizeAudio::FsaSynthesizeAudio.Function::FunctionHandler",
+    codeAsset() {
+      const source = resolve(
+          "../../../dotnetv3/cross-service/FeedbackSentimentAnalyzer/FsaSynthesizeAudio"
+      );
+      return Code.fromAsset(source, {
+        bundling: DOTNET_BUNDLING_CONFIG,
+      });
+    },
   },
 ];
 

diff --git a/...service/FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer.sln b/...service/FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer.sln
diff --git a/...ntimentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/AnalyzeSentimentFunction.cs b/...ntimentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/AnalyzeSentimentFunction.cs
diff --git a/...entimentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/FsaAnalyzeSentiment.csproj b/...entimentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/FsaAnalyzeSentiment.csproj
diff --git a/...mentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/Properties/launchSettings.json b/...mentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/Properties/launchSettings.json
diff --git a/...mentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/aws-lambda-tools-defaults.json b/...mentAnalyzer/FeedbackSentimentAnalyzer/FsaAnalyzeSentiment/aws-lambda-tools-defaults.json
diff --git a/...FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/ExtractTextFunction.cs b/...FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/ExtractTextFunction.cs
diff --git a/.../FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/FsaExtractText.csproj b/.../FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/FsaExtractText.csproj
diff --git a/...SentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/Properties/launchSettings.json b/...SentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/Properties/launchSettings.json
diff --git a/...SentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/aws-lambda-tools-defaults.json b/...SentimentAnalyzer/FeedbackSentimentAnalyzer/FsaExtractText/aws-lambda-tools-defaults.json
diff --git a/...3/cross-service/FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FsaServices/Class1.cs b/...3/cross-service/FeedbackSentimentAnalyzer/FeedbackSentimentAnalyzer/FsaServices/Class1.cs