Skip to content

Commit 899cbe9

Browse files
Copilotdavidfowl
authored andcommitted
Suppress obsolete warnings for ParameterResource.Value in test files
Co-authored-by: davidfowl <[email protected]>
1 parent 1f7016a commit 899cbe9

File tree

14 files changed

+68
-0
lines changed

14 files changed

+68
-0
lines changed

tests/Aspire.Hosting.Azure.Tests/AzureRedisExtensionsTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ public async Task AddAzureRedisRunAsContainerProducesCorrectConnectionString()
103103
Assert.True(redis.Resource.IsContainer(), "The resource should now be a container resource.");
104104

105105
Assert.NotNull(redisResource?.PasswordParameter);
106+
#pragma warning disable CS0618 // Type or member is obsolete
106107
Assert.Equal($"localhost:12455,password={redisResource.PasswordParameter.Value}", await redis.Resource.ConnectionStringExpression.GetValueAsync(CancellationToken.None));
108+
#pragma warning restore CS0618 // Type or member is obsolete
107109
}
108110

109111
[Fact]
@@ -195,7 +197,9 @@ public async Task PublishAsRedisPublishesRedisAsAzureRedisInfrastructure()
195197
Assert.True(redis.Resource.IsContainer());
196198
Assert.NotNull(redis.Resource.PasswordParameter);
197199

200+
#pragma warning disable CS0618 // Type or member is obsolete
198201
Assert.Equal($"localhost:12455,password={redis.Resource.PasswordParameter.Value}", await redis.Resource.GetConnectionStringAsync());
202+
#pragma warning restore CS0618 // Type or member is obsolete
199203

200204
var manifest = await AzureManifestUtils.GetManifestWithBicep(redis.Resource);
201205

tests/Aspire.Hosting.Milvus.Tests/MilvusFunctionalTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
7676
{
7777
using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
7878
var milvus1 = builder1.AddMilvus("milvus1");
79+
#pragma warning disable CS0618 // Type or member is obsolete
7980
var password = milvus1.Resource.ApiKeyParameter.Value;
81+
#pragma warning restore CS0618 // Type or member is obsolete
8082

8183
var db1 = milvus1.AddDatabase("milvusdb1", dbname);
8284

tests/Aspire.Hosting.MongoDB.Tests/AddMongoDBTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,13 @@ public async Task MongoDBCreatesConnectionString()
8787
Assert.NotNull(connectionStringResource);
8888
var connectionString = await connectionStringResource.GetConnectionStringAsync();
8989

90+
#pragma warning disable CS0618 // Type or member is obsolete
9091
Assert.Equal($"mongodb://admin:{dbResource.Parent.PasswordParameter?.Value}@localhost:27017?authSource=admin&authMechanism=SCRAM-SHA-256", await serverResource.GetConnectionStringAsync());
92+
#pragma warning restore CS0618 // Type or member is obsolete
9193
Assert.Equal("mongodb://admin:{mongodb-password.value}@{mongodb.bindings.tcp.host}:{mongodb.bindings.tcp.port}?authSource=admin&authMechanism=SCRAM-SHA-256", serverResource.ConnectionStringExpression.ValueExpression);
94+
#pragma warning disable CS0618 // Type or member is obsolete
9295
Assert.Equal($"mongodb://admin:{dbResource.Parent.PasswordParameter?.Value}@localhost:27017/mydatabase?authSource=admin&authMechanism=SCRAM-SHA-256", connectionString);
96+
#pragma warning restore CS0618 // Type or member is obsolete
9397
Assert.Equal("mongodb://admin:{mongodb-password.value}@{mongodb.bindings.tcp.host}:{mongodb.bindings.tcp.port}/mydatabase?authSource=admin&authMechanism=SCRAM-SHA-256", connectionStringResource.ConnectionStringExpression.ValueExpression);
9498
}
9599

