Skip to content

Commit 37f73e1

Browse files
rlhagermrlhagerm
authored
Merge branch 'main' into python-sns-scenario
2 parents 1251511 + a994c38 commit 37f73e1

33 files changed

Lines changed: 2369 additions & 163 deletions

File tree

‎.doc_gen/metadata/controltower_metadata.yaml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ controltower_Hello:
44
synopsis: get started using &CTower;.
55
category: Hello
66
languages:
7+
Java:
8+
versions:
9+
- sdk_version: 2
10+
github: javav2/example_code/controltower
11+
sdkguide:
12+
excerpts:
13+
- description:
14+
snippet_tags:
15+
- controltower.java2.hello.main
716
Python:
817
versions:
918
- sdk_version: 3
@@ -25,6 +34,15 @@ controltower_Hello:
2534

2635
controltower_ListBaselines:
2736
languages:
37+
Java:
38+
versions:
39+
- sdk_version: 2
40+
github: javav2/example_code/controltower
41+
sdkguide:
42+
excerpts:
43+
- description:
44+
snippet_tags:
45+
- controltower.java2.list_baselines.main
2846
Python:
2947
versions:
3048
- sdk_version: 3
@@ -47,6 +65,15 @@ controltower_ListBaselines:
4765

4866
controltower_ListEnabledBaselines:
4967
languages:
68+
Java:
69+
versions:
70+
- sdk_version: 2
71+
github: javav2/example_code/controltower
72+
sdkguide:
73+
excerpts:
74+
- description:
75+
snippet_tags:
76+
- controltower.java2.list_enabled_baselines.main
5077
Python:
5178
versions:
5279
- sdk_version: 3
@@ -69,6 +96,15 @@ controltower_ListEnabledBaselines:
6996

7097
controltower_EnableBaseline:
7198
languages:
99+
Java:
100+
versions:
101+
- sdk_version: 2
102+
github: javav2/example_code/controltower
103+
sdkguide:
104+
excerpts:
105+
- description:
106+
snippet_tags:
107+
- controltower.java2.enable_baseline.main
72108
Python:
73109
versions:
74110
- sdk_version: 3
@@ -91,6 +127,15 @@ controltower_EnableBaseline:
91127

92128
controltower_ResetEnabledBaseline:
93129
languages:
130+
Java:
131+
versions:
132+
- sdk_version: 2
133+
github: javav2/example_code/controltower
134+
sdkguide:
135+
excerpts:
136+
- description:
137+
snippet_tags:
138+
- controltower.java2.reset_enabled_baseline.main
94139
Python:
95140
versions:
96141
- sdk_version: 3
@@ -113,6 +158,15 @@ controltower_ResetEnabledBaseline:
113158

114159
controltower_DisableBaseline:
115160
languages:
161+
Java:
162+
versions:
163+
- sdk_version: 2
164+
github: javav2/example_code/controltower
165+
sdkguide:
166+
excerpts:
167+
- description:
168+
snippet_tags:
169+
- controltower.java2.disable_baseline.main
116170
Python:
117171
versions:
118172
- sdk_version: 3
@@ -135,6 +189,15 @@ controltower_DisableBaseline:
135189

136190
controltower_ListEnabledControls:
137191
languages:
192+
Java:
193+
versions:
194+
- sdk_version: 2
195+
github: javav2/example_code/controltower
196+
sdkguide:
197+
excerpts:
198+
- description:
199+
snippet_tags:
200+
- controltower.java2.list_enabled_controls.main
138201
Python:
139202
versions:
140203
- sdk_version: 3
@@ -157,6 +220,15 @@ controltower_ListEnabledControls:
157220

158221
controltower_EnableControl:
159222
languages:
223+
Java:
224+
versions:
225+
- sdk_version: 2
226+
github: javav2/example_code/controltower
227+
sdkguide:
228+
excerpts:
229+
- description:
230+
snippet_tags:
231+
- controltower.java2.enable_control.main
160232
Python:
161233
versions:
162234
- sdk_version: 3
@@ -179,6 +251,15 @@ controltower_EnableControl:
179251

180252
controltower_GetControlOperation:
181253
languages:
254+
Java:
255+
versions:
256+
- sdk_version: 2
257+
github: javav2/example_code/controltower
258+
sdkguide:
259+
excerpts:
260+
- description:
261+
snippet_tags:
262+
- controltower.java2.get_control_operation.main
182263
Python:
183264
versions:
184265
- sdk_version: 3
@@ -201,6 +282,15 @@ controltower_GetControlOperation:
201282

202283
controltower_DisableControl:
203284
languages:
285+
Java:
286+
versions:
287+
- sdk_version: 2
288+
github: javav2/example_code/controltower
289+
sdkguide:
290+
excerpts:
291+
- description:
292+
snippet_tags:
293+
- controltower.java2.disable_control.main
204294
Python:
205295
versions:
206296
- sdk_version: 3
@@ -223,6 +313,15 @@ controltower_DisableControl:
223313

