Skip to content

chore: Triggering org contract tests (do not merge) #1410

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

chore: Triggering org contract tests (do not merge) #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3efba3
adding file
AgustinBettati Aug 25, 2025
e80201a
test: adding a retry to see if error is avoided
AgustinBettati Sep 12, 2025
ceeb4c9
wait 20 seconds and add warning log
AgustinBettati Sep 18, 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
8 changes: 7 additions & 1 deletion cfn-resources/organization/cmd/resource/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler
responseChan := make(chan DeleteResponse, 1)
go func() {
response, err := deleteRequest.Execute()
if err != nil && response != nil && response.StatusCode == http.StatusInternalServerError {
time.Sleep(20 * time.Second)
_, _ = logger.Warnf("waited 20s due to failed delete")
retryRequest := conn.OrganizationsApi.DeleteOrganization(ctx, *currentModel.OrgId)
response, err = retryRequest.Execute()
}
responseChan <- DeleteResponse{Error: err, Response: response}
}()

Expand All @@ -241,7 +247,7 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler
return handleError(responseMsg.Response, constants.DELETE, responseMsg.Error)
}

case <-time.After(30 * time.Second):
case <-time.After(60 * time.Second):
// If the Delete is not completed in the above time,
// we return a progress event with inProgress status and callback context
return handler.ProgressEvent{
Expand Down
1 change: 1 addition & 0 deletions cfn-resources/organization/trigger.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hello
Loading