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

Aws organizations account idempotency #90

Merged
merged 8 commits into from
Jan 8, 2025
Merged

Aws organizations account idempotency #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54ab944
Implementation of Idempotency for Account Resource Handler
ramsriu Dec 18, 2024
86ed07e
Idempotency Implementatiom for Policy Resource Handler
ramsriu Jan 1, 2025
e7010a8
Revert " Implementation of Idempotency for Account Resource Handler"
ramsriu Jan 2, 2025
5fc813f
Revert "Idempotency Implementatiom for Policy Resource Handler"
ramsriu Jan 2, 2025
cd1ee5d
Idempotency Implementatiom for Policy Resource Handler
ramsriu Jan 1, 2025
a9804bf
Revert "Idempotency Implementatiom for Policy Resource Handler"
ramsriu Jan 6, 2025
05c94f5
Implementation of Idempotency for Account Resource Handler
ramsriu Jan 6, 2025
ad6fcc3
A small idempotency change
ramsriu Jan 6, 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
2 changes: 2 additions & 0 deletions ...izations-account/src/main/java/software/amazon/organizations/account/CallbackContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public void setCurrentRetryAttempt(final AccountConstants.Action actionName, fin
}
// used in CREATE handler
private boolean isAccountCreated = false;
private boolean isPreExistenceCheckComplete = false;
private boolean isDidResourceAlreadyExist = false;
Copy link
Contributor

@pns-amzn pns-amzn Jan 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isDidResourceAlreadyExist -> didResourceAlreadyExist

Without this update, will isDidResourceAlreadyExist and setDidResourceAlreadyExist work correctly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes the Functionality of it doesn't have any affect(if it has any may be I would have caught in the unit tests), it is the name that looks a bit redundant may be not following the naming conventions in java properly, I followed because to maintain similarity with the other intializations

private String createAccountRequestId;
private String failureReason;
}
66 changes: 49 additions & 17 deletions ...anizations-account/src/main/java/software/amazon/organizations/account/CreateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package software.amazon.organizations.account;

import org.apache.commons.collections4.CollectionUtils;
import software.amazon.awssdk.services.organizations.model.Account;
import software.amazon.awssdk.services.organizations.OrganizationsClient;
import software.amazon.awssdk.services.organizations.model.CreateAccountRequest;
import software.amazon.awssdk.services.organizations.model.CreateAccountResponse;
import software.amazon.awssdk.services.organizations.model.DescribeCreateAccountStatusResponse;
import software.amazon.awssdk.services.organizations.model.DuplicateAccountException;
import software.amazon.awssdk.services.organizations.model.ListAccountsRequest;
import software.amazon.awssdk.services.organizations.model.ListParentsRequest;
import software.amazon.awssdk.services.organizations.model.ListParentsResponse;
import software.amazon.awssdk.services.organizations.model.MoveAccountRequest;
Expand All @@ -17,6 +19,7 @@
import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
import software.amazon.organizations.utils.OrgsLoggerWrapper;

import java.util.Optional;
import java.util.Set;

public class CreateHandler extends BaseHandlerStd {
Expand Down Expand Up @@ -47,28 +50,57 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
}

return ProgressEvent.progress(request.getDesiredResourceState(), callbackContext)
.then(progress -> {
if (progress.getCallbackContext().isAccountCreated()) {
log.log(String.format("Account has already been created in previous handler invoke with account Id: [%s]. Skip create account.", model.getAccountId()));
return ProgressEvent.progress(model, callbackContext);
}
return awsClientProxy.initiate("AWS-Organizations-Account::CreateAccount", orgsClient, progress.getResourceModel(), progress.getCallbackContext())
.translateToServiceRequest(Translator::translateToCreateAccountRequest)
.makeServiceCall(this::createAccount)
.handleError((organizationsRequest, e, proxyClient1, model1, context) -> handleError(organizationsRequest, request, e, proxyClient1, model1, context, logger))
.done(CreateAccountResponse -> {
callbackContext.setCreateAccountRequestId(CreateAccountResponse.createAccountStatus().id());
logger.log(String.format("Successfully initiated new account creation request with CreateAccountRequestId [%s]", callbackContext.getCreateAccountRequestId()));
return ProgressEvent.progress(model, callbackContext);
});
}

)
.then(progress -> checkIfAccountExists(awsClientProxy, progress, orgsClient))
.then(progress -> {
if (progress.getCallbackContext().isPreExistenceCheckComplete() && progress.getCallbackContext().isDidResourceAlreadyExist()) {
return ProgressEvent.failed(model, callbackContext, HandlerErrorCode.AlreadyExists,
String.format("Account with email [%s] already exists.", model.getEmail()));
}
if (progress.getCallbackContext().isAccountCreated()) {
log.log(String.format("Account has already been created in previous handler invoke with account Id: [%s]. Skip create account.", model.getAccountId()));
return ProgressEvent.progress(model, callbackContext);
}
return awsClientProxy.initiate("AWS-Organizations-Account::CreateAccount", orgsClient, progress.getResourceModel(), progress.getCallbackContext())
.translateToServiceRequest(Translator::translateToCreateAccountRequest)
.makeServiceCall(this::createAccount)
.handleError((organizationsRequest, e, proxyClient1, model1, context) -> handleError(organizationsRequest, request, e, proxyClient1, model1, context, logger))
.done(CreateAccountResponse -> {
callbackContext.setCreateAccountRequestId(CreateAccountResponse.createAccountStatus().id());
logger.log(String.format("Successfully initiated new account creation request with CreateAccountRequestId [%s]", callbackContext.getCreateAccountRequestId()));
return ProgressEvent.progress(model, callbackContext);
});
})
.then(progress -> describeCreateAccountStatus(awsClientProxy, request, model, callbackContext, orgsClient, logger))
.then(progress -> moveAccount(awsClientProxy, request, model, callbackContext, orgsClient, logger))
.then(progress -> ProgressEvent.success(progress.getResourceModel(), progress.getCallbackContext()));
}

private ProgressEvent<ResourceModel, CallbackContext> checkIfAccountExists(
final AmazonWebServicesClientProxy awsClientProxy,
ProgressEvent<ResourceModel, CallbackContext> progress,
final ProxyClient<OrganizationsClient> orgsClient) {

ResourceModel model = progress.getResourceModel();

return awsClientProxy.initiate("AWS-Organizations-Account::ListAccounts", orgsClient, model, progress.getCallbackContext())
.translateToServiceRequest(resourceModel -> ListAccountsRequest.builder().build())
.makeServiceCall((listAccountsRequest, proxyClient) -> proxyClient.injectCredentialsAndInvokeV2(listAccountsRequest, proxyClient.client()::listAccounts))
.done((listAccountsRequest, listAccountsResponse, proxyClient, resourceModel, context) -> {
Optional<Account> existingAccount = listAccountsResponse.accounts().stream()
.filter(account -> account.email().equals(model.getEmail()))
.findFirst();

if (existingAccount.isPresent()) {
model.setAccountId(existingAccount.get().id());
context.setDidResourceAlreadyExist(true);
log.log(String.format("Failing PreExistenceCheck: Account with email [%s] already exists with Id: [%s]", model.getEmail(), model.getAccountId()));
}

context.setPreExistenceCheckComplete(true);
return ProgressEvent.progress(model, context);
});
}

protected ProgressEvent<ResourceModel, CallbackContext> describeCreateAccountStatus(
final AmazonWebServicesClientProxy awsClientProxy,
final ResourceHandlerRequest<ResourceModel> request,
Expand Down
Loading
Loading