Skip to content

Commit e4898c1

Browse files
committed
Merge branch 'develop' into #3667-maintenence-error-handling-for-saving-a-task-without-assigning
2 parents d06a837 + d454683 commit e4898c1

655 files changed

Lines changed: 59229 additions & 15522 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,90 @@
1+
# Dependencies
12
**/node_modules
3+
.yarn/
4+
.pnp.*
5+
6+
# Build outputs
27
**/dist
8+
**/build
9+
10+
# Tests
311
**/tests
412
**/*.test.ts
5-
.vscode
13+
**/*.test.js
14+
**/*.spec.ts
15+
**/*.spec.js
16+
system-tests/
17+
coverage/
18+
__tests__/
19+
20+
# AWS & Infrastructure
21+
infrastructure/
22+
.elasticbeanstalk/
23+
.ebextensions/
24+
Dockerrun.aws.json
25+
*.tf
26+
*.tfvars
27+
*.tfstate
28+
*.tfstate.*
29+
ECR_DEPLOYMENT.md
30+
TERRAFORM_CHANGES.md
31+
32+
# Git
33+
.git/
34+
.gitignore
35+
.gitattributes
36+
.github/
37+
38+
# IDE
39+
.vscode/
40+
.idea/
41+
*.swp
42+
*.swo
43+
*~
44+
.DS_Store
45+
46+
# Documentation
47+
README.md
48+
*.md
49+
LICENSE
50+
51+
# Environment files
52+
.env
53+
.env.*
54+
*.env
55+
56+
# Logs
57+
*.log
58+
npm-debug.log*
59+
yarn-debug.log*
60+
yarn-error.log*
61+
62+
# Lock files (keep package.json though)
63+
package-lock.json
664
yarn.lock
65+
.yarnrc.yml
66+
67+
# Prettier
68+
.prettierrc*
69+
.prettierignore
70+
71+
# TypeScript config (keep for build)
72+
# tsconfig.json - commented out, may need this
73+
74+
# Docker files
75+
.dockerignore
76+
docker-compose*.yml
77+
docker-compose*.yaml
78+
Dockerfile.*
79+
80+
# Temporary files
81+
tmp/
82+
temp/
83+
*.tmp
84+
*.bak
85+
*.backup
86+
87+
# Containerization helpers
88+
containerization/
89+
devContainerization/
90+
scripts/
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
option_settings:
2+
# Relax health check settings for debugging
3+
aws:elasticbeanstalk:environment:process:default:
4+
HealthCheckInterval: 30
5+
HealthCheckTimeout: 10
6+
HealthyThresholdCount: 2
7+
UnhealthyThresholdCount: 10
8+
9+
# Ignore health check failures during deployment
10+
aws:elasticbeanstalk:command:
11+
IgnoreHealthCheck: true
12+
Timeout: 900
13+
14+
# Enhanced health reporting settings
15+
aws:elasticbeanstalk:healthreporting:system:
16+
HealthCheckSuccessThreshold: Ok
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
files:
2+
"/opt/aws/amazon-cloudwatch-agent/bin/config.json":
3+
mode: "000600"
4+
owner: root
5+
group: root
6+
content: |
7+
{
8+
"agent": {
9+
"metrics_collection_interval": 60,
10+
"run_as_user": "root"
11+
},
12+
"metrics": {
13+
"namespace": "CWAgent",
14+
"append_dimensions": {
15+
"AutoScalingGroupName": "${aws:AutoScalingGroupName}",
16+
"InstanceId": "${aws:InstanceId}"
17+
},
18+
"metrics_collected": {
19+
"mem": {
20+
"measurement": [
21+
{
22+
"name": "mem_used_percent",
23+
"rename": "MemoryUtilization",
24+
"unit": "Percent"
25+
}
26+
],
27+
"metrics_collection_interval": 60
28+
},
29+
"disk": {
30+
"measurement": [
31+
{
32+
"name": "used_percent",
33+
"rename": "DiskUtilization",
34+
"unit": "Percent"
35+
}
36+
],
37+
"metrics_collection_interval": 60,
38+
"resources": [
39+
"*"
40+
]
41+
}
42+
}
43+
}
44+
}
45+
46+
container_commands:
47+
start_cloudwatch_agent:
48+
command: /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a append-config -m ec2 -s -c file:/opt/aws/amazon-cloudwatch-agent/bin/config.json

