v3

sergiobtos · sergiobtos · commit 5fd7bd38aca2 · 2020-12-03T16:56:49.000-05:00
diff --git a/.vs/Assignment4AWSLambda/v16/.suo b/.vs/Assignment4AWSLambda/v16/.suo
diff --git a/AWSService/AWSDynamoService.cs b/AWSService/AWSDynamoService.cs
@@ -18,19 +18,19 @@ public class AWSDynamoService
         RegionEndpoint Region = RegionEndpoint.USWest2;
         IAmazonDynamoDB dynamoDBClient { get; }
         private static AmazonDynamoDBClient client = new AmazonDynamoDBClient();
-        String tableName = "Images";
+        String tableName = "MyImage";
 
         public AWSDynamoService(IAmazonDynamoDB dynamoDBClient)
         {
             this.dynamoDBClient = dynamoDBClient;
             CreateTable();
         }
 
-        public async Task<Image> Create(Image image)
+        public async Task<MyImage> Create(MyImage image)
         {
             image.Id = (image.BucketName + image.KeyName);
             DynamoDBContext Context = new DynamoDBContext(dynamoDBClient);
-            await Context.SaveAsync<Image>(image);
+            await Context.SaveAsync<MyImage>(image);
             return image;
         }
 
diff --git a/Function.cs b/Function.cs
@@ -14,6 +14,7 @@
 using Amazon.S3;
 using Amazon.S3.Model;
 using Amazon.DynamoDBv2;
+using Assignment4AWSLambda.Model;
 
 //test
 // Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.
@@ -52,10 +53,12 @@ public class Function
         /// </summary>
         public Function()
         {
-            new AWSDynamoService(dynamoDBClient);
+            this.dynamoDBClient = new AmazonDynamoDBClient();
             this.S3Client = new AmazonS3Client();
             this.RekognitionClient = new AmazonRekognitionClient();
 
+            new AWSDynamoService(dynamoDBClient);
+
             var environmentMinConfidence = System.Environment.GetEnvironmentVariable(MIN_CONFIDENCE_ENVIRONMENT_VARIABLE_NAME);
             if(!string.IsNullOrWhiteSpace(environmentMinConfidence))
             {
@@ -121,28 +124,42 @@ public async Task FunctionHandler(S3Event input, ILambdaContext context)
                 });
 
                 var tags = new List<Tag>();
+                var labels = new List<MyLabel>();
                 foreach(var label in detectResponses.Labels)
                 {
                     if(tags.Count < 10)
                     {
                         Console.WriteLine($"\tFound Label {label.Name} with confidence {label.Confidence}");
                         tags.Add(new Tag { Key = label.Name, Value = label.Confidence.ToString() });
+                        labels.Add(new MyLabel { Key = label.Name, Value = label.Confidence.ToString() });
                     }
                     else
                     {
                         Console.WriteLine($"\tSkipped label {label.Name} with confidence {label.Confidence} because the maximum number of tags has been reached");
                     }
                 }
 
-                await this.S3Client.PutObjectTaggingAsync(new PutObjectTaggingRequest
+
+                MyImage image = new MyImage();
+                image.BucketName = record.S3.Bucket.Name;
+                image.KeyName = record.S3.Object.Key;
+                image.Labels = labels;
+                image.Processed = false;
+                image.Metadatainfo = null;
+
+                image = new AWSDynamoService(dynamoDBClient).Create(image).Result;
+
+                Console.WriteLine($"\tSaved {image.KeyName} with confidence {image.Id}");
+
+                /*await this.S3Client.PutObjectTaggingAsync(new PutObjectTaggingRequest
                 {
                     BucketName = record.S3.Bucket.Name,
                     Key = record.S3.Object.Key,
                     Tagging = new Tagging
                     {
                         TagSet = tags
                     }
-                });
+                });*/
             }
             return;
         }
diff --git a/Model/MyImage.cs b/Model/MyImage.cs
@@ -3,8 +3,8 @@
 
 namespace Assignment4AWSLambda.Model
 {
-    [DynamoDBTable("Images")]
-    public class Image
+    [DynamoDBTable("MyImage")]
+    public class MyImage
     {
         [DynamoDBHashKey]
         public string Id { get; set; }
@@ -22,6 +22,6 @@ public class Image
         public string Metadatainfo { get; set; }
 
         [DynamoDBProperty(AttributeName = "Labels")]
-        public List<Label> Labels { get; set; }
+        public List<MyLabel> Labels { get; set; }
     }
 }