224314
controltower_ListLandingZones:
225315
languages:
316+
Java:
317+
versions:
318+
- sdk_version: 2
319+
github: javav2/example_code/controltower
320+
sdkguide:
321+
excerpts:
322+
- description:
323+
snippet_tags:
324+
- controltower.java2.list_landing_zones.main
226325
Python:
227326
versions:
228327
- sdk_version: 3
@@ -245,6 +344,15 @@ controltower_ListLandingZones:
245344

246345
controltower_GetBaselineOperation:
247346
languages:
347+
Java:
348+
versions:
349+
- sdk_version: 2
350+
github: javav2/example_code/controltower
351+
sdkguide:
352+
excerpts:
353+
- description:
354+
snippet_tags:
355+
- controltower.java2.get_baseline_operation.main
248356
Python:
249357
versions:
250358
- sdk_version: 3
@@ -272,6 +380,16 @@ controltower_Scenario:
272380
- List, enable, get, and disable controls.
273381
category: Basics
274382
languages:
383+
Java:
384+
versions:
385+
- sdk_version: 2
386+
github: javav2/example_code/controltower
387+
sdkguide:
388+
excerpts:
389+
- description: Run an interactive scenario demonstrating &CTowerlong; features.
390+
snippet_tags:
391+
- controltower.java2.controltower_scenario.main
392+
- controltower.java2.controltower_actions.main
275393
Python:
276394
versions:
277395
- sdk_version: 3

‎.tools/ailly/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.tools/readmes/scanner.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def snippet(self, example: Example, readme_folder, api_name: str):
158158
readme_path = Path(__file__).parent.parent.parent / readme_folder
159159
# tag_path = snippet_path.relative_to(readme_path) # Must be subpaths, no ..
160160
tag_path = relpath(snippet_path, readme_path)
161-
tag_path = str(tag_path).replace("\\", "/")
161+
tag_path = str(tag_path).replace("\\", "/").replace("#", "%23")
162162
if api_name != "":
163163
tag_path += f"#L{snippet.line_start + 1}"
164164
return tag_path

