OSCER-544: Update infra template (#545)

## Ticket

Resolves #544 

## Changes

- Infra code updated to match template
- reporting-app code configuration updated to indicate not using neither
sms notification nor data extraction modules
- dynamodb settings in tfbackend files removed using migration script

## Context for reviewers

Ran `nava-platform infra update . --version HEAD`, fixed merge
collisions (we were ahead on some e2e libraries)

Ran `bin/migrate-terraform-state-locking-to-s3 --reinit` and verified
plans worked.

## Testing

Ran `terraform plan` against
- infra/networks: no change
- infra/accounts: removes dynamodb (expected)
- infra/reporting-app/database (dev and sandbox): no change
- infra/reporting-app/build-repository: no change
- infra/reporting-app/service (dev and sandbox): no-op storage access
iam_policy change (verified via AWS Console)

Application works normally.
- Created case
- Uploaded file as member
- Reviewed file as caseworker


<!-- reporting-app - begin PR environment info -->
## Preview environment for reporting-app
- Service endpoint:
https://p-545-reporting-app-dev-112901576.us-east-1.elb.amazonaws.com
- Deployed commit: 64a5f68
<!-- reporting-app - end PR environment info -->

Author: jdettmannnava

.template-infra/base.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: v0.15.7-1-g4ebae27
+_commit: v0.17.0-1-gad00fcf
 _src_path: https://github.com/navapbc/template-infra
 base_code_repository_url: https://github.com/navapbc/oscer
 base_default_region: us-east-1

Makefile

@@ -2,9 +2,8 @@ PROJECT_ROOT ?= $(notdir $(PWD))
 
 # Use `=` instead of `:=` so that we only execute `./bin/current-account-alias` when needed
 # See https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors
-CURRENT_ACCOUNT_ALIAS = `./bin/current-account-alias`
-
-CURRENT_ACCOUNT_ID = $(./bin/current-account-id)
+CURRENT_ACCOUNT_ALIAS = $(shell ./bin/current-account-alias)
+CURRENT_ACCOUNT_ID = $(shell ./bin/current-account-id)
 
 # Get the list of reusable terraform modules by getting out all the modules
 # in infra/modules and then stripping out the "infra/modules/" prefix
@@ -193,7 +192,7 @@ infra-configure-app-service: ## Configure infra/$APP_NAME/service module's tfbac
 	./bin/create-tfbackend "infra/$(APP_NAME)/service" "$(ENVIRONMENT)"
 
 infra-update-current-account: ## Update infra resources for current AWS profile
-	./bin/terraform-init-and-apply infra/accounts `./bin/current-account-config-name`
+	./bin/terraform-init-and-apply infra/accounts $$(./bin/current-account-config-name)
 
 infra-update-network: ## Update network
 	@:$(call check_defined, NETWORK_NAME, the name of the network in /infra/networks)
@@ -272,7 +271,7 @@ infra-format: ## Format infra code
 
 infra-test-service: ## Run service layer infra test suite
 	@:$(call check_defined, APP_NAME, "the name of subdirectory of /infra that holds the application's infrastructure code")
-	cd infra/test && APP_NAME=$(APP_NAME) go test -run TestService -v -timeout 30m
+	cd infra/test && APP_NAME=$(APP_NAME) IMAGE_TAG=$(IMAGE_TAG) go test -run TestService -v -timeout 30m
 
 #############
 ## Linting ##

bin/account-ids-by-name

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Prints a JSON dictionary that maps account names to account ids for the list
 # of accounts given by the terraform backend files of the form
 # <ACCOUNT_NAME>.<ACCOUNT_ID>.s3.tfbackend in the infra/accounts directory.

bin/check-database-roles

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # -----------------------------------------------------------------------------
 # Script that invokes the database role-manager AWS Lambda function to check
 # that the Postgres users were configured properly.

bin/check-github-actions-auth

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # -----------------------------------------------------------------------------
 # This script configures the database module for the specified application
 # and environment by creating the .tfvars file and .tfbackend file for the module.

bin/configure-monitoring-secret

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # -----------------------------------------------------------------------------
 # This script creates SSM parameter for storing integration URL for incident management
 # services. Script creates new SSM attribute or updates existing.

bin/create-or-update-database-roles

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # -----------------------------------------------------------------------------
 # Script that invokes the database role-manager AWS Lambda function to create
 # or update the Postgres user roles for a particular environment.

bin/create-tfbackend

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # -----------------------------------------------------------------------------
 # This script creates a terraform backend config file for a terraform module.
 # It is not meant to be used directly. Instead, it is called by other scripts
@@ -23,11 +23,9 @@ tf_state_key="${3:-${module_dir}/${backend_config_name}.tfstate}"
 backend_config_file="${module_dir}/${backend_config_name}.s3.tfbackend"
 
 # Get the name of the S3 bucket that was created to store the tf state
-# and the name of the DynamoDB table that was created for tf state locks.
 # This will be used to configure the S3 backends in all the application
 # modules
 tf_state_bucket_name=$(terraform -chdir="infra/accounts" output --raw tf_state_bucket_name)
-tf_locks_table_name=$(terraform -chdir="infra/accounts" output --raw tf_locks_table_name)
 region=$(terraform -chdir="infra/accounts" output --raw region)
 
 echo "===================================="
@@ -44,7 +42,6 @@ cp infra/example.s3.tfbackend "${backend_config_file}"
 # Replace the placeholder values
 sed -i.bak "s/<TF_STATE_BUCKET_NAME>/${tf_state_bucket_name}/g" "${backend_config_file}"
 sed -i.bak "s|<TF_STATE_KEY>|${tf_state_key}|g" "${backend_config_file}"
-sed -i.bak "s/<TF_LOCKS_TABLE_NAME>/${tf_locks_table_name}/g" "${backend_config_file}"
 sed -i.bak "s/<REGION>/${region}/g" "${backend_config_file}"
 
 # Remove the backup file created by sed

bin/current-account-alias

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Print the current AWS account alias
 set -euo pipefail
 account_alias="$(aws iam list-account-aliases --query "AccountAliases" --max-items 1 --output text)"

bin/current-account-config-name

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Print the config name for the current AWS account
 # Do this by getting the current account and searching for a file in
 # infra/accounts that matches "<account name>.<account id>.s3.tfbackend".