Updates for EC2.

rlhagerm · rlhagerm · commit 93485bf7588b · 2025-01-24T11:39:40.000-06:00
diff --git a/dotnetv4/EC2/Actions/EC2Wrapper.cs b/dotnetv4/EC2/Actions/EC2Wrapper.cs
@@ -288,34 +288,6 @@ public async Task<string> CreateSecurityGroup(string groupName, string groupDesc
 
     // snippet-end:[EC2.dotnetv4.CreateSecurityGroup]
 
-    // snippet-start:[EC2.dotnetv4.CreateVPC]
-    /// <summary>
-    /// Create a new Amazon EC2 VPC.
-    /// </summary>
-    /// <param name="cidrBlock">The CIDR block for the new security group.</param>
-    /// <returns>The VPC Id of the new VPC.</returns>
-    public async Task<string?> CreateVPC(string cidrBlock)
-    {
-
-        try
-        {
-            var response = await _amazonEC2.CreateVpcAsync(new CreateVpcRequest
-            {
-                CidrBlock = cidrBlock,
-            });
-
-            Vpc vpc = response.Vpc;
-            Console.WriteLine($"Created VPC with ID: {vpc.VpcId}.");
-            return vpc.VpcId;
-        }
-        catch (AmazonEC2Exception ex)
-        {
-            Console.WriteLine($"Couldn't create VPC because: {ex.Message}");
-            return null;
-        }
-    }
-    // snippet-end:[EC2.dotnetv4.CreateVPC]
-
     // snippet-start:[EC2.dotnetv4.DeleteKeyPair]
     /// <summary>
     /// Delete an Amazon EC2 key pair.
@@ -391,24 +363,6 @@ await _amazonEC2.DeleteSecurityGroupAsync(
     }
     // snippet-end:[EC2.dotnetv4.DeleteSecurityGroup]
 
-    // snippet-start:[EC2.dotnetv4.DeleteVPC]
-    /// <summary>
-    /// Delete an Amazon EC2 VPC.
-    /// </summary>
-    /// <returns>A Boolean value indicating the success of the action.</returns>
-    public async Task<bool> DeleteVpc(string vpcId)
-    {
-        var request = new DeleteVpcRequest
-        {
-            VpcId = vpcId,
-        };
-
-        var response = await _amazonEC2.DeleteVpcAsync(request);
-
-        return response.HttpStatusCode == System.Net.HttpStatusCode.OK;
-    }
-    // snippet-end:[EC2.dotnetv4.DeleteVPC]
-
     // snippet-start:[EC2.dotnetv4.DescribeImages]
     /// <summary>
     /// Get information about existing Amazon EC2 images.
@@ -428,20 +382,6 @@ public async Task<List<Image>> DescribeImages(List<string>? imageIds)
         return response.Images;
     }
 
-    /// <summary>
-    /// Display the information returned by DescribeImages.
-    /// </summary>
-    /// <param name="images">The list of image information to display.</param>
-    public void DisplayImageInfo(List<Image> images)
-    {
-        images.ForEach(image =>
-        {
-            Console.WriteLine($"{image.Name} Created on: {image.CreationDate}");
-        });
-
-    }
-    // snippet-end:[EC2.dotnetv4.DescribeImages]
-
     // snippet-start:[EC2.dotnetv4.DescribeInstance]
     /// <summary>
     /// Get information about an Amazon EC2 instance.
@@ -471,62 +411,6 @@ public void DisplayInstanceInformation(Instance instance)
     }
     // snippet-end:[EC2.dotnetv4.DescribeInstance]
 
