Skip to content

Commit

Permalink
Update infra base to version v0.12.4-58-g370470a
Browse files Browse the repository at this point in the history
  • Loading branch information
nava-platform-bot committed Nov 15, 2024
1 parent 624555e commit c46b72d
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 223 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

The CI/CD for this project uses [reusable Github Actions workflows](https://docs.github.com/en/actions/using-workflows/reusing-workflows).

TODO: update the workflow links to point to blob/main before merge

## 🧪 CI

### Per app workflows
Expand Down
2 changes: 1 addition & 1 deletion .template-infra/base.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: v0.12.4-47-g7ab97e1
_commit: v0.12.4-58-g370470a
_src_path: ../template-infra
base_code_repository_url: git@github.com:navapbc/platform-test-nextjs.git
base_default_region: us-east-1
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ e2e-build: ## Build the e2e Docker image, if not already built, using ./e2e/Dock

e2e-clean-report: ## Remove the local ./e2e/playwright-report and ./e2e/test-results folder and their contents
rm -rf ./e2e/playwright-report
rm -rf ./e2e/blob-report
rm -rf ./e2e/test-results

e2e-delete-image: ## Delete the Docker image for e2e tests
Expand All @@ -98,16 +99,21 @@ e2e-test: ## Run E2E Playwright tests in a Docker container and copy the report
e2e-test: e2e-build
@:$(call check_defined, APP_NAME, You must pass in a specific APP_NAME)
@:$(call check_defined, BASE_URL, You must pass in a BASE_URL)
docker run --rm \
docker run --rm\
--name playwright-e2e-container \
-e APP_NAME=$(APP_NAME) \
-e BASE_URL=$(BASE_URL) \
-e CURRENT_SHARD=$(CURRENT_SHARD) \
-e TOTAL_SHARDS=$(TOTAL_SHARDS) \
-e CI=$(CI) \
-v $(PWD)/e2e/playwright-report:/e2e/playwright-report \
-v $(PWD)/e2e/blob-report:/e2e/blob-report \
playwright-e2e

e2e-test-native: ## Run end-to-end tests
@:$(call check_defined, APP_NAME, You must pass in a specific APP_NAME)
@:$(call check_defined, BASE_URL, You must pass in a BASE_URL)
@echo "Running tests with CI=${CI}, APP_NAME=${APP_NAME}, BASE_URL=${BASE_URL}"
@cd e2e/$(APP_NAME) && APP_NAME=$(APP_NAME) BASE_URL=$(BASE_URL) npx playwright test $(E2E_ARGS)

###########
Expand Down
2 changes: 1 addition & 1 deletion docs/infra/destroy-infrastructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ To destroy everything you'll need to undeploy all the infrastructure in reverse
# Comment out or delete the backend block
backend "s3" {
...
}2
}
```

4. Then run the following from within the `infra/accounts` directory to copy the `tfstate` back to a local `tfstate` file:
Expand Down
1 change: 1 addition & 0 deletions docs/infra/set-up-network.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Before setting up the network you'll need to have:
3. Configure the app in `infra/<APP_NAME>/app-config/main.tf`.
1. Update `has_database` to `true` or `false` depending on whether or not your application has a database to integrate with. This setting determines whether or not to create VPC endpoints needed by the database layer.
2. Update `has_external_non_aws_service` to `true` or `false` depending on whether or not your application makes calls over the public internet. Set this to `true` (a) if your application makes calls to a SaaS service, or (b) if your application needs to call services from another application in the same git repo. This setting determines whether or not to create NAT gateways, which allows the service in the private subnet to make requests to the internet. For more information, see [set up network access to the public internet](./set-up-public-internet-access.md)
<!-- markdown-link-check-disable-next-line -->
3. If you made changes to the configuration of the networks in the optional step 2 above and or to the default application environments: Update `network_name` for your application environments. This mapping ensures that each network is configured appropriately based on the application(s) in that network (see `local.apps_in_network` in [/infra/networks/main.tf](/infra/networks/main.tf)) Failure to set the network name properly means that the network layer may not receive the correct application configurations for `has_database` and `has_external_non_aws_service`.

## 1. Configure backend
Expand Down
Loading

0 comments on commit c46b72d

Please sign in to comment.