Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete endpoint logic code #3680

Merged
merged 3 commits into from
Mar 6, 2025
Merged

Remove obsolete endpoint logic code #3680

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d880ec3
Remove obsolete endpoint logic code
normj Feb 28, 2025
ec3bea0
Merge branch 'v4-development' into normj/remove-obsolete-endpoints-logic
normj Mar 4, 2025
b1d7f04
Regen tt file
normj Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Regen tt file
  • Loading branch information
@normj
normj committed Mar 5, 2025
commit b1d7f04d604700afb82b2551fff770cade862d89
77 changes: 40 additions & 37 deletions generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceConfig.cs
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles
/// Class to produce the template output
/// </summary>

#line 1 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 1 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
public partial class ServiceConfig : BaseGenerator
{
@@ -29,7 +29,7 @@ public partial class ServiceConfig : BaseGenerator
public override string TransformText()
{

#line 6 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 6 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"

AddLicenseHeader();

@@ -40,78 +40,78 @@ public override string TransformText()
"zon.Util.Internal;\r\nusing Amazon.Runtime.Internal.Auth;\r\nusing Amazon.Runtime.En" +
"dpoints;\r\nusing ");

#line 16 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 16 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace));

#line default
#line hidden
this.Write(".Internal;\r\n\r\nnamespace ");

#line 18 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 18 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace));

#line default
#line hidden
this.Write("\r\n{\r\n /// <summary>\r\n /// Configuration for accessing Amazon ");

#line 21 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 21 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write(" service\r\n /// </summary>\r\n [AWSSignerType(\"");

#line 23 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 23 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(Config.ServiceModel.SignatureVersion));

#line default
#line hidden
this.Write("\")]\r\n public partial class Amazon");

#line 24 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 24 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write("Config : ClientConfig\r\n {\r\n private static readonly string UserAgentStr" +
"ing =\r\n InternalSDKUtils.BuildUserAgentString(\"");

#line 27 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 27 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceId));

#line default
#line hidden
this.Write("\", \"");

#line 27 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 27 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceFileVersion));

#line default
#line hidden
this.Write("\");\r\n\r\n");

#line 29 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 29 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
if (this.Config.EndpointsRuleSet != null) {

#line default
#line hidden
this.Write(" private static readonly Amazon");

#line 30 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 30 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write("EndpointResolver EndpointResolver =\r\n new Amazon");

#line 31 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 31 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write("EndpointResolver();\r\n");

#line 32 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 32 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
}

#line default
@@ -127,38 +127,38 @@ public override string TransformText()
{
return """);

#line 42 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 42 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceId));

#line default
#line hidden
this.Write("\";\r\n }\r\n }\r\n /// <summary>\r\n /// Default construc" +
"tor\r\n /// </summary>\r\n public Amazon");

#line 48 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 48 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write("Config()\r\n : base(new Amazon.Runtime.Internal.DefaultConfigurationProv" +
"ider(Amazon");

#line 49 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 49 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write("DefaultConfiguration.GetAllConfigurations()))\r\n {\r\n base.Servic" +
"eId = \"");

#line 51 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 51 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceId));

#line default
#line hidden
this.Write("\";\r\n");

#line 52 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 52 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"

if(!string.IsNullOrEmpty(this.Config.AuthenticationServiceName))
{
@@ -168,14 +168,14 @@ public override string TransformText()
#line hidden
this.Write(" this.AuthenticationServiceName = \"");

#line 56 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 56 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AuthenticationServiceName));

#line default
#line hidden
this.Write("\";\r\n");

#line 57 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 57 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"

}
if(this.Config.OverrideMaxRetries.HasValue)
@@ -186,14 +186,14 @@ public override string TransformText()
#line hidden
this.Write(" this.MaxErrorRetry = ");

#line 62 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 62 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.OverrideMaxRetries));

#line default
#line hidden
this.Write(";\r\n");

#line 63 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 63 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"

}
if(!string.IsNullOrEmpty(this.Config.DefaultRegion))
@@ -205,22 +205,22 @@ public override string TransformText()
this.Write(" var region = FallbackRegionFactory.GetRegionEndpoint(false);\r\n " +
" this.RegionEndpoint = region ?? RegionEndpoint.");

#line 69 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 69 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.DefaultRegion));

#line default
#line hidden
this.Write(";\r\n");

#line 70 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 70 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"

}


#line default
#line hidden

#line 73 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 73 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"

if (this.Config.EndpointsRuleSet != null)
{
@@ -230,14 +230,14 @@ public override string TransformText()
#line hidden
this.Write(" this.EndpointProvider = new Amazon");

#line 77 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 77 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write("EndpointProvider();\r\n");

#line 78 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 78 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"

}

@@ -255,7 +255,7 @@ public override string RegionEndpointServiceName
{
return """);

#line 90 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 90 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.RegionLookupName));

#line default
@@ -264,7 +264,7 @@ public override string RegionEndpointServiceName
"ceVersion property.\r\n /// </summary>\r\n public override string Serv" +
"iceVersion\r\n {\r\n get\r\n {\r\n return \"");

#line 101 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 101 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceModel.APIVersion));

#line default
@@ -286,7 +286,7 @@ public override string UserAgent

");

#line 116 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 116 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
if (this.Config.EndpointsRuleSet != null)
foreach(var parameter in this.Config.ServiceModel.ClientContextParameters) {

@@ -295,34 +295,34 @@ public override string UserAgent
#line hidden
this.Write(" /// <summary>\r\n /// ");

#line 120 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 120 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(parameter.documentation));

#line default
#line hidden
this.Write("\r\n /// </summary>\r\n public ");

#line 122 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 122 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(parameter.nativeType));

#line default
#line hidden
this.Write(" ");

#line 122 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 122 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(parameter.name));

#line default
#line hidden
this.Write(" { get; set; }\r\n\r\n");

#line 124 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 124 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
}

#line default
#line hidden

#line 125 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 125 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
if (this.Config.EndpointsRuleSet != null) {

#line default
@@ -339,6 +339,9 @@ public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpo
ClientConfig = this,
OriginalRequest = parameters.Request,
Request = new DefaultRequest(parameters.Request, ServiceId)
{
AlternateEndpoint = parameters.AlternateEndpoint
}
};

var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null);
@@ -347,7 +350,7 @@ public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpo

");

#line 144 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 147 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
}
else if (this.Config.IsTestService)
{
@@ -367,7 +370,7 @@ public override Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpo
}
");

#line 158 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
#line 161 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceConfig.tt"
}

#line default