From 9c8d4fdb0da70443c39124d2f3ebaf68dc3f8a7e Mon Sep 17 00:00:00 2001 From: Mike Cooper Date: Fri, 22 Feb 2019 15:39:35 -0800 Subject: [PATCH 1/4] Update environments list in docs Fixes #1736 Fixes #1737 --- docs/qa/environments.rst | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/docs/qa/environments.rst b/docs/qa/environments.rst index 5018144b7..2858def39 100644 --- a/docs/qa/environments.rst +++ b/docs/qa/environments.rst @@ -13,13 +13,8 @@ Production Production is the live, user-facing instance of Normandy that is hit by every active user of Firefox. -- **Read-only server:** https://normandy.services.mozilla.com/ -- **API CDN:** https://normandy.cdn.mozilla.net/ -- **Legacy admin:** https://normandy-admin.prod.mozaws.net/ (VPN Required) -- **Bearer auth admin:** https://normandy-admin-bearer.prod.mozaws.net/ (VPN Required) - -For new usage, the API CDN server is preferred for read-only usages, and the -Bearer auth server is preferred for read-write usages. +- **Public API server:** https://normandy.cdn.mozilla.net/ +- **Admin API server:** https://prod-admin.normandy.prod.cloudops.mozgcp.net/ (VPN Required) Preferences ~~~~~~~~~~~ @@ -40,11 +35,10 @@ Staging is a test environment used to test the deployment process. It is useful for testing a version of Normandy before it is deployed to users, but is not guaranteed to be functional or available at all times. -- **Read-only server:** https://normandy.stage.mozaws.net/ -- **Legacy admin:** https://normandy-admin.stage.mozaws.net/ (VPN Required) -- **Bearer auth admin:** https://normandy-admin-bearer.stage.mozaws.net/ (VPN Required) +- **Public API server:** https://stage.normandy.nonprod.cloudops.mozgcp.net/ +- **Admin API server:** https://stage-admin.normandy.nonprod.cloudops.mozgcp.net/ (VPN Required) -Staging does not have a API CDN. +Staging does not have an API CDN. Preferences ~~~~~~~~~~~ @@ -53,7 +47,7 @@ server: .. describe:: app.normandy.api_url - ``https://normandy.stage.mozaws.net/api/v1`` + ``https://stage.normandy.nonprod.cloudops.mozgcp.net/api/v1`` .. describe:: security.content.signature.root_hash @@ -66,11 +60,10 @@ for testing admin frontends to Normandy, and always has the latest code. Someti is broken. Dev doesn't have a separate read-only and admin server, there is only one server. -- **Legacy admin:** https://normandy.dev.mozaws.net/ -- **Bearer auth admin:** https://normandy-admin-bearer.dev.mozaws.net/ +- **Read-only API server:** https://dev.normandy.nonprod.cloudops.mozgcp.net/ +- **Writable API server:** https://dev-admin.normandy.nonprod.cloudops.mozgcp.net/ -Dev does not have a separate read-only server, nor an API CDN. None of its server -require VPN to access. +Dev does not require VPN to access. Preferences ~~~~~~~~~~~ @@ -79,7 +72,7 @@ server: .. describe:: app.normandy.api_url - ``https://normandy.dev.mozaws.net/api/v1`` + ``https://dev.normandy.nonprod.cloudops.mozgcp.net/api/v1`` .. describe:: security.content.signature.root_hash From c038ba72e7fe19e2a9938becbe635eb9fb680454 Mon Sep 17 00:00:00 2001 From: Michael Cooper Date: Mon, 25 Feb 2019 15:49:58 -0800 Subject: [PATCH 2/4] Review feedback --- docs/qa/environments.rst | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/docs/qa/environments.rst b/docs/qa/environments.rst index 2858def39..7122ec38a 100644 --- a/docs/qa/environments.rst +++ b/docs/qa/environments.rst @@ -11,10 +11,11 @@ auth admin server, and an API CDN. Not all environments have all of these. Production ---------- Production is the live, user-facing instance of Normandy that is hit by every -active user of Firefox. +active user of Firefox. The public server is served through a CDN with a cache +time of a few minutes. -- **Public API server:** https://normandy.cdn.mozilla.net/ -- **Admin API server:** https://prod-admin.normandy.prod.cloudops.mozgcp.net/ (VPN Required) +- **Public Read-only API server:** https://normandy.cdn.mozilla.net/ +- **VPN-Only Admin API server:** https://prod-admin.normandy.prod.cloudops.mozgcp.net/ Preferences ~~~~~~~~~~~ @@ -33,12 +34,11 @@ Staging ------- Staging is a test environment used to test the deployment process. It is useful for testing a version of Normandy before it is deployed to users, but is not -guaranteed to be functional or available at all times. +guaranteed to be functional or available at all times. Unlike Production, stage +does not use a VPN for the public API server. -- **Public API server:** https://stage.normandy.nonprod.cloudops.mozgcp.net/ -- **Admin API server:** https://stage-admin.normandy.nonprod.cloudops.mozgcp.net/ (VPN Required) - -Staging does not have an API CDN. +- **Public Read-only API server:** https://stage.normandy.nonprod.cloudops.mozgcp.net/ +- **VPN-Only Admin API server:** https://stage-admin.normandy.nonprod.cloudops.mozgcp.net/ (VPN Required) Preferences ~~~~~~~~~~~ @@ -56,14 +56,12 @@ server: Dev --- Dev is an environment that deploys automatically from the master branch. It can be used -for testing admin frontends to Normandy, and always has the latest code. Sometimes it -is broken. Dev doesn't have a separate read-only and admin server, there is only one -server. +for testing admin frontends to Normandy, and always has the latest code. Sometimes it +is broken. Unlike Production and Staging, Dev doesn't require use of the VPN to access +the admin server. - **Read-only API server:** https://dev.normandy.nonprod.cloudops.mozgcp.net/ -- **Writable API server:** https://dev-admin.normandy.nonprod.cloudops.mozgcp.net/ - -Dev does not require VPN to access. +- **Admin API server:** https://dev-admin.normandy.nonprod.cloudops.mozgcp.net/ Preferences ~~~~~~~~~~~ @@ -107,4 +105,4 @@ local server: .. describe:: security.content.signature.root_hash - ``4C:35:B1:C3:E3:12:D9:55:E7:78:ED:D0:A7:E7:8A:38:83:04:EF:01:BF:FA:03:29:B2:46:9F:3C:C5:EC:36:04`` \ No newline at end of file + ``4C:35:B1:C3:E3:12:D9:55:E7:78:ED:D0:A7:E7:8A:38:83:04:EF:01:BF:FA:03:29:B2:46:9F:3C:C5:EC:36:04`` From d903c9d2e42b08894ab93b71133fd7d030cffad6 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Tue, 26 Feb 2019 13:16:13 -0800 Subject: [PATCH 3/4] Update docs/qa/environments.rst Co-Authored-By: mythmon --- docs/qa/environments.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/qa/environments.rst b/docs/qa/environments.rst index 7122ec38a..2195b8496 100644 --- a/docs/qa/environments.rst +++ b/docs/qa/environments.rst @@ -11,7 +11,7 @@ auth admin server, and an API CDN. Not all environments have all of these. Production ---------- Production is the live, user-facing instance of Normandy that is hit by every -active user of Firefox. The public server is served through a CDN with a cache +active user of Firefox. The public read-only API server is served through a CDN with a cache time of a few minutes. - **Public Read-only API server:** https://normandy.cdn.mozilla.net/ From 396cb1c43eae3c83e845f1022fb1caa9b1292223 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Tue, 26 Feb 2019 13:16:30 -0800 Subject: [PATCH 4/4] Update docs/qa/environments.rst Co-Authored-By: mythmon --- docs/qa/environments.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/qa/environments.rst b/docs/qa/environments.rst index 2195b8496..8c959b8a4 100644 --- a/docs/qa/environments.rst +++ b/docs/qa/environments.rst @@ -34,7 +34,7 @@ Staging ------- Staging is a test environment used to test the deployment process. It is useful for testing a version of Normandy before it is deployed to users, but is not -guaranteed to be functional or available at all times. Unlike Production, stage +guaranteed to be functional or available at all times. Unlike Production, Stage does not use a VPN for the public API server. - **Public Read-only API server:** https://stage.normandy.nonprod.cloudops.mozgcp.net/