fix(deployment): inlude region config

Author: hannahhoward

README.md

@@ -38,10 +38,11 @@ brew install opentofu
 tofu -u version
 ```
 
-The best way to get started with Storoku is to use the [Storoku starter example](./examples/starter). 
+Then install Storoku
 
-Generally, Storoku deployments are seperated into an app deployment that is specific to the deployment environment (i.e. 'staging', 'prod' or an individual developer deployment) and a shared deployment that covers resources that are shared across environments including several 'dev' resources that would be expensive to replicate for each individual developer.
+```terminal
+brew install storacha/storoku
+```
 
-In general, you will want to copy the files in the starter example to your project, and follow the README for the example to setup your deployment. Most deployment commands are run with `make`. Yes, that `make` get used to Makefiles again (but hopefully you will not have to edit)
+# Usage
 
-## 

app/variables.tf

@@ -16,7 +16,6 @@ variable "appState" {
 variable "allowed_account_ids" {
   description = "account ids used for AWS"
   type = list(string)
-  default = ["505595374361"]
 }
 
 variable "private_key" {

cmd/storoku/template/.github/workflows/deploy.yml

@@ -39,6 +39,7 @@ jobs:
     secrets:
       aws-account-id: {{"${{ secrets.STAGING_AWS_ACCOUNT_ID }}"}}
       aws-region: {{"${{ secrets.STAGING_AWS_REGION }}"}}
+      region: {{"${{ secrets.STAGING_AWS_REGION }}"}}
       private-key: {{"${{ secrets.STAGING_PRIVATE_KEY }}"}}
 
   # apply prod on successful release, plan otherwise
@@ -56,5 +57,6 @@ jobs:
     secrets:
       aws-account-id: {{"${{ secrets.PROD_AWS_ACCOUNT_ID }}"}}
       aws-region: {{"${{ secrets.PROD_AWS_REGION }}"}}
+      region: {{"${{ secrets.PROD_AWS_REGION }}"}}
       private-key: {{"${{ secrets.PROD_PRIVATE_KEY }}"}}
 

cmd/storoku/template/.github/workflows/terraform.yml

@@ -37,6 +37,7 @@ env:
   TF_VAR_app: {{.App}}
   TF_VAR_domain_base: {{.DomainBase}}
   TF_VAR_allowed_account_id: {{"${{ secrets.aws-account-id }}"}}
+  TF_VAR_region: {{"${{ secrets.region }}"}}
   DEPLOY_ENV: ci
 
 permissions:

cmd/storoku/template/deploy/.env.terraform.tpl

@@ -5,5 +5,6 @@ TF_VAR_app={{ .App }}
 TF_VAR_did= # did for your env
 TF_VAR_private_key= # private_key or your env -- do not commit to repo!
 TF_VAR_allowed_account_id=505595374361
+TF_VAR_region=us-west-2
 {{if .Cloudflare}}TF_VAR_cloudflare_zone_id=37783d6f032b78cd97ce37ab6fd42848
 CLOUDFLARE_API_TOKEN= # enter a cloudflare api token{{end}}

cmd/storoku/template/deploy/Makefile

@@ -7,7 +7,7 @@ else
 	endif
 endif
 
-ECR_URI=$(TF_VAR_allowed_account_id).dkr.ecr.us-west-2.amazonaws.com
+ECR_URI=$(TF_VAR_allowed_account_id).dkr.ecr.$(TF_VAR_region).amazonaws.com
 IMAGE_TAG_BASE=$(ECR_URI)/$(TF_VAR_app)-ecr:$(TF_WORKSPACE)
 
 # This is a hack to eval the image tag only when it's a dependency, cause we don't want to set it until docker builds
@@ -29,7 +29,7 @@ eval_env_file: ../.env.production.local
 
 .PHONY: docker-login
 docker-login:
-	aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin $(ECR_URI)
+	aws ecr get-login-password --region $(TF_VAR_region) | docker login --username AWS --password-stdin $(ECR_URI)
 
 .env.terraform:
 

cmd/storoku/template/deploy/app/main.tf

@@ -17,6 +17,7 @@ terraform {
 
 provider "aws" {
   allowed_account_ids = [var.allowed_account_id]
+  region = var.region
   default_tags {
 
     tags = {

cmd/storoku/template/deploy/app/variables.tf

@@ -8,6 +8,11 @@ variable "allowed_account_id" {
   type = string
 }
 
+variable "region" {
+  description = "aws region for all services"
+  type        = string
+}
+
 variable "private_key" {
   description = "private_key for the peer for this deployment"
   type = string

cmd/storoku/template/deploy/shared/main.tf

@@ -19,6 +19,7 @@ terraform {
 
 provider "aws" {
   allowed_account_ids = [var.allowed_account_id]
+  region = var.region
   default_tags {
     tags = {
       "Environment" = terraform.workspace

cmd/storoku/template/deploy/shared/variables.tf

@@ -8,6 +8,11 @@ variable "allowed_account_id" {
   type = string
 }
 
+variable "region" {
+  description = "aws region for all services"
+  type        = string
+}
+
 variable "domain_base" {
   type = string
   default = ""