-    // snippet-start:[EC2.dotnetv4.DescribeInstances]
-    /// <summary>
-    /// Get information about EC2 instances with a particular state.
-    /// </summary>
-    /// <param name="tagName">The name of the tag to filter on.</param>
-    /// <param name="tagValue">The value of the tag to look for.</param>
-    /// <returns>True if successful.</returns>
-    public async Task<bool> GetInstancesWithState(string state)
-    {
-        try
-        {
-            // Filters the results of the instance list.
-            var filters = new List<Filter>
-            {
-                new Filter
-                {
-                    Name = $"instance-state-name",
-                    Values = new List<string> { state, },
-                },
-            };
-            var request = new DescribeInstancesRequest { Filters = filters, };
-
-            Console.WriteLine($"\nShowing instances with state {state}");
-            var paginator = _amazonEC2.Paginators.DescribeInstances(request);
-
-            await foreach (var response in paginator.Responses)
-            {
-                foreach (var reservation in response.Reservations)
-                {
-                    foreach (var instance in reservation.Instances)
-                    {
-                        Console.Write($"Instance ID: {instance.InstanceId} ");
-                        Console.WriteLine($"\tCurrent State: {instance.State.Name}");
-                    }
-                }
-            }
-
-            return true;
-        }
-        catch (AmazonEC2Exception ec2Exception)
-        {
-            if (ec2Exception.ErrorCode == "InvalidParameterValue")
-            {
-                _logger.LogError(
-                    $"Invalid parameter value for filtering instances.");
-            }
-
-            return false;
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"Couldn't list instances because: {ex.Message}");
-            return false;
-        }
-    }
-    // snippet-end:[EC2.dotnetv4.DescribeInstances]
 
     // snippet-start:[EC2.dotnetv4.DescribeInstanceTypes]
     /// <summary>
