Skip to content

Commit bf1ca76

Browse files
boblodgettboblodgett
authored
Changed Legacy configuration defaults for StsRegionalEndpoints to StsRegionalEndpointsValue.Regional.
1 parent 4be9b79 commit bf1ca76

File tree

3 files changed

+46
-37
lines changed

3 files changed

+46
-37
lines changed

‎generator/.DevConfigs/3bd833ea-a230-467a-a08e-261bdc7c0938.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"core": {
3+
"changeLogMessages": [
4+
"Changed Legacy configuration defaults for StsRegionalEndpoints to StsRegionalEndpointsValue.Regional."
5+
],
6+
"updateMinimum": true
7+
},
8+
"overrideVersion": "3.7.500.0"
9+
}

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/DefaultConfiguration.cs

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles
2020
/// Class to produce the template output
2121
/// </summary>
2222

23-
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
23+
#line 1 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
2424
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
2525
public partial class DefaultConfiguration : BaseGenerator
2626
{
@@ -34,7 +34,7 @@ public override string TransformText()
3434
this.Write("\r\n");
3535
this.Write("\r\n");
3636

37-
#line 11 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
37+
#line 11 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
3838

3939
AddLicenseHeader();
4040

@@ -44,29 +44,29 @@ public override string TransformText()
4444
this.Write("\r\n\r\nusing System;\r\nusing System.Collections.Generic;\r\nusing System.Collections.Ob" +
4545
"jectModel;\r\n\r\nusing Amazon.Runtime;\r\n\r\nnamespace ");
4646

47-
#line 22 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
47+
#line 22 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
4848
this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.Namespace));
4949

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

54-
#line 25 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
54+
#line 25 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
5555
this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.ClassName));
5656

5757
#line default
5858
#line hidden
5959
this.Write(" service\r\n /// </summary>\r\n public static class Amazon");
6060

61-
#line 27 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
61+
#line 27 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
6262
this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.ClassName));
6363

6464
#line default
6565
#line hidden
6666
this.Write("DefaultConfiguration\r\n {\r\n /// <summary>\r\n /// Collection of all" +
6767
" <see cref=\"DefaultConfiguration\"/>s supported by\r\n /// ");
6868

69-
#line 31 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
69+
#line 31 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
7070
this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.ClassName));
7171

7272
#line default
@@ -76,14 +76,14 @@ public override string TransformText()
7676
"ction<IDefaultConfiguration>(new List<IDefaultConfiguration>\r\n {\r\n " +
7777
" ");
7878

79-
#line 37 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
79+
#line 37 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
8080
this.Write(this.ToStringHelper.ToStringWithCulture(string.Join(",\r\n ", base.DefaultConfigurationModel.Modes.Select(x => x.Name).ToArray())));
8181

8282
#line default
8383
#line hidden
8484
this.Write("\r\n });\r\n }\r\n\r\n");
8585

86-
#line 41 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
86+
#line 41 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
8787

