Adding stack deployment

rlhagerm · rlhagerm · commit 2fb5c701b1c0 · 2025-11-20T09:02:40.000-06:00
diff --git a/.kiro/settings/mcp.json b/.kiro/settings/mcp.json
@@ -35,6 +35,20 @@
         "aws___search_documentation",
         "aws___read_documentation"
       ]
+    },
+    "codeloom-mcp": {
+      "disabled": false,
+      "command": "code-loom-mcp",
+      "args": [],
+      "env": {},
+      "transportType": "stdio",
+      "autoApprove": [
+        "loomer",
+        "search_aws_docs",
+        "read_aws_docs",
+        "query_knowledge_bases",
+        "list_knowledge_bases"
+      ]
     }
   }
 }
diff --git a/dotnetv4/CloudWatchLogs/LargeQuery/Actions/CloudWatchLogsActions.csproj b/dotnetv4/CloudWatchLogs/LargeQuery/Actions/CloudWatchLogsActions.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.407.7" />
-    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="3.7.403.14" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.*" />
+    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="3.7.*" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnetv4/CloudWatchLogs/LargeQuery/Actions/CloudWatchLogsWrapper.cs b/dotnetv4/CloudWatchLogs/LargeQuery/Actions/CloudWatchLogsWrapper.cs
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[CloudWatchLogs.dotnetv3.CloudWatchLogsWrapper]
+// snippet-start:[CloudWatchLogs.dotnetv4.CloudWatchLogsWrapper]
 using Amazon.CloudWatchLogs;
 using Amazon.CloudWatchLogs.Model;
 using Microsoft.Extensions.Logging;
@@ -27,7 +27,7 @@ public CloudWatchLogsWrapper(IAmazonCloudWatchLogs amazonCloudWatchLogs, ILogger
         _logger = logger;
     }
 
-    // snippet-start:[CloudWatchLogs.dotnetv3.StartQuery]
+    // snippet-start:[CloudWatchLogs.dotnetv4.StartQuery]
     /// <summary>
     /// Starts a CloudWatch Logs Insights query.
     /// </summary>
@@ -74,9 +74,9 @@ public CloudWatchLogsWrapper(IAmazonCloudWatchLogs amazonCloudWatchLogs, ILogger
             return null;
         }
     }
-    // snippet-end:[CloudWatchLogs.dotnetv3.StartQuery]
+    // snippet-end:[CloudWatchLogs.dotnetv4.StartQuery]
 
-    // snippet-start:[CloudWatchLogs.dotnetv3.GetQueryResults]
+    // snippet-start:[CloudWatchLogs.dotnetv4.GetQueryResults]
     /// <summary>
     /// Gets the results of a CloudWatch Logs Insights query.
     /// </summary>
@@ -105,9 +105,9 @@ public CloudWatchLogsWrapper(IAmazonCloudWatchLogs amazonCloudWatchLogs, ILogger
             return null;
         }
     }
-    // snippet-end:[CloudWatchLogs.dotnetv3.GetQueryResults]
+    // snippet-end:[CloudWatchLogs.dotnetv4.GetQueryResults]
 
-    // snippet-start:[CloudWatchLogs.dotnetv3.PutLogEvents]
+    // snippet-start:[CloudWatchLogs.dotnetv4.PutLogEvents]
     /// <summary>
     /// Puts log events to a CloudWatch Logs log stream.
     /// </summary>
@@ -143,6 +143,6 @@ public async Task<bool> PutLogEventsAsync(
             return false;
         }
     }
-    // snippet-end:[CloudWatchLogs.dotnetv3.PutLogEvents]
+    // snippet-end:[CloudWatchLogs.dotnetv4.PutLogEvents]
 }
-// snippet-end:[CloudWatchLogs.dotnetv3.CloudWatchLogsWrapper]
+// snippet-end:[CloudWatchLogs.dotnetv4.CloudWatchLogsWrapper]
diff --git a/dotnetv4/CloudWatchLogs/LargeQuery/README.md b/dotnetv4/CloudWatchLogs/LargeQuery/README.md
@@ -54,7 +54,6 @@ LargeQuery/
 
 - .NET 8.0 or later
 - AWS credentials configured
