Fix formatting and warnings

rlhagerm · rlhagerm · commit 57e838568a9c · 2025-12-09T13:44:55.000-06:00
diff --git a/dotnetv4/IoT/Actions/HelloIoT.cs b/dotnetv4/IoT/Actions/HelloIoT.cs
@@ -42,7 +42,7 @@ public static async Task Main(string[] args)
                     Console.WriteLine($"  Thing ARN: {thing.ThingArn}");
                     Console.WriteLine($"  Thing Type: {thing.ThingTypeName ?? "No type specified"}");
                     Console.WriteLine($"  Version: {thing.Version}");
-                    
+
                     if (thing.Attributes?.Count > 0)
                     {
                         Console.WriteLine("  Attributes:");
@@ -72,4 +72,4 @@ public static async Task Main(string[] args)
         }
     }
 }
-// snippet-end:[iot.dotnetv4.Hello]
+// snippet-end:[iot.dotnetv4.Hello]
diff --git a/dotnetv4/IoT/Actions/IoTWrapper.cs b/dotnetv4/IoT/Actions/IoTWrapper.cs
@@ -209,7 +209,7 @@ public async Task<List<Certificate>> ListCertificatesAsync()
         {
             var request = new ListCertificatesRequest();
             var response = await _amazonIoT.ListCertificatesAsync(request);
-            
+
             _logger.LogInformation($"Retrieved {response.Certificates.Count} certificates");
             return response.Certificates;
         }
@@ -278,7 +278,7 @@ public async Task<bool> UpdateThingShadowAsync(string thingName, string shadowPa
             var response = await _amazonIotData.GetThingShadowAsync(request);
             using var reader = new StreamReader(response.Payload);
             var shadowData = await reader.ReadToEndAsync();
-            
+
             _logger.LogInformation($"Retrieved shadow for Thing {thingName}");
             return shadowData;
         }
@@ -357,7 +357,7 @@ public async Task<List<TopicRuleListItem>> ListTopicRulesAsync()
         {
             var request = new ListTopicRulesRequest();
             var response = await _amazonIoT.ListTopicRulesAsync(request);
-            
+
             _logger.LogInformation($"Retrieved {response.Rules.Count} IoT rules");
             return response.Rules;
         }
@@ -607,7 +607,7 @@ public async Task<List<ThingAttribute>> ListThingsAsync()
         {
             var request = new ListThingsRequest();
             var response = await _amazonIoT.ListThingsAsync(request);
-            
+
             _logger.LogInformation($"Retrieved {response.Things.Count} Things");
             return response.Things;
         }
@@ -625,4 +625,4 @@ public async Task<List<ThingAttribute>> ListThingsAsync()
     // snippet-end:[iot.dotnetv4.ListThings]
 
 }