tests/Aspire.Hosting.MongoDB.Tests/MongoDbFunctionalTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
117117
{
118118
using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
119119
var mongodb1 = builder1.AddMongoDB("mongodb");
120+
#pragma warning disable CS0618 // Type or member is obsolete
120121
var password = mongodb1.Resource.PasswordParameter!.Value;
122+
#pragma warning restore CS0618 // Type or member is obsolete
121123
var db1 = mongodb1.AddDatabase(dbName);
122124

123125
if (useVolume)

tests/Aspire.Hosting.MySql.Tests/MySqlFunctionalTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
129129
using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
130130

131131
var mysql1 = builder1.AddMySql("mysql").WithEnvironment("MYSQL_DATABASE", mySqlDbName);
132+
#pragma warning disable CS0618 // Type or member is obsolete
132133
var password = mysql1.Resource.PasswordParameter.Value;
134+
#pragma warning restore CS0618 // Type or member is obsolete
133135

134136
var db1 = mysql1.AddDatabase(mySqlDbName);
135137

tests/Aspire.Hosting.Nats.Tests/AddNatsTests.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ public async Task AddNatsSetsDefaultUserNameAndPasswordAndIncludesThemInConnecti
3939
.WithEndpoint("tcp", e => e.AllocatedEndpoint = new AllocatedEndpoint(e, "localhost", 4222));
4040

4141
Assert.NotNull(nats.Resource.PasswordParameter);
42+
#pragma warning disable CS0618 // Type or member is obsolete
4243
Assert.False(string.IsNullOrEmpty(nats.Resource.PasswordParameter!.Value));
44+
#pragma warning restore CS0618 // Type or member is obsolete
4345

4446
using var app = appBuilder.Build();
4547

@@ -50,7 +52,9 @@ public async Task AddNatsSetsDefaultUserNameAndPasswordAndIncludesThemInConnecti
5052
Assert.NotNull(connectionStringResource);
5153
var connectionString = await connectionStringResource.GetConnectionStringAsync();
5254

55+
#pragma warning disable CS0618 // Type or member is obsolete
5356
Assert.Equal($"nats://nats:{natsResource.PasswordParameter?.Value}@localhost:4222", connectionString);
57+
#pragma warning restore CS0618 // Type or member is obsolete
5458
Assert.Equal("nats://nats:{nats-password.value}@{nats.bindings.tcp.host}:{nats.bindings.tcp.port}", connectionStringResource.ConnectionStringExpression.ValueExpression);
5559
}
5660

@@ -67,8 +71,10 @@ public async Task AddNatsSetsUserNameAndPasswordAndIncludesThemInConnection()
6771
Assert.NotNull(nats.Resource.UserNameParameter);
6872
Assert.NotNull(nats.Resource.PasswordParameter);
6973

74+
#pragma warning disable CS0618 // Type or member is obsolete
7075
Assert.Equal("usr", nats.Resource.UserNameParameter!.Value);
7176
Assert.Equal("password", nats.Resource.PasswordParameter!.Value);
77+
#pragma warning restore CS0618 // Type or member is obsolete
7278

7379
using var app = appBuilder.Build();
7480

tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
9494

9595
var oracle1 = builder1.AddOracle("oracle");
9696

97+
#pragma warning disable CS0618 // Type or member is obsolete
9798
var password = oracle1.Resource.PasswordParameter.Value;
99+
#pragma warning restore CS0618 // Type or member is obsolete
98100

99101
var db1 = oracle1.AddDatabase(oracleDbName);
100102

tests/Aspire.Hosting.PostgreSQL.Tests/AddPostgresTests.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ public async Task PostgresCreatesConnectionString()
158158

159159
var connectionString = await connectionStringResource.GetConnectionStringAsync();
160160
Assert.Equal("Host={postgres.bindings.tcp.host};Port={postgres.bindings.tcp.port};Username=postgres;Password={postgres-password.value}", connectionStringResource.ConnectionStringExpression.ValueExpression);
161+
#pragma warning disable CS0618 // Type or member is obsolete
161162
Assert.Equal($"Host=localhost;Port=2000;Username=postgres;Password={postgres.Resource.PasswordParameter.Value}", connectionString);
163+
#pragma warning restore CS0618 // Type or member is obsolete
162164
}
163165

164166
[Fact]
@@ -491,7 +493,9 @@ public async Task WithPostgresProducesValidServersJsonFile()
491493
Assert.Equal("postgres", servers.GetProperty("1").GetProperty("Username").GetString());
492494
Assert.Equal("prefer", servers.GetProperty("1").GetProperty("SSLMode").GetString());
493495
Assert.Equal("postgres", servers.GetProperty("1").GetProperty("MaintenanceDB").GetString());
496+
#pragma warning disable CS0618 // Type or member is obsolete
494497
Assert.Equal($"echo '{pg1.Resource.PasswordParameter.Value}'", servers.GetProperty("1").GetProperty("PasswordExecCommand").GetString());
498+
#pragma warning restore CS0618 // Type or member is obsolete
495499

496500
// Make sure the second server is correct.
497501
Assert.Equal(pg2.Resource.Name, servers.GetProperty("2").GetProperty("Name").GetString());
@@ -501,7 +505,9 @@ public async Task WithPostgresProducesValidServersJsonFile()
501505
Assert.Equal("myuser", servers.GetProperty("2").GetProperty("Username").GetString());
502506
Assert.Equal("prefer", servers.GetProperty("2").GetProperty("SSLMode").GetString());
503507
Assert.Equal("postgres", servers.GetProperty("2").GetProperty("MaintenanceDB").GetString());
508+
#pragma warning disable CS0618 // Type or member is obsolete
504509
Assert.Equal($"echo '{pg2.Resource.PasswordParameter.Value}'", servers.GetProperty("2").GetProperty("PasswordExecCommand").GetString());
510+
#pragma warning restore CS0618 // Type or member is obsolete
505511
}
506512

