chore: improved backoff

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to aws organization formation will be documented in this fil
 **BREAKING CHANGES**:
 - v1.0.0: execution role under which org-formation is ran requires the ec2:describeRegions permission 
 
+
+**version: 1.0.18**
+- fix: improved backoff for account creation and type registration
+
 **version: 1.0.16**
 - fix: access denied issue when running init-pipeline passing --build-account-id as an argument
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-organization-formation",
-  "version": "1.0.17-beta.2",
+  "version": "1.0.18",
   "description": "Infrastructure as code solution for AWS Organizations",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/aws-provider/aws-organization-writer.ts

@@ -1,7 +1,7 @@
 import * as Organizations from '@aws-sdk/client-organizations';
 import * as IAM from '@aws-sdk/client-iam';
 import { CreateCaseCommand } from '@aws-sdk/client-support';
 import { STSServiceException } from '@aws-sdk/client-sts';
 import { AwsUtil, passwordPolicyEquals } from '../util/aws-util';
 import { ConsoleUtil } from '../util/console-util';
 import { OrgFormationError } from '../org-formation-error';
@@ -336,10 +336,10 @@
             try {
                 await this.updateAccount(resource, accountId);
             } catch (err) {
-                if ((err.name === 'AccessDenied' || err.name === 'InvalidClientTokenId') && retryCountAccessDenied < 3) {
+                if ((err.name === 'AccessDenied' || err.name === 'InvalidClientTokenId' || err.name === 'RegionDisabledException') && retryCountAccessDenied < 3) {
                     shouldRetry = true;
                     retryCountAccessDenied = retryCountAccessDenied + 1;
-                    await sleep(3000);
+                    await sleep(6000);
                     continue;
                 }
                 throw err;

src/plugin/impl/rp-build-task-plugin.ts

@@ -202,12 +202,12 @@ const retryTypeRegistrationWrapper = async (type: string, fn: () => Promise<any>
             await fn();
         } catch (err) {
             const message = err.message as string;
-            if (message && -1 !== message.indexOf('Deployment is currently in DEPLOY_STAGE of status FAILED')) {
+            if (message && -1 !== message.indexOf('Rate exceeded on Registry APIs')) {
                 if (retryCount >= 20) {
                     throw err;
                 }
 
-                ConsoleUtil.LogInfo(`Type registration ${type} is in DEPLOY_STAGE of status FAILED. waiting.... `);
+                ConsoleUtil.LogInfo(`Type registration ${type} Rate exceeded on Registry APIs. waiting.... `);
                 retryCount += 1;
                 await sleep(1000 * (26 + (4 * Math.random())));
                 retryTypeRegistration = true;