This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 8f8a4aa08 Fix spelling (#5522)
8f8a4aa08 is described below
commit 8f8a4aa0802ba795e9ef68c3ca423ce9b7426c5f
Author: John Bampton <[email protected]>
AuthorDate: Mon Dec 16 05:24:32 2024 +1000
Fix spelling (#5522)
---
ansible/roles/nginx/templates/nginx.conf.j2 | 2 +-
.../scala/org/apache/openwhisk/core/entity/EntityPath.scala | 2 +-
.../scala/org/apache/openwhisk/core/entity/WhiskStore.scala | 2 +-
core/invoker/src/main/resources/application.conf | 4 ++--
core/routemgmt/common/apigw-utils.js | 4 ++--
tests/src/test/scala/system/basic/WskActivationTests.scala | 10 +++++-----
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2
b/ansible/roles/nginx/templates/nginx.conf.j2
index b5ec5302f..0ddc1e65e 100644
--- a/ansible/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -81,7 +81,7 @@ http {
proxy_set_header X-OW-EXTRA-LOGGING $extra_logging;
# Set the request id generated by nginx as tid-header to the upstream.
- # This tid is either the request-id generated by ngix or a tid, sent by
the caller.
+ # This tid is either the request-id generated by nginx or a tid, sent by
the caller.
proxy_set_header {{ transactions.header }} $request_id;
# Send the tid always back as header.
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/EntityPath.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/EntityPath.scala
index b52b4dff3..c72d80b8f 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/EntityPath.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/EntityPath.scala
@@ -53,7 +53,7 @@ protected[core] class EntityPath private (private val path:
Seq[String]) extends
def addPath(e: EntityName) = EntityPath(path :+ e.name)
/**
- * Concatenates given path to existin path.
+ * Concatenates given path to existing path.
*/
def addPath(p: EntityPath) = EntityPath(path ++ p.path)
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskStore.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskStore.scala
index 28997941e..7ae959ed2 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskStore.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskStore.scala
@@ -166,7 +166,7 @@ trait WhiskEntityQueries[T] {
*/
def listCollectionInNamespace[A <: WhiskEntity](
db: ArtifactStore[A],
- path: EntityPath, // could be a namesapce or namespace + package name
+ path: EntityPath, // could be a namespace or namespace + package name
skip: Int,
limit: Int,
includeDocs: Boolean = false,
diff --git a/core/invoker/src/main/resources/application.conf
b/core/invoker/src/main/resources/application.conf
index ba7f50bf3..4b2127a51 100644
--- a/core/invoker/src/main/resources/application.conf
+++ b/core/invoker/src/main/resources/application.conf
@@ -96,8 +96,8 @@ whisk {
#
#pod-template =
- # Set this optional string to be the namespace that the invoker should
target for adding pods. This allows the invoker to run in a namesapce it
doesn't have API access to but add pods to another namespace. See also
https://github.com/apache/openwhisk/issues/4711
- # When not set the underlying client may pickup the namesapce from the
kubeconfig or via system property setting.
+ # Set this optional string to be the namespace that the invoker should
target for adding pods. This allows the invoker to run in a namespace it
doesn't have API access to but add pods to another namespace. See also
https://github.com/apache/openwhisk/issues/4711
+ # When not set the underlying client may pickup the namespace from the
kubeconfig or via system property setting.
# See
https://github.com/fabric8io/kubernetes-client#configuring-the-client for more
information.
# action-namespace = "ns-actions"
diff --git a/core/routemgmt/common/apigw-utils.js
b/core/routemgmt/common/apigw-utils.js
index 7e99432c1..b4fbf88b5 100644
--- a/core/routemgmt/common/apigw-utils.js
+++ b/core/routemgmt/common/apigw-utils.js
@@ -901,7 +901,7 @@ function replaceNamespaceInUrl(url, namespace) {
* body: JSON object or JSON string
* }
* Otherwise, the action was invoked as a regular OpenWhisk action
- * (i.e. https://OW-HOST/api/v1/namesapces/NS/actions/ACTION) and the
+ * (i.e. https://OW-HOST/api/v1/namespaces/NS/actions/ACTION) and the
* error response is just a string. OpenWhisk backend logic will ultimately
* convert this string into the above error object format.
*
@@ -944,7 +944,7 @@ function makeErrorResponseObject(err, isWebAction) {
* body: JSON object or JSON string
* }
* Otherwise, the action was invoked as a regular OpenWhisk action
- * (i.e. https://OW-HOST/api/v1/namesapces/NS/actions/ACTION) and the
+ * (i.e. https://OW-HOST/api/v1/namespaces/NS/actions/ACTION) and the
* response is just a string. OpenWhisk backend logic will ultimately
* convert this string into the above object format.
*
diff --git a/tests/src/test/scala/system/basic/WskActivationTests.scala
b/tests/src/test/scala/system/basic/WskActivationTests.scala
index 514f8aebb..581076149 100644
--- a/tests/src/test/scala/system/basic/WskActivationTests.scala
+++ b/tests/src/test/scala/system/basic/WskActivationTests.scala
@@ -56,8 +56,8 @@ class WskActivationTests extends TestHelpers with
WskTestHelpers with WskActorSy
(wp, assetHelper) =>
val packageName = "shared-package"
val actionName = "echo"
- var invocationNamesapce = if (wskprops.namespace == "_") "guest" else
wskprops.namespace
- val packageActionName =
s"/${invocationNamesapce}/${packageName}/${actionName}"
+ var invocationNamespace = if (wskprops.namespace == "_") "guest" else
wskprops.namespace
+ val packageActionName =
s"/${invocationNamespace}/${packageName}/${actionName}"
assetHelper.withCleaner(wsk.pkg, packageName) { (pkg, _) =>
pkg.create(packageName, shared = Some(true))(wp)
@@ -68,15 +68,15 @@ class WskActivationTests extends TestHelpers with
WskTestHelpers with WskActorSy
}
withActivation(wsk.activation, wsk.action.invoke(packageActionName)(wp))
{ activation =>
- activation.namespace shouldBe invocationNamesapce
+ activation.namespace shouldBe invocationNamespace
}(wp)
val systemId = "whisk.system"
val wskprops2 = WskProps(authKey = WskAdmin.listKeys(systemId)(0)._1,
namespace = systemId)
- invocationNamesapce = if (wskprops2.namespace == "_") "guest" else
wskprops2.namespace
+ invocationNamespace = if (wskprops2.namespace == "_") "guest" else
wskprops2.namespace
withActivation(wsk.activation,
wsk.action.invoke(packageActionName)(wskprops2)) { activation =>
- activation.namespace shouldBe invocationNamesapce
+ activation.namespace shouldBe invocationNamespace
}(wskprops2)
}
}
