Skip to content

Commit 3092f1f

Browse files
pritidesaipritidesai
authored
Introducing include and exclude in zip action (#991)
* adding include in yaml parser * wip include * wip * wip - dir level include * wip - dir level include * wip - dir level include * wip * wip * wip * wip * wip * wip * wip * wip * wip * include * deleting debugging statement * cleaning up * adding unit test * adding unit test * wip * refactoring * wip * wip * wip * wip * adding more unit tests * fixing unit test * fixing unit test * fixing unit test * adding exclude * fixing unit test * adding warning * adding exclude * refactoring exclude code * adding exclude test case * exclude integration test * cleaning up * adding wski18 strings
1 parent 4ad4b9c commit 3092f1f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1283
-95
lines changed

‎parsers/manifest_parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ func (dm *YAMLParser) readActionFunction(manifestFilePath string, manifestFileNa
649649

650650
if utils.IsDirectory(actionFilePath) {
651651
zipFileName = actionFilePath + "." + runtimes.ZIP_FILE_EXTENSION
652-
err := utils.NewZipWritter(actionFilePath, zipFileName).Zip()
652+
err := utils.NewZipWritter(actionFilePath, zipFileName, action.Include, action.Exclude, filepath.Dir(manifestFilePath)).Zip()
653653
if err != nil {
654654
return actionFilePath, nil, err
655655
}

‎parsers/yamlparser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ type Action struct {
114114
Inputs map[string]Parameter `yaml:"inputs"`
115115
Outputs map[string]Parameter `yaml:"outputs"`
116116
Annotations map[string]interface{} `yaml:"annotations,omitempty"`
117-
// TODO() this is propoagated from package to every action within that package
118-
//Parameters map[string]interface{} `yaml:parameters`
117+
Include [][]string `yaml:"include,omitempty"`
118+
Exclude []string `yaml:"exclude,omitempty"`
119119
}
120120

121121
type Limits struct {

‎tests/dat/manifest_validate_inputs.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
# license agreements; and to You under the Apache License, Version 2.0.
3+
4+
packages:
5+
helloworld:
6+
actions:
7+
helloNodejs:
8+
function: actions/
9+
runtime: nodejs:6
10+
include:
11+
- ["actions/hello.js"]
12+
- ["actions/hello.js", "actions/hello.js"]
13+
- ["actions/hello.js", "actions/hello.js", "actions/hello.js"]

‎tests/src/integration/zipactionwithexclude/actions/common/utils.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
const hello = "Hello Dear";
5+
6+
module.exports = {
7+
hello: hello
8+
};
9+

‎tests/src/integration/zipactionwithexclude/actions/greeting/index.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var common = require('./common/utils.js')
13+
14+
function main(params) {
15+
var name = params.name || params.payload || 'stranger';
16+
var place = params.place || 'somewhere';
17+
var hello = common.hello || 'Hello';
18+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
19+
}
20+
exports.main = main;
21+

‎tests/src/integration/zipactionwithexclude/actions/greeting/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

‎tests/src/integration/zipactionwithexclude/actions/index.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var common = require('./common/utils.js')
13+
14+
function main(params) {
15+
var name = params.name || params.payload || 'stranger';
16+
var place = params.place || 'somewhere';
17+
var hello = common.hello || 'Hello';
18+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
19+
}
20+
exports.main = main;
21+

‎tests/src/integration/zipactionwithexclude/actions/libs/lib1/utils.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
const hello = "Hello Dear";
5+
6+
module.exports = {
7+
hello: hello
8+
};
9+

‎tests/src/integration/zipactionwithexclude/actions/libs/lib2/utils.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
const hello = "Hello Dear";
5+
6+
module.exports = {
7+
hello: hello
8+
};
9+

‎tests/src/integration/zipactionwithexclude/actions/libs/lib3/utils.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
const hello = "Hello Dear";
5+
6+
module.exports = {
7+
hello: hello
8+
};
9+

‎tests/src/integration/zipactionwithexclude/actions/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

‎tests/src/integration/zipactionwithexclude/manifest.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
# license agreements; and to You under the Apache License, Version 2.0.
3+
4+
packages:
5+
zipactionwithexclude:
6+
version: 1.0
7+
license: Apache-2.0
8+
actions:
9+
greeting1:
10+
function: actions
11+
runtime: nodejs:6
12+
exclude:
13+
- actions/*
14+
include:
15+
- ["actions/common/utils.js", "common/utils.js"]
16+
- ["actions/index.js", "index.js"]
17+
- ["actions/package.json", "package.json"]
18+

‎tests/src/integration/zipactionwithexclude/zipactionwithexclude_test.go

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// +build integration
2+
3+
/*
4+
* Licensed to the Apache Software Foundation (ASF) under one or more
5+
* contributor license agreements. See the NOTICE file distributed with
6+
* this work for additional information regarding copyright ownership.
7+
* The ASF licenses this file to You under the Apache License, Version 2.0
8+
* (the "License"); you may not use this file except in compliance with
9+
* the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
20+
package tests
21+
22+
import (
23+
"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
24+
"github.com/stretchr/testify/assert"
25+
"os"
26+
"testing"
27+
)
28+
29+
func TestZipActionWithExclude(t *testing.T) {
30+
wskdeploy := common.NewWskdeploy()
31+
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
32+
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
33+
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
34+
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
35+
}
36+
37+
var (
38+
manifestPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/zipactionwithexclude/manifest.yml"
39+
deploymentPath = ""
40+
)

‎tests/src/integration/zipactionwithinclude/actions/common/utils.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
const hello = "Hello Dear";
5+
6+
module.exports = {
7+
hello: hello
8+
};
9+

‎tests/src/integration/zipactionwithinclude/actions/greeting1/index.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var common = require('./actions/common/utils.js')
13+
14+
function main(params) {
15+
var name = params.name || params.payload || 'stranger';
16+
var place = params.place || 'somewhere';
17+
var hello = common.hello || 'Hello';
18+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
19+
}
20+
exports.main = main;
21+

‎tests/src/integration/zipactionwithinclude/actions/greeting1/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

‎tests/src/integration/zipactionwithinclude/actions/greeting10/index.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var lib1 = require('./actions/libs/lib1/utils.js')
13+
var lib2 = require('./actions/libs/lib2/utils.js')
14+
var lib3 = require('./actions/libs/lib3/utils.js')
15+
16+
function main(params) {
17+
var name = params.name || params.payload || 'stranger';
18+
var place = params.place || 'somewhere';
19+
var hello = lib1.hello || lib2.hello || lib3.hello || 'Hello';
20+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
21+
}
22+
exports.main = main;
23+

‎tests/src/integration/zipactionwithinclude/actions/greeting10/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

‎tests/src/integration/zipactionwithinclude/actions/greeting2/index.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var common1 = require('./common/utils.js')
13+
var common2 = require('./common/common1/utils.js')
14+
var common3 = require('./common/common1/copyUtils.js')
15+
16+
function main(params) {
17+
var name = params.name || params.payload || 'stranger';
18+
var place = params.place || 'somewhere';
19+
var hello = common1.hello || common2.hello || common3.hello || 'Hello';
20+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
21+
}
22+
exports.main = main;
23+

‎tests/src/integration/zipactionwithinclude/actions/greeting2/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

‎tests/src/integration/zipactionwithinclude/actions/greeting3/index.js

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var common1 = require('./common/utils.js')
13+
var common2 = require('./common/common1/utils.js')
14+
15+
function main(params) {
16+
var name = params.name || params.payload || 'stranger';
17+
var place = params.place || 'somewhere';
18+
var hello = common1.hello || common2.hello || 'Hello';
19+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
20+
}
21+
exports.main = main;
22+

‎tests/src/integration/zipactionwithinclude/actions/greeting3/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

‎tests/src/integration/zipactionwithinclude/actions/greeting4/index.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var common = require('./common/utils.js')
13+
14+
function main(params) {
15+
var name = params.name || params.payload || 'stranger';
16+
var place = params.place || 'somewhere';
17+
var hello = common.hello || 'Hello';
18+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
19+
}
20+
exports.main = main;
21+

‎tests/src/integration/zipactionwithinclude/actions/greeting4/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

‎tests/src/integration/zipactionwithinclude/actions/greeting5/index.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
// license agreements; and to You under the Apache License, Version 2.0.
3+
4+
/**
5+
* Return a simple greeting message for someone.
6+
*
7+
* @param name A person's name.
8+
* @param place Where the person is from.
9+
*/
10+
11+
12+
var common = require('./common/utils.js')
13+
14+
function main(params) {
15+
var name = params.name || params.payload || 'stranger';
16+
var place = params.place || 'somewhere';
17+
var hello = common.hello || 'Hello';
18+
return {payload: hello + ', ' + name + ' from ' + place + '!'};
19+
}
20+
exports.main = main;
21+

‎tests/src/integration/zipactionwithinclude/actions/greeting5/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "my-action",
3+
"main": "index.js",
4+
"dependencies" : {
5+
}
6+
}

0 commit comments

Comments
 (0)