Skip to content

User input validation #57

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
dtoki merged 5 commits into from
Aug 6, 2020
Merged

User input validation #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76cbb49
adds support for field validation
dtoki Aug 5, 2020
487a136
shorten appened cluster-name suffix
dtoki Aug 5, 2020
2eb8d4e
update env
dtoki Aug 5, 2020
39778a9
update readme
dtoki Aug 5, 2020
20c7a01
shorten rds secret env
dtoki Aug 6, 2020
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
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ The root folder is used for declaring parameters required by the templates, and
| |-- terraform/
| | |-- bootstrap/ #initial setup
| | |-- environments/ #infrastructure setup
| | | |-- production/
| | | |-- staging/
| | | |-- prod/
| | | |-- stage/
| |-- kubernetes
| | |-- terraform
| | | |-- environments #k8s-ultities
| | | | |-- production/
| | | | |-- staging/
| | | | |-- prod/
| | | | |-- stage/
```

## AWS EKS Stack
Expand Down Expand Up @@ -60,7 +60,7 @@ infrastructure:
- RDS (db.t3.small): $0.034 USD / hr
- EC2 (t2.small): $0.023 USD / hr

EC2 instance sizing can be configured in [terraform/environments/staging/main.tf](terraform/environments/staging/main.tf)
EC2 instance sizing can be configured in [terraform/environments/stage/main.tf](terraform/environments/stage/main.tf)

## Other links
Project board: [zenhub][zenhub-board]
Expand Down
2 changes: 1 addition & 1 deletion templates/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ENVIRONMENT ?= staging
ENVIRONMENT ?= stage

apply: apply-remote-state apply-secrets apply-env apply-k8s-utils

Expand Down
6 changes: 3 additions & 3 deletions ...erraform/environments/development/main.tf → ...rnetes/terraform/environments/dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
terraform {
backend "s3" {
bucket = "<% .Name %>-development-terraform-state"
bucket = "<% .Name %>-dev-terraform-state"
key = "infrastructure/terraform/environments/development/kubernetes"
encrypt = true
region = "<% index .Params `region` %>"
dynamodb_table = "<% .Name %>-development-terraform-state-locks"
dynamodb_table = "<% .Name %>-dev-terraform-state-locks"
}
}

# Provision kubernetes resources required to run services/applications
module "kubernetes" {
source = "../../modules/kubernetes"

environment = "development"
environment = "dev"
region = "<% index .Params `region` %>"

# Authenticate with the EKS cluster via the cluster id
Expand Down
8 changes: 4 additions & 4 deletions ...terraform/environments/production/main.tf → ...netes/terraform/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
backend "s3" {
bucket = "<% .Name %>-production-terraform-state"
bucket = "<% .Name %>-prod-terraform-state"
key = "infrastructure/terraform/environments/production/kubernetes"
encrypt = true
region = "<% index .Params `region` %>"
dynamodb_table = "<% .Name %>-production-terraform-state-locks"
dynamodb_table = "<% .Name %>-prod-terraform-state-locks"
}
}

Expand All @@ -16,11 +16,11 @@ provider "aws" {
module "kubernetes" {
source = "../../modules/kubernetes"

environment = "production"
environment = "prod"
region = "<% index .Params `region` %>"

# Authenticate with the EKS cluster via the cluster id
cluster_name = "<% .Name %>-production-<% index .Params `region` %>"
cluster_name = "<% .Name %>-prod-<% index .Params `region` %>"

external_dns_zone = "<% index .Params `productionHostRoot` %>"
external_dns_owner_id = "<% GenerateUUID %>" # randomly generated ID
Expand Down
8 changes: 4 additions & 4 deletions ...es/terraform/environments/staging/main.tf → ...etes/terraform/environments/stage/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
backend "s3" {
bucket = "<% .Name %>-staging-terraform-state"
bucket = "<% .Name %>-stage-terraform-state"
key = "infrastructure/terraform/environments/staging/kubernetes"
encrypt = true
region = "<% index .Params `region` %>"
dynamodb_table = "<% .Name %>-staging-terraform-state-locks"
dynamodb_table = "<% .Name %>-stage-terraform-state-locks"
}
}

Expand All @@ -16,11 +16,11 @@ provider "aws" {
module "kubernetes" {
source = "../../modules/kubernetes"

environment = "staging"
environment = "stage"
region = "<% index .Params `region` %>"

# Authenticate with the EKS cluster via the cluster id
cluster_name = "<% .Name %>-staging-<% index .Params `region` %>"
cluster_name = "<% .Name %>-stage-<% index .Params `region` %>"

external_dns_zone = "<% index .Params `stagingHostRoot` %>"
external_dns_owner_id = "<% GenerateUUID %>" # randomly generated ID
Expand Down
4 changes: 2 additions & 2 deletions templates/terraform/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
```
README.md
environments/
production/
prod/
main.tf
staging/
stage/
main.tf
development/
main.tf
Expand Down
12 changes: 6 additions & 6 deletions templates/terraform/bootstrap/secrets/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ module "ci_user_keys" {
tags = map("project", local.project)
}

