Revert the creation of Smithy.Identity.Abstractions project and move …

…its interfaces to AWSSDK.Core (#3584)

* Revert the creation of Smithy.Identity.Abstractions project and move its interfaces to AWSSDK.Core

* Update the namespaces of the identity and auth interfaces

docgenerator/SDKDocGeneratorLib/ReflectionWrappers.cs

@@ -595,7 +595,7 @@ public string CreateReferenceHtml(bool fullTypeName)
             string html;
             var nameOrFullName = fullTypeName ? (this.FullName ?? this.Name) : this.Name;
 
-            if (this.IsGenericParameter || this.IsSmithyNamespace)
+            if (this.IsGenericParameter)
             {
                 html = this.JustName;
             }
@@ -695,15 +695,6 @@ public bool IsAmazonNamespace
             }
         }
 
-        public bool IsSmithyNamespace
-        {
-            get
-            {
-                return this.Namespace.Equals("Smithy", StringComparison.Ordinal)
-                    || this.Namespace.StartsWith("Smithy.", StringComparison.Ordinal);
-            }
-        }
-
         // strips the type argument count off of generic collections so
         // we get a cleaner display
         public string GenericTypeName

extensions/AWSSDK.Extensions.sln

@@ -48,8 +48,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CloudFron
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.EC2.DecryptPassword.NetFramework", "src\AWSSDK.Extensions.EC2.DecryptPassword\AWSSDK.Extensions.EC2.DecryptPassword.NetFramework.csproj", "{3EC669E6-A541-445E-B68E-0A853715E39C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smithy.Identity.Abstractions", "src\Smithy.Identity.Abstractions\Smithy.Identity.Abstractions.csproj", "{326AC89B-35CC-4D68-86E4-90CF8F1E1EC5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -128,10 +126,6 @@ Global
 		{3EC669E6-A541-445E-B68E-0A853715E39C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EC669E6-A541-445E-B68E-0A853715E39C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3EC669E6-A541-445E-B68E-0A853715E39C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{326AC89B-35CC-4D68-86E4-90CF8F1E1EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{326AC89B-35CC-4D68-86E4-90CF8F1E1EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{326AC89B-35CC-4D68-86E4-90CF8F1E1EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{326AC89B-35CC-4D68-86E4-90CF8F1E1EC5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -155,7 +149,6 @@ Global
 		{0377B228-91F3-4A0B-BE66-221E7ECA6DF7} = {0BA39F07-84D6-420B-82D3-6DC3AF016C65}
 		{E195094D-5899-4FDF-969D-93C4432BA921} = {3D822DC2-ED2E-4434-BC4F-CE7FCD846B02}
 		{3EC669E6-A541-445E-B68E-0A853715E39C} = {3D822DC2-ED2E-4434-BC4F-CE7FCD846B02}
-		{326AC89B-35CC-4D68-86E4-90CF8F1E1EC5} = {3D822DC2-ED2E-4434-BC4F-CE7FCD846B02}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {949367A4-5683-4FD3-93F4-A2CEA6EECB21}

extensions/src/AWSSDK.Extensions.NETCore.Setup/ClientFactory.cs

@@ -20,7 +20,7 @@
 using System.Xml.Linq;
 using Amazon.Runtime;
 using Amazon.Runtime.CredentialManagement;
-using Amazon.Runtime.Credentials.Internal.IdentityResolvers;
+using Amazon.Runtime.Credentials.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs

@@ -38,8 +38,8 @@ public override string TransformText()
             #line default
             #line hidden
             this.Write("\r\nusing Amazon.Runtime;\r\nusing Amazon.Runtime.Credentials.Internal;\r\nusing Amazon" +
-                    ".Runtime.Internal;\r\nusing Amazon.Runtime.Internal.Auth;\r\nusing Smithy.Identity.A" +
-                    "bstractions;\r\nusing System.Collections.Generic;\r\n\r\nnamespace ");
+                    ".Runtime.Internal;\r\nusing Amazon.Runtime.Internal.Auth;\r\nusing Amazon.Runtime.Id" +
+                    "entity;\r\nusing System.Collections.Generic;\r\n\r\nnamespace ");
 
             #line 18 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace));

generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt

@@ -12,7 +12,7 @@ using Amazon.Runtime;
 using Amazon.Runtime.Credentials.Internal;
 using Amazon.Runtime.Internal;
 using Amazon.Runtime.Internal.Auth;
-using Smithy.Identity.Abstractions;
+using Amazon.Runtime.Identity;
 using System.Collections.Generic;
 
 namespace <#=this.Config.Namespace#>.Internal

generator/ServiceClientGeneratorLib/SolutionFileCreator.cs

@@ -49,9 +49,6 @@ public abstract class ProjectTypes
         private const string IntegrationTestUtilityName = "AWSSDK.IntegrationTestUtilities.NetFramework";
         private const string IntegrationTestUtilityGuid = "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}";
 
-        private const string SmithyIdentityProjectGuid = "{D253C367-816E-4482-BD9F-514800601AA3}";
-        private const string SmithyIdentityProjectName = "Smithy.Identity.Abstractions";
-
         private static Regex ProjectReferenceRegex = new Regex("\"([^\"]*)\"");
 
         private static readonly ProjectFileCreator.ProjectConfigurationData GeneratorLibProjectConfig
@@ -136,20 +133,6 @@ private static readonly ProjectFileCreator.ProjectConfigurationData GeneratorLib
             RelativePath = Utils.PathCombineAlt("..", "..", "..", "test", "NetStandard", "UnitTests", $"{UnitTestsNetStandardCoreOnlyProjectName}.csproj")
         };
 
-        private static readonly Project SmithyIdentityProjectForCore = new Project
-        {
-            Name = SmithyIdentityProjectName,
-            ProjectGuid = SmithyIdentityProjectGuid,
-            ProjectPath = Utils.PathCombineAlt("..", "extensions", "src", SmithyIdentityProjectName, $"{SmithyIdentityProjectName}.csproj")
-        };
-
-        private static readonly Project SmithyIdentityProjectForServices = new Project
-        {
-            Name = SmithyIdentityProjectName,
-            ProjectGuid = SmithyIdentityProjectGuid,
-            ProjectPath = Utils.PathCombineAlt("..", "..", "..", "..", "extensions", "src", SmithyIdentityProjectName, $"{SmithyIdentityProjectName}.csproj")
-        };
-
         private static readonly List<Project> CoreProjects = new List<Project>
         {
             new Project
@@ -383,9 +366,6 @@ private void GenerateVS2017Solution(string solutionFileName, bool includeTests,
                 }
             }
 
-            // Include a dependency on the identity and auth interfaces (as of now a project in the extensions folder, but may be moved to a separate package in the future).
-            coreProjects.Add(SmithyIdentityProjectForCore);
-
             IList<Project> testProjects = new List<Project>();
             IList<Project> integrationTestDependencies = new List<Project>();
             if (includeTests)
@@ -458,12 +438,6 @@ private void GenerateVS2017ServiceSolution(IEnumerable<ProjectFileConfiguration>
             var serviceProjectsRoot = Utils.PathCombineAlt(sdkSourceFolder, GeneratorDriver.ServicesSubFoldername);
             var coreProjectsRoot = Utils.PathCombineAlt(sdkSourceFolder, GeneratorDriver.CoreSubFoldername);
 
-            // In addition to the Core projects, also include the Smithy abstractions in each service solution. 
-            IList<Project> coreProjects = new List<Project>(CoreProjects)
-            {
-                SmithyIdentityProjectForServices
-            };
-
             // Iterating through each service in the service folder
             foreach (var servicePath in Directory.GetDirectories(serviceProjectsRoot).OrderBy(d => d))
             {
@@ -535,7 +509,7 @@ private void GenerateVS2017ServiceSolution(IEnumerable<ProjectFileConfiguration>
 
                 serviceSolutionFolders.Add(folder);
                 // Adding core projects to service solution
-                session["CoreProjects"] = coreProjects;
+                session["CoreProjects"] = CoreProjects;
                 // Adding service projects and its dependencies to the service solution
                 session["ServiceSolutionFolders"] = serviceSolutionFolders;
                 // Adding test projects to the service solution

sdk/AWSSDK.CoreAndCustomUnitTests.NetFramework.sln

@@ -50,8 +50,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SSO.NetFramework", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.KeyManagementService.NetFramework", "src\Services\KeyManagementService\AWSSDK.KeyManagementService.NetFramework.csproj", "{F0397317-53D7-4B42-8D15-9E02083BF5D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smithy.Identity.Abstractions", "..\extensions\src\Smithy.Identity.Abstractions\Smithy.Identity.Abstractions.csproj", "{22DCC673-78A4-421E-AEB3-83B648583154}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -142,10 +140,6 @@ Global
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22DCC673-78A4-421E-AEB3-83B648583154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22DCC673-78A4-421E-AEB3-83B648583154}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22DCC673-78A4-421E-AEB3-83B648583154}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22DCC673-78A4-421E-AEB3-83B648583154}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -172,7 +166,6 @@ Global
 		{4608625B-B089-49B0-A3C3-F18DC5FFCEA5} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
 		{685155AC-D4AE-41ED-A76E-388D0F66D6F8} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
 		{F0397317-53D7-4B42-8D15-9E02083BF5D3} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
-		{22DCC673-78A4-421E-AEB3-83B648583154} = {5AB643DB-79E0-47A4-BCFF-FCB51B100447}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BBAD3467-3B24-41C1-898E-1B34BB9931DE}

sdk/AWSSDK.CoreAndCustomUnitTests.NetStandard.sln

@@ -25,8 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.Custom.Net
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.DynamoDBv2.NetStandard", "src\Services\DynamoDBv2\AWSSDK.DynamoDBv2.NetStandard.csproj", "{B52234D7-08EA-4D07-A9B7-9F71E6AE5490}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smithy.Identity.Abstractions", "..\extensions\src\Smithy.Identity.Abstractions\Smithy.Identity.Abstractions.csproj", "{89D06867-848D-4353-A250-A9BEC53F21CE}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,10 +63,6 @@ Global
 		{B52234D7-08EA-4D07-A9B7-9F71E6AE5490}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B52234D7-08EA-4D07-A9B7-9F71E6AE5490}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B52234D7-08EA-4D07-A9B7-9F71E6AE5490}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89D06867-848D-4353-A250-A9BEC53F21CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89D06867-848D-4353-A250-A9BEC53F21CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89D06867-848D-4353-A250-A9BEC53F21CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89D06867-848D-4353-A250-A9BEC53F21CE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -82,7 +76,6 @@ Global
 		{0BF01833-13DD-4BD5-84AA-BC8844F46470} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
 		{27D0813B-6FB9-438B-8B8E-C59636A35C30} = {CAEA0944-D530-499D-BC5D-4F3EB68407B3}
 		{B52234D7-08EA-4D07-A9B7-9F71E6AE5490} = {4CD78D56-2ABB-4F58-A0CB-08CED1B06370}
-		{89D06867-848D-4353-A250-A9BEC53F21CE} = {5AB643DB-79E0-47A4-BCFF-FCB51B100447}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BBAD3467-3B24-41C1-898E-1B34BB9931DE}

sdk/AWSSDK.NetFramework.sln

@@ -6,8 +6,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "src/Core/AWSSDK.Core.NetFramework.csproj", "{1827E98F-AAD5-4354-897D-C64DA0F95495}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smithy.Identity.Abstractions", "../extensions/src/Smithy.Identity.Abstractions/Smithy.Identity.Abstractions.csproj", "{D253C367-816E-4482-BD9F-514800601AA3}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AccessAnalyzer", "AccessAnalyzer", "{D35E1267-0F99-4C3C-BC76-23E855530127}"
@@ -1694,10 +1692,6 @@ Global
 		{1827E98F-AAD5-4354-897D-C64DA0F95495}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1827E98F-AAD5-4354-897D-C64DA0F95495}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1827E98F-AAD5-4354-897D-C64DA0F95495}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C9E03D46-8113-4476-8B66-69A307DC193E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C9E03D46-8113-4476-8B66-69A307DC193E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C9E03D46-8113-4476-8B66-69A307DC193E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -3392,7 +3386,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{1827E98F-AAD5-4354-897D-C64DA0F95495} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}
