Remove cross account switch and usage

guardian · Oct 18, 2016 · 8ec1149 · 8ec1149
1 parent 8e9199e
commit 8ec1149
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/common/app/conf/switches/FaciaSwitches.scala b/common/app/conf/switches/FaciaSwitches.scala
@@ -65,14 +65,4 @@ trait FaciaSwitches {
     exposeClientSide = false
   )
 
-  val FaciaPressCrossAccountSwitch = Switch(
-    SwitchGroup.Facia,
-    "facia-press-cross-account",
-    "If this is switched on, facia-press will use the cross account FAPI client, reading from the tools bucket",
-    owners = Seq(Owner.withGithub("janua")),
-    safeState = Off,
-    sellByDate = never,
-    exposeClientSide = false
-  )
-
 }
diff --git a/facia-press/app/frontpress/FapiFrontPress.scala b/facia-press/app/frontpress/FapiFrontPress.scala
@@ -31,11 +31,7 @@ class LiveFapiFrontPress(val wsClient: WSClient, val capiClientForFrontsSeo: Con
     apiKey = Configuration.contentApi.key.getOrElse("facia-press")
   )
 
-  implicit def fapiClient: ApiClient =
-    if (Switches.FaciaPressCrossAccountSwitch.isSwitchedOn)
-      FrontsApi.crossAccountClient
-    else
-      FrontsApi.amazonClient
+  implicit val fapiClient: ApiClient = FrontsApi.crossAccountClient
 
   def pressByPathId(path: String): Future[Unit] =
     getPressedFrontForPath(path)
@@ -61,11 +57,7 @@ class DraftFapiFrontPress(val wsClient: WSClient, val capiClientForFrontsSeo: Co
     apiKey = Configuration.contentApi.key.getOrElse("facia-press")
   )
 
-  implicit def fapiClient: ApiClient =
-    if (Switches.FaciaPressCrossAccountSwitch.isSwitchedOn)
-      FrontsApi.crossAccountClient
-    else
-      FrontsApi.amazonClient
+  implicit val fapiClient: ApiClient = FrontsApi.crossAccountClient
 
   def pressByPathId(path: String): Future[Unit] =
     getPressedFrontForPath(path)