diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3ef5b7208..13c05acea 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -38,7 +38,7 @@ jobs: - uses: ./.github/actions/setup-project - name: Create requirements.txt run: pipenv requirements > requirements.txt - - uses: trailofbits/gh-action-pip-audit@v1.0.0 + - uses: pypa/gh-action-pip-audit@v1.0.4 with: inputs: requirements.txt ignore-vulns: PYSEC-2022-237 diff --git a/.github/workflows/daily_checks.yml b/.github/workflows/daily_checks.yml index adbcdca9b..8506d138e 100644 --- a/.github/workflows/daily_checks.yml +++ b/.github/workflows/daily_checks.yml @@ -26,7 +26,7 @@ jobs: - uses: ./.github/actions/setup-project - name: Create requirements.txt run: pipenv requirements > requirements.txt - - uses: trailofbits/gh-action-pip-audit@v1.0.0 + - uses: pypa/gh-action-pip-audit@v1.0.4 with: inputs: requirements.txt ignore-vulns: PYSEC-2022-237 diff --git a/Makefile b/Makefile index 787ff699d..eac26f3db 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,10 @@ freeze-requirements: ## create static requirements.txt .PHONY: pip-audit pip-audit: - pipenv run pip-audit -r requirements.txt -l --ignore-vuln PYSEC-2022-237 - -pipenv run pip-audit -r requirements_for_test.txt -l + pipenv requirements > requirements.txt + pipenv requirements --dev > requirements_for_test.txt + pipenv run pip-audit -r requirements.txt --ignore-vuln PYSEC-2022-237 + -pipenv run pip-audit -r requirements_for_test.txt .PHONY: audit audit: npm-audit pip-audit diff --git a/docs/notify-pilot-info.md b/docs/notify-pilot-info.md index b2db3e5ad..222b2eea0 100644 --- a/docs/notify-pilot-info.md +++ b/docs/notify-pilot-info.md @@ -97,3 +97,11 @@ To get involved, email us at [notify-support@gsa.gov](mailto:notify-support@gsa. co-design a pilot program to test U.S. Notify for specific use cases. Early adopters will have wrap-around set-up support from the Studio and an opportunity to shape the future of this product. + +### US Notify Demo + + + +https://user-images.githubusercontent.com/6556888/208711970-eb70e618-fd13-4e38-bb61-3ddbf6e21a6d.mp4 + + diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index fd351bc49..8a6137797 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -7,27 +7,22 @@ locals { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } module "logo_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name recursive_delete = local.recursive_delete - s3_service_name = "${local.app_name}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { module "api_network_route" { source = "../shared/container_networking" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name source_app_name = "${local.app_name}-${local.env}" diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf index 5a7691ff0..eba9e9490 100644 --- a/terraform/demo/providers.tf +++ b/terraform/demo/providers.tf @@ -15,3 +15,10 @@ terraform { profile = "notify-terraform-backend" } } + +provider "cloudfoundry" { + api_url = "https://api.fr.cloud.gov" + user = var.cf_user + password = var.cf_password + app_logs_max = 30 +} diff --git a/terraform/production/main.tf b/terraform/production/main.tf index 88ccb5ae5..e479d61c1 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -7,27 +7,22 @@ locals { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "TKTK-production-redis-plan" } module "logo_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name recursive_delete = local.recursive_delete - s3_service_name = "${local.app_name}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { # module "api_network_route" { # source = "../shared/container_networking" # -# cf_user = var.cf_user -# cf_password = var.cf_password # cf_org_name = local.cf_org_name # cf_space_name = local.cf_space_name # source_app_name = "${local.app_name}-${local.env}" @@ -55,14 +48,12 @@ module "logo_upload_bucket" { # `cf create-domain TKTK-org-name TKTK-production-domain-name` ########################################################################### # module "domain" { -# source = "github.com/18f/terraform-cloudgov//domain" +# source = "github.com/18f/terraform-cloudgov//domain?ref=v0.2.0" # -# cf_user = var.cf_user -# cf_password = var.cf_password # cf_org_name = local.cf_org_name # cf_space_name = local.cf_space_name -# env = local.env -# app_name = local.app_name +# app_name_or_id = "${local.app_name}-${local.env}" +# name = "${local.app_name}-domain-${local.env}" # recursive_delete = local.recursive_delete # cdn_plan_name = "domain" # domain_name = "TKTK-production-domain-name" diff --git a/terraform/production/providers.tf b/terraform/production/providers.tf index 276ad5105..e0daee8b0 100644 --- a/terraform/production/providers.tf +++ b/terraform/production/providers.tf @@ -15,3 +15,10 @@ terraform { profile = "notify-terraform-backend" } } + +provider "cloudfoundry" { + api_url = "https://api.fr.cloud.gov" + user = var.cf_user + password = var.cf_password + app_logs_max = 30 +} diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 766aa2f29..ab67c5ac7 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -7,27 +7,22 @@ locals { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } module "logo_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name recursive_delete = local.recursive_delete - s3_service_name = "${local.app_name}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { # module "api_network_route" { # source = "../shared/container_networking" -# cf_user = var.cf_user -# cf_password = var.cf_password # cf_org_name = local.cf_org_name # cf_space_name = local.cf_space_name # source_app_name = "${local.app_name}-${local.env}" diff --git a/terraform/sandbox/providers.tf b/terraform/sandbox/providers.tf index f21cfe326..5fe15f874 100644 --- a/terraform/sandbox/providers.tf +++ b/terraform/sandbox/providers.tf @@ -15,3 +15,10 @@ terraform { profile = "notify-terraform-backend" } } + +provider "cloudfoundry" { + api_url = "https://api.fr.cloud.gov" + user = var.cf_user + password = var.cf_password + app_logs_max = 30 +} diff --git a/terraform/shared/container_networking/providers.tf b/terraform/shared/container_networking/providers.tf index 6fe315c0b..8db86ca90 100644 --- a/terraform/shared/container_networking/providers.tf +++ b/terraform/shared/container_networking/providers.tf @@ -7,10 +7,3 @@ terraform { } } } - -provider "cloudfoundry" { - api_url = "https://api.fr.cloud.gov" - user = var.cf_user - password = var.cf_password - app_logs_max = 30 -} diff --git a/terraform/shared/container_networking/variables.tf b/terraform/shared/container_networking/variables.tf index 76f699fc4..960ee72f0 100644 --- a/terraform/shared/container_networking/variables.tf +++ b/terraform/shared/container_networking/variables.tf @@ -1,14 +1,9 @@ -variable "cf_password" { - type = string - sensitive = true -} -variable "cf_user" {} variable "cf_org_name" {} variable "cf_space_name" {} variable "source_app_name" {} variable "destination_app_name" {} variable "destination_port" { - type = string + type = string # 61443 is the port to use to enable automatic TLS termination as specified at # https://cloud.gov/docs/management/container-to-container/#configuring-secure-container-to-container-networking default = "61443" diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 4df6471e5..dfa327cbe 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -7,27 +7,22 @@ locals { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } module "logo_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name recursive_delete = local.recursive_delete - s3_service_name = "${local.app_name}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { module "api_network_route" { source = "../shared/container_networking" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name source_app_name = "${local.app_name}-${local.env}" diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf index ab8e8ced0..7648e192f 100644 --- a/terraform/staging/providers.tf +++ b/terraform/staging/providers.tf @@ -15,3 +15,10 @@ terraform { profile = "notify-terraform-backend" } } + +provider "cloudfoundry" { + api_url = "https://api.fr.cloud.gov" + user = var.cf_user + password = var.cf_password + app_logs_max = 30 +}