From a9fe39c62dc1d4ea7714e0a20051d44d1473967b Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 6 Jun 2024 15:31:39 -0400 Subject: [PATCH 01/17] 816 initial dev for api reverse proxy --- .circleci/config.yml | 31 ++++++++++++++++++ .gitignore | 0 bin/cf_deploy.sh | 63 +++++++++++++++++++++++++++++++++++ manifest_dev.yml | 13 ++++++++ manifest_prod.yml | 13 ++++++++ manifest_stage.yml | 13 ++++++++ mime.types | 78 ++++++++++++++++++++++++++++++++++++++++++++ nginx.conf | 49 ++++++++++++++++++++++++++++ 8 files changed, 260 insertions(+) create mode 100644 .circleci/config.yml create mode 100644 .gitignore create mode 100755 bin/cf_deploy.sh create mode 100644 manifest_dev.yml create mode 100644 manifest_prod.yml create mode 100644 manifest_stage.yml create mode 100644 mime.types create mode 100644 nginx.conf diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..639b743 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,31 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. +# See: https://circleci.com/docs/2.0/configuration-reference +version: 2.1 +jobs: + deploy: + docker: + - image: cimg/base:2024.06 + + working_directory: ~/repo + + steps: + - checkout + + - run: + name: Install CF CLI + command: | + mkdir -p $HOME/bin + export PATH=$HOME/bin:$PATH + curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary&version=7.1.0" | tar xzv -C $HOME/bin + + - run: + name: Deploy Proxy + command: | + export PATH=$HOME/bin:$PATH + ./bin/cf_deploy.sh fecfile-api-proxy fec-fecfileonline-prototyping $CIRCLE_BRANCH + +workflows: + version: 2.1 + build-deploy: + jobs: + - deploy diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/bin/cf_deploy.sh b/bin/cf_deploy.sh new file mode 100755 index 0000000..f24e5ec --- /dev/null +++ b/bin/cf_deploy.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +set -o errexit +set -o pipefail +set -x + +cloud_gov=${CF_API:-https://api.fr.cloud.gov} + +app=${1} +org=${2} +branch=${3} + +# Get the space that corresponds with the branch name +if [[ ${branch} == "develop" ]]; then + echo "Branch is develop, deploying to dev space" + space="dev" +elif [[ ${branch} == release* ]]; then + echo "Branch starts with release, deploying to stage space" + space="stage" +elif [[ ${branch} == "main" ]]; then + echo "Branch is main, deploying to prod space" + space="prod" +else +# Don't deploy other branches, pass build + echo "No space detected" + exit 0 +fi + +manifest=manifest_${space}.yml + +# Get username/password for relevant space (uppercased) +cf_username_label="FEC_CF_USERNAME_$(echo $space | tr [a-z] [A-Z])" +cf_password_label="FEC_CF_PASSWORD_$(echo $space | tr [a-z] [A-Z])" + +if [[ -z ${org} || -z ${branch} || -z ${app} ]]; then + echo "Usage: $0 " >&2 + exit 1 +fi + +( + set +x # Disable debugging + + if [[ -n ${!cf_username_label} && -n ${!cf_password_label} ]]; then + cf api ${cloud_gov} + cf auth "${!cf_username_label}" "${!cf_password_label}" + fi +) + +# Target space +cf target -o ${org} -s ${space} + +# If the app exists, use rolling deployment +if cf app ${app}; then + command="push --strategy rolling" +else + command="push" +fi + +# Deploy app +cf ${command} ${app} -f ${manifest} + +# Add network policies +#cf add-network-policy proxy cms diff --git a/manifest_dev.yml b/manifest_dev.yml new file mode 100644 index 0000000..fa758df --- /dev/null +++ b/manifest_dev.yml @@ -0,0 +1,13 @@ +--- +applications: + - name: fecfile-api-proxy + instances: 1 + memory: 256M + disk_quota: 700M + routes: + - route: fecfile-api-proxy-dev.app.cloud.gov + stack: cflinuxfs4 + buildpacks: + - nginx_buildpack + env: + FECFILE_WEB_API: "fecfile-web-api-dev.app.cloud.gov" diff --git a/manifest_prod.yml b/manifest_prod.yml new file mode 100644 index 0000000..f1d828e --- /dev/null +++ b/manifest_prod.yml @@ -0,0 +1,13 @@ +--- +applications: + - name: fecfile-api-proxy + instances: 4 + memory: 512M + disk_quota: 1G + routes: + - route: fecfile-api-proxy-prod.app.cloud.gov + stack: cflinuxfs4 + buildpacks: + - nginx_buildpack + env: + FECFILE_WEB_API: "fecfile-web-api-prod.app.cloud.gov" diff --git a/manifest_stage.yml b/manifest_stage.yml new file mode 100644 index 0000000..624d29b --- /dev/null +++ b/manifest_stage.yml @@ -0,0 +1,13 @@ +--- +applications: + - name: fecfile-api-proxy + instances: 1 + memory: 512M + disk_quota: 1G + routes: + - route: fecfile-api-proxy-stage.app.cloud.gov + stack: cflinuxfs4 + buildpacks: + - nginx_buildpack + env: + FECFILE_WEB_API: "fecfile-web-api-stage.app.cloud.gov" diff --git a/mime.types b/mime.types new file mode 100644 index 0000000..bc0d7f2 --- /dev/null +++ b/mime.types @@ -0,0 +1,78 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/x-javascript js; + application/atom+xml atom; + application/rss+xml rss; + font/ttf ttf; + font/woff woff; + font/woff2 woff2; + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + text/cache-manifest manifest; + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; + application/java-archive jar war ear; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.ms-excel xls; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/zip zip; + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream eot; + application/octet-stream iso img; + application/octet-stream msi msp msm; + application/json json; + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + video/3gpp 3gpp 3gp; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..09191ba --- /dev/null +++ b/nginx.conf @@ -0,0 +1,49 @@ +worker_processes 1; +daemon off; + +error_log stderr; +events { worker_connections 1024; } + +http { + charset utf-8; + log_format cloudfoundry '$http_x_forwarded_for - $http_referer - [$time_local] "$request" $status $body_bytes_sent'; + access_log /dev/stdout cloudfoundry; + default_type application/octet-stream; + include mime.types; + sendfile on; + + gzip on; + gzip_disable "msie6"; + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types text/plain text/css text/js text/xml text/javascript application/javascript application/x-javascript application/json application/xml application/xml+rss; + + tcp_nopush on; + keepalive_timeout 300; + proxy_connect_timeout 300; + proxy_read_timeout 300; + # Ensure that redirects don't include the internal container PORT - {{port}} + port_in_redirect off; + server_tokens off; + + server { + listen {{port}}; + server_name localhost; + + # Restrict IPs + include blockips.conf; + + client_max_body_size 100M; + + location / { + resolver {{nameservers}} ipv6=off valid=1s; + set $backend "{{env "FECFILE_WEB_API"}}"; + proxy_pass $backend; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_set_header X-Script-Name "/"; + } + } +} From 0a7b6bc95724de9e436cb0b696c2b2538daa3093 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 6 Jun 2024 16:03:55 -0400 Subject: [PATCH 02/17] 816 updates --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 09191ba..2c80156 100644 --- a/nginx.conf +++ b/nginx.conf @@ -29,7 +29,7 @@ http { server_tokens off; server { - listen {{port}}; + listen 8080; server_name localhost; # Restrict IPs From 40c44bd899454bc20a2e94841833d6222f58e759 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 6 Jun 2024 16:10:22 -0400 Subject: [PATCH 03/17] 816 fixes --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 2c80156..09191ba 100644 --- a/nginx.conf +++ b/nginx.conf @@ -29,7 +29,7 @@ http { server_tokens off; server { - listen 8080; + listen {{port}}; server_name localhost; # Restrict IPs From 27954ed8542479a25b8e2e7fcbd940849a0541e2 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 6 Jun 2024 17:25:27 -0400 Subject: [PATCH 04/17] 816 dev testing --- blockips.conf | 5 +++++ manifest_dev.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 blockips.conf diff --git a/blockips.conf b/blockips.conf new file mode 100644 index 0000000..a7813d4 --- /dev/null +++ b/blockips.conf @@ -0,0 +1,5 @@ +# The entire if condition is needed to block an IP + +# if ($http_x_forwarded_for ~* x.x.x.x) { +# return 403; +# } diff --git a/manifest_dev.yml b/manifest_dev.yml index fa758df..52d2bdb 100644 --- a/manifest_dev.yml +++ b/manifest_dev.yml @@ -10,4 +10,4 @@ applications: buildpacks: - nginx_buildpack env: - FECFILE_WEB_API: "fecfile-web-api-dev.app.cloud.gov" + FECFILE_WEB_API: "https://fecfile-web-api-dev.app.cloud.gov" From a760e27624515c75278839312af12dda0e7ad48a Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 12 Jun 2024 11:07:17 -0400 Subject: [PATCH 05/17] 816 add dockerfile for local dev --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..82767a4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,2 @@ +FROM nginx:stable +COPY nginx.conf mime.types blockips.conf /etc/nginx/ \ No newline at end of file From 411c5e5e22e961756c7f48568e021c15632e08f3 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 12 Jun 2024 15:24:42 -0400 Subject: [PATCH 06/17] 816 local testing --- Dockerfile | 6 +++++- nginx.conf | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82767a4..f22a343 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,6 @@ FROM nginx:stable -COPY nginx.conf mime.types blockips.conf /etc/nginx/ \ No newline at end of file +COPY nginx.conf mime.types blockips.conf /etc/nginx/ +RUN sed -i '/daemon off;/d' /etc/nginx/nginx.conf +RUN sed -i 's/{{port}}/8080/g' /etc/nginx/nginx.conf +RUN sed -i 's/{{nameservers}}/127.0.0.11/g' /etc/nginx/nginx.conf +RUN sed -i 's/{{env "FECFILE_WEB_API"}}/http:\/\/api:8080/g' /etc/nginx/nginx.conf \ No newline at end of file diff --git a/nginx.conf b/nginx.conf index 09191ba..a7b9950 100644 --- a/nginx.conf +++ b/nginx.conf @@ -41,7 +41,7 @@ http { resolver {{nameservers}} ipv6=off valid=1s; set $backend "{{env "FECFILE_WEB_API"}}"; proxy_pass $backend; - proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Host $host:{{port}}; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; #proxy_set_header X-Script-Name "/"; } From 36835ea0b00c10ddc168ccc064187f6c9ecd69b1 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Wed, 12 Jun 2024 15:54:30 -0400 Subject: [PATCH 07/17] 816 develop testing --- manifest_dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest_dev.yml b/manifest_dev.yml index 52d2bdb..b8623da 100644 --- a/manifest_dev.yml +++ b/manifest_dev.yml @@ -5,9 +5,9 @@ applications: memory: 256M disk_quota: 700M routes: - - route: fecfile-api-proxy-dev.app.cloud.gov + - route: fecfile-web-api-dev.app.cloud.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack env: - FECFILE_WEB_API: "https://fecfile-web-api-dev.app.cloud.gov" + FECFILE_WEB_API: "https://fecfile-web-api-dev.apps.internal" From 7aefee1aea86997220a12cc486234dae13dd7255 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 13 Jun 2024 15:08:40 -0400 Subject: [PATCH 08/17] 816 dev testing --- manifest_dev.yml | 2 +- nginx.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest_dev.yml b/manifest_dev.yml index b8623da..738d24a 100644 --- a/manifest_dev.yml +++ b/manifest_dev.yml @@ -10,4 +10,4 @@ applications: buildpacks: - nginx_buildpack env: - FECFILE_WEB_API: "https://fecfile-web-api-dev.apps.internal" + FECFILE_WEB_API: "http://fecfile-web-api-dev.apps.internal:8080" diff --git a/nginx.conf b/nginx.conf index a7b9950..e40c73b 100644 --- a/nginx.conf +++ b/nginx.conf @@ -41,6 +41,7 @@ http { resolver {{nameservers}} ipv6=off valid=1s; set $backend "{{env "FECFILE_WEB_API"}}"; proxy_pass $backend; + proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Host $host:{{port}}; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; #proxy_set_header X-Script-Name "/"; From dd65fe4346a9a3b3043fddbd8d7ed24aad197fa1 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 13 Jun 2024 15:50:34 -0400 Subject: [PATCH 09/17] 816 dev testing --- nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.conf b/nginx.conf index e40c73b..a40bbd1 100644 --- a/nginx.conf +++ b/nginx.conf @@ -41,8 +41,8 @@ http { resolver {{nameservers}} ipv6=off valid=1s; set $backend "{{env "FECFILE_WEB_API"}}"; proxy_pass $backend; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host:{{port}}; + proxy_set_header X-Forwarded-Proto https; + proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; #proxy_set_header X-Script-Name "/"; } From d70de46868e41f716efb1186b9c1b01f03198c8f Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 13 Jun 2024 16:07:45 -0400 Subject: [PATCH 10/17] 816 local testing fixes --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index f22a343..c7ef5a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,6 @@ FROM nginx:stable COPY nginx.conf mime.types blockips.conf /etc/nginx/ RUN sed -i '/daemon off;/d' /etc/nginx/nginx.conf RUN sed -i 's/{{port}}/8080/g' /etc/nginx/nginx.conf +RUN sed -i 's/$host/$host:8080/g' /etc/nginx/nginx.conf RUN sed -i 's/{{nameservers}}/127.0.0.11/g' /etc/nginx/nginx.conf RUN sed -i 's/{{env "FECFILE_WEB_API"}}/http:\/\/api:8080/g' /etc/nginx/nginx.conf \ No newline at end of file From bfeebddc1cbcff9215e20bd38c6f5c5406f95377 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 13 Jun 2024 16:35:15 -0400 Subject: [PATCH 11/17] 816 cleanup --- manifest_prod.yml | 4 ++-- manifest_stage.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest_prod.yml b/manifest_prod.yml index f1d828e..6010de6 100644 --- a/manifest_prod.yml +++ b/manifest_prod.yml @@ -5,9 +5,9 @@ applications: memory: 512M disk_quota: 1G routes: - - route: fecfile-api-proxy-prod.app.cloud.gov + - route: fecfile-web-api-prod.app.cloud.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack env: - FECFILE_WEB_API: "fecfile-web-api-prod.app.cloud.gov" + FECFILE_WEB_API: "http://fecfile-web-api-prod.apps.internal:8080" diff --git a/manifest_stage.yml b/manifest_stage.yml index 624d29b..a877e9a 100644 --- a/manifest_stage.yml +++ b/manifest_stage.yml @@ -5,9 +5,9 @@ applications: memory: 512M disk_quota: 1G routes: - - route: fecfile-api-proxy-stage.app.cloud.gov + - route: fecfile-web-api-stage.app.cloud.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack env: - FECFILE_WEB_API: "fecfile-web-api-stage.app.cloud.gov" + FECFILE_WEB_API: "http://fecfile-web-api-stage.apps.internal:8080" From f0a2ed8cb68a2ef70b07bd1bc5ef1ce80564f455 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Mon, 17 Jun 2024 15:01:42 -0400 Subject: [PATCH 12/17] 816 CR comments --- bin/cf_deploy.sh | 2 +- manifest_dev.yml | 2 +- manifest_prod.yml | 2 +- manifest_stage.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/cf_deploy.sh b/bin/cf_deploy.sh index f24e5ec..2f79e66 100755 --- a/bin/cf_deploy.sh +++ b/bin/cf_deploy.sh @@ -60,4 +60,4 @@ fi cf ${command} ${app} -f ${manifest} # Add network policies -#cf add-network-policy proxy cms +cf add-network-policy fecfile-api-proxy fecfile-web-api diff --git a/manifest_dev.yml b/manifest_dev.yml index 738d24a..c8101ba 100644 --- a/manifest_dev.yml +++ b/manifest_dev.yml @@ -5,7 +5,7 @@ applications: memory: 256M disk_quota: 700M routes: - - route: fecfile-web-api-dev.app.cloud.gov + - route: api-dev.fecfile.fec.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack diff --git a/manifest_prod.yml b/manifest_prod.yml index 6010de6..3bcaf10 100644 --- a/manifest_prod.yml +++ b/manifest_prod.yml @@ -5,7 +5,7 @@ applications: memory: 512M disk_quota: 1G routes: - - route: fecfile-web-api-prod.app.cloud.gov + - route: api.fecfile.fec.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack diff --git a/manifest_stage.yml b/manifest_stage.yml index a877e9a..d3108ea 100644 --- a/manifest_stage.yml +++ b/manifest_stage.yml @@ -5,7 +5,7 @@ applications: memory: 512M disk_quota: 1G routes: - - route: fecfile-web-api-stage.app.cloud.gov + - route: api-stage.fecfile.fec.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack From 0fb8ab697a4b930e214294460b29484b419b8439 Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 20 Jun 2024 15:46:12 -0400 Subject: [PATCH 13/17] 816 discussion updates --- manifest_prod.yml | 4 ++-- manifest_stage.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest_prod.yml b/manifest_prod.yml index 3bcaf10..37a22d8 100644 --- a/manifest_prod.yml +++ b/manifest_prod.yml @@ -1,8 +1,8 @@ --- applications: - name: fecfile-api-proxy - instances: 4 - memory: 512M + instances: 2 + memory: 256M disk_quota: 1G routes: - route: api.fecfile.fec.gov diff --git a/manifest_stage.yml b/manifest_stage.yml index d3108ea..b9389aa 100644 --- a/manifest_stage.yml +++ b/manifest_stage.yml @@ -1,8 +1,8 @@ --- applications: - name: fecfile-api-proxy - instances: 1 - memory: 512M + instances: 2 + memory: 256M disk_quota: 1G routes: - route: api-stage.fecfile.fec.gov From c1b985de514a592f8dca25b292ddee278924e75f Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 20 Jun 2024 15:46:44 -0400 Subject: [PATCH 14/17] 816 deploy via circle --- bin/cf_deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cf_deploy.sh b/bin/cf_deploy.sh index 2f79e66..6217b5f 100755 --- a/bin/cf_deploy.sh +++ b/bin/cf_deploy.sh @@ -11,7 +11,7 @@ org=${2} branch=${3} # Get the space that corresponds with the branch name -if [[ ${branch} == "develop" ]]; then +if [[ ${branch} == "feature/816" ]]; then echo "Branch is develop, deploying to dev space" space="dev" elif [[ ${branch} == release* ]]; then From 1f998860c2c7e6fd1a655240b5699a8bad75097b Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 20 Jun 2024 15:56:10 -0400 Subject: [PATCH 15/17] 816 update routes --- manifest_dev.yml | 2 +- manifest_prod.yml | 2 +- manifest_stage.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest_dev.yml b/manifest_dev.yml index c8101ba..738d24a 100644 --- a/manifest_dev.yml +++ b/manifest_dev.yml @@ -5,7 +5,7 @@ applications: memory: 256M disk_quota: 700M routes: - - route: api-dev.fecfile.fec.gov + - route: fecfile-web-api-dev.app.cloud.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack diff --git a/manifest_prod.yml b/manifest_prod.yml index 37a22d8..5c94f28 100644 --- a/manifest_prod.yml +++ b/manifest_prod.yml @@ -5,7 +5,7 @@ applications: memory: 256M disk_quota: 1G routes: - - route: api.fecfile.fec.gov + - route: fecfile-web-api-prod.app.cloud.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack diff --git a/manifest_stage.yml b/manifest_stage.yml index b9389aa..2053258 100644 --- a/manifest_stage.yml +++ b/manifest_stage.yml @@ -5,7 +5,7 @@ applications: memory: 256M disk_quota: 1G routes: - - route: api-stage.fecfile.fec.gov + - route: fecfile-web-api-stage.app.cloud.gov stack: cflinuxfs4 buildpacks: - nginx_buildpack From 32e7a78747282d1e02ebc544fc790bb746101f7d Mon Sep 17 00:00:00 2001 From: David Heitzer Date: Thu, 20 Jun 2024 16:54:34 -0400 Subject: [PATCH 16/17] 816 circle cfg replace --- bin/cf_deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cf_deploy.sh b/bin/cf_deploy.sh index 6217b5f..2f79e66 100755 --- a/bin/cf_deploy.sh +++ b/bin/cf_deploy.sh @@ -11,7 +11,7 @@ org=${2} branch=${3} # Get the space that corresponds with the branch name -if [[ ${branch} == "feature/816" ]]; then +if [[ ${branch} == "develop" ]]; then echo "Branch is develop, deploying to dev space" space="dev" elif [[ ${branch} == release* ]]; then From 45b4c2f3318a4a0fedd41649949e981470690765 Mon Sep 17 00:00:00 2001 From: Laura Beaufort Date: Tue, 25 Jun 2024 09:51:40 -0400 Subject: [PATCH 17/17] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 34 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 22 +++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..4cc5222 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,34 @@ +--- +name: Bug report +about: Create a report to help us improve +title: 'Potential Bug: [Insert title here]' +labels: bug +assignees: WiseQA + +--- + +**Where was the issue found:** +- Committee ID: +- Environment: +- Browser: + +**Please describe the issue clearly and concisely** +A clear and concise description of what the bug is. + +Approximate time the issue was found: + +**To Reproduce** +How to replicate the issue: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..15e6b4c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,22 @@ +--- +name: Feature request +about: Ticket for feature requirements +title: '' +labels: '' +assignees: '' + +--- + +### Business Reason +As a [role], I will be able to [blank] so that I can [business reason] + +### Acceptance Criteria +**Given** [precedent] +**When** [action] +**Then** [result] + +### QA Notes + +### DEV Notes + +### Design