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/08/26 03:06:11 UTC

[incubator-openwhisk-wskdeploy] branch master updated (1352788 -> fdeeea1)

This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git.


    from 1352788  Add files via upload (#389)
     new 0ddef37  remove invalid package_credential from Package structure.
     new fdeeea1  remove invalid package_credential from Package structure.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 incubator-openwhisk-wskdeploy | Bin 0 -> 11359036 bytes
 parsers/yamlparser.go         |   1 -
 parsers/yamlparser_test.go    |   1 -
 tests/dat/deploy2.yaml        |   1 -
 4 files changed, 3 deletions(-)
 create mode 100755 incubator-openwhisk-wskdeploy

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].

[incubator-openwhisk-wskdeploy] 01/02: remove invalid package_credential from Package structure.

Posted by ho...@apache.org.
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

commit 0ddef37508f6fee0a42a9636139f606898ce3974
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Fri Aug 25 08:31:56 2017 -0500

    remove invalid package_credential from Package structure.
---
 incubator-openwhisk-wskdeploy | Bin 0 -> 11359036 bytes
 parsers/yamlparser.go         |   1 -
 tests/dat/deploy2.yaml        |   1 -
 3 files changed, 2 deletions(-)

diff --git a/incubator-openwhisk-wskdeploy b/incubator-openwhisk-wskdeploy
new file mode 100755
index 0000000..5dcb982
Binary files /dev/null and b/incubator-openwhisk-wskdeploy differ
diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go
index 23c4f6c..960f23e 100644
--- a/parsers/yamlparser.go
+++ b/parsers/yamlparser.go
@@ -141,7 +141,6 @@ type Package struct {
 	Repositories      []Repository          `yaml:"repositories,omitempty"`
 	Dependencies      map[string]Dependency `yaml: dependencies`        // used in manifest.yaml
 	Function          string                `yaml:"function"`           //used in deployment.yaml
-	PackageCredential string                `yaml:"package_credential"` //used in deployment.yaml
 	//mapping to wsk.SentPackageNoPublish.Namespace
 	Namespace   string                 `yaml:"namespace"`  //used in deployment.yaml
 	Credential  string                 `yaml:"credential"` //used in deployment.yaml
diff --git a/tests/dat/deploy2.yaml b/tests/dat/deploy2.yaml
index 0bc7d92..8b463d4 100644
--- a/tests/dat/deploy2.yaml
+++ b/tests/dat/deploy2.yaml
@@ -6,7 +6,6 @@ application:
     test_package:
       name: test_package
       function: http://abc.com/bbb
-      package_credential: 12345678ABCDEF
       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>.

[incubator-openwhisk-wskdeploy] 02/02: remove invalid package_credential from Package structure.

Posted by ho...@apache.org.
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

commit fdeeea1fd241b20be4079fec4eb6c3acd3d7b1f4
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Fri Aug 25 11:00:24 2017 -0500

    remove invalid package_credential from Package structure.
---
 parsers/yamlparser_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/parsers/yamlparser_test.go b/parsers/yamlparser_test.go
index c0a0cd5..b88195a 100644
--- a/parsers/yamlparser_test.go
+++ b/parsers/yamlparser_test.go
@@ -239,7 +239,6 @@ func TestParseDeploymentYAML_Package(t *testing.T) {
 		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, "12345678ABCDEF", pkg.PackageCredential, "Get package credential 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.")

-- 
To stop receiving notification emails like this one, please contact
"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>.