-- Python 3.x (for log generation)
 - Permissions for CloudWatch Logs and CloudFormation
 
 ## Related Resources
diff --git a/dotnetv4/CloudWatchLogs/LargeQuery/Scenarios/CloudWatchLogsScenario.csproj b/dotnetv4/CloudWatchLogs/LargeQuery/Scenarios/CloudWatchLogsScenario.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.407.7" />
-    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="3.7.403.14" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.*" />
+    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="3.7.*" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/dotnetv4/CloudWatchLogs/LargeQuery/Scenarios/LargeQueryWorkflow.cs b/dotnetv4/CloudWatchLogs/LargeQuery/Scenarios/LargeQueryWorkflow.cs
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[CloudWatchLogs.dotnetv3.LargeQueryWorkflow]
+// snippet-start:[CloudWatchLogs.dotnetv4.LargeQueryWorkflow]
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using Amazon.CloudFormation;
@@ -24,7 +24,7 @@ public class LargeQueryWorkflow
     1. Prepare the Application:
        - Prompt the user to deploy CloudFormation stack and generate sample logs.
        - Deploy the CloudFormation template for resource creation.
-       - Generate 50,000 sample log entries using a Python script.
+       - Generate 50,000 sample log entries using CloudWatch Logs API.
        - Wait 5 minutes for logs to be fully ingested.
 
     2. Execute Large Query:
@@ -48,8 +48,7 @@ public class LargeQueryWorkflow
 
     public static bool _interactive = true;
     private static string _stackName = "CloudWatchLargeQueryStack";
-    private static string _stackResourcePath = "../../../../../../scenarios/features/cloudwatch_logs_large_query/resources/stack.yaml";
-    private static string _pythonScriptPath = "../../../../../../scenarios/features/cloudwatch_logs_large_query/resources/create_logs.py";
+    private static string _stackResourcePath = "../../../../../../../scenarios/features/cloudwatch_logs_large_query/resources/stack.yaml";
 
     public static async Task Main(string[] args)
     {
@@ -147,8 +146,8 @@ public static async Task<bool> PrepareApplication()
             }
             else
             {
-                _logGroupName = PromptUserForInput("Enter the log group name: ", _logGroupName);
-                _logStreamName = PromptUserForInput("Enter the log stream name: ", _logStreamName);
+                _logGroupName = PromptUserForInput("Enter the log group name ", _logGroupName);
+                _logStreamName = PromptUserForInput("Enter the log stream name ", _logStreamName);
 
                 var startDateMs = PromptUserForLong("Enter the query start date (milliseconds since epoch): ");
                 var endDateMs = PromptUserForLong("Enter the query end date (milliseconds since epoch): ");
@@ -267,65 +266,65 @@ private static async Task<bool> WaitForStackCompletion(string stackId)
     }
 
     /// <summary>
