You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ho...@apache.org on 2017/09/29 14:09:20 UTC
[incubator-openwhisk-wskdeploy] branch master updated: removing
function field from package (#567)
This is an automated email from the ASF dual-hosted git repository.
houshengbo 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 14c6095 removing function field from package (#567)
14c6095 is described below
commit 14c6095417595e045c3171e4ffab1a3577c20edc
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Fri Sep 29 07:09:18 2017 -0700
removing function field from package (#567)
---
parsers/deploy_parser_test.go | 1 -
parsers/yamlparser.go | 1 -
tests/dat/deployment_data_application_package.yaml | 1 -
3 files changed, 3 deletions(-)
diff --git a/parsers/deploy_parser_test.go b/parsers/deploy_parser_test.go
index 9bd986b..3ab06e3 100644
--- a/parsers/deploy_parser_test.go
+++ b/parsers/deploy_parser_test.go
@@ -115,7 +115,6 @@ func TestParseDeploymentYAML_Package(t *testing.T) {
for pkg_name := range deployment.Application.Packages {
assert.Equal(t, "test_package", pkg_name, "Get package name failed.")
var pkg = deployment.Application.Packages[pkg_name]
- assert.Equal(t, "http://abc.com/bbb", pkg.Function, "Get package function failed.")
assert.Equal(t, "/wskdeploy/samples/test", pkg.Namespace, "Get package namespace failed.")
assert.Equal(t, "12345678ABCDEF", pkg.Credential, "Get package credential failed.")
assert.Equal(t, 1, len(pkg.Inputs), "Get package input list failed.")
diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go
index 7ae6fe9..b6c8950 100644
--- a/parsers/yamlparser.go
+++ b/parsers/yamlparser.go
@@ -152,7 +152,6 @@ type Package struct {
License string `yaml:"license"` //used in manifest.yaml, mandatory
Repositories []Repository `yaml:"repositories,omitempty"`
Dependencies map[string]Dependency `yaml: dependencies` //used in manifest.yaml
- Function string `yaml:"function"` //used in deployment.yaml
//mapping to wsk.SentPackageNoPublish.Namespace
Namespace string `yaml:"namespace"` //used in both manifest.yaml and deployment.yaml
Credential string `yaml:"credential"` //used in both manifest.yaml and deployment.yaml
diff --git a/tests/dat/deployment_data_application_package.yaml b/tests/dat/deployment_data_application_package.yaml
index 8b463d4..404d9e1 100644
--- a/tests/dat/deployment_data_application_package.yaml
+++ b/tests/dat/deployment_data_application_package.yaml
@@ -5,7 +5,6 @@ application:
packages:
test_package:
name: test_package
- function: http://abc.com/bbb
namespace: /wskdeploy/samples/test
credential: 12345678ABCDEF
inputs:
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].