Service to application

[wallyworld]

"Service" has been renamed to "Application". A few changes:

1. Use gopkg.in/names.v2 to pick up new application tags
2. Use yaml.v2 - there were a few old v1 methods around
3. Introduce unmarshalling of bundle metadata what accepts both services and applications
   (allow older bundle files to be read)

Waiting on names.v2 to be updated. There's a bot issue to get that sorted out.

[axw]

please move the comment in the "if" block

[wallyworld]

Done

[axw]

ditto

[wallyworld]

Done

[axw]

not sure that we should be changing this file, since it's taken from a real bundle...

[wallyworld]

Reverted

[axw]

pretty sure those interface names correspond to openstack terms, not juju services/applications. simple sed script? :)

[wallyworld]

FFS, missed that cleanup, fixed

[axw]

LGTM with a couple of small things. Are you sure nothing is relying on the yaml.v1 API being implemented?

[rogpeppe]

How about just embedding BundleData into this struct?
Something like this is simpler, I think, and consolidates the legacy checking
into one place:

type noMethodsBundleData BundleData
type legacyBundleData struct {
    noMethodsBundleData `bson:",inline" yaml:",inline"`
    Services            map[string]*ApplicationSpec `json:"services" yaml:"services" bson:"services"`
}

func (bdc *legacyBundleData) setBundleData(bd *BundleData) error {
    if len(bdc.Applications) > 0 && len(bdc.Services) > 0 {
        return fmt.Errorf("cannot specify both applications and services")
    }
    if len(bdc.Services) > 0 {
        bdc.Applications = bdc.Services
    }
    *bd = BundleData(bdc.noMethodsBundleData)
    return nil
}

func (bd *BundleData) UnmarshalJSON(b []byte) error {
    var bdc legacyBundleData
    if err := json.Unmarshal(b, &bdc); err != nil {
        return err
    }
    return bdc.setBundleData(bd)
}

func (bd *BundleData) UnmarshalYAML(f func(interface{}) error) error {
    var bdc legacyBundleData
    if err := f(&bdc); err != nil {
        return err
    }
    return bdc.setBundleData(bd)
}

func (bd *BundleData) SetBSON(raw bson.Raw) error {
    var bdc legacyBundleData
    if err := raw.Unmarshal(&bdc); err != nil {
        return err
    }
    return bdc.setBundleData(bd)
}

[wallyworld]

Nice idea, I forgot about the inline tag

[rogpeppe]

Let's have a test for a bundle that specifies both service and applications, please.
(I think that should be an error).

[wallyworld]

Done

[rogpeppe]

I have an implementation suggestion for the unmarshaling logic above.

I think I'd probably leave the yaml.v1 interface intact as axw suggests.

Also, it would be good to have some round-trip marshal/unmarshal tests
for BundleData as there are with Meta, and compatibility unmarshal tests
for json and bson too.

Otherwise LGTM, thanks!

[wallyworld]

$$merge$$

[jujubot]

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-charm