vbatts/microservices-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add FRONTEND_EXTRA_HEADERS env var to deployment

Browse source
This commit is contained in:
Dmitry 2020-08-21 14:15:27 -07:00 • committed by Dmitrii Anoshin
parent eb60138990
commit a4f6817d3a
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hack/make-release-artifacts.sh
View file

@ -31,6 +31,7 @@ NODE_SELECTOR_KEY="${NODE_SELECTOR_KEY:--}"
NODE_SELECTOR_VALUE="${NODE_SELECTOR_VALUE:--}" NODE_SELECTOR_VALUE="${NODE_SELECTOR_VALUE:--}"
TOLERATION_KEY="${TOLERATION_KEY:--}" TOLERATION_KEY="${TOLERATION_KEY:--}"
TOLERATION_VALUE="${TOLERATION_VALUE:--}" TOLERATION_VALUE="${TOLERATION_VALUE:--}"
FRONTEND_EXTRA_HEADERS="${FRONTEND_EXTRA_HEADERS:-}"
print_license_header() { print_license_header() {
cat "${SCRIPTDIR}/license_header.txt" cat "${SCRIPTDIR}/license_header.txt"
@ -98,6 +99,11 @@ mk_kubernetes_manifests() {
out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )" out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )"
fi fi
# insert FRONTEND_EXTRA_HEADERS
pattern="^(\s*)- name: FRONTEND_EXTRA_HEADERS"
replace="\1- name: FRONTEND_EXTRA_HEADERS\n\1 value: \"${FRONTEND_EXTRA_HEADERS}\""
out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )"
# substitude loadgenerator port: 8089 -> 80 # substitude loadgenerator port: 8089 -> 80
pattern="^(\s*)port:\s+8089(\s*)" pattern="^(\s*)port:\s+8089(\s*)"
replace="\1port: 80\2" replace="\1port: 80\2"

1
kubernetes-manifests/frontend.yaml
View file

@ -67,6 +67,7 @@ spec:
value: "checkoutservice:5050" value: "checkoutservice:5050"
- name: AD_SERVICE_ADDR - name: AD_SERVICE_ADDR
value: "adservice:9555" value: "adservice:9555"
- name: FRONTEND_EXTRA_HEADERS
- name: ENV_PLATFORM - name: ENV_PLATFORM
value: "gcp" value: "gcp"
- name: NODE_NAME - name: NODE_NAME

20
src/frontend/handlers.go
View file

@ -95,7 +95,7 @@ func (fe *frontendServer) homeHandler(w http.ResponseWriter, r *http.Request) {
"ad": fe.chooseAd(r.Context(), []string{}, log), "ad": fe.chooseAd(r.Context(), []string{}, log),
"platform_css": plat.css, "platform_css": plat.css,
"platform_name": plat.provider, "platform_name": plat.provider,
"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")), "extra_headers": template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
}); err != nil { }); err != nil {
log.Error(err) log.Error(err)
} }
@ -172,7 +172,7 @@ func (fe *frontendServer) productHandler(w http.ResponseWriter, r *http.Request)
"cart_size": cartSize(cart), "cart_size": cartSize(cart),
"platform_css": plat.css, "platform_css": plat.css,
"platform_name": plat.provider, "platform_name": plat.provider,
"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")), "extra_headers": template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
}); err != nil { }); err != nil {
log.Println(err) log.Println(err)
} }
@ -284,7 +284,7 @@ func (fe *frontendServer) viewCartHandler(w http.ResponseWriter, r *http.Request
"expiration_years": []int{year, year + 1, year + 2, year + 3, year + 4}, "expiration_years": []int{year, year + 1, year + 2, year + 3, year + 4},
"platform_css": plat.css, "platform_css": plat.css,
"platform_name": plat.provider, "platform_name": plat.provider,
"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")), "extra_headers": template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
}); err != nil { }); err != nil {
log.Println(err) log.Println(err)
} }
@ -354,7 +354,7 @@ func (fe *frontendServer) placeOrderHandler(w http.ResponseWriter, r *http.Reque
"recommendations": recommendations, "recommendations": recommendations,
"platform_css": plat.css, "platform_css": plat.css,
"platform_name": plat.provider, "platform_name": plat.provider,
"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")), "extra_headers": template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
}); err != nil { }); err != nil {
log.Println(err) log.Println(err)
} }
@ -410,12 +410,12 @@ func renderHTTPError(log logrus.FieldLogger, r *http.Request, w http.ResponseWri
w.WriteHeader(code) w.WriteHeader(code)
templates.ExecuteTemplate(w, "error", map[string]interface{}{ templates.ExecuteTemplate(w, "error", map[string]interface{}{
"session_id": sessionID(r), "session_id": sessionID(r),
"request_id": r.Context().Value(ctxKeyRequestID{}), "request_id": r.Context().Value(ctxKeyRequestID{}),
"error": errMsg, "error": errMsg,
"status_code": code, "status_code": code,
"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")), "extra_headers": template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
"status": http.StatusText(code)}) "status": http.StatusText(code)})
} }
func currentCurrency(r *http.Request) string { func currentCurrency(r *http.Request) string {