Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"features": {
"ghcr.io/devcontainers/features/aws-cli:1": {},
"ghcr.io/devcontainers/features/node:1": {},
"ghcr.io/devcontainers-contrib/features/aws-cdk:2": {},
"ghcr.io/devcontainers-extra/features/aws-cdk:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/dhoeric/features/act:1": {},
"ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
"ghcr.io/devcontainers-contrib/features/black:2": {},
"ghcr.io/devcontainers-contrib/features/flake8:2": {},
"ghcr.io/devcontainers-contrib/features/isort:2": {}
"ghcr.io/devcontainers-extra/features/pre-commit:2": {},
"ghcr.io/devcontainers-extra/features/black:2": {},
"ghcr.io/devcontainers-extra/features/flake8:2": {},
"ghcr.io/devcontainers-extra/features/isort:2": {}
},
"customizations": {
"vscode": {
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/code.test-and-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ jobs:
SLACK_FOOTER: ''
MSG_MINIMAL: true
SLACK_MESSAGE: 'PR Created ${{ github.event.pull_request.html_url }}'
- name: Send Mission Solution PR Created Notification
if: github.event_name == 'pull_request' && github.event.action == 'opened'
uses: rtCamp/action-slack-notify@v2
env:
SLACK_WEBHOOK: ${{ secrets.MISSION_SOLUTION_PR_WEBHOOK }}
SLACK_TITLE: '${{github.event.repository.name}} PR Created: ${{ github.event.pull_request.title }} by ${{ github.event.pull_request.user.login }}'
SLACK_FOOTER: ''
MSG_MINIMAL: true
SLACK_MESSAGE: 'PR Created ${{ github.event.pull_request.html_url }}'
backend_build:
name: Backend Tests
runs-on: ubuntu-latest
Expand Down
10 changes: 6 additions & 4 deletions bin/mlspace-cdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,19 @@ const app = new App();
const stacks = [];
const isIso = ['us-iso-east-1', 'us-isob-east-1'].includes(config.AWS_REGION);

//Translate is not currently available in us-isob-east1
const enableTranslate = !['us-isob-east-1'].includes(config.AWS_REGION);

const vpcStack = new VPCStack(app, 'mlspace-vpc', {
env: envProperties,
deployCFNEndpoint: true,
deployCWEndpoint: true,
deployCWLEndpoint: true,
deployDDBEndpoint: true,
deployEMREndpoint: true,
deployS3Endpoint: true,
deploySTSEndpoint: true,
deployTranslateEndpoint: enableTranslate,
isIso,
mlspaceConfig: config
});
Expand All @@ -79,9 +84,6 @@ const websiteBucketName = `${config.WEBSITE_BUCKET_NAME}-${config.AWS_ACCOUNT}`;
const cwlBucketName = `${config.LOGS_BUCKET_NAME}-${config.AWS_ACCOUNT}`;
const accessLogsBucketName = `${config.ACCESS_LOGS_BUCKET_NAME}-${config.AWS_ACCOUNT}`;

//Translate is not currently available in us-isob-east1
const enableTranslate = !['us-isob-east-1'].includes(config.AWS_REGION);

const iamStack = new IAMStack(app, 'mlspace-iam', {
env: envProperties,
dataBucketName,
Expand Down Expand Up @@ -238,4 +240,4 @@ stacks.forEach((resource) => {
Tags.of(resource).add('user', 'MLSpaceApplication');
Tags.of(resource).add('project', 'MLSpaceInfrastructure');
}
});
});
2 changes: 1 addition & 1 deletion cdk.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
"@aws-cdk/core:target-partitions": [
"aws",
"aws-gov",
"aws-us-gov",
"aws-iso",
"aws-iso-b"
]
Expand Down
62 changes: 44 additions & 18 deletions cypress/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading