Merge pull request #4 from wdolek/feature/move-projs-to-subdirs

Move projects under `src` and `tests` dirs
wdolek · Aug 2, 2024 · eb64164 · eb64164
2 parents ddab4dc + 0f160e1
commit eb64164
Show file tree

Hide file tree

Showing 32 changed files with 20 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -111,13 +111,13 @@ builder.Configuration.AddSecretsManager(
     });
 ```
 
-There's helper class [`SecretProcessor<T>`](W4k.Extensions.Configuration.Aws.SecretsManager/SecretProcessor.cs) which
-can be used to simplify implementation of custom processor (by providing implementation of [`ISecretStringParser<T>`](W4k.Extensions.Configuration.Aws.SecretsManager/Abstractions/ISecretStringParser.cs) and [`IConfigurationTokenizer<T>`](W4k.Extensions.Configuration.Aws.SecretsManager/Abstractions/IConfigurationTokenizer.cs)).
+There's helper class [`SecretProcessor<T>`](src/W4k.Extensions.Configuration.Aws.SecretsManager/SecretProcessor.cs) which
+can be used to simplify implementation of custom processor (by providing implementation of [`ISecretStringParser<T>`](src/W4k.Extensions.Configuration.Aws.SecretsManager/Abstractions/ISecretStringParser.cs) and [`IConfigurationTokenizer<T>`](src/W4k.Extensions.Configuration.Aws.SecretsManager/Abstractions/IConfigurationTokenizer.cs)).
 
 ### Configuration key transformation
 
 It is possible to hook into the configuration key transformation, which is used to transform the tokenized configuration key.
-By default, only [`KeyDelimiterTransformer`](W4k.Extensions.Configuration.Aws.SecretsManager/ConfigurationKeyTransformer.cs) is used.
+By default, only [`KeyDelimiterTransformer`](src/W4k.Extensions.Configuration.Aws.SecretsManager/ConfigurationKeyTransformer.cs) is used.
 
 `KeyDelimiterTransformer` transforms "`__`" to configuration key delimiter, "`:`".
 

diff --git a/W4k.Extensions.Configuration.Aws.SecretsManager.sln b/W4k.Extensions.Configuration.Aws.SecretsManager.sln
@@ -1,8 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W4k.Extensions.Configuration.Aws.SecretsManager", "W4k.Extensions.Configuration.Aws.SecretsManager\W4k.Extensions.Configuration.Aws.SecretsManager.csproj", "{9CB18F9D-A028-45FD-8F07-084ECB02C0DF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W4k.Extensions.Configuration.Aws.SecretsManager", "src\W4k.Extensions.Configuration.Aws.SecretsManager\W4k.Extensions.Configuration.Aws.SecretsManager.csproj", "{9CB18F9D-A028-45FD-8F07-084ECB02C0DF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W4k.Extensions.Configuration.Aws.SecretsManager.Tests", "W4k.Extensions.Configuration.Aws.SecretsManager.Tests\W4k.Extensions.Configuration.Aws.SecretsManager.Tests.csproj", "{C54F45CB-CEA0-40A8-8A1C-1A24DA0DBE7F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W4k.Extensions.Configuration.Aws.SecretsManager.Tests", "tests\W4k.Extensions.Configuration.Aws.SecretsManager.Tests\W4k.Extensions.Configuration.Aws.SecretsManager.Tests.csproj", "{C54F45CB-CEA0-40A8-8A1C-1A24DA0DBE7F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W4k.Extensions.Configuration.Aws.SecretsManager.IntegrationTests", "tests\W4k.Extensions.Configuration.Aws.SecretsManager.IntegrationTests\W4k.Extensions.Configuration.Aws.SecretsManager.IntegrationTests.csproj", "{DBC85EDF-3FA2-436F-BBC4-C63F0081A373}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B0197811-771A-4E94-A7C2-2644096B768C}"
 	ProjectSection(SolutionItems) = preProject
@@ -11,7 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W4k.Extensions.Configuration.Aws.SecretsManager.IntegrationTests", "W4k.Extensions.Configuration.Aws.SecretsManager.IntegrationTests\W4k.Extensions.Configuration.Aws.SecretsManager.IntegrationTests.csproj", "{DBC85EDF-3FA2-436F-BBC4-C63F0081A373}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{56EFFD8F-A115-42CE-8F4C-C63F5A1E6BE5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1B35BE65-9A4D-4C04-AD1E-1A034323F04D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -32,4 +36,9 @@ Global
 		{DBC85EDF-3FA2-436F-BBC4-C63F0081A373}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBC85EDF-3FA2-436F-BBC4-C63F0081A373}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9CB18F9D-A028-45FD-8F07-084ECB02C0DF} = {56EFFD8F-A115-42CE-8F4C-C63F5A1E6BE5}
+		{DBC85EDF-3FA2-436F-BBC4-C63F0081A373} = {1B35BE65-9A4D-4C04-AD1E-1A034323F04D}
+		{C54F45CB-CEA0-40A8-8A1C-1A24DA0DBE7F} = {1B35BE65-9A4D-4C04-AD1E-1A034323F04D}
+	EndGlobalSection
 EndGlobal
diff --git a/...SecretsManager/Abstractions/Exceptions.cs → ...SecretsManager/Abstractions/Exceptions.cs b/...SecretsManager/Abstractions/Exceptions.cs → ...SecretsManager/Abstractions/Exceptions.cs
diff --git a/...r/Abstractions/IConfigurationRefresher.cs → ...r/Abstractions/IConfigurationRefresher.cs b/...r/Abstractions/IConfigurationRefresher.cs → ...r/Abstractions/IConfigurationRefresher.cs
diff --git a/...r/Abstractions/IConfigurationTokenizer.cs → ...r/Abstractions/IConfigurationTokenizer.cs b/...r/Abstractions/IConfigurationTokenizer.cs → ...r/Abstractions/IConfigurationTokenizer.cs
diff --git a/...ger/Abstractions/IConfigurationWatcher.cs → ...ger/Abstractions/IConfigurationWatcher.cs b/...ger/Abstractions/IConfigurationWatcher.cs → ...ger/Abstractions/IConfigurationWatcher.cs
diff --git a/...sManager/Abstractions/ISecretProcessor.cs → ...sManager/Abstractions/ISecretProcessor.cs b/...sManager/Abstractions/ISecretProcessor.cs → ...sManager/Abstractions/ISecretProcessor.cs
diff --git a/...nager/Abstractions/ISecretStringParser.cs → ...nager/Abstractions/ISecretStringParser.cs b/...nager/Abstractions/ISecretStringParser.cs → ...nager/Abstractions/ISecretStringParser.cs
diff --git a/...etsManager/ConfigurationKeyTransformer.cs → ...etsManager/ConfigurationKeyTransformer.cs b/...etsManager/ConfigurationKeyTransformer.cs → ...etsManager/ConfigurationKeyTransformer.cs
diff --git a/....SecretsManager/Json/JsonElementParser.cs → ....SecretsManager/Json/JsonElementParser.cs b/....SecretsManager/Json/JsonElementParser.cs → ....SecretsManager/Json/JsonElementParser.cs
diff --git a/...cretsManager/Json/JsonElementTokenizer.cs → ...cretsManager/Json/JsonElementTokenizer.cs b/...cretsManager/Json/JsonElementTokenizer.cs → ...cretsManager/Json/JsonElementTokenizer.cs
diff --git a/...ation.Aws.SecretsManager/SecretFetcher.cs → ...ation.Aws.SecretsManager/SecretFetcher.cs b/...ation.Aws.SecretsManager/SecretFetcher.cs → ...ation.Aws.SecretsManager/SecretFetcher.cs
diff --git a/...ion.Aws.SecretsManager/SecretProcessor.cs → ...ion.Aws.SecretsManager/SecretProcessor.cs b/...ion.Aws.SecretsManager/SecretProcessor.cs → ...ion.Aws.SecretsManager/SecretProcessor.cs
diff --git a/...er/SecretsManagerConfigurationProvider.cs → ...er/SecretsManagerConfigurationProvider.cs b/...er/SecretsManagerConfigurationProvider.cs → ...er/SecretsManagerConfigurationProvider.cs
diff --git a/...etsManagerConfigurationProviderOptions.cs → ...etsManagerConfigurationProviderOptions.cs b/...etsManagerConfigurationProviderOptions.cs → ...etsManagerConfigurationProviderOptions.cs
diff --git a/...ager/SecretsManagerConfigurationSource.cs → ...ager/SecretsManagerConfigurationSource.cs b/...ager/SecretsManagerConfigurationSource.cs → ...ager/SecretsManagerConfigurationSource.cs
diff --git a/...tsManager/SecretsManagerPollingWatcher.cs → ...tsManager/SecretsManagerPollingWatcher.cs b/...tsManager/SecretsManagerPollingWatcher.cs → ...tsManager/SecretsManagerPollingWatcher.cs
diff --git a/...s.Configuration.Aws.SecretsManager.csproj → ...s.Configuration.Aws.SecretsManager.csproj b/...s.Configuration.Aws.SecretsManager.csproj → ...s.Configuration.Aws.SecretsManager.csproj
@@ -64,8 +64,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\README.md" Pack="true" PackagePath="\" />
-    <None Include="..\images\configuration_128px.png" Pack="true" PackagePath="_img" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\images\configuration_128px.png" Pack="true" PackagePath="_img" />
   </ItemGroup>
 
 </Project>
diff --git a/...ion.Aws.SecretsManager.csproj.DotSettings → ...ion.Aws.SecretsManager.csproj.DotSettings b/...ion.Aws.SecretsManager.csproj.DotSettings → ...ion.Aws.SecretsManager.csproj.DotSettings
diff --git a/...SecretsManager.IntegrationTests/README.md → ...SecretsManager.IntegrationTests/README.md b/...SecretsManager.IntegrationTests/README.md → ...SecretsManager.IntegrationTests/README.md
diff --git a/...Tests/SecretsManagerConfigSourceShould.cs → ...Tests/SecretsManagerConfigSourceShould.cs b/...Tests/SecretsManagerConfigSourceShould.cs → ...Tests/SecretsManagerConfigSourceShould.cs
@@ -35,7 +35,7 @@ public void NotThrowWhenSecretIsOptional()
             });
 
         Assert.That(config, Is.Not.Null);
-        CollectionAssert.IsEmpty(config.GetChildren());
+        CollectionAssert.IsEmpty(config.AsEnumerable());
     }
 
     [Test]

diff --git a/...grationTests/SecretsManagerTestFixture.cs → ...grationTests/SecretsManagerTestFixture.cs b/...grationTests/SecretsManagerTestFixture.cs → ...grationTests/SecretsManagerTestFixture.cs
diff --git a/...tsManager.IntegrationTests/TestSecrets.cs → ...tsManager.IntegrationTests/TestSecrets.cs b/...tsManager.IntegrationTests/TestSecrets.cs → ...tsManager.IntegrationTests/TestSecrets.cs
diff --git a/...ws.SecretsManager.IntegrationTests.csproj → ...ws.SecretsManager.IntegrationTests.csproj b/...ws.SecretsManager.IntegrationTests.csproj → ...ws.SecretsManager.IntegrationTests.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\W4k.Extensions.Configuration.Aws.SecretsManager\W4k.Extensions.Configuration.Aws.SecretsManager.csproj" />
+    <ProjectReference Include="..\..\src\W4k.Extensions.Configuration.Aws.SecretsManager\W4k.Extensions.Configuration.Aws.SecretsManager.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/....Aws.SecretsManager.Tests/GlobalUsings.cs → ....Aws.SecretsManager.Tests/GlobalUsings.cs b/....Aws.SecretsManager.Tests/GlobalUsings.cs → ....Aws.SecretsManager.Tests/GlobalUsings.cs
diff --git a/...sManager.Tests/JsonElementParserShould.cs → ...sManager.Tests/JsonElementParserShould.cs b/...sManager.Tests/JsonElementParserShould.cs → ...sManager.Tests/JsonElementParserShould.cs
diff --git a/...nager.Tests/JsonElementTokenizerShould.cs → ...nager.Tests/JsonElementTokenizerShould.cs b/...nager.Tests/JsonElementTokenizerShould.cs → ...nager.Tests/JsonElementTokenizerShould.cs
diff --git a/...er.Tests/KeyDelimiterTransformerShould.cs → ...er.Tests/KeyDelimiterTransformerShould.cs b/...er.Tests/KeyDelimiterTransformerShould.cs → ...er.Tests/KeyDelimiterTransformerShould.cs
diff --git a/...cretsManager.Tests/SecretFetcherShould.cs → ...cretsManager.Tests/SecretFetcherShould.cs b/...cretsManager.Tests/SecretFetcherShould.cs → ...cretsManager.Tests/SecretFetcherShould.cs
diff --git a/...etsManager.Tests/SecretProcessorShould.cs → ...etsManager.Tests/SecretProcessorShould.cs b/...etsManager.Tests/SecretProcessorShould.cs → ...etsManager.Tests/SecretProcessorShould.cs
diff --git a/...retsManagerConfigurationProviderShould.cs → ...retsManagerConfigurationProviderShould.cs b/...retsManagerConfigurationProviderShould.cs → ...retsManagerConfigurationProviderShould.cs
diff --git a/...iguration.Aws.SecretsManager.Tests.csproj → ...iguration.Aws.SecretsManager.Tests.csproj b/...iguration.Aws.SecretsManager.Tests.csproj → ...iguration.Aws.SecretsManager.Tests.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\W4k.Extensions.Configuration.Aws.SecretsManager\W4k.Extensions.Configuration.Aws.SecretsManager.csproj" />
+    <ProjectReference Include="..\..\src\W4k.Extensions.Configuration.Aws.SecretsManager\W4k.Extensions.Configuration.Aws.SecretsManager.csproj" />
   </ItemGroup>
 
 </Project>