diff --git a/Model/MyLabel.cs b/Model/MyLabel.cs
@@ -2,11 +2,11 @@
 
 namespace Assignment4AWSLambda.Model
 {
-    public class Label
+    public class MyLabel
     {
         [DynamoDBProperty]
-        public string TagName { get; set; }
+        public string Key { get; set; }
         [DynamoDBProperty]
-        public int Value { get; set; }
+        public string Value { get; set; }
     }
 }
diff --git a/aws-lambda-tools-defaults.json b/aws-lambda-tools-defaults.json
@@ -1,16 +1,24 @@
+
 {
-  "Information": [
-    "This file provides default values for the deployment wizard inside Visual Studio and the AWS Lambda commands added to the .NET Core CLI.",
-    "To learn more about the Lambda commands with the .NET Core CLI execute the following command at the command line in the project root directory.",
-    "dotnet lambda help",
-    "All the command line options for the Lambda command can be specified in this file."
-  ],
-  "profile": "default",
-  "region": "ca-central-1",
-  "configuration": "Release",
-  "framework": "netcoreapp3.1",
-  "function-runtime": "dotnetcore3.1",
-  "function-memory-size": 256,
-  "function-timeout": 30,
-  "function-handler": "Assignment4AWSLambda::Assignment4AWSLambda.Function::FunctionHandler"
+    "Information" : [
+        "This file provides default values for the deployment wizard inside Visual Studio and the AWS Lambda commands added to the .NET Core CLI.",
+        "To learn more about the Lambda commands with the .NET Core CLI execute the following command at the command line in the project root directory.",
+        "dotnet lambda help",
+        "All the command line options for the Lambda command can be specified in this file."
+    ],
+    "profile"     : "default",
+    "region"      : "us-west-2",
+    "configuration" : "Release",
+    "framework"     : "netcoreapp3.1",
+    "function-runtime" : "dotnetcore3.1",
+    "function-memory-size" : 256,
+    "function-timeout"     : 30,
+    "function-handler"     : "Assignment4AWSLambda::Assignment4AWSLambda.Function::FunctionHandler",
+    "function-name"        : "Lab4TriggerToDynamo",
+    "package-type"         : "Zip",
+    "function-role"        : "arn:aws:iam::230199793713:role/lambda_exec_Lab4TriggerToDynamo",
+    "tracing-mode"         : "Active",
+    "environment-variables" : "\"MinConfidence\"=\"90\"",
+    "image-tag"             : "",
+    "function-description"  : ""
 }
diff --git a/obj/Assignment4AWSLambda.csproj.nuget.dgspec.json b/obj/Assignment4AWSLambda.csproj.nuget.dgspec.json
@@ -84,6 +84,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "linux-x64": {
+          "#import": []
+        }
       }
     }
   }
diff --git a/obj/Debug/netcoreapp3.1/Assignment4AWSLambda.csprojAssemblyReference.cache b/obj/Debug/netcoreapp3.1/Assignment4AWSLambda.csprojAssemblyReference.cache
diff --git a/obj/project.assets.json b/obj/project.assets.json
@@ -151,6 +151,157 @@
           "lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll": {}
         }
       }