@@ -585,6 +469,7 @@ public async Task<List<KeyPairInfo>> DescribeKeyPairs(string keyPairName)
     {
         try
         {
+            var pairs = new List<KeyPairInfo>();
             var request = new DescribeKeyPairsRequest();
             if (!string.IsNullOrEmpty(keyPairName))
             {
@@ -595,7 +480,12 @@ public async Task<List<KeyPairInfo>> DescribeKeyPairs(string keyPairName)
             }
 
             var response = await _amazonEC2.DescribeKeyPairsAsync(request);
-            return response.KeyPairs.ToList();
+            if (response.KeyPairs != null)
+            {
+                pairs = response.KeyPairs.ToList();
+            }
+            return pairs;
+
         }
         catch (AmazonEC2Exception ec2Exception)
         {
@@ -674,36 +564,36 @@ public void DisplaySecurityGroupInfoAsync(SecurityGroup securityGroup)
     {
         Console.WriteLine($"{securityGroup.GroupName}");
         Console.WriteLine("Ingress permissions:");
-        securityGroup.IpPermissions.ForEach(permission =>
+        securityGroup.IpPermissions?.ForEach(permission =>
         {
             Console.WriteLine($"\tFromPort: {permission.FromPort}");
             Console.WriteLine($"\tIpProtocol: {permission.IpProtocol}");
 
             Console.Write($"\tIpv4Ranges: ");
-            permission.Ipv4Ranges.ForEach(range => { Console.Write($"{range.CidrIp} "); });
+            permission.Ipv4Ranges?.ForEach(range => { Console.Write($"{range.CidrIp} "); });
 
             Console.WriteLine($"\n\tIpv6Ranges:");
-            permission.Ipv6Ranges.ForEach(range => { Console.Write($"{range.CidrIpv6} "); });
+            permission.Ipv6Ranges?.ForEach(range => { Console.Write($"{range.CidrIpv6} "); });
 
             Console.Write($"\n\tPrefixListIds: ");
-            permission.PrefixListIds.ForEach(id => Console.Write($"{id.Id} "));
+            permission.PrefixListIds?.ForEach(id => Console.Write($"{id.Id} "));
 
             Console.WriteLine($"\n\tTo Port: {permission.ToPort}");
         });
         Console.WriteLine("Egress permissions:");
-        securityGroup.IpPermissionsEgress.ForEach(permission =>
+        securityGroup.IpPermissionsEgress?.ForEach(permission =>
         {
             Console.WriteLine($"\tFromPort: {permission.FromPort}");
             Console.WriteLine($"\tIpProtocol: {permission.IpProtocol}");
 
             Console.Write($"\tIpv4Ranges: ");
-            permission.Ipv4Ranges.ForEach(range => { Console.Write($"{range.CidrIp} "); });
+            permission.Ipv4Ranges?.ForEach(range => { Console.Write($"{range.CidrIp} "); });
 
             Console.WriteLine($"\n\tIpv6Ranges:");
-            permission.Ipv6Ranges.ForEach(range => { Console.Write($"{range.CidrIpv6} "); });
+            permission.Ipv6Ranges?.ForEach(range => { Console.Write($"{range.CidrIpv6} "); });
 
             Console.Write($"\n\tPrefixListIds: ");
-            permission.PrefixListIds.ForEach(id => Console.Write($"{id.Id} "));
+            permission.PrefixListIds?.ForEach(id => Console.Write($"{id.Id} "));
 
             Console.WriteLine($"\n\tTo Port: {permission.ToPort}");
         });
@@ -744,60 +634,6 @@ public async Task<bool> DisassociateIp(string associationId)
     }
     // snippet-end:[EC2.dotnetv4.DisassociateAddress]
 
-    // snippet-start:[EC2.dotnetv4.GetAMIList]
-    /// <summary>
-    /// Retrieve a list of available Amazon Linux images.
-    /// </summary>
-    /// <returns>A list of image information.</returns>
-    public async Task<List<Image>> GetEC2AmiList()
-    {
-        var filter = new Filter { Name = "architecture", Values = new List<string> { "x86_64" } };
-        var filters = new List<Filter> { filter };
-        var response = await _amazonEC2.DescribeImagesAsync(new DescribeImagesRequest { Filters = filters });
-        return response.Images;
-    }
-    // snippet-end:[EC2.dotnetv4.GetAMIList]
-
-    // snippet-start:[EC2.dotnetv4.RebootInstances]
-    /// <summary>
-    /// Reboot a specific EC2 instance.
-    /// </summary>
-    /// <param name="ec2InstanceId">The instance Id of the instance that will be rebooted.</param>
-    /// <returns>Async Task.</returns>
-    public async Task<bool> RebootInstances(string ec2InstanceId)
-    {
-        try
-        {
-            var request = new RebootInstancesRequest
-            {
-                InstanceIds = new List<string> { ec2InstanceId },
-            };
-
-            await _amazonEC2.RebootInstancesAsync(request);
-
-            // Wait for the instance to be running.
-            Console.Write("Waiting for the instance to start.");
-            await WaitForInstanceState(ec2InstanceId, InstanceStateName.Running);
-
-            return true;
-        }
-        catch (AmazonEC2Exception ec2Exception)
-        {
-            if (ec2Exception.ErrorCode == "InvalidInstanceId")
-            {
-                _logger.LogError(
-                    $"InstanceId {ec2InstanceId} is invalid, unable to reboot. {ec2Exception.Message}");
-            }
-            return false;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(
-                $"An error occurred while rebooting the instance {ec2InstanceId}.: {ex.Message}");
-            return false;
-        }
-    }
-    // snippet-end:[EC2.dotnetv4.RebootInstances]
 
     // snippet-start:[EC2.dotnetv4.ReleaseAddress]
     /// <summary>
@@ -812,8 +648,8 @@ public async Task<bool> ReleaseAddress(string allocationId)
         {
             var request = new ReleaseAddressRequest { AllocationId = allocationId };
 
-            var response = await _amazonEC2.ReleaseAddressAsync(request);
-            return response.HttpStatusCode == HttpStatusCode.OK;
+            await _amazonEC2.ReleaseAddressAsync(request);
+            return true;
         }
         catch (AmazonEC2Exception ec2Exception)
         {
diff --git a/dotnetv4/EC2/Actions/HelloEC2.cs b/dotnetv4/EC2/Actions/HelloEC2.cs
@@ -28,7 +28,7 @@ static async Task Main(string[] args)
         try
         {
             // Retrieve information for up to 10 Amazon EC2 security groups.
-            var request = new DescribeSecurityGroupsRequest { MaxResults = 10, };
+            var request = new DescribeSecurityGroupsRequest { MaxResults = 10 };
             var securityGroups = new List<SecurityGroup>();
 
             var paginatorForSecurityGroups =
diff --git a/dotnetv4/EC2/EC2Examples.sln b/dotnetv4/EC2/EC2Examples.sln
@@ -12,10 +12,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basics", "Scenarios\EC2_Bas
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EC2Tests", "Tests\EC2Tests.csproj", "{6046A2FC-6A39-4C2D-8DD9-AA3740B17B88}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateVPCExample", "Scenarios\CreateVPCExample\CreateVPCExample.csproj", "{A0B25DB2-E0BE-409F-950D-19E23FB76319}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateVPCforS3Example", "Scenarios\CreateVPCforS3Example\CreateVPCforS3Example.csproj", "{CB5A94D4-1BA1-41CE-B5AE-7CE906B4CA7D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,14 +30,6 @@ Global
 		{6046A2FC-6A39-4C2D-8DD9-AA3740B17B88}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6046A2FC-6A39-4C2D-8DD9-AA3740B17B88}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6046A2FC-6A39-4C2D-8DD9-AA3740B17B88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0B25DB2-E0BE-409F-950D-19E23FB76319}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0B25DB2-E0BE-409F-950D-19E23FB76319}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0B25DB2-E0BE-409F-950D-19E23FB76319}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0B25DB2-E0BE-409F-950D-19E23FB76319}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB5A94D4-1BA1-41CE-B5AE-7CE906B4CA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB5A94D4-1BA1-41CE-B5AE-7CE906B4CA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB5A94D4-1BA1-41CE-B5AE-7CE906B4CA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB5A94D4-1BA1-41CE-B5AE-7CE906B4CA7D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/dotnetv4/EC2/README.md b/dotnetv4/EC2/README.md
@@ -49,36 +49,20 @@ Code excerpts that show you how to call individual service functions.
 - [AssociateAddress](Actions/EC2Wrapper.cs#L64)
 - [AuthorizeSecurityGroupIngress](Actions/EC2Wrapper.cs#L107)
 - [CreateKeyPair](Actions/EC2Wrapper.cs#L170)
-- [CreateLaunchTemplate](../cross-service/ResilientService/AutoScalerActions/AutoScalerWrapper.cs#L263)
 - [CreateSecurityGroup](Actions/EC2Wrapper.cs#L242)
 - [DeleteKeyPair](Actions/EC2Wrapper.cs#L319)
-- [DeleteLaunchTemplate](../cross-service/ResilientService/AutoScalerActions/AutoScalerWrapper.cs#L470)
 - [DeleteSecurityGroup](Actions/EC2Wrapper.cs#L361)
-- [DescribeAvailabilityZones](../cross-service/ResilientService/AutoScalerActions/AutoScalerWrapper.cs#L325)
-- [DescribeIamInstanceProfileAssociations](../cross-service/ResilientService/AutoScalerActions/AutoScalerWrapper.cs#L574)
 - [DescribeInstanceTypes](Actions/EC2Wrapper.cs#L531)
 - [DescribeInstances](Actions/EC2Wrapper.cs#L474)
 - [DescribeKeyPairs](Actions/EC2Wrapper.cs#L578)
 - [DescribeSecurityGroups](Actions/EC2Wrapper.cs#L620)
-- [DescribeSubnets](../cross-service/ResilientService/AutoScalerActions/AutoScalerWrapper.cs#L422)
-- [DescribeVpcs](../cross-service/ResilientService/AutoScalerActions/AutoScalerWrapper.cs#L386)
 - [DisassociateAddress](Actions/EC2Wrapper.cs#L714)
-- [RebootInstances](Actions/EC2Wrapper.cs#L761)
 - [ReleaseAddress](Actions/EC2Wrapper.cs#L802)
-- [ReplaceIamInstanceProfileAssociation](../cross-service/ResilientService/AutoScalerActions/AutoScalerWrapper.cs#L611)
 - [RunInstances](Actions/EC2Wrapper.cs#L837)
 - [StartInstances](Actions/EC2Wrapper.cs#L890)
 - [StopInstances](Actions/EC2Wrapper.cs#L930)
 - [TerminateInstances](Actions/EC2Wrapper.cs#L971)
 
-### Scenarios
-
-Code examples that show you how to accomplish a specific task by calling multiple
-functions within the same service.
-
-- [Build and manage a resilient service](../cross-service/ResilientService/ResilientServiceWorkflow/ResilientServiceWorkflow.cs)
-
-
 <!--custom.examples.start-->
 <!--custom.examples.end-->
 
@@ -87,7 +71,7 @@ functions within the same service.
 ### Instructions
 
 For general instructions to run the examples, see the
-[README](../README.md#building-and-running-the-code-examples) in the `dotnetv3` folder.
+[README](../README.md#building-and-running-the-code-examples) in the `dotnetv4` folder.
 
 Some projects might include a settings.json file. Before compiling the project,
 you can change these values to match your own account and resources. Alternatively,
@@ -129,32 +113,13 @@ This example shows you how to do the following:
 <!--custom.basics.ec2_Scenario_GetStartedInstances.start-->
 <!--custom.basics.ec2_Scenario_GetStartedInstances.end-->
 
-
-#### Build and manage a resilient service
-
-This example shows you how to create a load-balanced web service that returns book, movie, and song recommendations. The example shows how the service responds to failures, and how to restructure the service for more resilience when failures occur.
-
-- Use an Amazon EC2 Auto Scaling group to create Amazon Elastic Compute Cloud (Amazon EC2) instances based on a launch template and to keep the number of instances in a specified range.
-- Handle and distribute HTTP requests with Elastic Load Balancing.
-- Monitor the health of instances in an Auto Scaling group and forward requests only to healthy instances.
-- Run a Python web server on each EC2 instance to handle HTTP requests. The web server responds with recommendations and health checks.
-- Simulate a recommendation service with an Amazon DynamoDB table.
-- Control web server response to requests and health checks by updating AWS Systems Manager parameters.
-
-<!--custom.scenario_prereqs.cross_ResilientService.start-->
-<!--custom.scenario_prereqs.cross_ResilientService.end-->
-
-
-<!--custom.scenarios.cross_ResilientService.start-->
-<!--custom.scenarios.cross_ResilientService.end-->
-
 ### Tests
 
 ⚠ Running tests might result in charges to your AWS account.
 
 
 To find instructions for running these tests, see the [README](../README.md#Tests)
-in the `dotnetv3` folder.
+in the `dotnetv4` folder.
 
 
 
diff --git a/dotnetv4/EC2/Tests/Usings.cs b/dotnetv4/EC2/Tests/Usings.cs

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static async Task Main(string[] args)`
`28`	`28`	`try`
`29`	`29`	`{`
`30`	`30`	`// Retrieve information for up to 10 Amazon EC2 security groups.`
`31`		`- var request = new DescribeSecurityGroupsRequest { MaxResults = 10, };`
	`31`	`+ var request = new DescribeSecurityGroupsRequest { MaxResults = 10 };`
`32`	`32`	`var securityGroups = new List<SecurityGroup>();`
`33`	`33`
`34`	`34`	`var paginatorForSecurityGroups =`