Update deprecated js_include in nginx configs

kube/services/revproxy/helpers.js

@@ -38,6 +38,8 @@ function atob(input) {
   return output;
 }
 
+
+
 /**
  * nginscript helper for parsing user out of JWT tokens.
  * We appear to have access to the 'access_token' variable
@@ -279,3 +281,5 @@ function gen3_workspace_authorize_handler(req) {
     req.return(400, '{ "status": "redirect failed validation" }');
   }
 }
+
+export default {userid, isCredentialsAllowed, checkBlackList, getServiceReleases};

kube/services/revproxy/nginx.conf

@@ -74,9 +74,9 @@ default_type application/octet-stream;
 # Note - nginscript js_set, etc get processed
 #   on demand: https://www.nginx.com/blog/introduction-nginscript/
 #
-js_include helpers.js;
-js_set $userid userid;
-js_set $black_list_check checkBlackList;
+js_import helpers.js;
+js_set $userid helpers.userid;
+js_set $black_list_check helpers.checkBlackList;
 
 # Modsecurity and blacklist configuration
 include /etc/nginx/gen3_server*.conf;
@@ -98,7 +98,7 @@ perl_set $canary_percent_json 'sub { return $ENV{"CANARY_PERCENT_JSON"}; }';
 ##
 # Service release parsing and assignment
 #
-js_set $service_releases getServiceReleases;
+js_set $service_releases helpers.getServiceReleases;
 
 ##
 # Logging Settings
@@ -166,7 +166,7 @@ perl_set $des_domain 'sub { return $ENV{"DES_NAMESPACE"} ? qq{.$ENV{"DES_NAMESPA
 # CORS Credential White List
 ##
 perl_set $origins_allow_credentials 'sub { return $ENV{"ORIGINS_ALLOW_CREDENTIALS"}; }';
-js_set $credentials_allowed isCredentialsAllowed;
+js_set $credentials_allowed helpers.isCredentialsAllowed;
 
 ## For multi-domain deployments
 perl_set $csrf_cookie_domain 'sub { return $ENV{"COOKIE_DOMAIN"} ? qq{;domain=$ENV{"COOKIE_DOMAIN"}} : ""; }';
@@ -361,29 +361,12 @@ server {
   set $fence_release_name "fence";
   # TODO: configure the rest of the canary-related config later
   set $presigned_url_fence_release_name "presigned-url-fence";
-  if ($service_releases ~* "fence\.canary") {
-    set $fence_release_name "${fence_release_name}-canary";
-  }
   set $fenceshib_release_name "fenceshib";
-  if ($service_releases ~* "fenceshib\.canary") {
-    set $fenceshib_release_name "${fenceshib_release_name}-canary";
-  }
   set $sheepdog_release_name "sheepdog";
-  if ($service_releases ~* "sheepdog\.canary") {
-    set $sheepdog_release_name "${sheepdog_release_name}-canary";
-  }
   set $peregrine_release_name "peregrine";
-  if ($service_releases ~* "peregrine\.canary") {
-    set $peregrine_release_name "${peregrine_release_name}-canary";
-  }
   set $indexd_release_name "indexd";
-  if ($service_releases ~* "indexd\.canary") {
-    set $indexd_release_name "${indexd_release_name}-canary";
-  }
   set $manifestservice_release_name "manifestservice";
-  if ($service_releases ~* "manifestservice\.canary") {
-    set $manifestservice_release_name "${manifestservice_release_name}-canary";
-  }
+
   set $arborist_release_name "arborist";
 
   error_page 500 501 502 503 504 @5xx;