Skip to content

Commit d85980f

Browse files
authored
chore: prepare release 1.0.11 (#500)
1 parent 002df3d commit d85980f

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ All notable changes to aws organization formation will be documented in this fil
55
**BREAKING CHANGES**:
66
- v1.0.0: execution role under which org-formation is ran requires the ec2:describeRegions permission
77

8-
**version 1.0.11-beta.1**
8+
**version 1.0.11**
99
- feat: support MaxConcurrentTasks > 0 on update-cdk tasks
1010
- feat: support IgnoreFileChanges on update-cdk, update-serverless.com and apply-tf tasks (allows the task to be skipped if certain files got changed)
1111
- fix: stacks in UPDATE_ROLLBACK_FAILED wont get deleted when attempting to recover from a failed update
1212
- feat: Control Tower (or any other account factory solution) support using the annotate-organization task
1313

14-
**version 1.0.9**
14+
**version 1.0.9** / **version 1.0.10** (redeploy of 1.0.9)
1515
- feat: support `--match` and `--dev` on print & validate commands
1616
- feat: support serverless.com V3, by setting the `SLSVersion` attribute to `3` in the task file
1717
- fix: allow sub-expression to be a `!ReadFile`, `!Cmd` or other expression

docs/task-files.md

+23
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
- [!Include](#include)
1818
- [Task types](#task-types)
1919
- [update-organization](#update-organization)
20+
- [annotate-organization](#annotate-organization)
2021
- [update-stacks](#update-stacks)
2122
- [update-serverless.com](#update-serverlesscom)
2223
- [copy-to-s3](#copy-to-s3)
@@ -282,6 +283,28 @@ The `update-organization` task will update all the organization resources based
282283
| Skip | `true` or `false` | When `true` task (and dependent tasks) will not be executed. |
283284
| TemplatingContext | Dictionary | Specifies the data for [templating](#templating). |
284285

286+
### annotate-organization
287+
288+
The `annotate-organization` task will will allow you to use a different account factory (e.g. AWS Control Tower) while using org-formation to provision resources across the AWS Organization. If you use `annotate-organization`, you must use this *instead of* `update-organization`.
289+
290+
| Attribute | Value | Remarks |
291+
| :---------------- | :---------------- | :----------------------------------------------------------- |
292+
| DefaultOrganizationAccessRoleName | string | The name of the Role used for cross account access (default is: `OrganizationAccountAccessRole`). |
293+
| ExcludeAccounts | List<string> | A list (array) of AWS Account Ids (string) that will be excluded from the org-formation provisioning process. These accounts will not be addressable using `!Ref AccountName` or bindings, such as `Account: *` |
294+
| AccountMapping | Dictionary<string, string> | Dictionary where the AttributeName will be used as the Logical Name of the account, specified as Attribute value. When not specified, the account name is used as Logical Name.|
295+
296+
example:
297+
``` yml
298+
AnnotateOrganization:
299+
Type: annotate-organization
300+
DefaultOrganizationAccessRoleName: OrganizationAccountAccessRole
301+
ExcludeAccounts: ["123123123123", "123123123124"]
302+
AccountMapping:
303+
AccountA: "234234234234" # these mappings are optional, when specified the account can be referenced using `!Ref AccountA`
304+
AccountB: "234234234235" # when not specified the account can be referenced using `!Ref My Account B` (or whatever the account name is)
305+
# regardless of this, accounts will always be included in bindings like `Account: *`
306+
```
307+
285308
### update-stacks
286309

287310
The `update-stacks` task will provision all resources in all accounts specified in `Template`.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-organization-formation",
3-
"version": "1.0.11-beta.1",
3+
"version": "1.0.11",
44
"description": "Infrastructure as code solution for AWS Organizations",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

0 commit comments

Comments
 (0)