-    /// Generates sample logs using a Python script.
+    /// Generates sample logs directly using CloudWatch Logs API.
+    /// Creates 50,000 log entries spanning 5 minutes.
     /// </summary>
     /// <returns>True if logs were generated successfully.</returns>
     private static async Task<bool> GenerateSampleLogs()
     {
+        const int totalEntries = 50000;
+        const int entriesPerBatch = 10000;
+        const int fiveMinutesMs = 5 * 60 * 1000;
+
         try
         {
-            if (!File.Exists(_pythonScriptPath))
-            {
-                _logger.LogError($"Python script not found at: {_pythonScriptPath}");
-                Console.WriteLine("Please run the script manually from:");
-                Console.WriteLine($"  {_pythonScriptPath}");
-                return false;
-            }
+            // Calculate timestamps
+            var startTimeMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+            var timestampIncrement = fiveMinutesMs / totalEntries;
 
-            var processStartInfo = new ProcessStartInfo
-            {
-                FileName = "python",
-                Arguments = _pythonScriptPath,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
+            Console.WriteLine($"Generating {totalEntries} log entries...");
 
-            using var process = Process.Start(processStartInfo);
-            if (process == null)
+            var entryCount = 0;
+            var currentTimestamp = startTimeMs;
+            var numBatches = totalEntries / entriesPerBatch;
+
+            // Generate and upload logs in batches
+            for (int batchNum = 0; batchNum < numBatches; batchNum++)
             {
-                _logger.LogError("Failed to start Python process.");
-                return false;
-            }
+                var logEvents = new List<InputLogEvent>();
 
-            var output = await process.StandardOutput.ReadToEndAsync();
-            var error = await process.StandardError.ReadToEndAsync();
-            await process.WaitForExitAsync();
+                for (int i = 0; i < entriesPerBatch; i++)
+                {
+                    logEvents.Add(new InputLogEvent
+                    {
+                        Timestamp = DateTimeOffset.FromUnixTimeMilliseconds(currentTimestamp).UtcDateTime,
+                        Message = $"Entry {entryCount}"
+                    });
 
-            if (process.ExitCode != 0)
-            {
-                _logger.LogError($"Python script failed: {error}");
-                return false;
+                    entryCount++;
+                    currentTimestamp += timestampIncrement;
+                }
+
+                // Upload batch
+                var success = await _wrapper.PutLogEventsAsync(_logGroupName, _logStreamName, logEvents);
+                if (!success)
+                {
+                    _logger.LogError($"Failed to upload batch {batchNum + 1}/{numBatches}");
+                    return false;
+                }
+
+                Console.WriteLine($"Uploaded batch {batchNum + 1}/{numBatches}");
             }
 
-            var startMatch = Regex.Match(output, @"QUERY_START_DATE=(\d+)");
-            var endMatch = Regex.Match(output, @"QUERY_END_DATE=(\d+)");
+            // Set query date range (convert milliseconds to seconds for query API)
+            _queryStartDate = startTimeMs / 1000;
+            _queryEndDate = (currentTimestamp - timestampIncrement) / 1000;
 
-            if (startMatch.Success && endMatch.Success)
-            {
-                _queryStartDate = long.Parse(startMatch.Groups[1].Value) / 1000;
-                _queryEndDate = long.Parse(endMatch.Groups[1].Value) / 1000;
+            Console.WriteLine($"Query start date: {DateTimeOffset.FromUnixTimeSeconds(_queryStartDate):yyyy-MM-ddTHH:mm:ss.fffZ}");
+            Console.WriteLine($"Query end date: {DateTimeOffset.FromUnixTimeSeconds(_queryEndDate):yyyy-MM-ddTHH:mm:ss.fffZ}");
+            Console.WriteLine($"Successfully uploaded {totalEntries} log entries");
 
-                Console.WriteLine($"Query start date: {DateTimeOffset.FromUnixTimeSeconds(_queryStartDate):yyyy-MM-ddTHH:mm:ss.fffZ}");
-                Console.WriteLine($"Query end date: {DateTimeOffset.FromUnixTimeSeconds(_queryEndDate):yyyy-MM-ddTHH:mm:ss.fffZ}");
-                return true;
-            }
-            else
-            {
-                _logger.LogError("Failed to parse timestamps from script output.");
-                return false;
-            }
+            return true;
         }
         catch (Exception ex)
         {
@@ -342,7 +341,7 @@ public static async Task ExecuteLargeQuery()
         Console.WriteLine("Starting recursive query to retrieve all logs...");
         Console.WriteLine();
 
-        var queryLimit = PromptUserForInteger("Enter the query limit (default 10000, max 10000): ", 10000);
+        var queryLimit = PromptUserForInteger("Enter the query limit (max 10000) ", 10000);
         if (queryLimit > 10000) queryLimit = 10000;
 
         var queryString = "fields @timestamp, @message | sort @timestamp asc";
@@ -407,17 +406,70 @@ private static async Task<List<List<ResultField>>> PerformLargeQuery(
             return results;
         }
 
+        // Parse the timestamp - CloudWatch returns ISO 8601 format with milliseconds
         var lastTime = DateTimeOffset.Parse(lastTimestamp).ToUnixTimeSeconds();
+        
+        // Check if there's any time range left to query
+        if (lastTime >= endTime)
+        {
+            return results;
+        }
+
+        // Calculate midpoint between last result and end time
         var midpoint = (lastTime + endTime) / 2;
+        
+        // Ensure we have enough range to split
+        if (midpoint <= lastTime || midpoint >= endTime)
+        {
+            // Range too small to split, just query the remaining range
+            var remainingResults = await PerformLargeQuery(logGroupName, queryString, lastTime, endTime, limit);
+            
+            var allResults = new List<List<ResultField>>(results);
+            // Skip the first result if it's a duplicate of the last result from previous query
+            if (remainingResults.Count > 0)
+            {
+                var firstTimestamp = remainingResults[0].Find(f => f.Field == "@timestamp")?.Value;
+                if (firstTimestamp == lastTimestamp)
+                {
+                    remainingResults.RemoveAt(0);
+                }
+            }
+            allResults.AddRange(remainingResults);
+            return allResults;
+        }
 
+        // Split the remaining range in half
         var results1 = await PerformLargeQuery(logGroupName, queryString, lastTime, midpoint, limit);
         var results2 = await PerformLargeQuery(logGroupName, queryString, midpoint, endTime, limit);
 
-        var allResults = new List<List<ResultField>>(results);
-        allResults.AddRange(results1);
-        allResults.AddRange(results2);
+        var combinedResults = new List<List<ResultField>>(results);
+        
+        // Remove duplicate from results1 if it matches the last result
+        if (results1.Count > 0)
+        {
+            var firstTimestamp1 = results1[0].Find(f => f.Field == "@timestamp")?.Value;
+            if (firstTimestamp1 == lastTimestamp)
+            {
+                results1.RemoveAt(0);
+            }
+        }
+        
+        combinedResults.AddRange(results1);
+        
+        // Remove duplicate from results2 if it matches the last result from results1
+        if (results2.Count > 0 && results1.Count > 0)
+        {
+            var lastTimestamp1 = results1[results1.Count - 1].Find(f => f.Field == "@timestamp")?.Value;
+            var firstTimestamp2 = results2[0].Find(f => f.Field == "@timestamp")?.Value;
+            if (firstTimestamp2 == lastTimestamp1)
+            {
+                results2.RemoveAt(0);
+            }
+        }
+        
+        combinedResults.AddRange(results2);
 
-        return allResults;
+        return combinedResults;
     }
 
     /// <summary>
@@ -592,9 +644,9 @@ private static bool GetYesNoResponse(string question)
     /// </summary>
     private static string PromptUserForStackName()
     {
-        Console.WriteLine($"Enter a name for the CloudFormation stack (default: {_stackName}): ");
         if (_interactive)
         {
+            Console.Write($"Enter a name for the CloudFormation stack (press Enter for default '{_stackName}'): ");
             string? input = Console.ReadLine();
             if (!string.IsNullOrWhiteSpace(input))
             {
@@ -617,7 +669,7 @@ private static string PromptUserForInput(string prompt, string defaultValue)
     {
         if (_interactive)
         {
-            Console.Write(prompt);
+            Console.Write($"{prompt}(press Enter for default '{defaultValue}'): ");
             string? input = Console.ReadLine();
             return string.IsNullOrWhiteSpace(input) ? defaultValue : input;
         }
@@ -631,7 +683,7 @@ private static int PromptUserForInteger(string prompt, int defaultValue)
     {
         if (_interactive)
         {
-            Console.Write(prompt);
+            Console.Write($"{prompt}(press Enter for default '{defaultValue}'): ");
             string? input = Console.ReadLine();
             if (string.IsNullOrWhiteSpace(input) || !int.TryParse(input, out var result))
             {
@@ -659,4 +711,4 @@ private static long PromptUserForLong(string prompt)
         return 0;
     }
 }
-// snippet-end:[CloudWatchLogs.dotnetv3.LargeQueryWorkflow]
+// snippet-end:[CloudWatchLogs.dotnetv4.LargeQueryWorkflow]
diff --git a/dotnetv4/CloudWatchLogs/LargeQuery/Tests/CloudWatchLogsTests.csproj b/dotnetv4/CloudWatchLogs/LargeQuery/Tests/CloudWatchLogsTests.csproj
diff --git a/scenarios/features/cloudwatch_logs_large_query/resources/stack.yaml b/scenarios/features/cloudwatch_logs_large_query/resources/stack.yaml
diff --git a/steering_docs/dotnet-tech/scenario.md b/steering_docs/dotnet-tech/scenario.md

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,20 @@`
`35`	`35`	`"aws___search_documentation",`
`36`	`36`	`"aws___read_documentation"`
`37`	`37`	`]`
	`38`	`+ },`
	`39`	`+ "codeloom-mcp": {`
	`40`	`+ "disabled": false,`
	`41`	`+ "command": "code-loom-mcp",`
	`42`	`+ "args": [],`
	`43`	`+ "env": {},`
	`44`	`+ "transportType": "stdio",`
	`45`	`+ "autoApprove": [`
	`46`	`+ "loomer",`
	`47`	`+ "search_aws_docs",`
	`48`	`+ "read_aws_docs",`
	`49`	`+ "query_knowledge_bases",`
	`50`	`+ "list_knowledge_bases"`
	`51`	`+ ]`
`38`	`52`	`}`
`39`	`53`	`}`
`40`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`		`-// snippet-start:[CloudWatchLogs.dotnetv3.CloudWatchLogsWrapper]`
	`4`	`+// snippet-start:[CloudWatchLogs.dotnetv4.CloudWatchLogsWrapper]`
`5`	`5`	`using Amazon.CloudWatchLogs;`
`6`	`6`	`using Amazon.CloudWatchLogs.Model;`
`7`	`7`	`using Microsoft.Extensions.Logging;`
`@@ -27,7 +27,7 @@ public CloudWatchLogsWrapper(IAmazonCloudWatchLogs amazonCloudWatchLogs, ILogger`
`27`	`27`	`_logger = logger;`
`28`	`28`	`}`
`29`	`29`
`30`		`- // snippet-start:[CloudWatchLogs.dotnetv3.StartQuery]`
	`30`	`+ // snippet-start:[CloudWatchLogs.dotnetv4.StartQuery]`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// Starts a CloudWatch Logs Insights query.`
`33`	`33`	`/// </summary>`
`@@ -74,9 +74,9 @@ public CloudWatchLogsWrapper(IAmazonCloudWatchLogs amazonCloudWatchLogs, ILogger`
`74`	`74`	`return null;`
`75`	`75`	`}`
`76`	`76`	`}`
`77`		`- // snippet-end:[CloudWatchLogs.dotnetv3.StartQuery]`
	`77`	`+ // snippet-end:[CloudWatchLogs.dotnetv4.StartQuery]`
`78`	`78`
`79`		`- // snippet-start:[CloudWatchLogs.dotnetv3.GetQueryResults]`
	`79`	`+ // snippet-start:[CloudWatchLogs.dotnetv4.GetQueryResults]`
`80`	`80`	`/// <summary>`
`81`	`81`	`/// Gets the results of a CloudWatch Logs Insights query.`
`82`	`82`	`/// </summary>`
`@@ -105,9 +105,9 @@ public CloudWatchLogsWrapper(IAmazonCloudWatchLogs amazonCloudWatchLogs, ILogger`
`105`	`105`	`return null;`
`106`	`106`	`}`
`107`	`107`	`}`
`108`		`- // snippet-end:[CloudWatchLogs.dotnetv3.GetQueryResults]`
	`108`	`+ // snippet-end:[CloudWatchLogs.dotnetv4.GetQueryResults]`
`109`	`109`
`110`		`- // snippet-start:[CloudWatchLogs.dotnetv3.PutLogEvents]`
	`110`	`+ // snippet-start:[CloudWatchLogs.dotnetv4.PutLogEvents]`
`111`	`111`	`/// <summary>`
`112`	`112`	`/// Puts log events to a CloudWatch Logs log stream.`
`113`	`113`	`/// </summary>`
`@@ -143,6 +143,6 @@ public async Task<bool> PutLogEventsAsync(`
`143`	`143`	`return false;`
`144`	`144`	`}`
`145`	`145`	`}`
`146`		`- // snippet-end:[CloudWatchLogs.dotnetv3.PutLogEvents]`
	`146`	`+ // snippet-end:[CloudWatchLogs.dotnetv4.PutLogEvents]`
`147`	`147`	`}`
`148`		`-// snippet-end:[CloudWatchLogs.dotnetv3.CloudWatchLogsWrapper]`
	`148`	`+// snippet-end:[CloudWatchLogs.dotnetv4.CloudWatchLogsWrapper]`