You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2017/11/08 15:08:34 UTC
[incubator-openwhisk-wskdeploy] branch master updated: Fixes
https://github.com/apache/incubator-openwhisk-wskdeploy/issues/289 (#637)
This is an automated email from the ASF dual-hosted git repository.
mrutkowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new a6da16a Fixes https://github.com/apache/incubator-openwhisk-wskdeploy/issues/289 (#637)
a6da16a is described below
commit a6da16a5b4cef7547e276117fa7256ae4e66a62d
Author: Manjiri Tapaswi <mp...@ncsu.edu>
AuthorDate: Wed Nov 8 07:08:32 2017 -0800
Fixes https://github.com/apache/incubator-openwhisk-wskdeploy/issues/289 (#637)
---
deployers/manifestreader.go | 2 +-
deployers/manifestreader_test.go | 2 +-
deployers/servicedeployer.go | 4 ++--
parsers/manifest_parser_test.go | 11 +++++------
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/deployers/manifestreader.go b/deployers/manifestreader.go
index 6fc6369..7b0eaca 100644
--- a/deployers/manifestreader.go
+++ b/deployers/manifestreader.go
@@ -34,7 +34,7 @@ type ManifestReader struct {
IsUndeploy bool
}
-func NewManfiestReader(serviceDeployer *ServiceDeployer) *ManifestReader {
+func NewManifestReader(serviceDeployer *ServiceDeployer) *ManifestReader {
var dep ManifestReader
dep.serviceDeployer = serviceDeployer
diff --git a/deployers/manifestreader_test.go b/deployers/manifestreader_test.go
index 8b1377f..79a99e6 100644
--- a/deployers/manifestreader_test.go
+++ b/deployers/manifestreader_test.go
@@ -33,7 +33,7 @@ func init() {
sd = NewServiceDeployer()
sd.ManifestPath = manifest_file
- mr = NewManfiestReader(sd)
+ mr = NewManifestReader(sd)
ps = parsers.NewYAMLParser()
ms, _ = ps.ParseManifest(manifest_file)
}
diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go
index 57b1c64..4bfdf15 100644
--- a/deployers/servicedeployer.go
+++ b/deployers/servicedeployer.go
@@ -112,7 +112,7 @@ func (deployer *ServiceDeployer) Check() {
func (deployer *ServiceDeployer) ConstructDeploymentPlan() error {
- var manifestReader = NewManfiestReader(deployer)
+ var manifestReader = NewManifestReader(deployer)
manifestReader.IsUndeploy = false
var err error
manifest, manifestParser, err := manifestReader.ParseManifest()
@@ -185,7 +185,7 @@ func (deployer *ServiceDeployer) ConstructDeploymentPlan() error {
func (deployer *ServiceDeployer) ConstructUnDeploymentPlan() (*DeploymentProject, error) {
- var manifestReader = NewManfiestReader(deployer)
+ var manifestReader = NewManifestReader(deployer)
manifestReader.IsUndeploy = true
var err error
manifest, manifestParser, err := manifestReader.ParseManifest()
diff --git a/parsers/manifest_parser_test.go b/parsers/manifest_parser_test.go
index 19ebc07..d2d07bd 100644
--- a/parsers/manifest_parser_test.go
+++ b/parsers/manifest_parser_test.go
@@ -528,7 +528,7 @@ func TestComposeActionsForInvalidRuntime(t *testing.T) {
}
}
-// Test 11: validate manfiest_parser.ComposeActions() method for single line parameters
+// Test 11: validate manifest_parser.ComposeActions() method for single line parameters
// manifest_parser should be able to parse input section with different types of values
func TestComposeActionsForSingleLineParams(t *testing.T) {
// manifest file is located under ../tests folder
@@ -687,7 +687,7 @@ func TestComposeActionsForSingleLineParams(t *testing.T) {
}
}
-// Test 12: validate manfiest_parser.ComposeActions() method for multi line parameters
+// Test 12: validate manifest_parser.ComposeActions() method for multi line parameters
// manifest_parser should be able to parse input section with different types of values
func TestComposeActionsForMultiLineParams(t *testing.T) {
// manifest file is located under ../tests folder
@@ -761,7 +761,7 @@ func TestComposeActionsForMultiLineParams(t *testing.T) {
}
}
-// Test 13: validate manfiest_parser.ComposeActions() method
+// Test 13: validate manifest_parser.ComposeActions() method
func TestComposeActionsForFunction(t *testing.T) {
data :=
`package:
@@ -802,7 +802,7 @@ func TestComposeActionsForFunction(t *testing.T) {
}
-// Test 14: validate manfiest_parser.ComposeActions() method
+// Test 14: validate manifest_parser.ComposeActions() method
func TestComposeActionsForLimits (t *testing.T) {
data :=
`package:
@@ -850,7 +850,7 @@ func TestComposeActionsForLimits (t *testing.T) {
}
}
-// Test 15: validate manfiest_parser.ComposeActions() method
+// Test 15: validate manifest_parser.ComposeActions() method
func TestComposeActionsForWebActions(t *testing.T) {
data :=
`package:
@@ -1628,4 +1628,3 @@ func TestComposeActionForAnnotations(t *testing.T) {
eq = reflect.DeepEqual(actual_annotations, expected_annotations)
assert.True(t, eq, "Expected list of annotations does not match with actual list, expected annotations: %v actual annotations: %v", expected_annotations, actual_annotations)
}
-
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].