Remove Mongo from E2E tests

dotnet · Jul 25, 2024 · c42fba0 · c42fba0
1 parent 1bbf7b3
commit c42fba0
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 102 deletions.
diff --git a/tests/Aspire.EndToEnd.Tests/IntegrationServicesTests.cs b/tests/Aspire.EndToEnd.Tests/IntegrationServicesTests.cs
@@ -23,7 +23,6 @@ public IntegrationServicesTests(ITestOutputHelper testOutput, IntegrationService
 
     [Theory]
     [Trait("scenario", "basicservices")]
-    [InlineData(TestResourceNames.mongodb)]
     [InlineData(TestResourceNames.postgres)]
     [InlineData(TestResourceNames.efnpgsql)]
     [InlineData(TestResourceNames.rabbitmq)]

diff --git a/tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs b/tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs
@@ -4,7 +4,6 @@
 using System.Text.Json;
 using Aspire.Components.Common.Tests;
 using Aspire.Hosting.Garnet;
-using Aspire.Hosting.MongoDB;
 using Aspire.Hosting.Postgres;
 using Aspire.Hosting.Publishing;
 using Aspire.Hosting.RabbitMQ;
@@ -483,7 +482,6 @@ public void VerifyTestProgramFullManifest()
                     "ConnectionStrings__garnet": "{garnet.connectionString}",
                     "ConnectionStrings__postgresdb": "{postgresdb.connectionString}",
                     "ConnectionStrings__rabbitmq": "{rabbitmq.connectionString}",
-                    "ConnectionStrings__mymongodb": "{mymongodb.connectionString}",
                     "ConnectionStrings__freepdb1": "{freepdb1.connectionString}",
                     "ConnectionStrings__cosmos": "{cosmos.connectionString}",
                     "ConnectionStrings__eventhubns": "{eventhubns.connectionString}"
@@ -589,23 +587,6 @@ public void VerifyTestProgramFullManifest()
                     }
                   }
                 },
-                "mongodb": {
-                  "type": "container.v0",
-                  "connectionString": "mongodb://{mongodb.bindings.tcp.host}:{mongodb.bindings.tcp.port}",
-                  "image": "{{TestConstants.AspireTestContainerRegistry}}/{{MongoDBContainerImageTags.Image}}:{{MongoDBContainerImageTags.Tag}}",
-                  "bindings": {
-                    "tcp": {
-                      "scheme": "tcp",
-                      "protocol": "tcp",
-                      "transport": "tcp",
-                      "targetPort": 27017
-                    }
-                  }
-                },
-                "mymongodb": {
-                  "type": "value.v0",
-                  "connectionString": "{mongodb.connectionString}/mymongodb"
-                },
                 "oracledatabase": {
                   "type": "container.v0",
                   "connectionString": "user id=system;password={oracledatabase-password.value};data source={oracledatabase.bindings.tcp.host}:{oracledatabase.bindings.tcp.port}",

diff --git a/tests/testproject/Common/TestResourceNames.cs b/tests/testproject/Common/TestResourceNames.cs
@@ -9,7 +9,6 @@ public enum TestResourceNames
     None = 0,
     cosmos = 1 << 0,
     dashboard = 1 << 1,
-    mongodb = 1 << 3,
     oracledatabase = 1 << 5,
     postgres = 1 << 7,
     rabbitmq = 1 << 8,
@@ -20,7 +19,7 @@ public enum TestResourceNames
     eventhubs = 1 << 13,
     efsqlserver = 1 << 16,
     efcosmos = 1 << 17,
-    All = cosmos | dashboard | mongodb | oracledatabase | postgres | rabbitmq | redis | sqlserver | efnpgsql | garnet | eventhubs | efsqlserver | efcosmos
+    All = cosmos | dashboard | oracledatabase | postgres | rabbitmq | redis | sqlserver | efnpgsql | garnet | eventhubs | efsqlserver | efcosmos
 }
 
 public static class TestResourceNamesExtensions

diff --git a/tests/testproject/TestProject.AppHost/TestProgram.cs b/tests/testproject/TestProject.AppHost/TestProgram.cs
@@ -115,14 +115,6 @@ private TestProgram(
                     .WithImageRegistry(AspireTestContainerRegistry);
                 IntegrationServiceABuilder = IntegrationServiceABuilder.WithReference(rabbitmq);
             }
