Skip to content

Remove last dependency on deislabs/cnab-go #168

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

Merged
silvin-lubecki merged 2 commits into from
Dec 27, 2019
Merged

Remove last dependency on deislabs/cnab-go #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1206f77
Rename deislabs to cnabio
silvin-lubecki Dec 24, 2019
a31fe98
Remove deislabs/cnab-go reference in the go.mod file using go mod tidy
silvin-lubecki Dec 24, 2019
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
2 changes: 1 addition & 1 deletion GOVERNANCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Project Maintainers

[Project maintainers](CODEOWNERS) are responsible for activities around maintaining and updating CNAB-go, a library for the [CNAB spec](https://github.com/deislabs/cnab-spec). Final decisions on the project reside with the project maintainers.
[Project maintainers](CODEOWNERS) are responsible for activities around maintaining and updating CNAB-go, a library for the [CNAB spec](https://github.com/cnabio/cnab-spec). Final decisions on the project reside with the project maintainers.

Maintainers MUST remain active. If they are unresponsive for >3 months, they will be automatically removed unless a [super-majority](https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote) of the other project maintainers agrees to extend the period to be greater than 3 months.

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

[![Build Status](https://dev.azure.com/deislabs/cnab-go/_apis/build/status/cnab-go?branchName=master)](https://dev.azure.com/deislabs/cnab-go/_build/latest?definitionId=27&branchName=master) ![Azure Pipelines coverage](https://img.shields.io/azure-devops/coverage/deislabs/cnab-go/27/master?logo=Azure%20Pipelines)

cnab-go is a library for building [CNAB](https://github.com/deislabs/cnab-spec) clients. It provides the building blocks relevant to the CNAB specification so that you may build tooling without needing to implement all aspects of the CNAB specification.
cnab-go is a library for building [CNAB](https://github.com/cnabio/cnab-spec) clients. It provides the building blocks relevant to the CNAB specification so that you may build tooling without needing to implement all aspects of the CNAB specification.

cnab-go is currently being used by [Docker App](https://github.com/docker/app), [Duffle](https://github.com/deislabs/duffle), and [Porter](https://github.com/deislabs/porter). If you'd like to see your CNAB project listed here, please submit a PR.
cnab-go is currently being used by [Docker App](https://github.com/docker/app), [Duffle](https://github.com/cnabio/duffle), and [Porter](https://github.com/deislabs/porter). If you'd like to see your CNAB project listed here, please submit a PR.

### Community

Expand Down
2 changes: 1 addition & 1 deletion bundle/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ var exampleBundle = &Bundle{
InvocationImages: []InvocationImage{
{
BaseImage: BaseImage{
Image: "deislabs/invocation-image:1.0",
Image: "cnabio/invocation-image:1.0",
ImageType: "docker",
Labels: map[string]string{
"os": "Linux",
Expand Down
2 changes: 1 addition & 1 deletion bundle/testdata/minimal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"description":"My First Bundle","images":{"mybund":{"description":"my bun daemon","image":"deislabs/mybund:abc123","imageType":"docker"}},"invocationImages":[{"image":"deislabs/mybunii:def456","imageType":"docker"}],"name":"mybun","schemaVersion":"v99.98","version":"v1.0.0"}
{"description":"My First Bundle","images":{"mybund":{"description":"my bun daemon","image":"cnabio/mybund:abc123","imageType":"docker"}},"invocationImages":[{"image":"cnabio/mybunii:def456","imageType":"docker"}],"name":"mybun","schemaVersion":"v99.98","version":"v1.0.0"}
6 changes: 3 additions & 3 deletions claim/claim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestClaimSchema(t *testing.T) {
claimBytes, err := json.Marshal(exampleClaim)
assert.NoError(t, err, "failed to json.Marshal the claim")

url := "https://raw.githubusercontent.com/deislabs/cnab-spec/master/schema/claim.schema.json"
url := "https://raw.githubusercontent.com/cnabio/cnab-spec/master/schema/claim.schema.json"
req, err := http.NewRequest("GET", url, nil)
assert.NoError(t, err, "failed to construct GET request for fetching claim schema")
res, err := http.DefaultClient.Do(req)
Expand All @@ -143,11 +143,11 @@ func TestClaimSchema(t *testing.T) {
assert.NoError(t, err, "failed to read claim schema")

rs := &jsonschema.RootSchema{}
// This currently fails; needs https://github.com/deislabs/cnab-spec/pull/243
// This currently fails; needs https://github.com/cnabio/cnab-spec/pull/243
err = json.Unmarshal(schemaData, rs)
assert.NoError(t, err, "failed to json.Unmarshal root claim schema")

// This currently fails due to https://github.com/deislabs/cnab-spec/issues/241
// This currently fails due to https://github.com/cnabio/cnab-spec/issues/241
// Thus, since the referenced bundle schema can't be fetched, schema validation is impaired
// Alternatively, we could read the qri-o/jsonschema docs to see how we might 'seed' our Validator
// with a fetched version of the bundle schema (from GitHub, as above for the claim schema)
Expand Down
36 changes: 17 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,68 +4,66 @@ go 1.13

require (
cloud.google.com/go v0.39.0 // indirect
github.com/Azure/go-autorest v12.2.0+incompatible
github.com/Azure/go-autorest/autorest v0.9.0
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Azure/go-autorest v12.2.0+incompatible // indirect
github.com/Masterminds/semver v1.5.0
github.com/Microsoft/hcsshim v0.8.6 // indirect
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/antonfisher/nested-logrus-formatter v1.0.2 // indirect
github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 // indirect
github.com/bitly/go-simplejson v0.5.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
github.com/bugsnag/panicwrap v1.2.0 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cloudflare/cfssl v1.4.1 // indirect
github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31 // indirect
github.com/containerd/cgroups v0.0.0-20191125132625-80b32e3c75c9 // indirect
github.com/containerd/containerd v1.3.0 // indirect
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c // indirect
github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c // indirect
github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd // indirect
github.com/deislabs/cnab-go v0.7.1-beta1.0.20191101172115-2fdc546bd3c7 // indirect
github.com/deislabs/oras v0.7.0 // indirect
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
github.com/docker/docker v1.4.2-0.20181229214054-f76d6a078d88
github.com/docker/go v1.5.1-1
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
github.com/godbus/dbus v4.1.0+incompatible // indirect
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/gogo/googleapis v1.3.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/gorilla/mux v1.7.3 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/vault/api v1.0.4 // indirect
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/hashicorp/go-version v1.1.0 // indirect
github.com/jinzhu/gorm v1.9.11 // indirect
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/lib/pq v1.2.0 // indirect
github.com/miekg/pkcs11 v1.0.3 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/oklog/ulid v1.3.1
github.com/opencontainers/runc v0.1.1 // indirect
github.com/opencontainers/runtime-spec v1.0.1 // indirect
github.com/philhofer/fwd v1.0.0 // indirect
github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v1.2.1 // indirect
github.com/qri-io/jsonschema v0.1.1
github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e // indirect
github.com/stretchr/testify v1.4.0
github.com/stripe/skycfg v0.0.0-20191003232334-40659e52cf16 // indirect
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
github.com/theupdateframework/notary v0.6.1 // indirect
github.com/tinylib/msgp v1.1.0 // indirect
github.com/valyala/fasttemplate v1.1.0 // indirect
github.com/vektah/gqlparser v1.1.2 // indirect
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
github.com/zalando/go-keyring v0.0.0-20190913082157-62750a1ff80d // indirect
go.etcd.io/bbolt v1.3.3 // indirect
golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 // indirect
golang.org/x/tools v0.0.0-20191025174333-e96d959c4788 // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
gopkg.in/fatih/pool.v2 v2.0.0 // indirect
gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect
gopkg.in/jcmturner/goidentity.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.2.4
gopkg.in/yaml.v3 v3.0.0-20191010095647-fc94e3f71652 // indirect
k8s.io/api v0.0.0-20191016110408-35e52d86657a
k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5 // indirect
k8s.io/client-go v0.0.0-20191016111102-bec269661e48
vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
)
Expand Down
Loading