-		{D253C367-816E-4482-BD9F-514800601AA3} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}
 		{D35E1267-0F99-4C3C-BC76-23E855530127} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB}
 		{C9E03D46-8113-4476-8B66-69A307DC193E} = {D35E1267-0F99-4C3C-BC76-23E855530127}
 		{952ED7BB-663B-47BD-B5D9-393AF6BFF3E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB}

sdk/AWSSDK.NetStandard.sln

@@ -6,8 +6,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "src/Core/AWSSDK.Core.NetStandard.csproj", "{15BB19BE-ABCA-441F-8217-3AE9A993B5E7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smithy.Identity.Abstractions", "../extensions/src/Smithy.Identity.Abstractions/Smithy.Identity.Abstractions.csproj", "{D253C367-816E-4482-BD9F-514800601AA3}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AccessAnalyzer", "AccessAnalyzer", "{CDEDFA0E-9192-5F7F-200A-5329D35913C5}"
@@ -1690,10 +1688,6 @@ Global
 		{15BB19BE-ABCA-441F-8217-3AE9A993B5E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15BB19BE-ABCA-441F-8217-3AE9A993B5E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15BB19BE-ABCA-441F-8217-3AE9A993B5E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D253C367-816E-4482-BD9F-514800601AA3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{81A3EBDE-824D-458E-9ABF-359E5B32B773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81A3EBDE-824D-458E-9ABF-359E5B32B773}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81A3EBDE-824D-458E-9ABF-359E5B32B773}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -3384,7 +3378,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{15BB19BE-ABCA-441F-8217-3AE9A993B5E7} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}