‎dotnetv4/ControlTower/Actions/ControlTowerWrapper.cs‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,21 @@ public async Task<List<EnabledBaselineSummary>> ListEnabledBaselinesAsync()
125125
/// <param name="baselineIdentifier">The identifier of baseline to enable.</param>
126126
/// <param name="baselineVersion">The version of baseline to enable.</param>
127127
/// <param name="identityCenterBaseline">The identifier of identity center baseline if it is enabled.</param>
128-
/// <returns>The enabled baseline ARN or null if already enabled.</returns>
128+
/// <returns>The enabled baseline ARN or null.</returns>
129129
public async Task<string?> EnableBaselineAsync(string targetIdentifier, string baselineIdentifier, string baselineVersion, string identityCenterBaseline)
130130
{
131131
try
132132
{
133-
var parameters = new List<EnabledBaselineParameter>
133+
var parameters = new List<EnabledBaselineParameter>();
134+
if (!string.IsNullOrEmpty(identityCenterBaseline))
134135
{
135-
new EnabledBaselineParameter
136-
{
137-
Key = "IdentityCenterEnabledBaselineArn",
138-
Value = identityCenterBaseline
139-
}
140-
};
141-
136+
parameters.Add(
137+
new EnabledBaselineParameter
138+
{
139+
Key = "IdentityCenterEnabledBaselineArn",
140+
Value = identityCenterBaseline
141+
});
142+
}
142143
var request = new EnableBaselineRequest
143144
{
144145
BaselineIdentifier = baselineIdentifier,
@@ -164,9 +165,12 @@ public async Task<List<EnabledBaselineSummary>> ListEnabledBaselinesAsync()
164165

165166
return response.Arn;
166167
}
167-
catch (ValidationException ex) when (ex.Message.Contains("already enabled"))
168+
catch (ValidationException ex)
168169
{
169-
Console.WriteLine("Baseline is already enabled for this target");
170+
if (ex.Message.Contains("already enabled"))
171+
Console.WriteLine("Baseline is already enabled for this target");
172+
else { Console.WriteLine(ex.Message); }
173+
// Write the message and return null if baseline cannot be enabled.
170174
return null;
171175
}
172176
catch (AmazonControlTowerException ex)

‎dotnetv4/ControlTower/README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,31 @@ For prerequisites, see the [README](../README.md#Prerequisites) in the `dotnetv4
3131

3232
### Get started
3333

34-
- [Hello AWS Control Tower](../ControlTower/Actions/HelloControlTower.cs#L4) (`ListBaselines`)
34+
- [Hello AWS Control Tower](Actions/HelloControlTower.cs#L4) (`ListBaselines`)
3535

3636

3737
### Basics
3838

3939
Code examples that show you how to perform the essential operations within a service.
4040

41-
- [Learn the basics](../ControlTower/Scenarios/ControlTower_Basics/ControlTowerBasics.cs)
41+
- [Learn the basics](Scenarios/ControlTower_Basics/ControlTowerBasics.cs)
4242

4343

4444
### Single actions
4545

4646
Code excerpts that show you how to call individual service functions.
4747

48-
- [DisableBaseline](../ControlTower/Actions/ControlTowerWrapper.cs#L181)
49-
- [DisableControl](../ControlTower/Actions/ControlTowerWrapper.cs#L401)
50-
- [EnableBaseline](../ControlTower/Actions/ControlTowerWrapper.cs#L120)
51-
- [EnableControl](../ControlTower/Actions/ControlTowerWrapper.cs#L345)
52-
- [GetBaselineOperation](../ControlTower/Actions/ControlTowerWrapper.cs#L273)
53-
- [GetControlOperation](../ControlTower/Actions/ControlTowerWrapper.cs#L449)
54-
- [ListBaselines](../ControlTower/Actions/ControlTowerWrapper.cs#L62)
55-
- [ListEnabledBaselines](../ControlTower/Actions/ControlTowerWrapper.cs#L91)
56-
- [ListEnabledControls](../ControlTower/Actions/ControlTowerWrapper.cs#L305)
57-
- [ListLandingZones](../ControlTower/Actions/ControlTowerWrapper.cs#L33)
58-
- [ResetEnabledBaseline](../ControlTower/Actions/ControlTowerWrapper.cs#L227)
48+
- [DisableBaseline](Actions/ControlTowerWrapper.cs#L185)
49+
- [DisableControl](Actions/ControlTowerWrapper.cs#L405)
50+
- [EnableBaseline](Actions/ControlTowerWrapper.cs#L120)
51+
- [EnableControl](Actions/ControlTowerWrapper.cs#L349)
52+
- [GetBaselineOperation](Actions/ControlTowerWrapper.cs#L277)
53+
- [GetControlOperation](Actions/ControlTowerWrapper.cs#L453)
54+
- [ListBaselines](Actions/ControlTowerWrapper.cs#L62)
55+
- [ListEnabledBaselines](Actions/ControlTowerWrapper.cs#L91)
56+
- [ListEnabledControls](Actions/ControlTowerWrapper.cs#L309)
57+
- [ListLandingZones](Actions/ControlTowerWrapper.cs#L33)
58+
- [ResetEnabledBaseline](Actions/ControlTowerWrapper.cs#L231)
5959

6060

6161
<!--custom.examples.start-->

‎dotnetv4/ControlTower/Scenarios/ControlTower_Basics/ControlTowerBasics.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public static async Task RunScenario()
130130
Console.WriteLine("\nEnabling Control Tower Baseline.");
131131
var icBaselineArn = identityCenterBaseline?.Arn;
132132
baselineArn = await wrapper.EnableBaselineAsync(ouArn,
133-
controlTowerBaseline.Arn, "4.0", icBaselineArn ?? "");
133+
controlTowerBaseline.Arn, "5.0", icBaselineArn ?? "");
134134
var alreadyEnabled = false;
135135
if (baselineArn != null)
136136
{
@@ -144,12 +144,11 @@ public static async Task RunScenario()
144144
if (enabled.BaselineIdentifier == controlTowerBaseline.Arn)
145145
{
146146
baselineArn = enabled.Arn;
147+
alreadyEnabled = true;
148+
Console.WriteLine("No change, the selected baseline was already enabled.");
147149
break;
148150
}
149151
}
150-
151-
alreadyEnabled = true;
152-
Console.WriteLine("No change, the selected baseline was already enabled.");
153152
}
154153

155154
if (baselineArn != null)
@@ -173,7 +172,7 @@ public static async Task RunScenario()
173172
Console.WriteLine($"\nRe-enabling Control Tower Baseline: {baselineArn}");
174173
// Re-enable the Control Tower baseline if it was originally enabled.
175174
await wrapper.EnableBaselineAsync(ouArn,
176-
controlTowerBaseline.Arn, "4.0", icBaselineArn ?? "");
175+
controlTowerBaseline.Arn, "5.0", icBaselineArn ?? "");
177176
}
178177
}
179178
}

‎dotnetv4/DynamoDB/Actions/DynamoDBActions.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11+
<PackageReference Include="AWSSDK.Core" Version="4.0.3.3" />
1112
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.2.1" />
1213
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0-preview.4" />
1314
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />

‎dotnetv4/DynamoDB/Scenarios/DynamoDB_Basics/Basics.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="AWSSDK.Core" Version="4.0.0.14" />
10+
<PackageReference Include="AWSSDK.Core" Version="4.0.3.3" />
1111
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.2.1" />
1212
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0-preview.4" />
1313
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />

‎java/example_code/dynamodb/src/main/java/com/amazonaws/codesamples/document/DocumentAPILocalSecondaryIndexExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
// snippet-start:[dynamodb.java.codeexample.DocumentAPILocalSecondaryIndexExample]
4+
// snippet-start:[dynamodb.java.codeexample.DocumentAPILocalSecondaryIndexExampleV1]
55

66
package com.amazonaws.codesamples.document;
77

@@ -326,4 +326,4 @@ public static void loadData() {
326326

327327
}
328328

329-
// snippet-end:[dynamodb.java.codeexample.DocumentAPILocalSecondaryIndexExample]
329+
// snippet-end:[dynamodb.java.codeexample.DocumentAPILocalSecondaryIndexExampleV1]

0 commit comments

Comments
 (0)