Skip to content

Commit

Permalink
Fix spelling (#5522)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbampton authored Dec 15, 2024
1 parent db2b1c6 commit 8f8a4aa
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion ansible/roles/nginx/templates/nginx.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions core/invoker/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions core/routemgmt/common/apigw-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.
*
Expand Down
10 changes: 5 additions & 5 deletions tests/src/test/scala/system/basic/WskActivationTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
}

0 comments on commit 8f8a4aa

Please sign in to comment.