Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added interpolation to docker option in manifest.yaml #1100

Merged
merged 8 commits into from
Aug 21, 2020
Merged

Added interpolation to docker option in manifest.yaml #1100

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5079772
Added interpolation to docker option in manifest.yaml
Aug 7, 2020
b648eee
Migrate to using Go Module. Upgraded Go version to 1.14 alongside wit…
Aug 10, 2020
3740583
Upgraded Travis Go version to 1.14
Aug 11, 2020
9992d56
Added End-of-Line to a test data file
Aug 11, 2020
3b4b09d
Fixed test manifest.yml for integration test. Applied golint and sani…
Aug 11, 2020
36122de
Merge branch 'go-mod-migration' of https://github.com/huydoan2/openwh…
Aug 18, 2020
d4b5d56
Merge branch 'master' of https://github.com/apache/openwhisk-wskdeplo…
Aug 18, 2020
c1381d4
Added example for docker interpolation in manifest.yaml
Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions parsers/manifest_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import (

"gopkg.in/yaml.v2"

"net/url"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better ordering of dependencies


"github.com/apache/openwhisk-client-go/whisk"
"github.com/apache/openwhisk-wskdeploy/conductor"
"github.com/apache/openwhisk-wskdeploy/dependencies"
Expand All @@ -40,7 +42,6 @@ import (
"github.com/apache/openwhisk-wskdeploy/wski18n"
"github.com/apache/openwhisk-wskdeploy/wskprint"
yamlHelper "github.com/ghodss/yaml"
"net/url"
)

const (
Expand Down Expand Up @@ -796,7 +797,7 @@ func (dm *YAMLParser) composeActionExec(manifestFilePath string, manifestFileNam
if action.Native {
exec.Image = NATIVE_DOCKER_IMAGE
} else {
exec.Image = action.Docker
exec.Image = wskenv.InterpolateStringWithEnvVar(action.Docker).(string)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interpolation feature in 1 line! Nice!

}
}

Expand Down
9 changes: 8 additions & 1 deletion parsers/manifest_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ func TestComposeActionsForFunctionWithRemoteDir(t *testing.T) {

// validate manifest_parser.ComposeActions() method
func TestComposeActionsForDocker(t *testing.T) {

os.Setenv("image_name", "environmental_variable/image")
file := "../tests/dat/manifest_data_compose_actions_for_docker.yaml"
actionFile := "../tests/src/integration/docker/actions/exec.zip"

Expand Down Expand Up @@ -960,8 +960,15 @@ func TestComposeActionsForDocker(t *testing.T) {
assert.NotNil(t, action.Action.Exec.Code, TEST_MSG_ACTION_CODE_MISSING)
assert.Equal(t, runtimes.BLACKBOX, action.Action.Exec.Kind, fmt.Sprintf(TEST_MSG_ACTION_DOCKER_KIND_MISMATCH, action.Action.Exec.Kind))
assert.Equal(t, "mydockerhub/myimage", action.Action.Exec.Image, TEST_MSG_ACTION_DOCKER_IMAGE_MISMATCH)
case "CustomDockerAction6":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding a unit test

println(action.Action.Exec.Image)
assert.NotNil(t, action.Action.Exec.Code, TEST_MSG_ACTION_CODE_MISSING)
assert.Equal(t, runtimes.BLACKBOX, action.Action.Exec.Kind, fmt.Sprintf(TEST_MSG_ACTION_DOCKER_KIND_MISMATCH, action.Action.Exec.Kind))
assert.Equal(t, os.Getenv("image_name"), action.Action.Exec.Image, TEST_MSG_ACTION_DOCKER_IMAGE_MISMATCH)
}
}

os.Unsetenv("image_name")
}

func TestComposeActionsForEnvVariableInFunction(t *testing.T) {
Expand Down
44 changes: 23 additions & 21 deletions tests/dat/manifest_data_compose_actions_for_docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,26 @@

packages:
IntegrationTestDocker:
actions:
OpenWhiskSkeleton:
docker: openwhisk/skeleton
OpenWhiskSkeletonWithNative:
native: true
CustomDockerAction1:
function: ../src/integration/docker/actions/exec.zip
docker: openwhisk/skeleton
CustomDockerAction2:
function: ../src/integration/docker/actions/exec.zip
native: true
CustomDockerAction3:
function: ../src/integration/docker/actions/bash
native: true
CustomDockerAction4:
function: ../src/integration/docker/actions/go
native: true
CustomDockerAction5:
function: ../src/integration/docker/actions/go
docker: mydockerhub/myimage

actions:
OpenWhiskSkeleton:
docker: openwhisk/skeleton
OpenWhiskSkeletonWithNative:
native: true
CustomDockerAction1:
function: ../src/integration/docker/actions/exec.zip
docker: openwhisk/skeleton
CustomDockerAction2:
function: ../src/integration/docker/actions/exec.zip
native: true
CustomDockerAction3:
function: ../src/integration/docker/actions/bash
native: true
CustomDockerAction4:
function: ../src/integration/docker/actions/go
native: true
CustomDockerAction5:
function: ../src/integration/docker/actions/go
docker: mydockerhub/myimage
CustomDockerAction6:
function: ../src/integration/docker/actions/go
docker: ${image_name}