+    },
+    ".NETCoreApp,Version=v3.1/linux-x64": {
+      "Amazon.Lambda.Core/1.2.0": {
+        "type": "package",
+        "compile": {
+          "lib/netstandard2.0/Amazon.Lambda.Core.dll": {}
+        },
+        "runtime": {
+          "lib/netstandard2.0/Amazon.Lambda.Core.dll": {}
+        }
+      },
+      "Amazon.Lambda.S3Events/1.2.0": {
+        "type": "package",
+        "dependencies": {
+          "AWSSDK.S3": "3.5.3.5"
+        },
+        "compile": {
+          "lib/netstandard2.0/Amazon.Lambda.S3Events.dll": {}
+        },
+        "runtime": {
+          "lib/netstandard2.0/Amazon.Lambda.S3Events.dll": {}
+        }
+      },
+      "Amazon.Lambda.Serialization.SystemTextJson/2.1.0": {
+        "type": "package",
+        "dependencies": {
+          "Amazon.Lambda.Core": "1.2.0"
+        },
+        "compile": {
+          "lib/netcoreapp3.1/Amazon.Lambda.Serialization.SystemTextJson.dll": {}
+        },
+        "runtime": {
+          "lib/netcoreapp3.1/Amazon.Lambda.Serialization.SystemTextJson.dll": {}
+        }
+      },
+      "AWSSDK.Core/3.5.1.42": {
+        "type": "package",
+        "compile": {
+          "lib/netcoreapp3.1/AWSSDK.Core.dll": {}
+        },
+        "runtime": {
+          "lib/netcoreapp3.1/AWSSDK.Core.dll": {}
+        }
+      },
+      "AWSSDK.DynamoDBv2/3.5.3": {
+        "type": "package",
+        "dependencies": {
+          "AWSSDK.Core": "[3.5.1.34, 3.6.0)"
+        },
+        "compile": {
+          "lib/netcoreapp3.1/AWSSDK.DynamoDBv2.dll": {}
+        },
+        "runtime": {
+          "lib/netcoreapp3.1/AWSSDK.DynamoDBv2.dll": {}
+        }
+      },
+      "AWSSDK.Rekognition/3.5.2.15": {
+        "type": "package",
+        "dependencies": {
+          "AWSSDK.Core": "[3.5.1.42, 3.6.0)"
+        },
+        "compile": {
+          "lib/netcoreapp3.1/AWSSDK.Rekognition.dll": {}
+        },
+        "runtime": {
+          "lib/netcoreapp3.1/AWSSDK.Rekognition.dll": {}
+        }
+      },
+      "AWSSDK.S3/3.5.5.2": {
+        "type": "package",
+        "dependencies": {
+          "AWSSDK.Core": "[3.5.1.42, 3.6.0)"
+        },
+        "compile": {
+          "lib/netcoreapp3.1/AWSSDK.S3.dll": {}
+        },
+        "runtime": {
+          "lib/netcoreapp3.1/AWSSDK.S3.dll": {}
+        }
+      },
+      "GrapeCity.Documents.Common/3.0.0.415": {
+        "type": "package",
+        "compile": {
+          "lib/netstandard2.0/GrapeCity.Documents.Common.dll": {}
+        },
+        "runtime": {
+          "lib/netstandard2.0/GrapeCity.Documents.Common.dll": {}
+        },
+        "resource": {
+          "lib/netstandard2.0/ja/GrapeCity.Documents.Common.resources.dll": {
+            "locale": "ja"
+          }
+        }
+      },
+      "GrapeCity.Documents.Imaging/3.0.0.415": {
+        "type": "package",
+        "dependencies": {
+          "GrapeCity.Documents.Common": "[3.0.0.415]",
+          "System.Buffers": "4.4.0",
+          "System.Memory": "4.5.0",
+          "System.Numerics.Vectors": "4.4.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.0"
+        },
+        "compile": {
+          "lib/netstandard2.0/GrapeCity.Documents.Imaging.dll": {}
+        },
+        "runtime": {
+          "lib/netstandard2.0/GrapeCity.Documents.Imaging.dll": {}
+        },
+        "resource": {
+          "lib/netstandard2.0/ja/GrapeCity.Documents.Imaging.resources.dll": {
+            "locale": "ja"
+          }
+        }
+      },
+      "System.Buffers/4.4.0": {
+        "type": "package",
+        "compile": {
+          "ref/netcoreapp2.0/_._": {}
+        },
+        "runtime": {
+          "lib/netcoreapp2.0/_._": {}
+        }
+      },
+      "System.Memory/4.5.0": {
+        "type": "package",
+        "compile": {
+          "ref/netcoreapp2.1/_._": {}
+        },
+        "runtime": {
+          "lib/netcoreapp2.1/_._": {}
+        }
+      },
+      "System.Numerics.Vectors/4.4.0": {
+        "type": "package",
+        "compile": {
+          "ref/netcoreapp2.0/_._": {}
+        },
+        "runtime": {
+          "lib/netcoreapp2.0/_._": {}
+        }
+      },
+      "System.Runtime.CompilerServices.Unsafe/4.5.0": {
+        "type": "package",
+        "compile": {
+          "ref/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": {}
+        },
+        "runtime": {
+          "lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll": {}
+        }
+      }
     }
   },
   "libraries": {
@@ -578,6 +729,11 @@
         },
         "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
       }
