From 8c1a3803af46459f0ae787d1622495842072c2d4 Mon Sep 17 00:00:00 2001 From: Muhammad Othman Date: Mon, 23 Dec 2024 04:36:10 -0500 Subject: [PATCH] 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 --- .../SDKDocGeneratorLib/ReflectionWrappers.cs | 11 +----- extensions/AWSSDK.Extensions.sln | 6 ---- .../ClientFactory.cs | 2 +- .../Auth/IAuthSchemeOption.cs | 14 -------- .../Identity/BaseIdentity.cs | 17 --------- .../Properties/AssemblyInfo.cs | 15 -------- .../Signer/ISigner.cs | 17 --------- .../Smithy.Identity.Abstractions.csproj | 19 ---------- .../smithy.abstractions.snk | Bin 596 -> 0 bytes .../AuthResolvers/ModeledResolver.cs | 4 +-- .../AuthResolvers/ModeledResolver.tt | 2 +- .../SolutionFileCreator.cs | 28 +-------------- ...DK.CoreAndCustomUnitTests.NetFramework.sln | 7 ---- ...SDK.CoreAndCustomUnitTests.NetStandard.sln | 7 ---- sdk/AWSSDK.NetFramework.sln | 7 ---- sdk/AWSSDK.NetStandard.sln | 7 ---- sdk/src/Core/AWSSDK.Core.NetFramework.csproj | 3 -- sdk/src/Core/AWSSDK.Core.NetStandard.csproj | 3 -- sdk/src/Core/Amazon.Runtime/AWSRegion.cs | 2 +- .../CSM/CSMFallbackConfigChain.cs | 2 +- sdk/src/Core/Amazon.Runtime/ClientConfig.cs | 7 ++-- .../Credentials/AWSCredentials.cs | 3 +- .../AnonymousIdentityResolver.cs | 4 +-- .../DefaultAWSCredentialsIdentityResolver.cs | 8 ++--- .../DefaultAWSTokenIdentityResolver.cs | 4 +-- .../Internal/AnonymousAuthScheme.cs | 2 +- .../Credentials/Internal/AuthSchemeOption.cs | 2 +- .../Credentials/Internal/AwsV4AuthScheme.cs | 2 +- .../Credentials/Internal/AwsV4aAuthScheme.cs | 2 +- .../Credentials/Internal/BearerAuthScheme.cs | 2 +- ...> DefaultIdentityResolverConfiguration.cs} | 4 +-- sdk/src/Core/Amazon.Runtime/IClientConfig.cs | 5 +-- .../Amazon.Runtime/Identity/BaseIdentity.cs | 32 +++++++++++++++++ .../Identity/IIdentityResolver.cs | 19 ++++++++-- .../IIdentityResolverConfiguration.cs | 2 +- .../Internal/Auth/AWS4Signer.cs | 2 +- .../Internal/Auth/AWS4aSignerCRTWrapper.cs | 2 +- .../Auth/AWSEndpointAuthSchemeSigner.cs | 2 +- .../Internal/Auth/AbstractAWSSigner.cs | 2 +- .../Internal/Auth/BearerTokenSigner.cs | 3 +- .../Internal/Auth/CloudFrontSigner.cs | 2 +- .../Internal/Auth/EventBridgeSigner.cs | 4 +-- .../Internal}/Auth/IAuthScheme.cs | 19 +++++++++- .../Internal/Auth/IAuthSchemeOption.cs | 29 +++++++++++++++ .../Internal}/Auth/IAuthSchemeParameters.cs | 17 ++++++++- .../Internal}/Auth/IAuthSchemeResolver.cs | 19 ++++++++-- .../Amazon.Runtime/Internal/Auth/ISigner.cs | 34 ++++++++++++++++++ .../Internal/Auth/NullSigner.cs | 2 +- .../Internal/Auth/QueryStringSigner.cs | 3 +- .../Amazon.Runtime/Internal/Auth/S3Signer.cs | 2 +- .../Internal/InternalConfiguration.cs | 3 +- .../Core/Amazon.Runtime/Pipeline/Contexts.cs | 2 +- .../Handlers/BaseAuthResolverHandler.cs | 2 +- .../Core/Amazon.Runtime/Tokens/AWSToken.cs | 4 +-- .../Tokens/ProfileTokenProvider.cs | 2 +- sdk/src/Services/AutoScaling/AutoScaling.sln | 7 ---- .../Internal/AmazonAutoScalingAuthResolver.cs | 2 +- .../Polly/Custom/SynthesizeSpeechUtil.cs | 2 +- .../RDS/Custom/Util/RDSAuthTokenGenerator.cs | 2 +- .../S3/Custom/AmazonS3Client.Extensions.cs | 2 +- .../Services/S3/Custom/Internal/S3Signer.cs | 2 +- .../Internal/AmazonS3AuthResolver.cs | 2 +- sdk/src/Services/S3/S3.sln | 7 ---- .../Custom/RDSAuthTokenGeneratorTest.cs | 4 +-- .../S3/IntegrationTests/RegionsTest.cs | 2 +- .../Custom/Runtime/BearerTokenSignerTests.cs | 1 - .../Custom/Runtime/RuntimePipelineTestBase.cs | 2 +- 67 files changed, 226 insertions(+), 235 deletions(-) delete mode 100644 extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeOption.cs delete mode 100644 extensions/src/Smithy.Identity.Abstractions/Identity/BaseIdentity.cs delete mode 100644 extensions/src/Smithy.Identity.Abstractions/Properties/AssemblyInfo.cs delete mode 100644 extensions/src/Smithy.Identity.Abstractions/Signer/ISigner.cs delete mode 100644 extensions/src/Smithy.Identity.Abstractions/Smithy.Identity.Abstractions.csproj delete mode 100644 extensions/src/Smithy.Identity.Abstractions/smithy.abstractions.snk rename sdk/src/Core/Amazon.Runtime/Credentials/{Internal/IdentityResolvers => }/AnonymousIdentityResolver.cs (93%) rename sdk/src/Core/Amazon.Runtime/Credentials/{Internal/IdentityResolvers => }/DefaultAWSCredentialsIdentityResolver.cs (98%) rename sdk/src/Core/Amazon.Runtime/Credentials/{Internal/IdentityResolvers => }/DefaultAWSTokenIdentityResolver.cs (96%) rename sdk/src/Core/Amazon.Runtime/Credentials/Internal/{IdentityResolvers/IdentityResolverConfiguration.cs => DefaultIdentityResolverConfiguration.cs} (94%) create mode 100644 sdk/src/Core/Amazon.Runtime/Identity/BaseIdentity.cs rename {extensions/src/Smithy.Identity.Abstractions => sdk/src/Core/Amazon.Runtime}/Identity/IIdentityResolver.cs (63%) rename {extensions/src/Smithy.Identity.Abstractions => sdk/src/Core/Amazon.Runtime}/Identity/IIdentityResolverConfiguration.cs (96%) rename {extensions/src/Smithy.Identity.Abstractions => sdk/src/Core/Amazon.Runtime/Internal}/Auth/IAuthScheme.cs (64%) create mode 100644 sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeOption.cs rename {extensions/src/Smithy.Identity.Abstractions => sdk/src/Core/Amazon.Runtime/Internal}/Auth/IAuthSchemeParameters.cs (54%) rename {extensions/src/Smithy.Identity.Abstractions => sdk/src/Core/Amazon.Runtime/Internal}/Auth/IAuthSchemeResolver.cs (63%) create mode 100644 sdk/src/Core/Amazon.Runtime/Internal/Auth/ISigner.cs diff --git a/docgenerator/SDKDocGeneratorLib/ReflectionWrappers.cs b/docgenerator/SDKDocGeneratorLib/ReflectionWrappers.cs index d1fadc8aa156..a081bedc5e46 100644 --- a/docgenerator/SDKDocGeneratorLib/ReflectionWrappers.cs +++ b/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 diff --git a/extensions/AWSSDK.Extensions.sln b/extensions/AWSSDK.Extensions.sln index 506fdb855de4..60704f060db8 100644 --- a/extensions/AWSSDK.Extensions.sln +++ b/extensions/AWSSDK.Extensions.sln @@ -57,7 +57,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.Bedrock.MEAI.NetFramework", "src\AWSSDK.Extensions.Bedrock.MEAI\AWSSDK.Extensions.Bedrock.MEAI.NetFramework.csproj", "{4A94F623-0C71-47BD-B927-CB6FA28D33A1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.Bedrock.MEAI.NetStandard", "src\AWSSDK.Extensions.Bedrock.MEAI\AWSSDK.Extensions.Bedrock.MEAI.NetStandard.csproj", "{B174860A-0D1B-4B7D-9E46-7DBFC9AA5AAB}" -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 @@ -157,10 +156,6 @@ Global {B174860A-0D1B-4B7D-9E46-7DBFC9AA5AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU {B174860A-0D1B-4B7D-9E46-7DBFC9AA5AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU {B174860A-0D1B-4B7D-9E46-7DBFC9AA5AAB}.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 @@ -189,7 +184,6 @@ Global {3EC669E6-A541-445E-B68E-0A853715E39C} = {3D822DC2-ED2E-4434-BC4F-CE7FCD846B02} {4A94F623-0C71-47BD-B927-CB6FA28D33A1} = {3D822DC2-ED2E-4434-BC4F-CE7FCD846B02} {B174860A-0D1B-4B7D-9E46-7DBFC9AA5AAB} = {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} diff --git a/extensions/src/AWSSDK.Extensions.NETCore.Setup/ClientFactory.cs b/extensions/src/AWSSDK.Extensions.NETCore.Setup/ClientFactory.cs index de7fba1354e4..26c402eada88 100644 --- a/extensions/src/AWSSDK.Extensions.NETCore.Setup/ClientFactory.cs +++ b/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; diff --git a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeOption.cs b/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeOption.cs deleted file mode 100644 index ec187ff5680d..000000000000 --- a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeOption.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Smithy.Identity.Abstractions -{ - /// - /// The output from the authentication scheme resolver. The resolver returns a list of auth scheme options, - /// in the order that they should be used. - /// - public interface IAuthSchemeOption - { - /// - /// The ID of the scheme to use. This value matches the one returned by . - /// - string SchemeId { get; set; } - } -} diff --git a/extensions/src/Smithy.Identity.Abstractions/Identity/BaseIdentity.cs b/extensions/src/Smithy.Identity.Abstractions/Identity/BaseIdentity.cs deleted file mode 100644 index 2abd1882b322..000000000000 --- a/extensions/src/Smithy.Identity.Abstractions/Identity/BaseIdentity.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; - -namespace Smithy.Identity.Abstractions -{ - /// - /// An identity is an entity within the SDK representing who the customer is. - /// For example, the customer's identity could be anonymouus, a token, a public / private key pair, etc... - /// - public abstract class BaseIdentity - { - /// - /// The time after which this identity will no longer be valid. If this is null, an expiration time - /// is not known (for example, when using long-term credentials). - /// - public virtual DateTime? Expiration { get; set; } - } -} diff --git a/extensions/src/Smithy.Identity.Abstractions/Properties/AssemblyInfo.cs b/extensions/src/Smithy.Identity.Abstractions/Properties/AssemblyInfo.cs deleted file mode 100644 index c66c48158ab5..000000000000 --- a/extensions/src/Smithy.Identity.Abstractions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("Smithy.Identity.Abstractions")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("Smithy identity and authentication abstractions for the AWS SDK for .NET")] -[assembly: AssemblyCompany("Amazon.com, Inc")] -[assembly: AssemblyCopyright("Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.")] -[assembly: AssemblyTrademark("")] - -#if NETFRAMEWORK -[assembly: AssemblyVersion("0.1")] -#else -[assembly: AssemblyVersion("0.1")] -#endif -[assembly: AssemblyFileVersion("0.1")] diff --git a/extensions/src/Smithy.Identity.Abstractions/Signer/ISigner.cs b/extensions/src/Smithy.Identity.Abstractions/Signer/ISigner.cs deleted file mode 100644 index 550b96d69344..000000000000 --- a/extensions/src/Smithy.Identity.Abstractions/Signer/ISigner.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Smithy.Identity.Abstractions -{ - /// - /// - /// A signer is an entity within the SDK representing a way to generate a signature for a request. - /// - /// - /// A signature is metadata attached to a request that will be sent to the service in order to allow - /// the service to authenticate the SDK customer's identity. - /// - /// - public interface ISigner - { - // TODO: This is a marker interface at the moment since the signers defined in the SDK - // currently reference internal types that need to be extracted / refactored (e.g. IRequest). - } -} diff --git a/extensions/src/Smithy.Identity.Abstractions/Smithy.Identity.Abstractions.csproj b/extensions/src/Smithy.Identity.Abstractions/Smithy.Identity.Abstractions.csproj deleted file mode 100644 index 4947d88cf62e..000000000000 --- a/extensions/src/Smithy.Identity.Abstractions/Smithy.Identity.Abstractions.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - net472;netstandard2.0;netcoreapp3.1;net8.0 - Smithy.Identity.Abstractions - false - false - false - false - false - false - false - false - - True - smithy.abstractions.snk - 9.0 - enable - - diff --git a/extensions/src/Smithy.Identity.Abstractions/smithy.abstractions.snk b/extensions/src/Smithy.Identity.Abstractions/smithy.abstractions.snk deleted file mode 100644 index 23eb6cba777cf7dfdfb522b5b01c0cdb337f7252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096=9(tx^RRf-~8-;#Wg14##MHfLwyB*mB z&62XVgJ7Wa#E&ZspXVmxa!nAPV4KHH`zY9os+kyw&dengwx0MS$fWAQ&9{oWb*Q6n z9KIqfq8k3}Oo%Ij!(5Aofx!s+0p|u8iC<@U+NFQnWc`ngf+L$*E~qf(WfOW%yIG@u zVHG$>A1-GY5fLJFwN9Q4yQ6MTt1k5H%ZjFD5V`uM%4a565Ym|&5ED@0b85Lpf9On- zIywEKJ-Ogy?{&d9)LTP%8CIfD`gfQ-y@=OGG@@biS;pGKWFCyzx!&PJVpYz6)hB3` z{h(Px)+|*9apkv96*kw%sZ1h>{wLTy7#!7+pBAxG>-O46x_;9CtS1J3N1ZW@DwH%zBzSI>Xt4Zh|EXF(o5WZI>Q zj|}ky#EYN>^9EfzYjGmUz{Vh%mFK7hH_G!PjdPwi8aYn;=IdShHXaOeman^$S>eL2 z?2*U(_ES~4iKtKxP+)FECIi;&4Y94&BgA?T0Gx*a)RWQ*klXy?Hn9<6TV8Zzj|`Ve zSvvNBm+)z!rS>4?7a5x+(;dnJh4%xB>g5?P>nPl*`jWlECCRv+L25uP6`QKM71(f~ zE!A}_7;sUZtOR#eh{EJ!QAOtBMdPClv!+-hiZj4wR4jd5Ib$;qRY9^6EPxgh0@A4y i7$@&XkKtF%!}7cjV{CI0XA0NwKi`Dew0!zct1oEo>>bho diff --git a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs b/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs index c4d952ad1f6b..555992afef45 100644 --- a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs +++ b/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)); diff --git a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt b/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt index 66ad9ee572f8..c135223fb008 100644 --- a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt +++ b/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 diff --git a/generator/ServiceClientGeneratorLib/SolutionFileCreator.cs b/generator/ServiceClientGeneratorLib/SolutionFileCreator.cs index d5c2852d1998..44d3c4b1c2c0 100644 --- a/generator/ServiceClientGeneratorLib/SolutionFileCreator.cs +++ b/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 CoreProjects = new List { 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 testProjects = new List(); IList integrationTestDependencies = new List(); if (includeTests) @@ -458,12 +438,6 @@ private void GenerateVS2017ServiceSolution(IEnumerable 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 coreProjects = new List(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 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 diff --git a/sdk/AWSSDK.CoreAndCustomUnitTests.NetFramework.sln b/sdk/AWSSDK.CoreAndCustomUnitTests.NetFramework.sln index fb326d862c89..bd51a74027d6 100644 --- a/sdk/AWSSDK.CoreAndCustomUnitTests.NetFramework.sln +++ b/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} diff --git a/sdk/AWSSDK.CoreAndCustomUnitTests.NetStandard.sln b/sdk/AWSSDK.CoreAndCustomUnitTests.NetStandard.sln index f62bba262d32..dab4fffb3044 100644 --- a/sdk/AWSSDK.CoreAndCustomUnitTests.NetStandard.sln +++ b/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} diff --git a/sdk/AWSSDK.NetFramework.sln b/sdk/AWSSDK.NetFramework.sln index b99ca6cd82cd..507c91a53689 100644 --- a/sdk/AWSSDK.NetFramework.sln +++ b/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}" @@ -1742,10 +1740,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 @@ -3488,7 +3482,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} diff --git a/sdk/AWSSDK.NetStandard.sln b/sdk/AWSSDK.NetStandard.sln index 425a64c62132..75a36d18b4d0 100644 --- a/sdk/AWSSDK.NetStandard.sln +++ b/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}" @@ -1738,10 +1736,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 @@ -3480,7 +3474,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} diff --git a/sdk/src/Core/AWSSDK.Core.NetFramework.csproj b/sdk/src/Core/AWSSDK.Core.NetFramework.csproj index 5043c793775a..3960fb78bef6 100644 --- a/sdk/src/Core/AWSSDK.Core.NetFramework.csproj +++ b/sdk/src/Core/AWSSDK.Core.NetFramework.csproj @@ -79,7 +79,4 @@ - - - diff --git a/sdk/src/Core/AWSSDK.Core.NetStandard.csproj b/sdk/src/Core/AWSSDK.Core.NetStandard.csproj index 09269fcfa3b4..703c9b8357a6 100644 --- a/sdk/src/Core/AWSSDK.Core.NetStandard.csproj +++ b/sdk/src/Core/AWSSDK.Core.NetStandard.csproj @@ -90,7 +90,4 @@ - - - \ No newline at end of file diff --git a/sdk/src/Core/Amazon.Runtime/AWSRegion.cs b/sdk/src/Core/Amazon.Runtime/AWSRegion.cs index 78d1df5cab56..4d15e718d6a5 100644 --- a/sdk/src/Core/Amazon.Runtime/AWSRegion.cs +++ b/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 { diff --git a/sdk/src/Core/Amazon.Runtime/CSM/CSMFallbackConfigChain.cs b/sdk/src/Core/Amazon.Runtime/CSM/CSMFallbackConfigChain.cs index 9a57f6ffe971..38620ca65bdb 100644 --- a/sdk/src/Core/Amazon.Runtime/CSM/CSMFallbackConfigChain.cs +++ b/sdk/src/Core/Amazon.Runtime/CSM/CSMFallbackConfigChain.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Text; using Amazon.Runtime.CredentialManagement; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials; using Amazon.Runtime.Internal.Util; using Amazon.Util.Internal; diff --git a/sdk/src/Core/Amazon.Runtime/ClientConfig.cs b/sdk/src/Core/Amazon.Runtime/ClientConfig.cs index 887665a1d0b1..501356cd3044 100644 --- a/sdk/src/Core/Amazon.Runtime/ClientConfig.cs +++ b/sdk/src/Core/Amazon.Runtime/ClientConfig.cs @@ -19,7 +19,6 @@ using System.Globalization; -using Smithy.Identity.Abstractions; using Amazon.Util; using Amazon.Internal; using Amazon.Runtime.Endpoints; @@ -28,7 +27,11 @@ using Amazon.Runtime.CredentialManagement; using Amazon.Runtime.Internal.Settings; using Amazon.Runtime.Telemetry; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials.Internal; +using Amazon.Runtime.Identity; +using Amazon.Runtime.Credentials; + + #if NETSTANDARD using System.Runtime.InteropServices; diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/AWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/AWSCredentials.cs index a959cf3d0ea3..1bdc71c3699c 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/AWSCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/AWSCredentials.cs @@ -13,7 +13,8 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; + +using Amazon.Runtime.Identity; namespace Amazon.Runtime { diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/AnonymousIdentityResolver.cs b/sdk/src/Core/Amazon.Runtime/Credentials/AnonymousIdentityResolver.cs similarity index 93% rename from sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/AnonymousIdentityResolver.cs rename to sdk/src/Core/Amazon.Runtime/Credentials/AnonymousIdentityResolver.cs index a2e51d07862d..89dff64eafc4 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/AnonymousIdentityResolver.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/AnonymousIdentityResolver.cs @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; using System.Threading; using System.Threading.Tasks; +using Amazon.Runtime.Identity; -namespace Amazon.Runtime.Credentials.Internal.IdentityResolvers +namespace Amazon.Runtime { /// /// A resolver that provides an anonymous identity. diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/DefaultAWSCredentialsIdentityResolver.cs b/sdk/src/Core/Amazon.Runtime/Credentials/DefaultAWSCredentialsIdentityResolver.cs similarity index 98% rename from sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/DefaultAWSCredentialsIdentityResolver.cs rename to sdk/src/Core/Amazon.Runtime/Credentials/DefaultAWSCredentialsIdentityResolver.cs index 3499a6237f3a..53bb4b36579f 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/DefaultAWSCredentialsIdentityResolver.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/DefaultAWSCredentialsIdentityResolver.cs @@ -13,9 +13,6 @@ * permissions and limitations under the License. */ -using Amazon.Runtime.CredentialManagement; -using Amazon.Runtime.Internal.Util; -using Smithy.Identity.Abstractions; using System; using System.Collections.Generic; using System.Globalization; @@ -23,8 +20,11 @@ using System.Security; using System.Threading; using System.Threading.Tasks; +using Amazon.Runtime.CredentialManagement; +using Amazon.Runtime.Identity; +using Amazon.Runtime.Internal.Util; -namespace Amazon.Runtime.Credentials.Internal.IdentityResolvers +namespace Amazon.Runtime.Credentials { /// /// A resolver that provides an AWSCredentials identity. diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/DefaultAWSTokenIdentityResolver.cs b/sdk/src/Core/Amazon.Runtime/Credentials/DefaultAWSTokenIdentityResolver.cs similarity index 96% rename from sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/DefaultAWSTokenIdentityResolver.cs rename to sdk/src/Core/Amazon.Runtime/Credentials/DefaultAWSTokenIdentityResolver.cs index e4a04c328f4a..177600d5e777 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/DefaultAWSTokenIdentityResolver.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/DefaultAWSTokenIdentityResolver.cs @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; using System.Threading; using System.Threading.Tasks; +using Amazon.Runtime.Identity; -namespace Amazon.Runtime.Credentials.Internal.IdentityResolvers +namespace Amazon.Runtime.Credentials { /// /// A resolver that provides a bearer token identity. diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AnonymousAuthScheme.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AnonymousAuthScheme.cs index b6432ad3a5bc..8cd2cc7ec8c0 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AnonymousAuthScheme.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AnonymousAuthScheme.cs @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal.Auth; namespace Amazon.Runtime.Credentials.Internal diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AuthSchemeOption.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AuthSchemeOption.cs index fd8c2c275c3c..83feb2bc6f07 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AuthSchemeOption.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AuthSchemeOption.cs @@ -13,8 +13,8 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; using System.Collections.Generic; +using Amazon.Runtime.Internal.Auth; namespace Amazon.Runtime.Credentials.Internal { diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4AuthScheme.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4AuthScheme.cs index 7d8050eb9ef9..cc34e5b742f3 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4AuthScheme.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4AuthScheme.cs @@ -13,8 +13,8 @@ * permissions and limitations under the License. */ +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal.Auth; -using Smithy.Identity.Abstractions; namespace Amazon.Runtime.Credentials.Internal { diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4aAuthScheme.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4aAuthScheme.cs index 1d9994ebf8bf..99994a875aa2 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4aAuthScheme.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/AwsV4aAuthScheme.cs @@ -14,8 +14,8 @@ */ using System.Threading; +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal.Auth; -using Smithy.Identity.Abstractions; namespace Amazon.Runtime.Credentials.Internal { diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/BearerAuthScheme.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/BearerAuthScheme.cs index e762183a9958..5241888df920 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/BearerAuthScheme.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/BearerAuthScheme.cs @@ -13,8 +13,8 @@ * permissions and limitations under the License. */ +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal.Auth; -using Smithy.Identity.Abstractions; namespace Amazon.Runtime.Credentials.Internal { diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/IdentityResolverConfiguration.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/DefaultIdentityResolverConfiguration.cs similarity index 94% rename from sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/IdentityResolverConfiguration.cs rename to sdk/src/Core/Amazon.Runtime/Credentials/Internal/DefaultIdentityResolverConfiguration.cs index e8da48ec9fc0..990152887a02 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/IdentityResolvers/IdentityResolverConfiguration.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/DefaultIdentityResolverConfiguration.cs @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; using System; using System.Collections.Generic; +using Amazon.Runtime.Identity; -namespace Amazon.Runtime.Credentials.Internal.IdentityResolvers +namespace Amazon.Runtime.Credentials.Internal { /// public class DefaultIdentityResolverConfiguration : IIdentityResolverConfiguration diff --git a/sdk/src/Core/Amazon.Runtime/IClientConfig.cs b/sdk/src/Core/Amazon.Runtime/IClientConfig.cs index ee0e1690ae5f..a99e1c21cbf3 100644 --- a/sdk/src/Core/Amazon.Runtime/IClientConfig.cs +++ b/sdk/src/Core/Amazon.Runtime/IClientConfig.cs @@ -14,13 +14,14 @@ */ using System; using System.Net; -using Smithy.Identity.Abstractions; using Amazon.Runtime.Internal; using Amazon.Runtime.Endpoints; using Amazon.Runtime.Internal.Auth; using Amazon.Util; using Amazon.Runtime.Telemetry; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials.Internal; +using Amazon.Runtime.Identity; + #if NETSTANDARD using System.Net.Http; #endif diff --git a/sdk/src/Core/Amazon.Runtime/Identity/BaseIdentity.cs b/sdk/src/Core/Amazon.Runtime/Identity/BaseIdentity.cs new file mode 100644 index 000000000000..273545104c6e --- /dev/null +++ b/sdk/src/Core/Amazon.Runtime/Identity/BaseIdentity.cs @@ -0,0 +1,32 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +using System; + +namespace Amazon.Runtime.Identity +{ + /// + /// An identity is an entity within the SDK representing who the customer is. + /// For example, the customer's identity could be anonymous, a token, a public / private key pair, etc... + /// + public abstract class BaseIdentity + { + /// + /// The time after which this identity will no longer be valid. If this is null, an expiration time + /// is not known (for example, when using long-term credentials). + /// + public virtual DateTime? Expiration { get; set; } + } +} diff --git a/extensions/src/Smithy.Identity.Abstractions/Identity/IIdentityResolver.cs b/sdk/src/Core/Amazon.Runtime/Identity/IIdentityResolver.cs similarity index 63% rename from extensions/src/Smithy.Identity.Abstractions/Identity/IIdentityResolver.cs rename to sdk/src/Core/Amazon.Runtime/Identity/IIdentityResolver.cs index 055b67f4d7c0..36bf4ac1b98c 100644 --- a/extensions/src/Smithy.Identity.Abstractions/Identity/IIdentityResolver.cs +++ b/sdk/src/Core/Amazon.Runtime/Identity/IIdentityResolver.cs @@ -1,7 +1,22 @@ -using System.Threading; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +using System.Threading; using System.Threading.Tasks; -namespace Smithy.Identity.Abstractions +namespace Amazon.Runtime.Identity { /// /// An identity resolver is a component that is able to resolve a customer's . diff --git a/extensions/src/Smithy.Identity.Abstractions/Identity/IIdentityResolverConfiguration.cs b/sdk/src/Core/Amazon.Runtime/Identity/IIdentityResolverConfiguration.cs similarity index 96% rename from extensions/src/Smithy.Identity.Abstractions/Identity/IIdentityResolverConfiguration.cs rename to sdk/src/Core/Amazon.Runtime/Identity/IIdentityResolverConfiguration.cs index a0cca5d33b10..39e01d7fb3e9 100644 --- a/extensions/src/Smithy.Identity.Abstractions/Identity/IIdentityResolverConfiguration.cs +++ b/sdk/src/Core/Amazon.Runtime/Identity/IIdentityResolverConfiguration.cs @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -namespace Smithy.Identity.Abstractions +namespace Amazon.Runtime.Identity { /// /// The identity resolvers configured in the SDK. diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4Signer.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4Signer.cs index 71ba1d98ef78..92b495b94c4c 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4Signer.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4Signer.cs @@ -23,7 +23,7 @@ using Amazon.Runtime.Internal.Util; using Amazon.Runtime.Endpoints; using ThirdParty.RuntimeBackports; -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; namespace Amazon.Runtime.Internal.Auth { diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4aSignerCRTWrapper.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4aSignerCRTWrapper.cs index 3f1a16caef23..fa0599d8c41b 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4aSignerCRTWrapper.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWS4aSignerCRTWrapper.cs @@ -12,11 +12,11 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal.Util; using Amazon.Runtime.SharedInterfaces; using Amazon.RuntimeDependencies; using Amazon.Util.Internal; -using Smithy.Identity.Abstractions; using System; using System.Collections.Generic; using System.Globalization; diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWSEndpointAuthSchemeSigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWSEndpointAuthSchemeSigner.cs index 4b9e76c1fee1..2642e28acb29 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWSEndpointAuthSchemeSigner.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AWSEndpointAuthSchemeSigner.cs @@ -15,7 +15,7 @@ using Amazon.Util; using Amazon.Runtime.Internal.Util; -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; namespace Amazon.Runtime.Internal.Auth { diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AbstractAWSSigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AbstractAWSSigner.cs index b911d53b6420..80f28aeba6c1 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/AbstractAWSSigner.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/AbstractAWSSigner.cs @@ -20,10 +20,10 @@ using System.Threading; using System.Threading.Tasks; #endif -using Smithy.Identity.Abstractions; using Amazon.Internal; using Amazon.Util; using Amazon.Runtime.Internal.Util; +using Amazon.Runtime.Identity; namespace Amazon.Runtime.Internal.Auth { diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/BearerTokenSigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/BearerTokenSigner.cs index 087f2d1bee37..744b23fdf5ba 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/BearerTokenSigner.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/BearerTokenSigner.cs @@ -17,9 +17,10 @@ #if AWS_ASYNC_API using System.Threading; using System.Threading.Tasks; + #endif +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal.Util; -using Smithy.Identity.Abstractions; namespace Amazon.Runtime.Internal.Auth { diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/CloudFrontSigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/CloudFrontSigner.cs index 2a09c3df372b..d6f5accd78b4 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/CloudFrontSigner.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/CloudFrontSigner.cs @@ -22,7 +22,7 @@ using Amazon.Runtime.Internal.Util; using System.Globalization; -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; namespace Amazon.Runtime.Internal.Auth { diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/EventBridgeSigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/EventBridgeSigner.cs index bc9dbf1a1457..08d5c9e04f9f 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/EventBridgeSigner.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/EventBridgeSigner.cs @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ +using System; using Amazon.Util; using Amazon.Runtime.Internal.Util; -using System; -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; namespace Amazon.Runtime.Internal.Auth { diff --git a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthScheme.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthScheme.cs similarity index 64% rename from extensions/src/Smithy.Identity.Abstractions/Auth/IAuthScheme.cs rename to sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthScheme.cs index bcd12458c72b..9c1d495a6017 100644 --- a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthScheme.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthScheme.cs @@ -1,4 +1,21 @@ -namespace Smithy.Identity.Abstractions +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +using Amazon.Runtime.Identity; + +namespace Amazon.Runtime.Internal.Auth { /// /// diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeOption.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeOption.cs new file mode 100644 index 000000000000..68311f759167 --- /dev/null +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeOption.cs @@ -0,0 +1,29 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +namespace Amazon.Runtime.Internal.Auth +{ + /// + /// The output from the authentication scheme resolver. The resolver returns a list of auth scheme options, + /// in the order that they should be used. + /// + public interface IAuthSchemeOption + { + /// + /// The ID of the scheme to use. This value matches the one returned by . + /// + string SchemeId { get; set; } + } +} diff --git a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeParameters.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeParameters.cs similarity index 54% rename from extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeParameters.cs rename to sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeParameters.cs index 002e61c7fb22..6c7ef4ba05f9 100644 --- a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeParameters.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeParameters.cs @@ -1,4 +1,19 @@ -namespace Smithy.Identity.Abstractions +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +namespace Amazon.Runtime.Internal.Auth { /// /// diff --git a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeResolver.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeResolver.cs similarity index 63% rename from extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeResolver.cs rename to sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeResolver.cs index c11d155ef2c0..f29a653e480b 100644 --- a/extensions/src/Smithy.Identity.Abstractions/Auth/IAuthSchemeResolver.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/IAuthSchemeResolver.cs @@ -1,6 +1,21 @@ -using System.Collections.Generic; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ -namespace Smithy.Identity.Abstractions +using System.Collections.Generic; + +namespace Amazon.Runtime.Internal.Auth { /// /// diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/ISigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/ISigner.cs new file mode 100644 index 000000000000..cc26b48e705e --- /dev/null +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/ISigner.cs @@ -0,0 +1,34 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +namespace Amazon.Runtime.Internal.Auth +{ + /// + /// + /// A signer is an entity within the SDK representing a way to generate a signature for a request. + /// + /// + /// A signature is metadata attached to a request that will be sent to the service in order to allow + /// the service to authenticate the SDK customer's identity. + /// + /// +#pragma warning disable CA1040 // Avoid empty interfaces + public interface ISigner +#pragma warning restore CA1040 // Avoid empty interfaces + { + // TODO: This is a marker interface at the moment since the signers defined in the SDK + // currently reference internal types that need to be extracted / refactored (e.g. IRequest). + } +} diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/NullSigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/NullSigner.cs index 70e3218151fc..fee05ab402b4 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/NullSigner.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/NullSigner.cs @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; using System; using System.Collections.Generic; using System.Linq; using System.Text; +using Amazon.Runtime.Identity; namespace Amazon.Runtime.Internal.Auth { diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/QueryStringSigner.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/QueryStringSigner.cs index e481114adf45..afa2c1f217fb 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/QueryStringSigner.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/QueryStringSigner.cs @@ -16,11 +16,10 @@ using System.Collections.Generic; using System.Security; using System.Text; - +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Util; using Amazon.Util; -using Smithy.Identity.Abstractions; namespace Amazon.Runtime.Internal.Auth { diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Auth/S3Signer.cs b/sdk/src/Core/Amazon.Runtime/Internal/Auth/S3Signer.cs index 312b3eee725f..ab3fbde91215 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Auth/S3Signer.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Auth/S3Signer.cs @@ -19,7 +19,7 @@ using System.Linq; using Amazon.Util; using Amazon.Runtime.Internal.Util; -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; #pragma warning disable 1591 diff --git a/sdk/src/Core/Amazon.Runtime/Internal/InternalConfiguration.cs b/sdk/src/Core/Amazon.Runtime/Internal/InternalConfiguration.cs index 6778dead2636..23d60b3c3abe 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/InternalConfiguration.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/InternalConfiguration.cs @@ -17,7 +17,8 @@ using Amazon.Runtime.Internal.Util; using System.Collections.Generic; using System.Linq; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials; + #if BCL || NETSTANDARD using Amazon.Runtime.CredentialManagement; #endif diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/Contexts.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/Contexts.cs index 6fc8fda9153b..d7e5a1073811 100644 --- a/sdk/src/Core/Amazon.Runtime/Pipeline/Contexts.cs +++ b/sdk/src/Core/Amazon.Runtime/Pipeline/Contexts.cs @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs index 4bb0e7c3a83f..d84157e55e17 100644 --- a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs +++ b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs @@ -15,8 +15,8 @@ using Amazon.Runtime.Credentials.Internal; using Amazon.Runtime.Endpoints; +using Amazon.Runtime.Identity; using Amazon.Runtime.Internal.Auth; -using Smithy.Identity.Abstractions; using System.Collections; using System.Collections.Generic; using System.Linq; diff --git a/sdk/src/Core/Amazon.Runtime/Tokens/AWSToken.cs b/sdk/src/Core/Amazon.Runtime/Tokens/AWSToken.cs index 54f49d9fd181..354c27ec881b 100644 --- a/sdk/src/Core/Amazon.Runtime/Tokens/AWSToken.cs +++ b/sdk/src/Core/Amazon.Runtime/Tokens/AWSToken.cs @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -using Amazon.Runtime.Internal.Auth; -using Smithy.Identity.Abstractions; using System; using System.Diagnostics; +using Amazon.Runtime.Identity; +using Amazon.Runtime.Internal.Auth; namespace Amazon.Runtime { diff --git a/sdk/src/Core/Amazon.Runtime/_bcl+netstandard/Tokens/ProfileTokenProvider.cs b/sdk/src/Core/Amazon.Runtime/_bcl+netstandard/Tokens/ProfileTokenProvider.cs index e2fc5d51e358..cfb2dc77c4d1 100644 --- a/sdk/src/Core/Amazon.Runtime/_bcl+netstandard/Tokens/ProfileTokenProvider.cs +++ b/sdk/src/Core/Amazon.Runtime/_bcl+netstandard/Tokens/ProfileTokenProvider.cs @@ -14,8 +14,8 @@ */ using Amazon.Runtime.CredentialManagement; +using Amazon.Runtime.Credentials; using Amazon.Runtime.Credentials.Internal; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; using Amazon.Util; using Amazon.Util.Internal; #if AWS_ASYNC_API diff --git a/sdk/src/Services/AutoScaling/AutoScaling.sln b/sdk/src/Services/AutoScaling/AutoScaling.sln index af08243f294b..3abb5ee8c188 100644 --- a/sdk/src/Services/AutoScaling/AutoScaling.sln +++ b/sdk/src/Services/AutoScaling/AutoScaling.sln @@ -8,8 +8,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" 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}") = "AutoScaling", "AutoScaling", "{6535AA4C-E2CF-5A06-4659-8860EBDA1C64}" @@ -64,10 +62,6 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.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 {B48AE657-86BB-47ED-8CC7-C1C8082D492B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B48AE657-86BB-47ED-8CC7-C1C8082D492B}.Debug|Any CPU.Build.0 = Debug|Any CPU {B48AE657-86BB-47ED-8CC7-C1C8082D492B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -139,7 +133,6 @@ Global GlobalSection(NestedProjects) = preSolution {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} - {D253C367-816E-4482-BD9F-514800601AA3} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {6535AA4C-E2CF-5A06-4659-8860EBDA1C64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {B48AE657-86BB-47ED-8CC7-C1C8082D492B} = {6535AA4C-E2CF-5A06-4659-8860EBDA1C64} {67172631-4EDF-443A-96C6-AC8515220293} = {6535AA4C-E2CF-5A06-4659-8860EBDA1C64} diff --git a/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs b/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs index 1e72e1364208..ecbbe6617c40 100644 --- a/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs +++ b/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs @@ -21,7 +21,7 @@ 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 Amazon.AutoScaling.Internal diff --git a/sdk/src/Services/Polly/Custom/SynthesizeSpeechUtil.cs b/sdk/src/Services/Polly/Custom/SynthesizeSpeechUtil.cs index 8a2dd18c77d1..8920f1c036ce 100644 --- a/sdk/src/Services/Polly/Custom/SynthesizeSpeechUtil.cs +++ b/sdk/src/Services/Polly/Custom/SynthesizeSpeechUtil.cs @@ -21,7 +21,7 @@ using System; using System.Globalization; using Amazon.Internal; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials.Internal; namespace Amazon.Polly { diff --git a/sdk/src/Services/RDS/Custom/Util/RDSAuthTokenGenerator.cs b/sdk/src/Services/RDS/Custom/Util/RDSAuthTokenGenerator.cs index 6d01e39ac523..c044223b96cc 100644 --- a/sdk/src/Services/RDS/Custom/Util/RDSAuthTokenGenerator.cs +++ b/sdk/src/Services/RDS/Custom/Util/RDSAuthTokenGenerator.cs @@ -18,7 +18,7 @@ using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; using Amazon.Runtime.Internal.Util; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials.Internal; using System; using System.Globalization; diff --git a/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs b/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs index e345e85032f2..be4303e52fed 100644 --- a/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs +++ b/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs @@ -41,7 +41,7 @@ using System.Diagnostics.CodeAnalysis; using System.ComponentModel.Design; using System.Threading; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials.Internal; namespace Amazon.S3 { diff --git a/sdk/src/Services/S3/Custom/Internal/S3Signer.cs b/sdk/src/Services/S3/Custom/Internal/S3Signer.cs index ad2b2cbbd0bb..9dd5d5f7c05a 100644 --- a/sdk/src/Services/S3/Custom/Internal/S3Signer.cs +++ b/sdk/src/Services/S3/Custom/Internal/S3Signer.cs @@ -24,7 +24,7 @@ using Amazon.Runtime.Internal.Util; using Amazon.Runtime.Internal.Auth; using Amazon.S3.Util; -using Smithy.Identity.Abstractions; +using Amazon.Runtime.Identity; #pragma warning disable 1591 diff --git a/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs b/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs index 4eef37dbd45d..1bb23500f02e 100644 --- a/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs +++ b/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs @@ -21,7 +21,7 @@ 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 Amazon.S3.Internal diff --git a/sdk/src/Services/S3/S3.sln b/sdk/src/Services/S3/S3.sln index c5966b640a10..e847101569c4 100644 --- a/sdk/src/Services/S3/S3.sln +++ b/sdk/src/Services/S3/S3.sln @@ -8,8 +8,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" 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}") = "S3", "S3", "{34EC168F-E902-91E1-F81D-DCA3C52135BD}" @@ -66,10 +64,6 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.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 {BC16EE5A-2344-4ADD-9BFE-18877966F9F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BC16EE5A-2344-4ADD-9BFE-18877966F9F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC16EE5A-2344-4ADD-9BFE-18877966F9F5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -145,7 +139,6 @@ Global GlobalSection(NestedProjects) = preSolution {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} - {D253C367-816E-4482-BD9F-514800601AA3} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {34EC168F-E902-91E1-F81D-DCA3C52135BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {BC16EE5A-2344-4ADD-9BFE-18877966F9F5} = {34EC168F-E902-91E1-F81D-DCA3C52135BD} {E69E3A34-5318-47C9-99C0-288975B908C8} = {34EC168F-E902-91E1-F81D-DCA3C52135BD} diff --git a/sdk/test/Services/RDS/UnitTests/Custom/RDSAuthTokenGeneratorTest.cs b/sdk/test/Services/RDS/UnitTests/Custom/RDSAuthTokenGeneratorTest.cs index bccc231096de..c9dc740c4025 100644 --- a/sdk/test/Services/RDS/UnitTests/Custom/RDSAuthTokenGeneratorTest.cs +++ b/sdk/test/Services/RDS/UnitTests/Custom/RDSAuthTokenGeneratorTest.cs @@ -17,12 +17,12 @@ using Amazon.RDS; using Amazon.RDS.Util; using Amazon.Runtime; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials.Internal; +using Amazon.Runtime.Identity; using Amazon.Util; using AWSSDK_DotNet.IntegrationTests.Utils; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using Smithy.Identity.Abstractions; using System; using System.Collections.Generic; using System.Globalization; diff --git a/sdk/test/Services/S3/IntegrationTests/RegionsTest.cs b/sdk/test/Services/S3/IntegrationTests/RegionsTest.cs index 039fc4d46413..8656044c08aa 100644 --- a/sdk/test/Services/S3/IntegrationTests/RegionsTest.cs +++ b/sdk/test/Services/S3/IntegrationTests/RegionsTest.cs @@ -14,7 +14,7 @@ using System.Globalization; using System.Threading; using System.Collections.Generic; -using Amazon.Runtime.Credentials.Internal.IdentityResolvers; +using Amazon.Runtime.Credentials.Internal; namespace AWSSDK_DotNet.IntegrationTests.Tests.S3 { diff --git a/sdk/test/UnitTests/Custom/Runtime/BearerTokenSignerTests.cs b/sdk/test/UnitTests/Custom/Runtime/BearerTokenSignerTests.cs index 3c011ff55d19..b4a829a3780d 100644 --- a/sdk/test/UnitTests/Custom/Runtime/BearerTokenSignerTests.cs +++ b/sdk/test/UnitTests/Custom/Runtime/BearerTokenSignerTests.cs @@ -22,7 +22,6 @@ using Amazon.Runtime.Internal.Auth; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using Smithy.Identity.Abstractions; namespace AWSSDK.UnitTests.Runtime { diff --git a/sdk/test/UnitTests/Custom/Runtime/RuntimePipelineTestBase.cs b/sdk/test/UnitTests/Custom/Runtime/RuntimePipelineTestBase.cs index 2092dd0853af..3caf2f4af6f2 100644 --- a/sdk/test/UnitTests/Custom/Runtime/RuntimePipelineTestBase.cs +++ b/sdk/test/UnitTests/Custom/Runtime/RuntimePipelineTestBase.cs @@ -18,10 +18,10 @@ using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; using Amazon.Runtime.Internal.Util; +using Amazon.Runtime.Identity; using Amazon.S3; using Amazon.S3.Model; using Amazon.S3.Model.Internal.MarshallTransformations; -using Smithy.Identity.Abstractions; using System; using System.Net; using System.Reflection;