From f8ba2e5ad37618b2b399424f00446ec84eb09eea Mon Sep 17 00:00:00 2001 From: Falk Zoll Date: Wed, 15 Jan 2020 09:46:10 +0100 Subject: [PATCH 1/3] Switch credentials, adapt to changes in openwisk. --- .travis.yml | 2 +- tests/credentials.json.enc | Bin 4560 -> 4560 bytes .../SwiftCodableActionContainerTests.scala | 11 ++++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) 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 7c8f74ef80db4dca4cd24a5e3ae833d8622a9dfe..504d8b113118da3cd653e1043a6d03fcc94fff67 100644 GIT binary patch literal 4560 zcmV;>5ijlpLj$0bbw4uEXMd!b=5a<)@agGQ#C^?@$MR%Ji+>Ri84!^~HwMX@pBDQR z17l^H;b7a>j{;2GNE=vlJuFW@1q1Tnc1K}GS6%{Fmwd24r-)a;EL4{9q3~w(`I&

hLDR2GNRTuC_;g3SRD=AeMSgO++im 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 literal 4560 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 Date: Wed, 15 Jan 2020 10:45:35 +0100 Subject: [PATCH 2/3] Fix SwiftActionContainerTests.scala. --- .../actionContainers/SwiftActionContainerTests.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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) From 5bcdb6b9713afcfa2397ce89a834e547319b4320 Mon Sep 17 00:00:00 2001 From: Falk Zoll Date: Wed, 15 Jan 2020 15:27:47 +0100 Subject: [PATCH 3/3] Add missing ','. --- .../actionContainers/SwiftCodableActionContainerTests.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala index 7479e46..ffde9d7 100644 --- a/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/SwiftCodableActionContainerTests.scala @@ -173,7 +173,7 @@ abstract class SwiftCodableActionContainerTests extends BasicActionRunnerTests w | 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) + | 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,