Skip to content

Commit 1e968a4

Browse files
committed
Merge remote-tracking branch 'remote/main' into main
2 parents 1fbc832 + d5e9a2f commit 1e968a4

File tree

1,112 files changed

+78596
-21057
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,112 files changed

+78596
-21057
lines changed

.eslintrc.js

Lines changed: 188 additions & 255 deletions
Large diffs are not rendered by default.

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Use Node.js
1818
uses: actions/setup-node@v1
1919
with:
20-
node-version: 12
20+
node-version: 14
2121
- name: Cache Node.js modules
2222
uses: actions/cache@v1
2323
with:
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.OS }}-
2929
- name: Install Node.js modules
3030
run: |
31-
npm install -g pnpm@5.18.9
31+
npm install -g pnpm@6.2.3
3232
pnpm install --unsafe-perm --frozen-lockfile
3333
- name: Fix nasty bug in CDK
3434
run: |

.github/workflows/lint-prettier.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Use Node.js
1818
uses: actions/setup-node@v1
1919
with:
20-
node-version: 12
20+
node-version: 14
2121
- name: Cache Node.js modules
2222
uses: actions/cache@v1
2323
with:
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.OS }}-
2929
- name: Install Node.js modules
3030
run: |
31-
npm install -g pnpm@5.18.9
31+
npm install -g pnpm@6.2.3
3232
pnpm install --frozen-lockfile
3333
- name: Analyze TypeScript files
3434
run: |
@@ -42,10 +42,10 @@ jobs:
4242
- name: Use Node.js
4343
uses: actions/setup-node@v1
4444
with:
45-
node-version: 12
45+
node-version: 14
4646
- name: Install Prettier
4747
run: |
48-
npm install -g prettier@2.2.0
48+
npm install -g prettier@2.2.1
4949
- name: Analyze TypeScript files
5050
run: |
5151
prettier --check **/*.ts

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
env:
2929
RUNNER_TEMP: /tmp/runner
3030
with:
31-
node-version: 12
31+
node-version: 14
3232
- name: Install pnpm
3333
run: |
34-
npm install -g pnpm@5.18.9
34+
npm install -g pnpm@6.2.3
3535
- name: Generate Changelog
3636
id: changelog
3737
env:

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
cdk.out
2-
node_modules
3-
.DS_Store
4-
*.log
5-
config.json
6-
aws-landing-zone-configuration.zip
7-
**/dist
8-
.idea
1+
cdk.out
2+
node_modules
3+
.DS_Store
4+
*.log
5+
config.json
6+
aws-landing-zone-configuration.zip
7+
**/dist
8+
.idea

.gitlab-ci.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
image: public.ecr.aws/bitnami/node:14
2+
3+
workflow:
4+
rules:
5+
- if: $CI_MERGE_REQUEST_ID
6+
- if: $CI_COMMIT_BRANCH == 'main'
7+
8+
stages:
9+
- build
10+
11+
default:
12+
before_script:
13+
- export NODE_OPTIONS=--max_old_space_size=4096
14+
- npm install -g pnpm@6.2.3
15+
- pnpm recursive install
16+
- pnpm -w build
17+
18+
test:
19+
stage: build
20+
script:
21+
- pnpm -w test
22+
timeout: 3h
23+
24+
eslint:
25+
stage: build
26+
script:
27+
- pnpm -w lint:eslint
28+
timeout: 3h
29+
30+
typecheck:
31+
stage: build
32+
script:
33+
- pnpm -w lint:typecheck
34+
timeout: 3h
35+
36+
ui:
37+
stage: build
38+
script:
39+
- apt-get update
40+
- cd src/ui
41+
- pnpm build:ui
42+
artifacts:
43+
expire_in: 30 days
44+
paths:
45+
- src/ui/build
46+
47+
docs-gen:
48+
stage: build
49+
script:
50+
- cd src/lib/docs-gen
51+
- pnpm build
52+
artifacts:
53+
expire_in: 30 days
54+
paths:
55+
- src/lib/docs-gen/output-docs

