Skip to content
This repository has been archived by the owner on May 3, 2022. It is now read-only.

Commit

Permalink
Update cnab-go to v0.3.0-beta1
Browse files Browse the repository at this point in the history
Signed-off-by: Radu M <root@radu.sh>
  • Loading branch information
Radu M committed Aug 9, 2019
1 parent 367ce6b commit 94dc5fc
Show file tree
Hide file tree
Showing 21 changed files with 382 additions and 168 deletions.
5 changes: 3 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@

[[constraint]]
name = "github.com/deislabs/cnab-go"
# version = "v0.2.1-beta1"
# FIX ME
revision = "b58e5b38096273e9fbbea9691111dda27c59d836"
version = "v0.3.0-beta1"

[[override]]
name = "github.com/google/go-containerregistry"
Expand Down
4 changes: 2 additions & 2 deletions cmd/duffle/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ type driverWithRelocationMapping struct {
relMapping string
}

func (d *driverWithRelocationMapping) Run(op *driver.Operation) error {
func (d *driverWithRelocationMapping) Run(op *driver.Operation) (driver.OperationResult, error) {
// if there is a relocation mapping, ensure it is mounted and relocate the invocation image
if d.relMapping != "" {
op.Files["/cnab/app/relocation-mapping.json"] = d.relMapping

var err error
op.Image, err = d.relocateImage(op.Image)
if err != nil {
return err
return driver.OperationResult{}, err
}
}

Expand Down
4 changes: 1 addition & 3 deletions pkg/builder/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ func (tc testImage) Build(ctx context.Context, log io.WriteCloser) error {
}

func TestPrepareBuild(t *testing.T) {
outputs := &bundle.OutputsDefinition{
Fields: map[string]bundle.OutputDefinition{"output1": {}},
}
outputs := map[string]bundle.Output{"output1": {}}
params := map[string]bundle.Parameter{"param1": {}}

mfst := &manifest.Manifest{
Expand Down
2 changes: 1 addition & 1 deletion pkg/duffle/manifest/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type Manifest struct {
Parameters map[string]bundle.Parameter `json:"parameters,omitempty"`
Credentials map[string]bundle.Credential `json:"credentials,omitempty"`
Definitions definition.Definitions `json:"definitions,omitempty"`
Outputs *bundle.OutputsDefinition `json:"outputs,omitempty"`
Outputs map[string]bundle.Output `json:"outputs,omitempty"`
Custom map[string]interface{} `json:"custom,omitempty"`
License string `json:"license,omitempty"`
RequiredExtensions []string `json:"requiredExtensions,omitempty"`
Expand Down
133 changes: 133 additions & 0 deletions vendor/github.com/deislabs/cnab-go/action/action.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions vendor/github.com/deislabs/cnab-go/action/install.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions vendor/github.com/deislabs/cnab-go/action/run_custom.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion vendor/github.com/deislabs/cnab-go/action/status.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions vendor/github.com/deislabs/cnab-go/action/uninstall.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions vendor/github.com/deislabs/cnab-go/action/upgrade.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 94dc5fc

Please sign in to comment.