chore(canary-v2): Replace region with location. (#2106)

spinnaker · Mar 30, 2018 · 4b884f8 · 4b884f8
1 parent 8edef9c
commit 4b884f8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/KayentaService.kt b/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/KayentaService.kt
@@ -60,7 +60,7 @@ data class CanaryScopes(
 
 data class CanaryScope(
   val scope: String,
-  val region: String?,
+  val location: String?,
   val start: Instant,
   val end: Instant,
   val step: Long = 60, // TODO: would be nice to use a Duration

diff --git a/...-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/model/KayentaCanaryContext.kt b/...-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/model/KayentaCanaryContext.kt
@@ -48,9 +48,9 @@ data class KayentaCanaryContext(
 data class CanaryConfigScope(
   val scopeName: String = "default",
   val controlScope: String,
-  val controlRegion: String?,
+  val controlLocation: String?,
   val experimentScope: String,
-  val experimentRegion: String?,
+  val experimentLocation: String?,
   val startTimeIso: String?,
   val endTimeIso: String?,
   val step: Long = 60, // TODO: clarify this is in seconds

diff --git a/...kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/pipeline/KayentaCanaryStage.kt b/...kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/pipeline/KayentaCanaryStage.kt
@@ -150,15 +150,15 @@ class KayentaCanaryStage(
 
       val controlScope = CanaryScope(
         scope.controlScope,
-        scope.controlRegion,
+        scope.controlLocation,
         start,
         end,
         config.step.seconds,
         scope.extendedScopeParams
       )
       val experimentScope = controlScope.copy(
         scope = scope.experimentScope,
-        region = scope.experimentRegion
+        location = scope.experimentLocation
       )
 
       requestScopes[scope.scopeName] = CanaryScopes(

diff --git a/orca-kayenta/src/test/kotlin/com/netflix/spinnaker/orca/kayenta/KayentaServiceTest.kt b/orca-kayenta/src/test/kotlin/com/netflix/spinnaker/orca/kayenta/KayentaServiceTest.kt
@@ -91,13 +91,13 @@ object KayentaServiceTest : Spek({
             scopes = mapOf("canary" to CanaryScopes(
               CanaryScope(
                 scope = "covfefe-control",
-                region = "us-west-2",
+                location = "us-west-2",
                 start = startTime,
                 end = endTime
               ),
               CanaryScope(
                 scope = "covfefe-experiment",
-                region = "us-west-2",
+                location = "us-west-2",
                 start = startTime,
                 end = endTime
               )
@@ -236,7 +236,7 @@ object KayentaServiceTest : Spek({
       "default": {
         "controlScope": {
           "scope": "myapp-v059",
-          "region": "us-central1",
+          "location": "us-central1",
           "start": "2018-02-15T20:05:00Z",
           "end": "2018-02-15T21:05:00Z",
           "step": 60,
@@ -246,7 +246,7 @@ object KayentaServiceTest : Spek({
         },
         "experimentScope": {
           "scope": "myapp-v059",
-          "region": "us-central1",
+          "location": "us-central1",
           "start": "2018-02-15T20:05:00Z",
           "end": "2018-02-15T21:05:00Z",
           "step": 60,