module "rds_master_secret_staging" {
module "rds_master_secret_stage" {
source = "../../modules/secret"
name = "${local.project}-staging-rds-<% index .Params `randomSeed` %>"
name = "${local.project}-stage-rds-<% index .Params `randomSeed` %>"
type = "random"
random_length = 32
tags = map("rds", "${local.project}-staging")
tags = map("rds", "${local.project}-stage")
}

module "rds_master_secret_production" {
module "rds_master_secret_prod" {
source = "../../modules/secret"
name = "${local.project}-production-rds-<% index .Params `randomSeed` %>"
name = "${local.project}-prod-rds-<% index .Params `randomSeed` %>"
type = "random"
random_length = 32
tags = map("rds", "${local.project}-production")
tags = map("rds", "${local.project}-prod")
}
8 changes: 4 additions & 4 deletions ...terraform/environments/production/main.tf → ...lates/terraform/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
terraform {
required_version = ">= 0.12"
backend "s3" {
bucket = "<% .Name %>-production-terraform-state"
bucket = "<% .Name %>-prod-terraform-state"
key = "infrastructure/terraform/environments/production/main"
encrypt = true
region = "<% index .Params `region` %>"
dynamodb_table = "<% .Name %>-production-terraform-state-locks"
dynamodb_table = "<% .Name %>-prod-terraform-state-locks"
}
}

# Instantiate the production environment
module "production" {
module "prod" {
source = "../../modules/environment"
environment = "production"
environment = "prod"

# Project configuration
project = "<% .Name %>"
Expand Down
8 changes: 4 additions & 4 deletions ...es/terraform/environments/staging/main.tf → ...ates/terraform/environments/stage/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
terraform {
required_version = ">= 0.12"
backend "s3" {
bucket = "<% .Name %>-staging-terraform-state"
bucket = "<% .Name %>-stage-terraform-state"
key = "infrastructure/terraform/environments/staging/main"
encrypt = true
region = "<% index .Params `region` %>"
dynamodb_table = "<% .Name %>-staging-terraform-state-locks"
dynamodb_table = "<% .Name %>-stage-terraform-state-locks"
}
}

# Instantiate the staging environment
module "staging" {
module "stage" {
source = "../../modules/environment"
environment = "staging"
environment = "stage"

# Project configuration
project = "<% .Name %>"
Expand Down
24 changes: 24 additions & 0 deletions zero-module.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,44 @@ parameters:
- "us-east-2"
- field: productionHostRoot
label: Production Root Host Name (e.g. mydomain.com) - this must be the root of the chosen domain, not a subdomain.
fieldValidation:
type: regex
value: '^([a-z0-9]+(-[a-z0-9]+)*\.{1})+[a-z]{2,}$'
errorMessage: Invalid root domain name
- field: productionFrontendSubdomain
label: Production Frontend Host Name (e.g. app.)
default: app.
fieldValidation:
type: regex
value: '^([a-z0-9]+(-[a-z0-9]+)*\.)$'
errorMessage: Invalid subdomain (cannot contain special chars & must end with a '.')
- field: productionBackendSubdomain
label: Production Backend Host Name (e.g. api.)
default: api.
fieldValidation:
type: regex
value: '^([a-z0-9]+(-[a-z0-9]+)*\.)$'
errorMessage: Invalid subdomain (cannot contain special chars & must end with a '.')
- field: stagingHostRoot
label: Staging Root Host Name (e.g. mydomain-staging.com) - this must be the root of the chosen domain, not a subdomain.
fieldValidation:
type: regex
value: '^([a-z0-9]+(-[a-z0-9]+)*\.{1})+[a-z]{2,}$'
errorMessage: Invalid root domain name
- field: stagingFrontendSubdomain
label: Staging Frontend Host Name (e.g. app.)
default: app.
fieldValidation:
type: regex
value: '^([a-z0-9]+(-[a-z0-9]+)*\.)$'
errorMessage: Invalid subdomain (cannot contain special chars & must end with a '.')
- field: stagingBackendSubdomain
label: Staging Backend Host Name (e.g. api.)
default: api.
fieldValidation:
type: regex
value: '^([a-z0-9]+(-[a-z0-9]+)*\.)$'
errorMessage: Invalid subdomain (cannot contain special chars & must end with a '.')
- field: accountId
label: AWS Account ID
execute: aws sts get-caller-identity --query "Account" | tr -d '"'
Expand Down