Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adapt tests for provide-api-key annotation upstream #433

Merged
merged 2 commits into from
Apr 11, 2019
Merged

adapt tests for provide-api-key annotation upstream #433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46e61d3
Copied changes related to provide-api-key annotation
matthiaskubik Apr 10, 2019
ac6213b
Fix compilation error.
rabbah Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 35 additions & 17 deletions tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
// Some action invocation environments will not have an api key; so allow this check to be conditionally skipped
val apiKeyCheck = true

val requireAPIKeyAnnotation = WhiskProperties.getBooleanProperty("whisk.feature.requireApiKeyAnnotation", true);

behavior of "Wsk CLI usage"

it should "show help and usage info" in {
Expand Down Expand Up @@ -620,15 +622,20 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {

wsk.action.create(name, file, web = Some(flag), update = true)

val stdout =
wsk.action.get(name, fieldFilter = Some("annotations")).stdout
assert(stdout.startsWith(s"ok: got action $name, displaying field annotations\n"))
removeCLIHeader(stdout).parseJson shouldBe JsArray(
JsObject("key" -> JsString("web-export"), "value" -> JsBoolean(webEnabled || rawEnabled)),
JsObject("key" -> JsString("raw-http"), "value" -> JsBoolean(rawEnabled)),
JsObject("key" -> JsString("final"), "value" -> JsBoolean(webEnabled || rawEnabled)),
JsObject("key" -> JsString(WhiskAction.provideApiKeyAnnotationName), "value" -> JsBoolean(false)),
JsObject("key" -> JsString("exec"), "value" -> JsString("nodejs:6")))
val action = wsk.action.get(name)

val baseAnnotations = Parameters("web-export", JsBoolean(webEnabled || rawEnabled)) ++
Parameters("raw-http", JsBoolean(rawEnabled)) ++
Parameters("final", JsBoolean(webEnabled || rawEnabled)) ++
Parameters("exec", "nodejs:6")
val testAnnotations = if (requireAPIKeyAnnotation) {
baseAnnotations ++ Parameters(WhiskAction.provideApiKeyAnnotationName, JsFalse)
} else baseAnnotations

removeCLIHeader(action.stdout).parseJson.asJsObject
.fields("annotations")
.convertTo[Set[JsObject]] shouldBe testAnnotations.toJsArray
.convertTo[Set[JsObject]]
}
}

Expand Down Expand Up @@ -688,14 +695,25 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
action.create(name, file, web = Some("true"), update = true)
}

val stdout = wsk.action.get(name, fieldFilter = Some("annotations")).stdout
assert(stdout.startsWith(s"ok: got action $name, displaying field annotations\n"))
removeCLIHeader(stdout).parseJson shouldBe JsArray(
JsObject("key" -> JsString("web-export"), "value" -> JsBoolean(true)),
JsObject("key" -> JsString("raw-http"), "value" -> JsBoolean(false)),
JsObject("key" -> JsString("final"), "value" -> JsBoolean(true)),
JsObject("key" -> JsString(WhiskAction.provideApiKeyAnnotationName), "value" -> JsBoolean(false)),
JsObject("key" -> JsString("exec"), "value" -> JsString("nodejs:6")))
val baseAnnotations =
Parameters("web-export", JsBoolean(true)) ++
Parameters("raw-http", JsBoolean(false)) ++
Parameters("final", JsBoolean(true))

val testAnnotations = if (requireAPIKeyAnnotation) {
baseAnnotations ++
Parameters(WhiskAction.provideApiKeyAnnotationName, JsBoolean(false)) ++
Parameters("exec", "nodejs:6")
} else {
baseAnnotations ++
Parameters("exec", "nodejs:6")
}

val action = wsk.action.get(name)
removeCLIHeader(action.stdout).parseJson.asJsObject
.fields("annotations")
.convertTo[Set[JsObject]] shouldBe testAnnotations.toJsArray
.convertTo[Set[JsObject]]
}

it should "reject action create and update with invalid --web flag input" in withAssetCleaner(wskprops) {
Expand Down