Skip to content

Host UI in AWS #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 8, 2025
Merged

Host UI in AWS #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
106ba7f
add a bucket for the ui
devksingh4 Mar 8, 2025
0c7e9aa
only route /api to lambda
devksingh4 Mar 8, 2025
0a9bfc6
update cfn
devksingh4 Mar 8, 2025
27fa48e
simplify cfn
devksingh4 Mar 8, 2025
6258e01
updates to url
devksingh4 Mar 8, 2025
cc37200
fix health checks
devksingh4 Mar 8, 2025
a241e73
fix cfn
devksingh4 Mar 8, 2025
549eb01
comment out cloudfront broken tests for now
devksingh4 Mar 8, 2025
6a90e10
fix e2e tests url
devksingh4 Mar 8, 2025
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
9 changes: 0 additions & 9 deletions .github/workflows/deploy-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ jobs:
env:
HUSKY: "0"
VITE_RUN_ENVIRONMENT: dev
- name: Publish to Cloudflare
uses: cloudflare/pages-action@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: management-ui-dev
directory: dist_ui/
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
branch: main

test-dev:
runs-on: ubuntu-latest
Expand Down
36 changes: 20 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ set_application_name = ParameterKey=ApplicationFriendlyName,ParameterValue

prod_aws_account = 298118738376
dev_aws_account = 427040638965
current_aws_account := $(shell aws sts get-caller-identity --query Account --output text)

src_directory_root = src/
dist_ui_directory_root = dist_ui/
integration_test_directory_root = tests/live_integration/

# CHANGE ME (as needed)
Expand All @@ -24,22 +26,23 @@ common_params = --no-confirm-changeset \
--s3-prefix $(application_key) \
--resolve-s3

s3_bucket_prefix = "$(current_aws_account)-$(region)-$(application_key)"
ui_s3_bucket = "$(s3_bucket_prefix)-ui"

GIT_HASH := $(shell git rev-parse --short HEAD)

.PHONY: build clean
.PHONY: clean

check_account_prod:
@aws_account_id=$$(aws sts get-caller-identity --query Account --output text); \
if [ "$$aws_account_id" != "$(prod_aws_account)" ]; then \
echo "Error: running in incorrect account $$aws_account_id, expected account ID $(prod_aws_account)"; \
exit 1; \
fi
ifneq ($(current_aws_account),$(prod_aws_account))
$(error Error: running in account $(current_aws_account), expected account ID $(prod_aws_account))
endif

check_account_dev:
@aws_account_id=$$(aws sts get-caller-identity --query Account --output text); \
if [ "$$aws_account_id" != "$(dev_aws_account)" ]; then \
echo "Error: running in incorrect account $$aws_account_id, expected account ID $(dev_aws_account)"; \
exit 1; \
fi
ifneq ($(current_aws_account),$(dev_aws_account))
$(error Error: running in account $(current_aws_account), expected account ID $(dev_aws_account))
endif


clean:
rm -rf .aws-sam
Expand All @@ -61,11 +64,12 @@ local:
VITE_BUILD_HASH=$(GIT_HASH) yarn run dev

deploy_prod: check_account_prod build
aws sts get-caller-identity --query Account --output text
sam deploy $(common_params) --parameter-overrides $(run_env)=prod $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)"
sam deploy $(common_params) --parameter-overrides $(run_env)=prod $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)" S3BucketPrefix="$(s3_bucket_prefix)"
aws s3 sync $(dist_ui_directory_root) s3://$(ui_s3_bucket)/ --delete

deploy_dev: check_account_dev build
sam deploy $(common_params) --parameter-overrides $(run_env)=dev $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)"
sam deploy $(common_params) --parameter-overrides $(run_env)=dev $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)" S3BucketPrefix="$(s3_bucket_prefix)"
aws s3 sync $(dist_ui_directory_root) s3://$(ui_s3_bucket)/ --delete

install:
yarn -D
Expand All @@ -86,7 +90,7 @@ test_e2e: install
yarn test:e2e

dev_health_check:
curl -f https://$(application_key).aws.qa.acmuiuc.org/api/v1/healthz && curl -f https://manage.qa.acmuiuc.org
curl -f https://core.aws.qa.acmuiuc.org/api/v1/healthz && curl -f https://core.aws.qa.acmuiuc.org/

prod_health_check:
curl -f https://$(application_key).aws.acmuiuc.org/api/v1/healthz && curl -f https://manage.acm.illinois.edu
curl -f https://core.acm.illinois.edu/api/v1/healthz && curl -f https://core.acm.illinois.edu
Loading
Loading