.ebextensions/03_ssh_keys.config

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
files:
2+
"/tmp/add_authorized_keys.sh":
3+
mode: "000755"
4+
owner: root
5+
group: root
6+
content: |
7+
#!/bin/bash
8+
AUTHORIZED_KEYS="/home/ec2-user/.ssh/authorized_keys"
9+
mkdir -p /home/ec2-user/.ssh
10+
touch "$AUTHORIZED_KEYS"
11+
chown ec2-user:ec2-user /home/ec2-user/.ssh
12+
chmod 700 /home/ec2-user/.ssh
13+
14+
add_key() {
15+
local key="$1"
16+
if ! grep -qF "$key" "$AUTHORIZED_KEYS"; then
17+
echo "$key" >> "$AUTHORIZED_KEYS"
18+
fi
19+
}
20+
21+
# Chris Pyle
22+
add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqV5gwot3utGLPGpAPWr8znU1cjMn1RE7jN8htvaOMt aws-eb"
23+
24+
# Sean Walker
25+
add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICf1UhVM+65hiKahvdvEj20ohDu+bZVS+btVFJTtg0oP seanwalker@Seans-MacBook-Pro-2.local"
26+
27+
chown ec2-user:ec2-user "$AUTHORIZED_KEYS"
28+
chmod 600 "$AUTHORIZED_KEYS"
29+
30+
commands:
31+
add_authorized_keys:
32+
command: "/tmp/add_authorized_keys.sh"
33+
ignoreErrors: false

.ebignore

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
# Dockerfiles (use pre-built images from ECR)
2+
Dockerfile
3+
Dockerfile.*
4+
5+
# Docker Compose
6+
docker-compose*.yml
7+
docker-compose*.yaml
8+
9+
# Terraform
10+
infrastructure/
11+
*.tf
12+
*.tfvars
13+
*.tfstate
14+
*.tfstate.*
15+
16+
# Containerization helpers
17+
containerization/
18+
devContainerization/
19+
20+
# Git
21+
.git/
22+
.gitignore
23+
.gitattributes
24+
25+
# Documentation
26+
README.md
27+
*.md
28+
CHANGELOG.md
29+
LICENSE
30+
TERRAFORM_CHANGES.md
31+
ECR_DEPLOYMENT.md
32+
33+
# IDE and Editor
34+
.vscode/
35+
.idea/
36+
*.swp
37+
*.swo
38+
*~
39+
.DS_Store
40+
41+
# Node
42+
node_modules/
43+
npm-debug.log*
44+
yarn-debug.log*
45+
yarn-error.log*
46+
.yarn/
47+
.pnp.*
48+
49+
# Build artifacts
50+
dist/
51+
build/
52+
*.log
53+
54+
# Tests
55+
__tests__/
56+
*.test.js
57+
*.test.ts
58+
*.spec.js
59+
*.spec.ts
60+
test/
61+
tests/
62+
system-tests/
63+
coverage/
64+
65+
# CI/CD
66+
.github/
67+
68+
# Environment files (secrets should be in Terraform)
69+
.env
70+
.env.*
71+
*.env
72+
73+
# Elastic Beanstalk files that shouldn't be re-deployed
74+
.elasticbeanstalk/*
75+
!.elasticbeanstalk/*.cfg.yml
76+
!.elasticbeanstalk/*.global.yml
77+
78+
# Source code (we deploy pre-built containers)
79+
src/
80+
81+
# Package manager files
82+
package-lock.json
83+
yarn.lock
84+
.yarnrc.yml
85+
86+
# TypeScript
87+
tsconfig.json
88+
tsconfig.*.json
89+
90+
# Prettier
91+
.prettierrc*
92+
.prettierignore
93+
94+
# Backup files
95+
*.bak
96+
*.backup
97+
*.old
98+
99+
# Temporary files
100+
tmp/
101+
temp/
102+
*.tmp
103+
104+
# Scripts
105+
scripts/
106+
107+
# eb-deploy directory (if it exists)
108+
eb-deploy/

0 commit comments

Comments
 (0)