.gitlab/issue_templates/Bug.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
## Confirmation
2+
The ASEA is supported by a resource-constrained team within AWS. Our Community of Practice (COP) Slack channel should be your first point of contact before raising a bug via the GitLab repo. This ensures that we preserve the core team's attention and helps rule out misconfiguration as a source of the problem.
3+
4+
* COP Channel: https://amzn-aws.slack.com/archives/C0260BGSH3L
5+
6+
Please confirm you have explored this issue via the COP channel **OR** confirm you have a high level of confidence your issue warrants immediate developer attention due to customer impact:
7+
(yes|no)
8+
9+
10+
## Summary
11+
(Summarize the bug encountered concisely)
12+
13+
14+
## Steps to reproduce
15+
(How one can reproduce the issue)
16+
17+
18+
## Relevant Details
19+
(Provide as much information as possible, including your accelerator version, configuration file, environment/region details, etc)
20+
- Accelerator Version:
21+
- Issue during NEW Install?
22+
- Issue during UPGRADE?
23+
- Issue with existing deployment?
24+
- Which step or Phase in the State Machine did it fail?
25+
- Please provide error message per the Operations Guide Troubeshooting section:
26+
27+
- All other relevant details:
28+
29+
30+
## What is the current bug behavior?
31+
(What actually happens)
32+
33+
34+
## What is the expected correct behavior?
35+
(What you should see instead)
36+
37+
38+
## Relevant logs and/or screenshots
39+
(Any log output you feel is relevant. Feel free to attach a screenshot)
40+
41+
42+
```
43+
please use code blocks (```) to format console output, logs, etc for the sake of readability.
44+
```
45+
46+
## Any other details?
47+
48+
49+
/label ~Bug ~Accelerator
50+
/cc @bmycroft
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
## Confirmation
2+
The ASEA is supported by a resource-constrained team within AWS. Our Community of Practice (COP) Slack channel should be your first point of contact before raising a feature request via the GitLab repo. This ensures that we preserve the core team's attention and helps verify that the feature under request is not already achievable via configuration.
3+
4+
* COP Channel: https://amzn-aws.slack.com/archives/C0260BGSH3L
5+
6+
Please confirm you have explored this feature request via the COP channel:
7+
(yes|no)
8+
9+
10+
## Summary
11+
(Summarize the feature request concisely)
12+
13+
14+
## Customer Benefit
15+
(What is the customer benefit of this feature request)
16+
17+
18+
## Relevant Details
19+
(Provide as much information as possible, including your accelerator version, configuration file, environment/region details, etc)
20+
21+
22+
## Relevant logs and/or screenshots
23+
(Any log output you feel is relevant. Feel free to attach a screenshot)
24+
25+
26+
```
27+
please use code blocks (```) to format console output, logs, etc for the sake of readability.
28+
```
29+
30+
## Any other details?
31+
32+
33+
/label ~Accelerator
34+
/cc @bmycroft

.viperlightignore

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Ignore Config used with code.amazon.com
2+
Config
3+
4+
^dist/
5+
6+
.github/workflows/publish.yml:31
7+
.github/workflows/release.yml:53
8+
CODE_OF_CONDUCT.md
9+
CONTRIBUTING.md
10+
docs/architectures/pbmm/architecture.md
11+
docs/architectures/pbmm/log-file-locations.md
12+
docs/architectures/pbmm/AWS_PBMM_Accel_Account_Network_VPC.pdf
13+
docs/developer/developer-guide.md
14+
docs/faq/faq.md
15+
docs/installation/customization-index.md
16+
docs/installation/installation.md
17+
docs/installation/sm_inputs.md
18+
docs/operations/operations-import-ALZAccount.md
19+
pnpm-lock.yaml:3142
20+
reference-artifacts/Certs-Sample/example1-cert.key
21+
reference-artifacts/Certs-Sample/example2-cert.key
22+
reference-artifacts/config-rules/ec2-instance-profile-permissions.zip
23+
reference-artifacts/config-rules/ec2-instance-profile.zip
24+
reference-artifacts/Custom-Scripts/SEA-uninstall/aws-sea-cleanup.py:67
25+
reference-artifacts/Custom-Scripts/SEA-uninstall/aws-sea-cleanup.py:66
26+
reference-artifacts/SAMPLE_CONFIGS/config.*.json
27+
reference-artifacts/SAMPLE_CONFIGS/sample_snippets.md
28+
reference-artifacts/SCPs/ASEA-Guardrails-Sensitive.json:57
29+
reference-artifacts/SCPs/ASEA-Guardrails-Sensitive.json:173
30+
reference-artifacts/iam-policies/key-policy-basic.txt:9
31+
src/core/cdk/src/index.ts:43
32+
src/core/runtime/src/create-stack-set/create-stack-set.ts:116
33+
src/core/runtime/src/create-stack-set/create-stack-set.ts:115
34+
src/core/runtime/test/load-configuration-step.mocks.ts:70
35+
src/core/runtime/test/load-configuration-step.spec.ts:139
36+
src/deployments/cdk/README.md
37+
src/deployments/cdk/test/apps/unsupported-changes.mocks.ts
38+
src/deployments/cdk/test/deployments/alb/step-1.spec.ts:24
39+
src/installer/cdk/test/start-execution.spec.ts:98
40+
src/installer/cdk/test/start-execution.spec.ts:97
41+
src/installer/cdk/test/start-execution.spec.ts:86
42+
src/installer/cdk/test/start-execution.spec.ts:86
43+
src/lib/cdk-plugin-assume-role/src/assume-role-provider-source.ts:59
44+
src/lib/cdk-plugin-assume-role/src/assume-role-provider-source.ts:58
45+
src/lib/common/src/aws/sts.ts:54
46+
src/lib/common/src/aws/sts.ts:53
47+
src/lib/common-config/test/config/compare/validate.spec.ts:54
48+
src/lib/custom-resources/cdk-associate-hosted-zones/runtime/src/index.ts:72
49+
src/lib/custom-resources/cdk-associate-hosted-zones/runtime/src/index.ts:71
50+
src/lib/custom-resources/cdk-disassociate-hosted-zones/runtime/src/index.ts:67
51+
src/lib/custom-resources/cdk-disassociate-hosted-zones/runtime/src/index.ts:66
52+
src/lib/custom-resources/cdk-ec2-image-finder/README.md
53+
src/ui/src/components/aws-credentials-context.tsx:53
54+
src/ui/src/components/aws-credentials-context.tsx:44
55+
src/ui/src/components/aws-credentials-context.tsx:43
56+
src/ui/src/pages/wizards/components/account-table.tsx:89
57+
src/ui/src/pages/wizards/components/organizational-unit-table.tsx:68
58+
src/ui/src/pages/wizards/steps/configure-global-settings.tsx:309
59+
src/ui/src/pages/wizards/steps/configure-global-settings.tsx:308
60+
test/config.example.json:563
61+
test/config.example.json:69
62+

.viperlightrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"all": true,
3+
"failOn": "medium"
4+
}

0 commit comments

Comments
 (0)