diff --git a/.travis.yml b/.travis.yml index 48934ac..a8eba16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ notifications: secure: ZE3Y6k7io6D13CsP45gDGpIVToQbucSftdDmZicreSK9+TjBjMG90GPEGc1BXSyfQEgmmvZ2eHuL2iuA9cbrY/exX14YMzrT7ejh9YhvS2QDjMazvp7PigSVp05BiixppmWEAYiituPxAONr80mXxMKSUQBTqdoqaiIOVkMURMOvxg3n5iwSLQgTZrV+eaVjCcgJ4WWIFgrktr+Dpo6qd7IBc7cM+Wfk5WKhP9arXY59KPxKeB8Ksy2+geOspyZjLM3dEKhx2IfUkwtf4L3aW9LQewglWdGrsOt3S+vpGbMhvviua1HQsC8Al8TY5FnSfd9wM2x9hyZbFT7omz7/em8zuGZQi5C3NNCgRoHjlg0ccp9Kqh3ulIDAMhcTG+yYqo1y420HV4kdneuDbF+nyNnU+ouswgSwWlCUOSbwnprW3B39qui/8l9ktB/rOI7J76hlRj5ke0oi7bfEbcNSSFlTyZwHq6zzWXprSdXJAnT3DomN/rwTb+RiqA9T+G6TafmSB7ay4nmxzcuzTmMYQw3RCrXK9Uk7XzGCPvcquoimK5x13bi8yV2AjTw9rPy2xLsG0Yyn/ltnlbD7oDBWAdMkJZO/4s/STCJOUff05k94r62333pqKsP7sYoUX3bJuNoMvUr1GMSX1ydu7FEcBQG2ItDJKWl0uNWHI+o6pZ8= before_install: - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_a0b9052d7bd5_key -iv $encrypted_a0b9052d7bd5_iv -in tests/credentials.json.enc -out tests/credentials.json -d; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K "$encrypted_DF18CF3F552A_key" -iv "$encrypted_DF18CF3F552A_iv" -in tests/credentials.json.enc -out tests/credentials.json -d; fi' - "./tools/travis/setup.sh" install: true script: diff --git a/tests/credentials.json.enc b/tests/credentials.json.enc index 7c8f74e..504d8b1 100644 Binary files a/tests/credentials.json.enc and b/tests/credentials.json.enc differ diff --git a/tests/src/test/scala/runtime/actionContainers/SwiftActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/SwiftActionContainerTests.scala index a5f8e52..cb440cd 100644 --- a/tests/src/test/scala/runtime/actionContainers/SwiftActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/SwiftActionContainerTests.scala @@ -112,6 +112,7 @@ abstract class SwiftActionContainerTests extends BasicActionRunnerTests with Wsk | var d = "???" | var e = "???" | var f = "???" + | var g = "???" | if let v : String = env["__OW_API_HOST"] { | a = "\(v)" | } @@ -124,13 +125,16 @@ abstract class SwiftActionContainerTests extends BasicActionRunnerTests with Wsk | if let v : String = env["__OW_ACTION_NAME"] { | d = "\(v)" | } - | if let v : String = env["__OW_ACTIVATION_ID"] { + | if let v : String = env["__OW_ACTION_VERSION"] { | e = "\(v)" | } - | if let v : String = env["__OW_DEADLINE"] { + | if let v : String = env["__OW_ACTIVATION_ID"] { | f = "\(v)" | } - | return ["api_host": a, "api_key": b, "namespace": c, "action_name": d, "activation_id": e, "deadline": f] + | if let v : String = env["__OW_DEADLINE"] { + | g = "\(v)" + | } + | return ["api_host": a, "api_key": b, "namespace": c, "action_name": d, "action_version": e, "activation_id": f, "deadline": g] | } """.stripMargin, enforceEmptyOutputStream = enforceEmptyOutputStream) diff --git a/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala index d015949..ffde9d7 100644 --- a/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala @@ -139,6 +139,7 @@ abstract class SwiftCodableActionContainerTests extends BasicActionRunnerTests w | let api_key: String | let namespace: String | let action_name: String + | let action_version: String | let activation_id: String | let deadline: String | } @@ -150,6 +151,7 @@ abstract class SwiftCodableActionContainerTests extends BasicActionRunnerTests w | var d = "???" | var e = "???" | var f = "???" + | var g = "???" | if let v : String = env["__OW_API_HOST"] { | a = "\(v)" | } @@ -162,13 +164,16 @@ abstract class SwiftCodableActionContainerTests extends BasicActionRunnerTests w | if let v : String = env["__OW_ACTION_NAME"] { | d = "\(v)" | } - | if let v : String = env["__OW_ACTIVATION_ID"] { + | if let v : String = env["__OW_ACTION_VERSION"] { | e = "\(v)" | } - | if let v : String = env["__OW_DEADLINE"] { + | if let v : String = env["__OW_ACTIVATION_ID"] { | f = "\(v)" | } - | let result = AnOutput(api_host:a, api_key:b, namespace:c, action_name:d, activation_id:e, deadline: f) + | if let v : String = env["__OW_DEADLINE"] { + | g = "\(v)" + | } + | let result = AnOutput(api_host:a, api_key:b, namespace:c, action_name:d, action_version:e, activation_id:f, deadline: g) | respondWith(result, nil) | } """.stripMargin,