-		{D253C367-816E-4482-BD9F-514800601AA3} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}
 		{CDEDFA0E-9192-5F7F-200A-5329D35913C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB}
 		{81A3EBDE-824D-458E-9ABF-359E5B32B773} = {CDEDFA0E-9192-5F7F-200A-5329D35913C5}
 		{AEF6C919-A19B-DF6C-2AEC-8537B2BEE229} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB}

sdk/src/Core/AWSSDK.Core.NetFramework.csproj

@@ -79,7 +79,4 @@
   </ItemGroup>
   <Import Project="overrides.targets"/>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\extensions\src\Smithy.Identity.Abstractions\Smithy.Identity.Abstractions.csproj" />
-  </ItemGroup>
 </Project>

sdk/src/Core/AWSSDK.Core.NetStandard.csproj

@@ -90,7 +90,4 @@
   </ItemGroup>
     <Import Project="overrides.targets"/>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\extensions\src\Smithy.Identity.Abstractions\Smithy.Identity.Abstractions.csproj" />
-  </ItemGroup>
 </Project>

sdk/src/Core/Amazon.Runtime/AWSRegion.cs

@@ -19,7 +19,7 @@
 using System.Collections.Generic;
 using Amazon.Util;
 using Amazon.Runtime.CredentialManagement;
-using Amazon.Runtime.Credentials.Internal.IdentityResolvers;
+using Amazon.Runtime.Credentials;
 
 namespace Amazon.Runtime
 {