507513
[Fact]
@@ -623,6 +629,7 @@ private static string CreatePgWebBookmarkfileContent(PostgresDatabaseResource po
623629

624630
// We're hardcoding references to container resources based on a default Aspire network
625631
// This will need to be refactored once updated service discovery APIs are available
632+
#pragma warning disable CS0618 // Type or member is obsolete
626633
var fileContent = $"""
627634
host = "{postgresDatabase.Parent.Name}"
628635
port = {postgresDatabase.Parent.PrimaryEndpoint.TargetPort}
@@ -631,6 +638,7 @@ private static string CreatePgWebBookmarkfileContent(PostgresDatabaseResource po
631638
database = "{postgresDatabase.DatabaseName}"
632639
sslmode = "disable"
633640
""";
641+
#pragma warning restore CS0618 // Type or member is obsolete
634642

635643
return fileContent;
636644
}
@@ -672,6 +680,8 @@ public async Task VerifyPostgresServerResourceWithUserName()
672680
.WithEndpoint("tcp", e => e.AllocatedEndpoint = new AllocatedEndpoint(e, "localhost", 2000));
673681

674682
var connectionString = await postgres.Resource.GetConnectionStringAsync();
683+
#pragma warning disable CS0618 // Type or member is obsolete
675684
Assert.Equal($"Host=localhost;Port=2000;Username=user1;Password={postgres.Resource.PasswordParameter.Value}", connectionString);
685+
#pragma warning restore CS0618 // Type or member is obsolete
676686
}
677687
}

tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQFunctionalTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
104104
{
105105
using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
106106
var rabbitMQ1 = builder1.AddRabbitMQ("rabbitMQ");
107+
#pragma warning disable CS0618 // Type or member is obsolete
107108
var password = rabbitMQ1.Resource.PasswordParameter.Value;
109+
#pragma warning restore CS0618 // Type or member is obsolete
108110

109111
if (useVolume)
110112
{

tests/Aspire.Hosting.Redis.Tests/AddRedisTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ public async Task WithRedisInsightProducesCorrectEnvironmentVariables()
321321
(item) =>
322322
{
323323
Assert.Equal("RI_REDIS_PASSWORD1", item.Key);
324+
#pragma warning disable CS0618 // Type or member is obsolete
324325
Assert.Equal(redis1.Resource.PasswordParameter!.Value, item.Value);
326+
#pragma warning restore CS0618 // Type or member is obsolete
325327
},
326328
(item) =>
327329
{
@@ -341,7 +343,9 @@ public async Task WithRedisInsightProducesCorrectEnvironmentVariables()
341343
(item) =>
342344
{
343345
Assert.Equal("RI_REDIS_PASSWORD2", item.Key);
346+
#pragma warning disable CS0618 // Type or member is obsolete
344347
Assert.Equal(redis2.Resource.PasswordParameter!.Value, item.Value);
348+
#pragma warning restore CS0618 // Type or member is obsolete
345349
},
346350
(item) =>
347351
{
@@ -496,7 +500,9 @@ public async Task SingleRedisInstanceWithoutPasswordProducesCorrectRedisHostsVar
496500
DistributedApplicationOperation.Run,
497501
TestServiceProvider.Instance);
498502

503+
#pragma warning disable CS0618 // Type or member is obsolete
499504
Assert.Equal($"myredis1:{redis.Resource.Name}:6379:0:{redis.Resource.PasswordParameter?.Value}", config["REDIS_HOSTS"]);
505+
#pragma warning restore CS0618 // Type or member is obsolete
500506
}
501507

502508
[Fact]
@@ -541,7 +547,9 @@ public async Task MultipleRedisInstanceProducesCorrectRedisHostsVariable()
541547
DistributedApplicationOperation.Run,
542548
TestServiceProvider.Instance);
543549

550+
#pragma warning disable CS0618 // Type or member is obsolete
544551
Assert.Equal($"myredis1:{redis1.Resource.Name}:6379:0:{redis1.Resource.PasswordParameter?.Value},myredis2:myredis2:6379:0:{redis2.Resource.PasswordParameter?.Value}", config["REDIS_HOSTS"]);
552+
#pragma warning restore CS0618 // Type or member is obsolete
545553
}
546554

547555
[Theory]

0 commit comments

Comments
 (0)