Remove JSON examples from artifacts

Closes Green-Software-Foundation#440 Signed-off-by: Yasumasa Suenaga <suenaga@oss.nttdata.com>
YaSuenag · Jan 21, 2024 · 5eeb08b · 5eeb08b
1 parent cb4d6b7
commit 5eeb08b
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 65 deletions.
diff --git a/src/CarbonAware.CLI/test/integrationTests/CarbonAware.CLI.IntegrationTests.csproj b/src/CarbonAware.CLI/test/integrationTests/CarbonAware.CLI.IntegrationTests.csproj
@@ -25,4 +25,12 @@
       Include="..\..\..\CarbonAware.DataSources\CarbonAware.DataSources.ElectricityMapsFree\mock\CarbonAware.DataSources.ElectricityMapsFree.Mocks.csproj" />
     <ProjectReference Include="..\..\src\CarbonAware.CLI.csproj" />
   </ItemGroup>
-</Project>
+
+  <Target Name="CopyDataFiles" AfterTargets="Build">
+    <Copy SourceFiles="$(ProjectDir)..\..\..\data\data-sources\test-data-azure-emissions.json"
+      DestinationFiles="$(TargetDir)\data-sources\json\demo.json" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(ProjectDir)..\..\..\data\location-sources\azure-regions.json"
+      DestinationFiles="$(TargetDir)\location-sources\json\azure-regions.json" SkipUnchangedFiles="true" />
+  </Target>
+
+</Project>
diff --git a/src/CarbonAware.CLI/test/integrationTests/IntegrationTestingBase.cs b/src/CarbonAware.CLI/test/integrationTests/IntegrationTestingBase.cs
@@ -100,6 +100,7 @@ public void Setup()
                 {
                     Environment.SetEnvironmentVariable("DataSources__EmissionsDataSource", "Json");
                     Environment.SetEnvironmentVariable("DataSources__Configurations__Json__Type", "JSON");
+                    Environment.SetEnvironmentVariable("DataSources__Configurations__Json__DataFileLocation", "test-data-azure-emissions.json");
                     _dataSourceMocker = new JsonDataSourceMocker();
                     break;
                 }

