Skip to content
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

Jump to bottom

makefile: Clearer script calls #574

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

makefile: Clearer script calls #574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ PROJECT_ROOT ?= $(notdir $(PWD))

# Use `=` instead of `:=` so that we only execute `./bin/current-account-alias.sh` when needed
# See https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors
CURRENT_ACCOUNT_ALIAS = `./bin/current-account-alias.sh`

CURRENT_ACCOUNT_ID = $(./bin/current-account-id.sh)
CURRENT_ACCOUNT_ALIAS = $(shell ./bin/current-account-alias.sh)
CURRENT_ACCOUNT_ID = $(shell ./bin/current-account-id.sh)

# Get the list of reusable terraform modules by getting out all the modules
# in infra/modules and then stripping out the "infra/modules/" prefix
Expand Down Expand Up @@ -90,7 +89,7 @@ infra-configure-app-service: ## Configure infra/$APP_NAME/service module's tfbac
./bin/create-tfbackend.sh "infra/$(APP_NAME)/service" "$(ENVIRONMENT)"

infra-update-current-account: ## Update infra resources for current AWS profile
./bin/terraform-init-and-apply.sh infra/accounts `./bin/current-account-config-name.sh`
./bin/terraform-init-and-apply.sh infra/accounts $$(./bin/current-account-config-name.sh)

infra-update-network: ## Update network
@:$(call check_defined, NETWORK_NAME, the name of the network in /infra/networks)
Expand Down
Loading