diff --git a/go.mod b/go.mod index ba707e4a2..1595de113 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/apparentlymart/go-cidr v1.1.0 - github.com/coreos/stream-metadata-go v0.1.4 + github.com/coreos/stream-metadata-go v0.1.5 github.com/dustin/go-humanize v1.0.0 github.com/google/gopacket v1.1.19 github.com/google/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 diff --git a/go.sum b/go.sum index f166fe88c..ca01e332e 100644 --- a/go.sum +++ b/go.sum @@ -158,8 +158,8 @@ github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+ github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/stream-metadata-go v0.1.4 h1:7EXqkwilY/jnwilGAQODA36XrABys+sL6QNBixu/eRg= -github.com/coreos/stream-metadata-go v0.1.4/go.mod h1:zxVoWUDB0H8+tZRhTs0LeLeR/QdmBsuo7FN1oOBrWTE= +github.com/coreos/stream-metadata-go v0.1.5 h1:zCWHUrhWE+9gN1YSnKBaa5KmyEuPV/reO+ZXNAmV5TU= +github.com/coreos/stream-metadata-go v0.1.5/go.mod h1:zxVoWUDB0H8+tZRhTs0LeLeR/QdmBsuo7FN1oOBrWTE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= diff --git a/vendor/github.com/coreos/stream-metadata-go/stream/stream.go b/vendor/github.com/coreos/stream-metadata-go/stream/stream.go index c811b8354..2001c661c 100644 --- a/vendor/github.com/coreos/stream-metadata-go/stream/stream.go +++ b/vendor/github.com/coreos/stream-metadata-go/stream/stream.go @@ -52,9 +52,11 @@ type Artifact struct { // Images contains images available in cloud providers type Images struct { - Aliyun *ReplicatedImage `json:"aliyun,omitempty"` - Aws *AwsImage `json:"aws,omitempty"` - Gcp *GcpImage `json:"gcp,omitempty"` + Aliyun *ReplicatedImage `json:"aliyun,omitempty"` + Aws *AwsImage `json:"aws,omitempty"` + Gcp *GcpImage `json:"gcp,omitempty"` + Ibmcloud *ReplicatedObject `json:"ibmcloud,omitempty"` + PowerVS *ReplicatedObject `json:"powervs,omitempty"` } // ReplicatedImage represents an image in all regions of an AWS-like cloud @@ -76,7 +78,21 @@ type AwsRegionImage = RegionImage // GcpImage represents a GCP cloud image type GcpImage struct { - Project string `json:"project,omitempty"` + Release string `json:"release"` + Project string `json:"project"` Family string `json:"family,omitempty"` - Name string `json:"name,omitempty"` + Name string `json:"name"` +} + +// ReplicatedObject represents an object in all regions of an IBMCloud-like cloud +type ReplicatedObject struct { + Regions map[string]RegionObject `json:"regions,omitempty"` +} + +// RegionObject represents an IBMCloud/PowerVS cloud image +type RegionObject struct { + Release string `json:"release"` + Object string `json:"object"` + Bucket string `json:"bucket"` + Url string `json:"url"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index ed13ae15c..6269fbf15 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/apparentlymart/go-cidr v1.1.0 ## explicit github.com/apparentlymart/go-cidr/cidr -# github.com/coreos/stream-metadata-go v0.1.4 +# github.com/coreos/stream-metadata-go v0.1.5 ## explicit github.com/coreos/stream-metadata-go/fedoracoreos github.com/coreos/stream-metadata-go/fedoracoreos/internals