Skip to content

Commit d68b458

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 8473296 + 31b4cf5 commit d68b458

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/deployments/cdk/src/deployments/defaults/outputs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const AccountBucketOutputType = t.interface(
4444
bucketName: t.string,
4545
bucketArn: t.string,
4646
encryptionKeyArn: t.string,
47-
region: t.string,
47+
region: optional(t.string),
4848
encryptionKeyName: optional(t.string),
4949
encryptionKeyId: optional(t.string),
5050
},
@@ -141,7 +141,7 @@ export namespace AccountBucketOutput {
141141
const defaultBucket = RegionalBucket.fromBucketAttributes(accountStack, 'DefaultBucket', {
142142
bucketName: accountBucketOutput.bucketName,
143143
encryptionKey,
144-
region: accountBucketOutput.region,
144+
region: accountBucketOutput.region!,
145145
});
146146
accountBuckets[account.key] = defaultBucket;
147147
}

src/deployments/runtime/src/ou-validation-events/move-account-organization.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,15 @@ async function updateConfig(props: { account: org.Account; destinationOrg: Organ
236236
if (accConfigObject.type === 'mandatory') {
237237
accountsInConfig['mandatory-account-configs'][accKey].ou = destinationOrg.Name;
238238
accountsInConfig['mandatory-account-configs'][accKey].email = account.Email;
239-
accountsInConfig['mandatory-account-configs'][accKey]['accoount-name'] = account.Name;
239+
accountsInConfig['mandatory-account-configs'][accKey]['account-name'] = account.Name;
240240
accountsInConfig['mandatory-account-configs'][accKey]['ou-path'] = destinationOrg.Path;
241241
if (accountsInConfig['mandatory-account-configs'][accKey].deleted) {
242242
accountsInConfig['mandatory-account-configs'][accKey].deleted = false;
243243
}
244244
} else {
245245
accountsInConfig['workload-account-configs'][accKey].ou = destinationOrg.Name;
246246
accountsInConfig['workload-account-configs'][accKey].email = account.Email;
247-
accountsInConfig['workload-account-configs'][accKey]['accoount-name'] = account.Name;
247+
accountsInConfig['workload-account-configs'][accKey]['account-name'] = account.Name;
248248
accountsInConfig['workload-account-configs'][accKey]['ou-path'] = destinationOrg.Path;
249249
if (accountsInConfig['workload-account-configs'][accKey].deleted) {
250250
accountsInConfig['workload-account-configs'][accKey].deleted = false;

0 commit comments

Comments
 (0)