diff --git a/javav2/example_code/controltower/README.md b/javav2/example_code/controltower/README.md index 86b1e0139ee..219764f10dc 100644 --- a/javav2/example_code/controltower/README.md +++ b/javav2/example_code/controltower/README.md @@ -46,16 +46,16 @@ Code examples that show you how to perform the essential operations within a ser Code excerpts that show you how to call individual service functions. - [DisableBaseline](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L493) -- [DisableControl](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L803) +- [DisableControl](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L809) - [EnableBaseline](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L387) - [EnableControl](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L706) - [GetBaselineOperation](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L574) -- [GetControlOperation](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L886) +- [GetControlOperation](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L892) - [ListBaselines](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L257) - [ListEnabledBaselines](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L317) - [ListEnabledControls](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L638) - [ListLandingZones](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L204) -- [ResetEnabledBaseline](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L986) +- [ResetEnabledBaseline](src/main/java/com/example/controltower/scenario/ControlTowerActions.java#L992) diff --git a/javav2/example_code/controltower/pom.xml b/javav2/example_code/controltower/pom.xml index 7dab4008da6..3bf10fa4c51 100644 --- a/javav2/example_code/controltower/pom.xml +++ b/javav2/example_code/controltower/pom.xml @@ -16,7 +16,7 @@ software.amazon.awssdk bom - 2.28.11 + 2.44.5 pom import diff --git a/javav2/example_code/controltower/src/main/java/com/example/controltower/scenario/ControlTowerActions.java b/javav2/example_code/controltower/src/main/java/com/example/controltower/scenario/ControlTowerActions.java index 644a8b49192..96371dfd42d 100644 --- a/javav2/example_code/controltower/src/main/java/com/example/controltower/scenario/ControlTowerActions.java +++ b/javav2/example_code/controltower/src/main/java/com/example/controltower/scenario/ControlTowerActions.java @@ -771,6 +771,12 @@ public void run() { return null; } + if ("ValidationException".equals(errorCode) + && message.contains("enforced by default")) { + System.out.println("Control is enforced by default and cannot be enabled manually."); + return null; + } + if ("ResourceNotFoundException".equals(errorCode) && message.contains("not registered with AWS Control Tower")) { System.out.println( diff --git a/javav2/example_code/controltower/src/test/java/ControlTowerTest.java b/javav2/example_code/controltower/src/test/java/ControlTowerTest.java index 27ddd65c2ac..13bfc5d04e5 100644 --- a/javav2/example_code/controltower/src/test/java/ControlTowerTest.java +++ b/javav2/example_code/controltower/src/test/java/ControlTowerTest.java @@ -35,7 +35,6 @@ public class ControlTowerTest { public static void setUp() { controlTowerClient = ControlTowerClient.builder() .region(Region.US_EAST_1) - .credentialsProvider(ProfileCredentialsProvider.create("default")) .build(); }