-            if (!resourcesToSkip.HasFlag(TestResourceNames.mongodb))
-            {
-                var mongoDbName = "mymongodb";
-                var mongodb = AppBuilder.AddMongoDB("mongodb")
-                    .WithImageRegistry(AspireTestContainerRegistry)
-                    .AddDatabase(mongoDbName);
-                IntegrationServiceABuilder = IntegrationServiceABuilder.WithReference(mongodb);
-            }
             if (!resourcesToSkip.HasFlag(TestResourceNames.oracledatabase))
             {
                 var oracleDbName = "freepdb1";

diff --git a/tests/testproject/TestProject.AppHost/TestProject.AppHost.csproj b/tests/testproject/TestProject.AppHost/TestProject.AppHost.csproj
@@ -14,7 +14,6 @@
     <AspireProjectOrPackageReference Include="Aspire.Hosting.Azure.EventHubs" IsAspireProjectResource="false" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" IsAspireProjectResource="false" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.Garnet" IsAspireProjectResource="false" />
-    <AspireProjectOrPackageReference Include="Aspire.Hosting.MongoDB" IsAspireProjectResource="false" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.MySql" IsAspireProjectResource="false" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.NodeJs" IsAspireProjectResource="false" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.Oracle" IsAspireProjectResource="false" />

diff --git a/tests/testproject/TestProject.AppHost/aspire-manifest.json b/tests/testproject/TestProject.AppHost/aspire-manifest.json
@@ -134,7 +134,6 @@
         "ConnectionStrings__valkey": "{valkey.connectionString}",
         "ConnectionStrings__postgresdb": "{postgresdb.connectionString}",
         "ConnectionStrings__rabbitmq": "{rabbitmq.connectionString}",
-        "ConnectionStrings__mymongodb": "{mymongodb.connectionString}",
         "ConnectionStrings__freepdb1": "{freepdb1.connectionString}",
         "ConnectionStrings__kafka": "{kafka.connectionString}",
         "ConnectionStrings__cosmos": "{cosmos.connectionString}"
@@ -274,23 +273,6 @@
         }
       }
     },
-    "mongodb": {
-      "type": "container.v0",
-      "connectionString": "mongodb://{mongodb.bindings.tcp.host}:{mongodb.bindings.tcp.port}",
-      "image": "docker.io/library/mongo:7.0.8",
-      "bindings": {
-        "tcp": {
-          "scheme": "tcp",
-          "protocol": "tcp",
-          "transport": "tcp",
-          "targetPort": 27017
-        }
-      }
-    },
-    "mymongodb": {
-      "type": "value.v0",
-      "connectionString": "{mongodb.connectionString}/mymongodb"
-    },
     "oracledatabase": {
       "type": "container.v0",
       "connectionString": "user id=system;password={oracledatabase-password.value};data source={oracledatabase.bindings.tcp.host}:{oracledatabase.bindings.tcp.port}",

diff --git a/tests/testproject/TestProject.IntegrationServiceA/MongoDB/MongoDBExtensions.cs b/tests/testproject/TestProject.IntegrationServiceA/MongoDB/MongoDBExtensions.cs
diff --git a/tests/testproject/TestProject.IntegrationServiceA/MongoDB/Movie.cs b/tests/testproject/TestProject.IntegrationServiceA/MongoDB/Movie.cs
diff --git a/tests/testproject/TestProject.IntegrationServiceA/Program.cs b/tests/testproject/TestProject.IntegrationServiceA/Program.cs
@@ -37,10 +37,6 @@
 {
     builder.AddRabbitMQClient("rabbitmq");
 }
-if (!resourcesToSkip.HasFlag(TestResourceNames.mongodb))
-{
-    builder.AddMongoDBClient("mymongodb");
-}
 if (!resourcesToSkip.HasFlag(TestResourceNames.eventhubs))
 {
     builder.AddAzureEventHubProducerClient("eventhubsns", settings => settings.EventHubName = "hub");
@@ -96,11 +92,6 @@
     app.MapGarnetApi();
 }
 
-if (!resourcesToSkip.HasFlag(TestResourceNames.mongodb))
-{
-    app.MapMongoDBApi();
-}
-
 if (!resourcesToSkip.HasFlag(TestResourceNames.postgres))
 {
     app.MapPostgresApi();

diff --git a/tests/testproject/TestProject.IntegrationServiceA/TestProject.IntegrationServiceA.csproj b/tests/testproject/TestProject.IntegrationServiceA/TestProject.IntegrationServiceA.csproj
@@ -4,8 +4,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <!-- MongoDB.Driver package is unsigned, we ignore that warning on purpose  -->
-    <NoWarn>$(NoWarn);CS8002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +13,6 @@
   <ItemGroup>
     <AspireProjectOrPackageReference Include="Aspire.Microsoft.Azure.Cosmos" />
     <AspireProjectOrPackageReference Include="Aspire.Microsoft.Data.SqlClient" />
-    <AspireProjectOrPackageReference Include="Aspire.MongoDB.Driver" />
     <AspireProjectOrPackageReference Include="Aspire.MySqlConnector" />
     <AspireProjectOrPackageReference Include="Aspire.Npgsql" />
     <AspireProjectOrPackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />