Skip to content

Commit 829672d

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

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
@@ -77,7 +77,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
7777
{
7878
using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
7979
var milvus1 = builder1.AddMilvus("milvus1");
80+
#pragma warning disable CS0618 // Type or member is obsolete
8081
var password = milvus1.Resource.ApiKeyParameter.Value;
82+
#pragma warning restore CS0618 // Type or member is obsolete
8183

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

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

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

91+
#pragma warning disable CS0618 // Type or member is obsolete
9192
Assert.Equal($"mongodb://admin:{dbResource.Parent.PasswordParameter?.Value}@localhost:27017?authSource=admin&authMechanism=SCRAM-SHA-256", await serverResource.GetConnectionStringAsync());
93+
#pragma warning restore CS0618 // Type or member is obsolete
9294
Assert.Equal("mongodb://admin:{mongodb-password.value}@{mongodb.bindings.tcp.host}:{mongodb.bindings.tcp.port}?authSource=admin&authMechanism=SCRAM-SHA-256", serverResource.ConnectionStringExpression.ValueExpression);
95+
#pragma warning disable CS0618 // Type or member is obsolete
9396
Assert.Equal($"mongodb://admin:{dbResource.Parent.PasswordParameter?.Value}@localhost:27017/mydatabase?authSource=admin&authMechanism=SCRAM-SHA-256", connectionString);
97+
#pragma warning restore CS0618 // Type or member is obsolete
9498
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);
9599
}
96100

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

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

124126
if (useVolume)

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

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

132132
var mysql1 = builder1.AddMySql("mysql").WithEnvironment("MYSQL_DATABASE", mySqlDbName);
133+
#pragma warning disable CS0618 // Type or member is obsolete
133134
var password = mysql1.Resource.PasswordParameter.Value;
135+
#pragma warning restore CS0618 // Type or member is obsolete
134136

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

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

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

4242
Assert.NotNull(nats.Resource.PasswordParameter);
43+
#pragma warning disable CS0618 // Type or member is obsolete
4344
Assert.False(string.IsNullOrEmpty(nats.Resource.PasswordParameter!.Value));
45+
#pragma warning restore CS0618 // Type or member is obsolete
4446

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

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

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

@@ -68,8 +72,10 @@ public async Task AddNatsSetsUserNameAndPasswordAndIncludesThemInConnection()
6872
Assert.NotNull(nats.Resource.UserNameParameter);
6973
Assert.NotNull(nats.Resource.PasswordParameter);
7074

75+
#pragma warning disable CS0618 // Type or member is obsolete
7176
Assert.Equal("usr", nats.Resource.UserNameParameter!.Value);
7277
Assert.Equal("password", nats.Resource.PasswordParameter!.Value);
78+
#pragma warning restore CS0618 // Type or member is obsolete
7379

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

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

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

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

98+
#pragma warning disable CS0618 // Type or member is obsolete
9899
var password = oracle1.Resource.PasswordParameter.Value;
100+
#pragma warning restore CS0618 // Type or member is obsolete
99101

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

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

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

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

165167
[Fact]
@@ -492,7 +494,9 @@ public async Task WithPostgresProducesValidServersJsonFile()
492494
Assert.Equal("postgres", servers.GetProperty("1").GetProperty("Username").GetString());
493495
Assert.Equal("prefer", servers.GetProperty("1").GetProperty("SSLMode").GetString());
494496
Assert.Equal("postgres", servers.GetProperty("1").GetProperty("MaintenanceDB").GetString());
497+
#pragma warning disable CS0618 // Type or member is obsolete
495498
Assert.Equal($"echo '{pg1.Resource.PasswordParameter.Value}'", servers.GetProperty("1").GetProperty("PasswordExecCommand").GetString());
499+
#pragma warning restore CS0618 // Type or member is obsolete
496500

497501
// Make sure the second server is correct.
498502
Assert.Equal(pg2.Resource.Name, servers.GetProperty("2").GetProperty("Name").GetString());
@@ -502,7 +506,9 @@ public async Task WithPostgresProducesValidServersJsonFile()
502506
Assert.Equal("myuser", servers.GetProperty("2").GetProperty("Username").GetString());
503507
Assert.Equal("prefer", servers.GetProperty("2").GetProperty("SSLMode").GetString());
504508
Assert.Equal("postgres", servers.GetProperty("2").GetProperty("MaintenanceDB").GetString());
509+
#pragma warning disable CS0618 // Type or member is obsolete
505510
Assert.Equal($"echo '{pg2.Resource.PasswordParameter.Value}'", servers.GetProperty("2").GetProperty("PasswordExecCommand").GetString());
511+
#pragma warning restore CS0618 // Type or member is obsolete
506512
}
507513

508514
[Fact]
@@ -624,6 +630,7 @@ private static string CreatePgWebBookmarkfileContent(PostgresDatabaseResource po
624630

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

636644
return fileContent;
637645
}
@@ -673,6 +681,8 @@ public async Task VerifyPostgresServerResourceWithUserName()
673681
.WithEndpoint("tcp", e => e.AllocatedEndpoint = new AllocatedEndpoint(e, "localhost", 2000));
674682

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

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

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

110112
if (useVolume)
111113
{

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,9 @@ public async Task WithRedisInsightProducesCorrectEnvironmentVariables()
322322
(item) =>
323323
{
324324
Assert.Equal("RI_REDIS_PASSWORD1", item.Key);
325+
#pragma warning disable CS0618 // Type or member is obsolete
325326
Assert.Equal(redis1.Resource.PasswordParameter!.Value, item.Value);
327+
#pragma warning restore CS0618 // Type or member is obsolete
326328
},
327329
(item) =>
328330
{
@@ -342,7 +344,9 @@ public async Task WithRedisInsightProducesCorrectEnvironmentVariables()
342344
(item) =>
343345
{
344346
Assert.Equal("RI_REDIS_PASSWORD2", item.Key);
347+
#pragma warning disable CS0618 // Type or member is obsolete
345348
Assert.Equal(redis2.Resource.PasswordParameter!.Value, item.Value);
349+
#pragma warning restore CS0618 // Type or member is obsolete
346350
},
347351
(item) =>
348352
{
@@ -497,7 +501,9 @@ public async Task SingleRedisInstanceWithoutPasswordProducesCorrectRedisHostsVar
497501
DistributedApplicationOperation.Run,
498502
TestServiceProvider.Instance);
499503

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

503509
[Fact]
@@ -542,7 +548,9 @@ public async Task MultipleRedisInstanceProducesCorrectRedisHostsVariable()
542548
DistributedApplicationOperation.Run,
543549
TestServiceProvider.Instance);
544550

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

548556
[Theory]

0 commit comments

Comments
 (0)