-// snippet-end:[iot.dotnetv4.IoTWrapper]
+// snippet-end:[iot.dotnetv4.IoTWrapper]
diff --git a/dotnetv4/IoT/Scenarios/IoTBasics.cs b/dotnetv4/IoT/Scenarios/IoTBasics.cs
@@ -43,13 +43,13 @@ public static async Task Main(string[] args)
         // Set up dependency injection for the Amazon service.
         using var host = Host.CreateDefaultBuilder(args)
             .ConfigureServices((_, services) =>
-                services.AddAWSService<IAmazonIoT>(new AWSOptions(){Region = RegionEndpoint.USEast1})
+                services.AddAWSService<IAmazonIoT>(new AWSOptions() { Region = RegionEndpoint.USEast1 })
                     .AddAWSService<IAmazonCloudFormation>()
                         .AddTransient<IoTWrapper>()
                         .AddLogging(builder => builder.AddConsole())
                         .AddSingleton<IAmazonIotData>(sp =>
                         {
-                            var iotService = sp.GetService<IAmazonIoT>();
+                            var iotService = sp.GetRequiredService<IAmazonIoT>();
                             var request = new DescribeEndpointRequest
                             {
                                 EndpointType = "iot:Data-ATS"
@@ -133,7 +133,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
             Console.WriteLine("1. Create an AWS IoT Thing.");
             Console.WriteLine("An AWS IoT Thing represents a virtual entity in the AWS IoT service that can be associated with a physical device.");
             Console.WriteLine();
-            
+
             if (IsInteractive)
             {
                 Console.Write("Enter Thing name: ");
@@ -145,7 +145,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
             {
                 Console.WriteLine($"Using default Thing name: {thingName}");
             }
-            
+
             var thingArn = await iotWrapper.CreateThingAsync(thingName);
             Console.WriteLine($"{thingName} was successfully created. The ARN value is {thingArn}");
             Console.WriteLine(new string('-', 80));
@@ -155,7 +155,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
             Console.WriteLine("2. Generate a device certificate.");
             Console.WriteLine("A device certificate performs a role in securing the communication between devices (Things) and the AWS IoT platform.");
             Console.WriteLine();
-            
+
             var createCert = "y";
             if (IsInteractive)
             {
@@ -327,7 +327,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
             Console.WriteLine("Creates a rule that is an administrator-level action.");
             Console.WriteLine("Any user who has permission to create rules will be able to access data processed by the rule.");
             Console.WriteLine();
-            
+
             if (IsInteractive)
             {
                 Console.Write("Enter Rule name: ");
@@ -342,7 +342,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
 
             // Deploy CloudFormation stack to create SNS topic and IAM role
             Console.WriteLine("Deploying CloudFormation stack to create SNS topic and IAM role...");
-            
+
             var deployStack = !IsInteractive || GetYesNoResponse("Would you like to deploy the CloudFormation stack? (y/n) ");
             if (deployStack)
             {
@@ -358,10 +358,10 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
                     {
                         snsTopicArn = stackOutputs["SNSTopicArn"];
                         string roleArn = stackOutputs["RoleArn"];
-                        
+
                         Console.WriteLine($"Successfully deployed stack. SNS topic: {snsTopicArn}");
                         Console.WriteLine($"Successfully deployed stack. IAM role: {roleArn}");
-                        
+
                         // Now create the IoT rule with the CloudFormation outputs
                         var ruleResult = await iotWrapper.CreateTopicRuleAsync(ruleName, snsTopicArn, roleArn);
                         if (ruleResult)
@@ -489,7 +489,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
                 Console.WriteLine(new string('-', 80));
                 Console.WriteLine("13. Clean up CloudFormation stack.");
                 Console.WriteLine("Deleting the CloudFormation stack and all resources...");
-                
+
                 var cleanup = !IsInteractive || GetYesNoResponse("Do you want to delete the CloudFormation stack and all resources? (y/n) ");
                 if (cleanup)
                 {
@@ -513,7 +513,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
         catch (Exception ex)
         {
             scenarioLogger.LogError(ex, "Error occurred during scenario execution.");
-            
+
             // Cleanup on error
             if (!string.IsNullOrEmpty(certificateArn) && !string.IsNullOrEmpty(thingName))
             {
@@ -527,7 +527,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
                     scenarioLogger.LogError(cleanupEx, "Error during cleanup.");
                 }
             }
-            
+
             if (!string.IsNullOrEmpty(thingName))
             {
                 try
@@ -552,7 +552,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo
                     scenarioLogger.LogError(cleanupEx, "Error during CloudFormation stack cleanup.");
                 }
             }
-            
+
             throw;
         }
     }
@@ -574,7 +574,7 @@ private static async Task<bool> DeployCloudFormationStack(string stackName, IAma
             {
                 StackName = stackName,
                 TemplateBody = await File.ReadAllTextAsync(_stackResourcePath),
-                Capabilities = new List<string>{ Capability.CAPABILITY_NAMED_IAM }
+                Capabilities = new List<string> { Capability.CAPABILITY_NAMED_IAM }
             };
 
             var response = await cloudFormationClient.CreateStackAsync(request);
@@ -676,7 +676,7 @@ private static async Task<bool> WaitForStackCompletion(string stackId, IAmazonCl
             };
 
             var response = await cloudFormationClient.DescribeStacksAsync(describeStacksRequest);
-            
+
             if (response.Stacks.Count > 0)
             {
                 var outputs = new Dictionary<string, string>();
@@ -686,7 +686,7 @@ private static async Task<bool> WaitForStackCompletion(string stackId, IAmazonCl
                 }
                 return outputs;
             }
-            
+
             return null;
         }
         catch (Exception ex)
@@ -813,4 +813,4 @@ private static string PromptUserForStackName()
         return _stackName;
     }
 }
-// snippet-end:[iot.dotnetv4.IoTScenario]
+// snippet-end:[iot.dotnetv4.IoTScenario]
diff --git a/dotnetv4/IoT/Scenarios/IoTBasics.csproj b/dotnetv4/IoT/Scenarios/IoTBasics.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="AWSSDK.IotData" Version="4.0.2.7" />
     <PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.2.7" />
     <PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.3.7" />
-    <PackageReference Include="AWSSDK.CloudFormation" Version="4.0.3.7" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="4.0.4" />
     <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.14" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
diff --git a/dotnetv4/IoT/Tests/IoTIntegrationTests.cs b/dotnetv4/IoT/Tests/IoTIntegrationTests.cs
@@ -61,4 +61,4 @@ public async Task TestScenarioIntegration()
                 It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
             Times.Never);
     }
-}
+}
diff --git a/dotnetv4/IoT/Tests/IoTTests.csproj b/dotnetv4/IoT/Tests/IoTTests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="AWSSDK.IoT" Version="4.0.3.7" />
     <PackageReference Include="AWSSDK.IotData" Version="4.0.2.7" />
-    <PackageReference Include="AWSSDK.CloudFormation" Version="4.0.3.7" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="4.0.4" />
     <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.14" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static async Task Main(string[] args)`
`42`	`42`	`Console.WriteLine($" Thing ARN: {thing.ThingArn}");`
`43`	`43`	`Console.WriteLine($" Thing Type: {thing.ThingTypeName ?? "No type specified"}");`
`44`	`44`	`Console.WriteLine($" Version: {thing.Version}");`
`45`		`-`
	`45`	`+`
`46`	`46`	`if (thing.Attributes?.Count > 0)`
`47`	`47`	`{`
`48`	`48`	`Console.WriteLine(" Attributes:");`
`@@ -72,4 +72,4 @@ public static async Task Main(string[] args)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`-// snippet-end:[iot.dotnetv4.Hello]`
	`75`	`+// snippet-end:[iot.dotnetv4.Hello]`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public async Task<List<Certificate>> ListCertificatesAsync()`
`209`	`209`	`{`
`210`	`210`	`var request = new ListCertificatesRequest();`
`211`	`211`	`var response = await _amazonIoT.ListCertificatesAsync(request);`
`212`		`-`
	`212`	`+`
`213`	`213`	`_logger.LogInformation($"Retrieved {response.Certificates.Count} certificates");`
`214`	`214`	`return response.Certificates;`
`215`	`215`	`}`
`@@ -278,7 +278,7 @@ public async Task<bool> UpdateThingShadowAsync(string thingName, string shadowPa`
`278`	`278`	`var response = await _amazonIotData.GetThingShadowAsync(request);`
`279`	`279`	`using var reader = new StreamReader(response.Payload);`
`280`	`280`	`var shadowData = await reader.ReadToEndAsync();`
`281`		`-`
	`281`	`+`
`282`	`282`	`_logger.LogInformation($"Retrieved shadow for Thing {thingName}");`
`283`	`283`	`return shadowData;`
`284`	`284`	`}`
`@@ -357,7 +357,7 @@ public async Task<List<TopicRuleListItem>> ListTopicRulesAsync()`
`357`	`357`	`{`
`358`	`358`	`var request = new ListTopicRulesRequest();`
`359`	`359`	`var response = await _amazonIoT.ListTopicRulesAsync(request);`
`360`		`-`
	`360`	`+`
`361`	`361`	`_logger.LogInformation($"Retrieved {response.Rules.Count} IoT rules");`
`362`	`362`	`return response.Rules;`
`363`	`363`	`}`
`@@ -607,7 +607,7 @@ public async Task<List<ThingAttribute>> ListThingsAsync()`
`607`	`607`	`{`
`608`	`608`	`var request = new ListThingsRequest();`
`609`	`609`	`var response = await _amazonIoT.ListThingsAsync(request);`
`610`		`-`
	`610`	`+`
`611`	`611`	`_logger.LogInformation($"Retrieved {response.Things.Count} Things");`
`612`	`612`	`return response.Things;`
`613`	`613`	`}`
`@@ -625,4 +625,4 @@ public async Task<List<ThingAttribute>> ListThingsAsync()`
`625`	`625`	`// snippet-end:[iot.dotnetv4.ListThings]`
`626`	`626`
`627`	`627`	`}`
`628`		`-// snippet-end:[iot.dotnetv4.IoTWrapper]`
	`628`	`+// snippet-end:[iot.dotnetv4.IoTWrapper]`
Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,13 @@ public static async Task Main(string[] args)`
`43`	`43`	`// Set up dependency injection for the Amazon service.`
`44`	`44`	`using var host = Host.CreateDefaultBuilder(args)`
`45`	`45`	`.ConfigureServices((_, services) =>`
`46`		`- services.AddAWSService<IAmazonIoT>(new AWSOptions(){Region = RegionEndpoint.USEast1})`
	`46`	`+ services.AddAWSService<IAmazonIoT>(new AWSOptions() { Region = RegionEndpoint.USEast1 })`
`47`	`47`	`.AddAWSService<IAmazonCloudFormation>()`
`48`	`48`	`.AddTransient<IoTWrapper>()`
`49`	`49`	`.AddLogging(builder => builder.AddConsole())`
`50`	`50`	`.AddSingleton<IAmazonIotData>(sp =>`
`51`	`51`	`{`
`52`		`- var iotService = sp.GetService<IAmazonIoT>();`
	`52`	`+ var iotService = sp.GetRequiredService<IAmazonIoT>();`
`53`	`53`	`var request = new DescribeEndpointRequest`
`54`	`54`	`{`
`55`	`55`	`EndpointType = "iot:Data-ATS"`
`@@ -133,7 +133,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`133`	`133`	`Console.WriteLine("1. Create an AWS IoT Thing.");`
`134`	`134`	`Console.WriteLine("An AWS IoT Thing represents a virtual entity in the AWS IoT service that can be associated with a physical device.");`
`135`	`135`	`Console.WriteLine();`
`136`		`-`
	`136`	`+`
`137`	`137`	`if (IsInteractive)`
`138`	`138`	`{`
`139`	`139`	`Console.Write("Enter Thing name: ");`
`@@ -145,7 +145,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`145`	`145`	`{`
`146`	`146`	`Console.WriteLine($"Using default Thing name: {thingName}");`
`147`	`147`	`}`
`148`		`-`
	`148`	`+`
`149`	`149`	`var thingArn = await iotWrapper.CreateThingAsync(thingName);`
`150`	`150`	`Console.WriteLine($"{thingName} was successfully created. The ARN value is {thingArn}");`
`151`	`151`	`Console.WriteLine(new string('-', 80));`
`@@ -155,7 +155,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`155`	`155`	`Console.WriteLine("2. Generate a device certificate.");`
`156`	`156`	`Console.WriteLine("A device certificate performs a role in securing the communication between devices (Things) and the AWS IoT platform.");`
`157`	`157`	`Console.WriteLine();`
`158`		`-`
	`158`	`+`
`159`	`159`	`var createCert = "y";`
`160`	`160`	`if (IsInteractive)`
`161`	`161`	`{`
`@@ -327,7 +327,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`327`	`327`	`Console.WriteLine("Creates a rule that is an administrator-level action.");`
`328`	`328`	`Console.WriteLine("Any user who has permission to create rules will be able to access data processed by the rule.");`
`329`	`329`	`Console.WriteLine();`
`330`		`-`
	`330`	`+`
`331`	`331`	`if (IsInteractive)`
`332`	`332`	`{`
`333`	`333`	`Console.Write("Enter Rule name: ");`
`@@ -342,7 +342,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`342`	`342`
`343`	`343`	`// Deploy CloudFormation stack to create SNS topic and IAM role`
`344`	`344`	`Console.WriteLine("Deploying CloudFormation stack to create SNS topic and IAM role...");`
`345`		`-`
	`345`	`+`
`346`	`346`	`var deployStack = !IsInteractive \|\| GetYesNoResponse("Would you like to deploy the CloudFormation stack? (y/n) ");`
`347`	`347`	`if (deployStack)`
`348`	`348`	`{`
`@@ -358,10 +358,10 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`358`	`358`	`{`
`359`	`359`	`snsTopicArn = stackOutputs["SNSTopicArn"];`
`360`	`360`	`string roleArn = stackOutputs["RoleArn"];`
`361`		`-`
	`361`	`+`
`362`	`362`	`Console.WriteLine($"Successfully deployed stack. SNS topic: {snsTopicArn}");`
`363`	`363`	`Console.WriteLine($"Successfully deployed stack. IAM role: {roleArn}");`
`364`		`-`
	`364`	`+`
`365`	`365`	`// Now create the IoT rule with the CloudFormation outputs`
`366`	`366`	`var ruleResult = await iotWrapper.CreateTopicRuleAsync(ruleName, snsTopicArn, roleArn);`
`367`	`367`	`if (ruleResult)`
`@@ -489,7 +489,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`489`	`489`	`Console.WriteLine(new string('-', 80));`
`490`	`490`	`Console.WriteLine("13. Clean up CloudFormation stack.");`
`491`	`491`	`Console.WriteLine("Deleting the CloudFormation stack and all resources...");`
`492`		`-`
	`492`	`+`
`493`	`493`	`var cleanup = !IsInteractive \|\| GetYesNoResponse("Do you want to delete the CloudFormation stack and all resources? (y/n) ");`
`494`	`494`	`if (cleanup)`
`495`	`495`	`{`
`@@ -513,7 +513,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`513`	`513`	`catch (Exception ex)`
`514`	`514`	`{`
`515`	`515`	`scenarioLogger.LogError(ex, "Error occurred during scenario execution.");`
`516`		`-`
	`516`	`+`
`517`	`517`	`// Cleanup on error`
`518`	`518`	`if (!string.IsNullOrEmpty(certificateArn) && !string.IsNullOrEmpty(thingName))`
`519`	`519`	`{`
`@@ -527,7 +527,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`527`	`527`	`scenarioLogger.LogError(cleanupEx, "Error during cleanup.");`
`528`	`528`	`}`
`529`	`529`	`}`
`530`		`-`
	`530`	`+`
`531`	`531`	`if (!string.IsNullOrEmpty(thingName))`
`532`	`532`	`{`
`533`	`533`	`try`
`@@ -552,7 +552,7 @@ private static async Task RunScenarioInternalAsync(IoTWrapper iotWrapper, IAmazo`
`552`	`552`	`scenarioLogger.LogError(cleanupEx, "Error during CloudFormation stack cleanup.");`
`553`	`553`	`}`
`554`	`554`	`}`
`555`		`-`
	`555`	`+`
`556`	`556`	`throw;`
`557`	`557`	`}`
`558`	`558`	`}`
`@@ -574,7 +574,7 @@ private static async Task<bool> DeployCloudFormationStack(string stackName, IAma`
`574`	`574`	`{`
`575`	`575`	`StackName = stackName,`
`576`	`576`	`TemplateBody = await File.ReadAllTextAsync(_stackResourcePath),`
`577`		`- Capabilities = new List<string>{ Capability.CAPABILITY_NAMED_IAM }`
	`577`	`+ Capabilities = new List<string> { Capability.CAPABILITY_NAMED_IAM }`
`578`	`578`	`};`
`579`	`579`
`580`	`580`	`var response = await cloudFormationClient.CreateStackAsync(request);`
`@@ -676,7 +676,7 @@ private static async Task<bool> WaitForStackCompletion(string stackId, IAmazonCl`
`676`	`676`	`};`
`677`	`677`
`678`	`678`	`var response = await cloudFormationClient.DescribeStacksAsync(describeStacksRequest);`
`679`		`-`
	`679`	`+`
`680`	`680`	`if (response.Stacks.Count > 0)`
`681`	`681`	`{`
`682`	`682`	`var outputs = new Dictionary<string, string>();`
`@@ -686,7 +686,7 @@ private static async Task<bool> WaitForStackCompletion(string stackId, IAmazonCl`
`686`	`686`	`}`
`687`	`687`	`return outputs;`
`688`	`688`	`}`
`689`		`-`
	`689`	`+`
`690`	`690`	`return null;`
`691`	`691`	`}`
`692`	`692`	`catch (Exception ex)`
`@@ -813,4 +813,4 @@ private static string PromptUserForStackName()`
`813`	`813`	`return _stackName;`
`814`	`814`	`}`
`815`	`815`	`}`
`816`		`-// snippet-end:[iot.dotnetv4.IoTScenario]`
	`816`	`+// snippet-end:[iot.dotnetv4.IoTScenario]`
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,4 @@ public async Task TestScenarioIntegration()`
`61`	`61`	`It.IsAny<Func<It.IsAnyType, Exception?, string>>()),`
`62`	`62`	`Times.Never);`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`