Skip to content

Commit da7430f

Browse files
authored
fix yaml load and log bucket output error (#947)
* fixed raw config format to JSON * fixed log-bucket-config * Fixed log bucket output Co-authored-by: hickeydh-aws <hickeydh@amazon.com>
1 parent 9c7bf6d commit da7430f

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/deployments/cdk/src/deployments/iam/step-1.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import * as iam from '@aws-cdk/aws-iam';
1616
import { AccountStacks } from '../../common/account-stacks';
1717
import { createRoleName } from '@aws-accelerator/cdk-accelerator/src/core/accelerator-name-generator';
1818
import { CfnIamRoleOutput } from './outputs';
19-
import { LogBucketOutput, AccountBucketOutputFinder } from '../defaults/outputs';
19+
import { LogBucketOutput } from '../defaults/outputs';
2020
import { StackOutput } from '@aws-accelerator/common-outputs/src/stack-output';
2121

2222
export interface IamConfigServiceRoleProps {
@@ -35,12 +35,16 @@ export async function createConfigServiceRoles(props: IamConfigServiceRoleProps)
3535
const securityAccountKey = config.getMandatoryAccountKey('central-security');
3636
const centralOperationsKey = config.getMandatoryAccountKey('central-operations');
3737
const centralLogKey = config.getMandatoryAccountKey('central-log');
38-
39-
const logBucketDetails = LogBucketOutput.getBucket({
40-
accountStacks,
41-
config,
42-
outputs,
43-
});
38+
let logBucketDetails;
39+
try {
40+
logBucketDetails = LogBucketOutput.getBucket({
41+
accountStacks,
42+
config,
43+
outputs,
44+
});
45+
} catch (err) {
46+
console.log('Log Bucket not created yet. Continuing.');
47+
}
4448

4549
for (const accountKey of accountKeys) {
4650
const accountStack = accountStacks.tryGetOrCreateAccountStack(accountKey);

src/lib/common/src/util/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,6 @@ function enableGlobalRegion(config: string, rawConfig: string, format: FormatTyp
355355
}
356356

357357
const configStr = getStringFromObject(configObj, format);
358-
const rawConfigStr = getStringFromObject(rawConfigObj, format);
358+
const rawConfigStr = getStringFromObject(rawConfigObj, JSON_FORMAT);
359359
return { configStr, rawConfigStr };
360360
}

0 commit comments

Comments
 (0)