darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 23:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into tdlowden-2

Browse Source
This commit is contained in:
stvnrlly
2023-01-05 21:55:07 -05:00
parent 59d4f09d01 b39259ab6f
commit f3813769f9
14 changed files with 62 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/checks.yml vendored
View File

@@ -38,7 +38,7 @@ jobs:
- uses: ./.github/actions/setup-project - uses: ./.github/actions/setup-project
- name: Create requirements.txt - name: Create requirements.txt
run: pipenv requirements > 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: with:
inputs: requirements.txt inputs: requirements.txt
ignore-vulns: PYSEC-2022-237 ignore-vulns: PYSEC-2022-237

2
.github/workflows/daily_checks.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
- uses: ./.github/actions/setup-project - uses: ./.github/actions/setup-project
- name: Create requirements.txt - name: Create requirements.txt
run: pipenv requirements > 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: with:
inputs: requirements.txt inputs: requirements.txt
ignore-vulns: PYSEC-2022-237 ignore-vulns: PYSEC-2022-237

6
Makefile
View File

@@ -69,8 +69,10 @@ freeze-requirements: ## create static requirements.txt
.PHONY: pip-audit .PHONY: pip-audit
pip-audit: pip-audit:
pipenv run pip-audit -r requirements.txt -l --ignore-vuln PYSEC-2022-237 pipenv requirements > requirements.txt
-pipenv run pip-audit -r requirements_for_test.txt -l 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 .PHONY: audit
audit: npm-audit pip-audit audit: npm-audit pip-audit

8
docs/notify-pilot-info.md
View File

@@ -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. 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 Early adopters will have wrap-around set-up support from the Studio
and an opportunity to shape the future of this product. 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

15
terraform/demo/main.tf
View File

@@ -7,27 +7,22 @@ locals {
} }
module "redis" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "redis-dev" redis_plan_name = "redis-dev"
} }
module "logo_upload_bucket" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete 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" { module "api_network_route" {
source = "../shared/container_networking" source = "../shared/container_networking"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
source_app_name = "${local.app_name}-${local.env}" source_app_name = "${local.app_name}-${local.env}"

7
terraform/demo/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" 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
}

23
terraform/production/main.tf
View File

@@ -7,27 +7,22 @@ locals {
} }
module "redis" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "TKTK-production-redis-plan" redis_plan_name = "TKTK-production-redis-plan"
} }
module "logo_upload_bucket" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete 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" { # module "api_network_route" {
# source = "../shared/container_networking" # source = "../shared/container_networking"
# #
# cf_user = var.cf_user
# cf_password = var.cf_password
# cf_org_name = local.cf_org_name # cf_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name # cf_space_name = local.cf_space_name
# source_app_name = "${local.app_name}-${local.env}" # 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` # `cf create-domain TKTK-org-name TKTK-production-domain-name`
########################################################################### ###########################################################################
# module "domain" { # 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_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name # cf_space_name = local.cf_space_name
# env = local.env # app_name_or_id = "${local.app_name}-${local.env}"
# app_name = local.app_name # name = "${local.app_name}-domain-${local.env}"
# recursive_delete = local.recursive_delete # recursive_delete = local.recursive_delete
# cdn_plan_name = "domain" # cdn_plan_name = "domain"
# domain_name = "TKTK-production-domain-name" # domain_name = "TKTK-production-domain-name"

7
terraform/production/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" 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
}

15
terraform/sandbox/main.tf
View File

@@ -7,27 +7,22 @@ locals {
} }
module "redis" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "redis-dev" redis_plan_name = "redis-dev"
} }
module "logo_upload_bucket" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete 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" { # module "api_network_route" {
# source = "../shared/container_networking" # source = "../shared/container_networking"
# cf_user = var.cf_user
# cf_password = var.cf_password
# cf_org_name = local.cf_org_name # cf_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name # cf_space_name = local.cf_space_name
# source_app_name = "${local.app_name}-${local.env}" # source_app_name = "${local.app_name}-${local.env}"

7
terraform/sandbox/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" 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
}

7
terraform/shared/container_networking/providers.tf
View File

@@ -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
}

7
terraform/shared/container_networking/variables.tf
View File

@@ -1,14 +1,9 @@
variable "cf_password" {
type = string
sensitive = true
}
variable "cf_user" {}
variable "cf_org_name" {} variable "cf_org_name" {}
variable "cf_space_name" {} variable "cf_space_name" {}
variable "source_app_name" {} variable "source_app_name" {}
variable "destination_app_name" {} variable "destination_app_name" {}
variable "destination_port" { variable "destination_port" {
type = string type = string
# 61443 is the port to use to enable automatic TLS termination as specified at # 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 # https://cloud.gov/docs/management/container-to-container/#configuring-secure-container-to-container-networking
default = "61443" default = "61443"

15
terraform/staging/main.tf
View File

@@ -7,27 +7,22 @@ locals {
} }
module "redis" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "redis-dev" redis_plan_name = "redis-dev"
} }
module "logo_upload_bucket" { 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_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete 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" { module "api_network_route" {
source = "../shared/container_networking" source = "../shared/container_networking"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
source_app_name = "${local.app_name}-${local.env}" source_app_name = "${local.app_name}-${local.env}"

7
terraform/staging/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" 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
}