8888
foreach (var mode in base.DefaultConfigurationModel.Modes)
8989
{
@@ -93,71 +93,71 @@ public override string TransformText()
9393
#line hidden
9494
this.Write(" /// <summary>\r\n /// ");
9595

96-
#line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
96+
#line 46 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
9797
this.Write(this.ToStringHelper.ToStringWithCulture(mode.Documentation));
9898

9999
#line default
100100
#line hidden
101101
this.Write("\r\n /// </summary>\r\n public static IDefaultConfiguration ");
102102

103-
#line 48 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
103+
#line 48 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
104104
this.Write(this.ToStringHelper.ToStringWithCulture(mode.Name));
105105

106106
#line default
107107
#line hidden
108108
this.Write(" {get;} = new DefaultConfiguration\r\n {\r\n Name = DefaultConfigur" +
109109
"ationMode.");
110110

111-
#line 50 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
111+
#line 50 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
112112
this.Write(this.ToStringHelper.ToStringWithCulture(mode.Name));
113113

114114
#line default
115115
#line hidden
116116
this.Write(",\r\n RetryMode = ");
117117

118-
#line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
118+
#line 51 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
119119
this.Write(this.ToStringHelper.ToStringWithCulture(nameof(RequestRetryMode)));
120120

121121
#line default
122122
#line hidden
123123
this.Write(".");
124124

125-
#line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
125+
#line 51 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
126126
this.Write(this.ToStringHelper.ToStringWithCulture(mode.RetryMode));
127127

128128
#line default
129129
#line hidden
130130
this.Write(",\r\n StsRegionalEndpoints = ");
131131

132-
#line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
132+
#line 52 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
133133
this.Write(this.ToStringHelper.ToStringWithCulture(nameof(StsRegionalEndpointsValue)));
134134

135135
#line default
136136
#line hidden
137137
this.Write(".");
138138

139-
#line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
140-
this.Write(this.ToStringHelper.ToStringWithCulture(mode.StsRegionalEndpoints));
139+
#line 52 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
140+
this.Write(this.ToStringHelper.ToStringWithCulture(mode.StsRegionalEndpoints == StsRegionalEndpointsValue.Legacy ? StsRegionalEndpointsValue.Regional : mode.StsRegionalEndpoints));
141141

142142
#line default
143143
#line hidden
144144
this.Write(",\r\n S3UsEast1RegionalEndpoint = ");
145145

146-
#line 53 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
146+
#line 53 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
147147
this.Write(this.ToStringHelper.ToStringWithCulture(nameof(S3UsEast1RegionalEndpointValue)));
148148

149149
#line default
150150
#line hidden
151151
this.Write(".");
152152

153-
#line 53 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
153+
#line 53 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
154154
this.Write(this.ToStringHelper.ToStringWithCulture(mode.S3UsEast1RegionalEndpoint));
155155

156156
#line default
157157
#line hidden
158158
this.Write(",\r\n");
159159

160-
#line 54 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
160+
#line 54 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
161161

162162
if (mode.ConnectTimeout.HasValue)
163163
{
@@ -167,21 +167,21 @@ public override string TransformText()
167167
#line hidden
168168
this.Write(" // ");
169169

170-
#line 58 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
170+
#line 58 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
171171
this.Write(this.ToStringHelper.ToStringWithCulture(mode.ConnectTimeout.Value.ToString("g", CultureInfo.InvariantCulture)));
172172

173173
#line default
174174
#line hidden
175175
this.Write("\r\n ConnectTimeout = TimeSpan.FromMilliseconds(");
176176

177-
#line 59 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
177+
#line 59 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
178178
this.Write(this.ToStringHelper.ToStringWithCulture(mode.ConnectTimeout.Value.TotalMilliseconds));
179179

180180
#line default
181181
#line hidden
182182
this.Write("L),\r\n");
183183

184-
#line 60 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
184+
#line 60 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
185185

186186
}
187187
else
@@ -192,7 +192,7 @@ public override string TransformText()
192192
#line hidden
193193
this.Write(" ConnectTimeout = null,\r\n");
194194

195-
#line 66 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
195+
#line 66 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
196196

197197
}
198198

@@ -204,21 +204,21 @@ public override string TransformText()
204204
#line hidden
205205
this.Write(" // ");
206206

207-
#line 72 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
207+
#line 72 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
208208
this.Write(this.ToStringHelper.ToStringWithCulture(mode.TlsNegotiationTimeout.Value.ToString("g", CultureInfo.InvariantCulture)));
209209

210210
#line default
211211
#line hidden
212212
this.Write("\r\n TlsNegotiationTimeout = TimeSpan.FromMilliseconds(");
213213

214-
#line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
214+
#line 73 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
215215
this.Write(this.ToStringHelper.ToStringWithCulture(mode.TlsNegotiationTimeout.Value.TotalMilliseconds));
216216

