Skip to content

PLFM-8873 #700

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

Open
xschildw wants to merge 21 commits into
base: develop
Choose a base branch
from
Open

PLFM-8873 #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
14c29c5
Stubbing problem in OpenSearch tests?
xschildw Mar 11, 2025
639b3a0
Update Mockito
xschildw Mar 12, 2025
38b6997
Migrated SesClient
xschildw Mar 13, 2025
495f4e1
Migrated StsClient
xschildw Mar 14, 2025
b5d6680
Fixed tests
xschildw Mar 14, 2025
0784396
Cleanup
xschildw Mar 15, 2025
2ab2de7
Rename
xschildw Mar 15, 2025
afdb07e
Fixes.
xschildw Mar 15, 2025
0ab6955
String.valueOf() not needed on strings
xschildw Mar 15, 2025
f979359
Convert to Junit5
xschildw Mar 15, 2025
398ccf3
Relace com.amazonaws.services.elasticbeanstalk
xschildw Mar 15, 2025
fe340ca
Relace com.amazonaws.services.elasticloadbalancingv2
xschildw Mar 16, 2025
142ff40
Relace com.amazonaws.services.AWSKMS
xschildw Mar 16, 2025
13de5d0
Relace com.amazonaws.services.secretsmanager
xschildw Mar 16, 2025
017cd91
Relace com.amazonaws.services.cloudwatch
xschildw Mar 16, 2025
8c142ee
Replace com.amazonaws.services.glue
xschildw Mar 16, 2025
a8d797a
Replace com.amazonaws.services.lambda
xschildw Mar 16, 2025
37d1b14
Replace com.amazonaws.services.athena
xschildw Mar 16, 2025
7d0fbd7
Replace com.amazonaws.services.route53
xschildw Mar 16, 2025
81a79e5
Replace com.amazonaws.services.cloudformation - pass1
xschildw Mar 21, 2025
97463d5
Remove dependency
xschildw Mar 21, 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
125 changes: 56 additions & 69 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,76 +69,11 @@
<version>1.11</version>
</dependency>
<!-- The AWS Java SDK Dependencies -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudformation</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-secretsmanager</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-elasticloadbalancingv2</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kms</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-ec2</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-elasticbeanstalk</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-ses</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudwatch</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-lambda</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-route53</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-glue</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-athena</artifactId>
<version>${amazon.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
Expand Down Expand Up @@ -211,13 +146,13 @@

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -254,6 +189,58 @@
<groupId>software.amazon.awssdk</groupId>
<artifactId>bedrockagent</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ec2</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ses</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>elasticbeanstalk</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>elasticloadbalancingv2</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>kms</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>secretsmanager</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>cloudwatch</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>glue</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>lambda</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>athena</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>route53</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>cloudformation</artifactId>
</dependency>
</dependencies>
<build>
<resources>
Expand Down Expand Up @@ -304,13 +291,13 @@
<properties>
<bouncycastle.version>1.78.1</bouncycastle.version>
<amazon.sdk.version>1.12.296</amazon.sdk.version>
<amazon.sdk.v2.version>2.29.34</amazon.sdk.v2.version>
<amazon.sdk.v2.version>2.31.1</amazon.sdk.v2.version>
<log4j.version>2.17.1</log4j.version>
<junit.jupiter.version>5.4.1</junit.jupiter.version>
<junit.vintage.version>5.4.1</junit.vintage.version>
<junit.platform.version>1.4.1</junit.platform.version>
<cron.utils.version>9.1.6</cron.utils.version>
<mockito.version>2.27.0</mockito.version>
<mockito.version>5.2.0</mockito.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<synapse.version>520.0</synapse.version>
Expand Down
26 changes: 14 additions & 12 deletions src/main/java/org/sagebionetworks/template/CloudFormationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import java.util.Set;
import java.util.stream.Stream;

import com.amazonaws.services.cloudformation.model.AmazonCloudFormationException;
import com.amazonaws.services.cloudformation.model.Stack;
import software.amazon.awssdk.services.cloudformation.model.Stack;

/**
* Abstraction for CloudFormation Client operations
Expand All @@ -24,13 +23,13 @@ public interface CloudFormationClient {
boolean doesStackNameExist(String stackName);

/**
* Describe a stack given its name.
*
* @param stackName
* @return
* @throws AmazonCloudFormationException When the stack does not exist.
*/
Optional<Stack> describeStack(String stackName);
* Describe a stack given its name.
*
* @param stackName
* @return
* @throws CloudFormationException When the stack does not exist.
*/
Optional<software.amazon.awssdk.services.cloudformation.model.Stack> describeStack(String stackName);

/**
* Update a stack with the given name using the provided template body.
Expand Down Expand Up @@ -62,20 +61,22 @@ public interface CloudFormationClient {

/**
* Wait for the given stack to complete.
*
* @param stackName
* @return
* @throws InterruptedException
* @throws InterruptedException
*/
Optional<Stack> waitForStackToComplete(String stackName) throws InterruptedException;
Optional<software.amazon.awssdk.services.cloudformation.model.Stack> waitForStackToComplete(String stackName) throws InterruptedException;

/**
* Wait for the given stack to complete and handles any wait condition that is provided in the map (where the key is the logical id of the wait condition)
*
* @param stackName
* @param waitConditionHandlers
* @return
* @throws InterruptedException
*/
Optional<Stack> waitForStackToComplete(String stackName, Set<WaitConditionHandler> waitConditionHandlers) throws InterruptedException;
Optional<software.amazon.awssdk.services.cloudformation.model.Stack> waitForStackToComplete(String stackName, Set<WaitConditionHandler> waitConditionHandlers) throws InterruptedException;

/**
*
Expand All @@ -86,6 +87,7 @@ public interface CloudFormationClient {

/**
* Stream over all stacks.
*
* @return
*/
Stream<Stack> streamOverAllStacks();
Expand Down
Loading