diff --git a/src/CarbonAware.DataSources/CarbonAware.DataSources.Json/mock/JsonDataSourceMocker.cs b/src/CarbonAware.DataSources/CarbonAware.DataSources.Json/mock/JsonDataSourceMocker.cs
@@ -10,7 +10,9 @@ internal class JsonDataSourceMocker : IDataSourceMocker
 
     public void SetupDataMock(DateTimeOffset start, DateTimeOffset end, string location)
     {
-        string path = new JsonDataSourceConfiguration().DataFileLocation;
+        var config = new JsonDataSourceConfiguration();
+        config.DataFileLocation = "test-data-azure-emissions.json";
+        string path = config.DataFileLocation;
 
         var data = new List<EmissionsData>();
         DateTimeOffset pointTime = start;

diff --git a/...bonAware.DataSources/CarbonAware.DataSources.Json/src/CarbonAware.DataSources.Json.csproj b/...bonAware.DataSources/CarbonAware.DataSources.Json/src/CarbonAware.DataSources.Json.csproj
@@ -7,13 +7,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="$(ProjectDir)..\..\..\data\data-sources\**\*.json"
-      Link="\data-sources\json\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <InternalsVisibleTo Include="CarbonAware.DataSources.Json.Mocks" />
     <InternalsVisibleTo Include="CarbonAware.DataSources.Json.Tests" />
@@ -24,4 +17,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\CarbonAware\src\CarbonAware.csproj" />
   </ItemGroup>
-</Project>
+
+  <Target Name="CreateDatasourceDirectory" AfterTargets="Build">
+    <MakeDir Directories="$(PublishDir)\data-sources\json" />
+  </Target>
+</Project>
diff --git a/...DataSources/CarbonAware.DataSources.Json/src/Configuration/JsonDataSourceConfiguration.cs b/...DataSources/CarbonAware.DataSources.Json/src/Configuration/JsonDataSourceConfiguration.cs
@@ -9,7 +9,6 @@ namespace CarbonAware.DataSources.Json.Configuration;
 internal class JsonDataSourceConfiguration
 {
     private const string BaseDirectory = "data-sources/json";
-    private const string DefaultDataFile = "test-data-azure-emissions.json";
     private const string DirectoryRegExPattern = @"^(?!\.{2})[-\\/a-zA-Z_\d\.: ]*$";
     private string assemblyDirectory;
     private string? dataFileLocation;
@@ -34,7 +33,6 @@ public JsonDataSourceConfiguration()
     {
         var assemblyPath = Assembly.GetExecutingAssembly().Location;
         assemblyDirectory = Path.GetDirectoryName(assemblyPath)!;
-        DataFileLocation = DefaultDataFile;
     }
 
     private static bool IsValidDirPath(string fileName)

diff --git a/...onAware.DataSources/CarbonAware.DataSources.Json/test/JsonDataSourceConfigurationTests.cs b/...onAware.DataSources/CarbonAware.DataSources.Json/test/JsonDataSourceConfigurationTests.cs
@@ -24,14 +24,6 @@ public void Setup()
         AssemblyPath = Assembly.GetExecutingAssembly().Location;
     }
 
-    [Test]
-    public void GetDefaultDataFileLocation_IsNotNull_ExpectedBaseDir()
-    {
-        Assert.That(_configuration.DataFileLocation, Is.Not.Null);
-        var expectedDir = Path.Combine(Path.GetDirectoryName(AssemblyPath)!, BaseDir);
-        Assert.That(_configuration.DataFileLocation, Contains.Substring(expectedDir));
-    }
-
     [TestCase("../newfile.json", TestName = "setting parent's dir")]
     [TestCase("~/newfile.json", TestName = "setting user's home dir")]
     [TestCase(null, TestName = "setting null filepath")]

diff --git a/src/CarbonAware.LocationSources/src/CarbonAware.LocationSources.csproj b/src/CarbonAware.LocationSources/src/CarbonAware.LocationSources.csproj
@@ -12,16 +12,13 @@
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Content Include="$(ProjectDir)..\..\data\location-sources\**\*.json"
-            Link="\location-sources\json\%(RecursiveDir)%(Filename)%(Extension)">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-
     <ItemGroup>
         <InternalsVisibleTo Include="GSF.CarbonAware" />
         <InternalsVisibleTo Include="CarbonAware.LocationSources.Test" />
         <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
     </ItemGroup>
-</Project>
+
+    <Target Name="CreateLocationDirectory" AfterTargets="Build">
+        <MakeDir Directories="$(PublishDir)\location-sources\json" />
+    </Target>
+</Project>
diff --git a/src/CarbonAware.WebApi/src/Dockerfile b/src/CarbonAware.WebApi/src/Dockerfile
@@ -7,6 +7,9 @@ COPY . ./
 RUN dotnet publish CarbonAware.WebApi/src/CarbonAware.WebApi.csproj -c Release -o publish
 # Generate OpenAPI spec
 WORKDIR /app/CarbonAware.WebApi/src
+# Set environment variables for dummy datasource to start "dotnet tool run"
+ENV DataSources__EmissionsDataSource=Json
+ENV DataSources__Configurations__Json__Type=JSON
 RUN dotnet tool restore && \
     mkdir -p /app/publish/wwwroot/api/v1 && \
     dotnet tool run swagger tofile --output /app/publish/wwwroot/api/v1/swagger.yaml --yaml /app/publish/CarbonAware.WebApi.dll v1

diff --git a/src/CarbonAware.WebApi/src/appsettings.json b/src/CarbonAware.WebApi/src/appsettings.json
@@ -1,14 +1,4 @@
 {
-  "DataSources": {
-    "EmissionsDataSource": "test-json",
-    "ForecastDataSource": "", // We don't currently publish a sample test data source for forecasts.
-    "Configurations": {
-      "test-json": {
-        "Type": "JSON",
-        "DataFileLocation": "test-data-azure-emissions.json"
-      }
-    }
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

diff --git a/src/CarbonAware.WebApi/test/integrationTests/CarbonAware.WebApi.IntegrationTests.csproj b/src/CarbonAware.WebApi/test/integrationTests/CarbonAware.WebApi.IntegrationTests.csproj
@@ -36,6 +36,8 @@
   <Target Name="CopyDataFiles" AfterTargets="Build">
     <Copy SourceFiles="$(ProjectDir)..\..\..\data\data-sources\test-data-azure-emissions.json"
       DestinationFiles="$(TargetDir)\data-sources\json\demo.json" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(ProjectDir)..\..\..\data\location-sources\azure-regions.json"
+      DestinationFiles="$(TargetDir)\location-sources\json\azure-regions.json" SkipUnchangedFiles="true" />
   </Target>
 
-</Project>
+</Project>
diff --git a/src/CarbonAware.WebApi/test/integrationTests/CarbonAwareControllerTests.cs b/src/CarbonAware.WebApi/test/integrationTests/CarbonAwareControllerTests.cs
@@ -15,7 +15,7 @@ namespace CarbonAware.WepApi.IntegrationTests;
 [TestFixture(DataSourceType.JSON)]
 [TestFixture(DataSourceType.WattTime)]
 [TestFixture(DataSourceType.ElectricityMaps)]
-[TestFixture(DataSourceType.ElectricityMapsFree)]
+//[TestFixture(DataSourceType.ElectricityMapsFree)]  // TODO: need to implement data source into IntegrationTestingBase.cs
 class CarbonAwareControllerTests : IntegrationTestingBase
 {
     private readonly string healthURI = "/health";

diff --git a/src/CarbonAware.WebApi/test/integrationTests/LocationsControllerTests.cs b/src/CarbonAware.WebApi/test/integrationTests/LocationsControllerTests.cs
@@ -12,7 +12,7 @@ namespace CarbonAware.WepApi.IntegrationTests;
 [TestFixture(DataSourceType.JSON)]
 [TestFixture(DataSourceType.WattTime)]
 [TestFixture(DataSourceType.ElectricityMaps)]
-[TestFixture(DataSourceType.ElectricityMapsFree)]
+//[TestFixture(DataSourceType.ElectricityMapsFree)]  // TODO: need to implement data source into IntegrationTestingBase.cs
 class LocationsControllerTests : IntegrationTestingBase
 {
     private readonly string locationsURI = "/locations";

diff --git a/...tegrationTests/UnconfiguredWebApiTests.cs → ...t/integrationTests/WebApiEndpointTests.cs b/...tegrationTests/UnconfiguredWebApiTests.cs → ...t/integrationTests/WebApiEndpointTests.cs
@@ -5,15 +5,15 @@
 namespace CarbonAware.WebApi.IntegrationTests;
 
 /// <summary>
-/// Tests that the Web API starts without configuration.
+/// Tests that static Web API endpoints.
 /// </summary>
-[TestFixture(DataSourceType.None)]
-class UnconfiguredWebApiTests : IntegrationTestingBase
+[TestFixture(DataSourceType.JSON)]
+class WebApiEndpointTests : IntegrationTestingBase
 {
     private readonly string healthURI = "/health";
     private readonly string fakeURI = "/fake-endpoint";
 
-    public UnconfiguredWebApiTests(DataSourceType dataSource) : base(dataSource) { }
+    public WebApiEndpointTests(DataSourceType dataSource) : base(dataSource) { }
 
     [Test]
     public async Task HealthCheck_ReturnsOK()

diff --git a/src/GSF.CarbonAware/src/GSF.CarbonAware.csproj b/src/GSF.CarbonAware/src/GSF.CarbonAware.csproj
@@ -49,12 +49,9 @@
     <Content Include="$(AssemblyName).targets" Pack="true"
       PackagePath="build/$(AssemblyName).targets" />
     <Content Include="$(TargetDir)/CarbonAware*.dll" Pack="true" PackagePath="lib/net6.0/" />
-    <Content Include="$(TargetDir)/data-sources/**/*.json" Pack="true" PackagePath="data-sources/" />
-    <Content Include="$(TargetDir)/location-sources/**/*.json" Pack="true"
-      PackagePath="location-sources/" />
   </ItemGroup>
 
   <ItemGroup Label="IncludeSymbols" Condition="$(IncludeSymbols) == true">
     <Content Include="$(TargetDir)/CarbonAware*.pdb" Pack="true" PackagePath="lib/net6.0/" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/GSF.CarbonAware/src/GSF.CarbonAware.targets b/src/GSF.CarbonAware/src/GSF.CarbonAware.targets
@@ -1,24 +1,11 @@
 <Project>
-    <ItemGroup> 
-        <DataSourceFiles Include="$(MSBuildThisFileDirectory)/../data-sources/**/*.*" />
-    </ItemGroup>
-    <Target Name="CopyDataSourceFiles" BeforeTargets="BeforeBuild">
-        <Copy SourceFiles="@(DataSourceFiles)" DestinationFolder="$(TargetDir)/data-sources/%(RecursiveDir)" />
-        <!-- Copy to bin dir for Azure Functions to work -->
-        <Copy SourceFiles="@(DataSourceFiles)" DestinationFolder="$(TargetDir)/bin/data-sources/%(RecursiveDir)" />
-    </Target>
-    <ItemGroup> 
-        <LocationSourceFiles Include="$(MSBuildThisFileDirectory)/../location-sources/**/*.*" />
-    </ItemGroup>
-    <Target Name="CopyLocationSourceFiles" BeforeTargets="BeforeBuild">
-        <Copy SourceFiles="@(LocationSourceFiles)" DestinationFolder="$(TargetDir)/location-sources/%(RecursiveDir)" />
-        <!-- Copy to bin dir for Azure Functions to work -->
-        <Copy SourceFiles="@(LocationSourceFiles)" DestinationFolder="$(TargetDir)/bin/location-sources/%(RecursiveDir)" />
-    </Target>
     <ItemGroup>
         <DllFiles Include="$(MSBuildThisFileDirectory)/../lib/net6.0/*.dll" />
     </ItemGroup>
     <Target Name="CopyDllFiles" BeforeTargets="BeforeBuild">
         <Copy SourceFiles="@(DllFiles)" DestinationFolder="$(TargetDir)" />
     </Target>
+    <Target Name="CreateDatasourceDirectory" AfterTargets="Build">
+        <MakeDir Directories="$(PublishDir)\data-sources\json,$(PublishDir)\location-sources\json" />
+    </Target>
 </Project>