217217
#line default
218218
#line hidden
219219
this.Write("L),\r\n");
220220

221-
#line 74 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
221+
#line 74 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
222222

223223
}
224224
else
@@ -229,7 +229,7 @@ public override string TransformText()
229229
#line hidden
230230
this.Write(" TlsNegotiationTimeout = null,\r\n");
231231

232-
#line 80 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
232+
#line 80 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
233233

234234
}
235235

@@ -241,21 +241,21 @@ public override string TransformText()
241241
#line hidden
242242
this.Write(" // ");
243243

244-
#line 86 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
244+
#line 86 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
245245
this.Write(this.ToStringHelper.ToStringWithCulture(mode.TimeToFirstByteTimeout.Value.ToString("g", CultureInfo.InvariantCulture)));
246246

247247
#line default
248248
#line hidden
249249
this.Write("\r\n TimeToFirstByteTimeout = TimeSpan.FromMilliseconds(");
250250

251-
#line 87 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
251+
#line 87 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
252252
this.Write(this.ToStringHelper.ToStringWithCulture(mode.TimeToFirstByteTimeout.Value.TotalMilliseconds));
253253

254254
#line default
255255
#line hidden
256256
this.Write("L),\r\n");
257257

258-
#line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
258+
#line 88 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
259259

260260
}
261261
else
@@ -266,7 +266,7 @@ public override string TransformText()
266266
#line hidden
267267
this.Write(" TimeToFirstByteTimeout = null,\r\n");
268268

269-
#line 94 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
269+
#line 94 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
270270

271271
}
272272

@@ -278,21 +278,21 @@ public override string TransformText()
278278
#line hidden
279279
this.Write(" // ");
280280

281-
#line 100 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
281+
#line 100 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
282282
this.Write(this.ToStringHelper.ToStringWithCulture(mode.HttpRequestTimeout.Value.ToString("g", CultureInfo.InvariantCulture)));
283283

284284
#line default
285285
#line hidden
286286
this.Write("\r\n HttpRequestTimeout = TimeSpan.FromMilliseconds(");
287287

288-
#line 101 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
288+
#line 101 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
289289
this.Write(this.ToStringHelper.ToStringWithCulture(mode.HttpRequestTimeout.Value.TotalMilliseconds));
290290

291291
#line default
292292
#line hidden
293293
this.Write("L)\r\n");
294294

295-
#line 102 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
295+
#line 102 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
296296

297297
}
298298
else
@@ -303,7 +303,7 @@ public override string TransformText()
303303
#line hidden
304304
this.Write(" HttpRequestTimeout = null\r\n");
305305

306-
#line 108 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
306+
#line 108 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
307307

308308
}
309309

@@ -312,7 +312,7 @@ public override string TransformText()
312312
#line hidden
313313
this.Write(" };\r\n");
314314

315-
#line 112 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
315+
#line 112 "C:\Dev\repos\aws-sdk-net-staging-3.7\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt"
316316

317317
}
318318

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/DefaultConfiguration.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace <#= base.Config.Namespace#>
4949
{
5050
Name = DefaultConfigurationMode.<#= mode.Name#>,
5151
RetryMode = <#= nameof(RequestRetryMode) #>.<#= mode.RetryMode#>,
52-
StsRegionalEndpoints = <#= nameof(StsRegionalEndpointsValue) #>.<#= mode.StsRegionalEndpoints#>,
52+
StsRegionalEndpoints = <#= nameof(StsRegionalEndpointsValue) #>.<#= mode.StsRegionalEndpoints == StsRegionalEndpointsValue.Legacy ? StsRegionalEndpointsValue.Regional : mode.StsRegionalEndpoints#>,
5353
S3UsEast1RegionalEndpoint = <#= nameof(S3UsEast1RegionalEndpointValue) #>.<#= mode.S3UsEast1RegionalEndpoint#>,
5454
<#
5555
if (mode.ConnectTimeout.HasValue)

0 commit comments

Comments
 (0)