Skip to content

Commit 54c3b82

Browse files
rlhagermrlhagerm
authored
.NET v3: Update to .NET 6 and enable Weathertop tests (#5902)
1 parent 7486a1a commit 54c3b82

File tree

261 files changed

+595
-634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+595
-634
lines changed

‎.github/workflows/super-linter.yml

-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ jobs:
3636
VALIDATE_PYTHON_BLACK: true
3737
VALIDATE_RUBY: true
3838
VALIDATE_KOTLIN: true
39-
VALIDATE_EDITORCONFIG: true
4039
VALIDATE_BASH: true

‎dotnetv3/.editorconfig

+4
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ csharp_space_between_square_brackets = false
129129
###############################
130130
# File header.
131131
file_header_template = Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. \nSPDX-License-Identifier: Apache-2.0
132+
# SA0001: XML comment disable is allowed.
133+
dotnet_diagnostic.SA0001.severity = none
132134
# SA1600: Elements must be documented is disabled.
133135
dotnet_diagnostic.SA1600.severity = none
134136
dotnet_diagnostic.SA1615.severity = none
@@ -151,3 +153,5 @@ dotnet_diagnostic.SA1309.severity = none
151153
dotnet_diagnostic.IDE2000.severity = error
152154
# IDE0073: Require a file header.
153155
dotnet_diagnostic.IDE0073.severity = error
156+
# CA1416: Disable system.drawing warnings.
157+
dotnet_diagnostic.CA1416.severity = none

‎dotnetv3/ACM/DescribeCertificates/DescribeCertificate/DescribeCertificate.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace DescribeCertificate
1212
{
1313
class DescribeCertificate
1414
{
15-
// The following example retrieves and displays the metadate for a
15+
// The following example retrieves and displays the metadata for a
1616
// certificate using the AWS Certificate Manager (ACM) service.
1717

1818
// Specify your AWS Region (an example Region is shown).
@@ -21,7 +21,7 @@ class DescribeCertificate
2121

2222
static void Main(string[] args)
2323
{
24-
var _client = new Amazon.CertificateManager.AmazonCertificateManagerClient(ACMRegion);
24+
_client = new Amazon.CertificateManager.AmazonCertificateManagerClient(ACMRegion);
2525

2626
var describeCertificateReq = new DescribeCertificateRequest();
2727
// The ARN used here is just an example. Replace it with the ARN of

‎dotnetv3/ACM/DescribeCertificates/DescribeCertificate/DescribeCertificate.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎dotnetv3/ACM/DescribeCertificates/DescribeCertificateTest/DescribeCertificateTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎dotnetv3/ACM/ListCertificates/ListCertificates/ListCertificates.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ListCertificates
2323

2424
static void Main(string[] args)
2525
{
26-
var _client = new AmazonCertificateManagerClient(ACMRegion);
26+
_client = new AmazonCertificateManagerClient(ACMRegion);
2727
var certificateList = ListCertificatesResponseAsync(client: _client);
2828

2929
Console.WriteLine("Certificate Summary List\n");

‎dotnetv3/ACM/ListCertificates/ListCertificates/ListCertificates.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎dotnetv3/ACM/ListCertificates/ListCertificatesTest/ListCertificatesTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎dotnetv3/AutoScaling/Tests/AutoScalingWrapperTests.cs

+30-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public AutoScalingWrapperTests()
7070
[Fact()]
7171
[Order(1)]
7272
[Trait("Category", "Integration")]
73+
[Trait("Category", "Weathertop")]
7374
public async Task CreateLaunchTemplateAsyncTest()
7475
{
7576
_launchTemplateId = await _ec2Wrapper.CreateLaunchTemplateAsync(_imageId!, _instanceType!, _launchTemplateName!);
@@ -83,6 +84,7 @@ public async Task CreateLaunchTemplateAsyncTest()
8384
[Fact()]
8485
[Order(2)]
8586
[Trait("Category", "Integration")]
87+
[Trait("Category", "Weathertop")]
8688
public async Task DescribeLaunchTemplateAsyncTest()
8789
{
8890
var success = await _ec2Wrapper.DescribeLaunchTemplateAsync(_launchTemplateName!);
@@ -97,6 +99,7 @@ public async Task DescribeLaunchTemplateAsyncTest()
9799
[Fact()]
98100
[Order(3)]
99101
[Trait("Category", "Integration")]
102+
[Trait("Category", "Weathertop")]
100103
public async Task CreateAutoScalingGroupTest()
101104
{
102105
var availabilityZone =
@@ -114,6 +117,7 @@ public async Task CreateAutoScalingGroupTest()
114117
[Fact()]
115118
[Order(4)]
116119
[Trait("Category", "Integration")]
120+
[Trait("Category", "Weathertop")]
117121
public async Task DescribeAutoScalingInstancesAsyncTest()
118122
{
119123
var instanceDetails = await _autoScalingWrapper.DescribeAutoScalingInstancesAsync(_groupName!);
@@ -127,6 +131,7 @@ public async Task DescribeAutoScalingInstancesAsyncTest()
127131
[Fact()]
128132
[Order(5)]
129133
[Trait("Category", "Integration")]
134+
[Trait("Category", "Weathertop")]
130135
public async Task EnableMetricsCollectionAsyncTest()
131136
{
132137
var success = await _autoScalingWrapper.EnableMetricsCollectionAsync(_groupName!);
@@ -143,6 +148,7 @@ public async Task EnableMetricsCollectionAsyncTest()
143148
[Fact()]
144149
[Order(6)]
145150
[Trait("Category", "Integration")]
151+
[Trait("Category", "Weathertop")]
146152
public async Task SetDesiredCapacityAsyncTest()
147153
{
148154
var newMax = 3;
@@ -167,6 +173,7 @@ public async Task SetDesiredCapacityAsyncTest()
167173
[Fact()]
168174
[Order(7)]
169175
[Trait("Category", "Integration")]
176+
[Trait("Category", "Weathertop")]
170177
public async Task UpdateAutoScalingGroupTest()
171178
{
172179
var newMax = 3;
@@ -189,6 +196,7 @@ public async Task UpdateAutoScalingGroupTest()
189196
[Fact()]
190197
[Order(8)]
191198
[Trait("Category", "Integration")]
199+
[Trait("Category", "Weathertop")]
192200
public async Task DescribeAutoScalingGroupsAsyncTest()
193201
{
194202
var details = await _autoScalingWrapper.DescribeAutoScalingGroupsAsync(_groupName!);
@@ -203,6 +211,7 @@ public async Task DescribeAutoScalingGroupsAsyncTest()
203211
[Fact()]
204212
[Order(9)]
205213
[Trait("Category", "Integration")]
214+
[Trait("Category", "Weathertop")]
206215
public async Task DescribeScalingActivitiesAsyncTest()
207216
{
208217
var activities = await _autoScalingWrapper.DescribeScalingActivitiesAsync(_groupName!);
@@ -217,6 +226,7 @@ public async Task DescribeScalingActivitiesAsyncTest()
217226
[Fact()]
218227
[Order(10)]
219228
[Trait("Category", "Integration")]
229+
[Trait("Category", "Weathertop")]
220230
public async Task GetCloudWatchMetricsAsyncTest()
221231
{
222232
var metrics = await _cloudWatchWrapper.GetCloudWatchMetricsAsync(_groupName!);
@@ -231,6 +241,7 @@ public async Task GetCloudWatchMetricsAsyncTest()
231241
[Fact()]
232242
[Order(11)]
233243
[Trait("Category", "Integration")]
244+
[Trait("Category", "Weathertop")]
234245
public async Task GetMetricStatisticsAsyncTest()
235246
{
236247
var dataPoints = await _cloudWatchWrapper.GetMetricStatisticsAsync(_groupName!);
@@ -245,6 +256,7 @@ public async Task GetMetricStatisticsAsyncTest()
245256
[Fact()]
246257
[Order(12)]
247258
[Trait("Category", "Integration")]
259+
[Trait("Category", "Weathertop")]
248260
public async Task DisableMetricsCollectionAsyncTest()
249261
{
250262
var success = await _autoScalingWrapper.DisableMetricsCollectionAsync(_groupName!);
@@ -260,6 +272,7 @@ public async Task DisableMetricsCollectionAsyncTest()
260272
[Fact()]
261273
[Order(13)]
262274
[Trait("Category", "Integration")]
275+
[Trait("Category", "Weathertop")]
263276
public async Task TerminateInstanceInAutoScalingGroupAsyncTest()
264277
{
265278
foreach (var group in _groups!)
@@ -268,7 +281,20 @@ public async Task TerminateInstanceInAutoScalingGroupAsyncTest()
268281
{
269282
foreach (Amazon.AutoScaling.Model.Instance instance in group.Instances)
270283
{
271-
var success = await _autoScalingWrapper.TerminateInstanceInAutoScalingGroupAsync(instance.InstanceId);
284+
var retries = 3;
285+
var success = false;
286+
while (retries > 0 && !success)
287+
try
288+
{
289+
success =
290+
await _autoScalingWrapper
291+
.TerminateInstanceInAutoScalingGroupAsync(
292+
instance.InstanceId);
293+
}
294+
catch (ScalingActivityInProgressException)
295+
{
296+
retries--;
297+
}
272298
Assert.True(success, "Could not terminate the instance.");
273299
}
274300
}
@@ -283,6 +309,7 @@ public async Task TerminateInstanceInAutoScalingGroupAsyncTest()
283309
[Fact()]
284310
[Order(14)]
285311
[Trait("Category", "Integration")]
312+
[Trait("Category", "Weathertop")]
286313
public async Task DeleteAutoScalingGroupTest()
287314
{
288315
var success = await _autoScalingWrapper.DeleteAutoScalingGroupAsync(_groupName!);
@@ -299,6 +326,7 @@ public async Task DeleteAutoScalingGroupTest()
299326
[Fact()]
300327
[Order(15)]
301328
[Trait("Category", "Integration")]
329+
[Trait("Category", "Weathertop")]
302330
public async Task DeleteLaunchTemplateAsyncTest()
303331
{
304332
var templateName = await _ec2Wrapper.DeleteLaunchTemplateAsync(_launchTemplateId!);
@@ -313,6 +341,7 @@ public async Task DeleteLaunchTemplateAsyncTest()
313341
/// <returns>Async Task.</returns>
314342
[Fact()]
315343
[Trait("Category", "Integration")]
344+
[Trait("Category", "Weathertop")]
316345
public async Task DescribeAccountLimitsTest()
317346
{
318347
var success = await _autoScalingWrapper.DescribeAccountLimitsAsync();

‎dotnetv3/Bedrock/Tests/BedrockTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public BedrockTest()
2828
[Fact]
2929
[Order(1)]
3030
[Trait("Category", "Integration")]
31+
[Trait("Category", "Weathertop")]
3132
public async Task ListFoundationModelsAsync_ShouldNotBeNull()
3233
{
3334
var result = await bedrockClient.ListFoundationModelsAsync(new ListFoundationModelsRequest());

‎dotnetv3/CloudWatch/Actions/CloudWatchClasses.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class Widget
8383
public int Height { get; set; }
8484

8585
[JsonPropertyName("properties")]
86-
public Properties Properties { get; set; }
86+
public Properties Properties { get; set; } = null!;
8787
}
8888

8989
public class YAxis

‎dotnetv3/CloudWatch/Actions/CloudWatchWrapper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public async Task<List<MetricDataResult>> GetMetricData(int minutesOfData, bool
275275
/// <param name="alarmActions">Optional actions to execute when in an alarm state.</param>
276276
/// <returns>True if successful.</returns>
277277
public async Task<bool> PutMetricEmailAlarm(string alarmDescription, string alarmName, ComparisonOperator comparison,
278-
string metricName, string metricNamespace, double threshold, List<string> alarmActions = null)
278+
string metricName, string metricNamespace, double threshold, List<string> alarmActions = null!)
279279
{
280280
try
281281
{

0 commit comments

Comments
 (0)