+    },
+    "runtimes": {
+      "linux-x64": {
+        "#import": []
+      }
     }
   }
 }
diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "rZ0W76LK4dZLkljQgQj0clTOkRaYgDFTbNVz35k344T+5u8nVpXqPqzFjOY+w9vXiA3YLWl3+tk6tt2bXH5tIg==",
+  "dgSpecHash": "NoABLN25MYefQEkGicSukKFAIhIpdLuNv5qSVF2blAMj5DLoaXU44SCtICSa4XMvN2B8CbSj5Jml2LNg5+t3QA==",
   "success": true,
   "projectFilePath": "C:\\Comp306_AWSAmazon\\Lab4\\Assignment4AWSLambda\\Assignment4AWSLambda.csproj",
   "expectedPackageFiles": [

Original file line number	Diff line number	Diff line change
`@@ -18,19 +18,19 @@ public class AWSDynamoService`
`18`	`18`	`RegionEndpoint Region = RegionEndpoint.USWest2;`
`19`	`19`	`IAmazonDynamoDB dynamoDBClient { get; }`
`20`	`20`	`private static AmazonDynamoDBClient client = new AmazonDynamoDBClient();`
`21`		`- String tableName = "Images";`
	`21`	`+ String tableName = "MyImage";`
`22`	`22`
`23`	`23`	`public AWSDynamoService(IAmazonDynamoDB dynamoDBClient)`
`24`	`24`	`{`
`25`	`25`	`this.dynamoDBClient = dynamoDBClient;`
`26`	`26`	`CreateTable();`
`27`	`27`	`}`
`28`	`28`
`29`		`- public async Task<Image> Create(Image image)`
	`29`	`+ public async Task<MyImage> Create(MyImage image)`
`30`	`30`	`{`
`31`	`31`	`image.Id = (image.BucketName + image.KeyName);`
`32`	`32`	`DynamoDBContext Context = new DynamoDBContext(dynamoDBClient);`
`33`		`- await Context.SaveAsync<Image>(image);`
	`33`	`+ await Context.SaveAsync<MyImage>(image);`
`34`	`34`	`return image;`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using Amazon.S3;`
`15`	`15`	`using Amazon.S3.Model;`
`16`	`16`	`using Amazon.DynamoDBv2;`
	`17`	`+using Assignment4AWSLambda.Model;`
`17`	`18`
`18`	`19`	`//test`
`19`	`20`	`// Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.`
`@@ -52,10 +53,12 @@ public class Function`
`52`	`53`	`/// </summary>`
`53`	`54`	`public Function()`
`54`	`55`	`{`
`55`		`- new AWSDynamoService(dynamoDBClient);`
	`56`	`+ this.dynamoDBClient = new AmazonDynamoDBClient();`
`56`	`57`	`this.S3Client = new AmazonS3Client();`
`57`	`58`	`this.RekognitionClient = new AmazonRekognitionClient();`
`58`	`59`
	`60`	`+ new AWSDynamoService(dynamoDBClient);`
	`61`	`+`
`59`	`62`	`var environmentMinConfidence = System.Environment.GetEnvironmentVariable(MIN_CONFIDENCE_ENVIRONMENT_VARIABLE_NAME);`
`60`	`63`	`if(!string.IsNullOrWhiteSpace(environmentMinConfidence))`
`61`	`64`	`{`
`@@ -121,28 +124,42 @@ public async Task FunctionHandler(S3Event input, ILambdaContext context)`
`121`	`124`	`});`
`122`	`125`
`123`	`126`	`var tags = new List<Tag>();`
	`127`	`+ var labels = new List<MyLabel>();`
`124`	`128`	`foreach(var label in detectResponses.Labels)`
`125`	`129`	`{`
`126`	`130`	`if(tags.Count < 10)`
`127`	`131`	`{`
`128`	`132`	`Console.WriteLine($"\tFound Label {label.Name} with confidence {label.Confidence}");`
`129`	`133`	`tags.Add(new Tag { Key = label.Name, Value = label.Confidence.ToString() });`
	`134`	`+ labels.Add(new MyLabel { Key = label.Name, Value = label.Confidence.ToString() });`
`130`	`135`	`}`
`131`	`136`	`else`
`132`	`137`	`{`
`133`	`138`	`Console.WriteLine($"\tSkipped label {label.Name} with confidence {label.Confidence} because the maximum number of tags has been reached");`
`134`	`139`	`}`
`135`	`140`	`}`
`136`	`141`
`137`		`- await this.S3Client.PutObjectTaggingAsync(new PutObjectTaggingRequest`
	`142`	`+`
	`143`	`+ MyImage image = new MyImage();`
	`144`	`+ image.BucketName = record.S3.Bucket.Name;`
	`145`	`+ image.KeyName = record.S3.Object.Key;`
	`146`	`+ image.Labels = labels;`
	`147`	`+ image.Processed = false;`
	`148`	`+ image.Metadatainfo = null;`
	`149`	`+`
	`150`	`+ image = new AWSDynamoService(dynamoDBClient).Create(image).Result;`
	`151`	`+`
	`152`	`+ Console.WriteLine($"\tSaved {image.KeyName} with confidence {image.Id}");`
	`153`	`+`
	`154`	`+ /*await this.S3Client.PutObjectTaggingAsync(new PutObjectTaggingRequest`
`138`	`155`	`{`
`139`	`156`	`BucketName = record.S3.Bucket.Name,`
`140`	`157`	`Key = record.S3.Object.Key,`
`141`	`158`	`Tagging = new Tagging`
`142`	`159`	`{`
`143`	`160`	`TagSet = tags`
`144`	`161`	`}`
`145`		`- });`
	`162`	`+ });*/`
`146`	`163`	`}`
`147`	`164`	`return;`
`148`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace Assignment4AWSLambda.Model`
`5`	`5`	`{`
`6`		`- [DynamoDBTable("Images")]`
`7`		`- public class Image`
	`6`	`+ [DynamoDBTable("MyImage")]`
	`7`	`+ public class MyImage`
`8`	`8`	`{`
`9`	`9`	`[DynamoDBHashKey]`
`10`	`10`	`public string Id { get; set; }`
`@@ -22,6 +22,6 @@ public class Image`
`22`	`22`	`public string Metadatainfo { get; set; }`
`23`	`23`
`24`	`24`	`[DynamoDBProperty(AttributeName = "Labels")]`
`25`		`- public List<Label> Labels { get; set; }`
	`25`	`+ public List<MyLabel> Labels { get; set; }`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace Assignment4AWSLambda.Model`
`4`	`4`	`{`
`5`		`- public class Label`
	`5`	`+ public class MyLabel`
`6`	`6`	`{`
`7`	`7`	`[DynamoDBProperty]`
`8`		`- public string TagName { get; set; }`
	`8`	`+ public string Key { get; set; }`
`9`	`9`	`[DynamoDBProperty]`
`10`		`- public int Value { get; set; }`
	`10`	`+ public string Value { get; set; }`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,11 @@`
`84`	`84`	`},`
`85`	`85`	`"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"`
`86`	`86`	`}`
	`87`	`+ },`
	`88`	`+ "runtimes": {`
	`89`	`+ "linux-x64": {`
	`90`	`+ "#import": []`
	`91`	`+ }`
`87`	`92`	`}`
`88`	`93`	`}`
`89`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version": 2,`
`3`		`- "dgSpecHash": "rZ0W76LK4dZLkljQgQj0clTOkRaYgDFTbNVz35k344T+5u8nVpXqPqzFjOY+w9vXiA3YLWl3+tk6tt2bXH5tIg==",`
	`3`	`+ "dgSpecHash": "NoABLN25MYefQEkGicSukKFAIhIpdLuNv5qSVF2blAMj5DLoaXU44SCtICSa4XMvN2B8CbSj5Jml2LNg5+t3QA==",`
`4`	`4`	`"success": true,`
`5`	`5`	`"projectFilePath": "C:\\Comp306_AWSAmazon\\Lab4\\Assignment4AWSLambda\\Assignment4AWSLambda.csproj",`
`6`	`6`	`"expectedPackageFiles": [`