From c6cd50646819c1663a9e7614a61f35a9f7e684d9 Mon Sep 17 00:00:00 2001 From: Vaughn Dice Date: Mon, 26 Nov 2018 16:08:37 -0700 Subject: [PATCH] chore(*): s/deis/deislabs string updates --- Makefile | 2 +- README.md | 8 ++++---- brigade.js | 2 +- cmd/duffle/build.go | 20 ++++++++++---------- cmd/duffle/build_test.go | 6 +++--- cmd/duffle/bundle_list.go | 4 ++-- cmd/duffle/bundle_remove.go | 4 ++-- cmd/duffle/bundle_sign.go | 8 ++++---- cmd/duffle/bundle_sign_test.go | 2 +- cmd/duffle/bundle_verify.go | 4 ++-- cmd/duffle/claims_show.go | 2 +- cmd/duffle/claims_show_test.go | 4 ++-- cmd/duffle/claims_test.go | 4 ++-- cmd/duffle/create.go | 4 ++-- cmd/duffle/create_test.go | 2 +- cmd/duffle/credential_add.go | 4 ++-- cmd/duffle/credential_add_test.go | 2 +- cmd/duffle/credential_edit.go | 4 ++-- cmd/duffle/credential_generate.go | 6 +++--- cmd/duffle/credential_generate_test.go | 2 +- cmd/duffle/credential_list.go | 4 ++-- cmd/duffle/credential_list_test.go | 2 +- cmd/duffle/credential_remove.go | 2 +- cmd/duffle/credential_remove_test.go | 2 +- cmd/duffle/credential_show.go | 4 ++-- cmd/duffle/credential_show_test.go | 2 +- cmd/duffle/default_user.go | 2 +- cmd/duffle/export.go | 4 ++-- cmd/duffle/import.go | 4 ++-- cmd/duffle/init.go | 6 +++--- cmd/duffle/install.go | 10 +++++----- cmd/duffle/install_test.go | 4 ++-- cmd/duffle/key_export.go | 4 ++-- cmd/duffle/key_import.go | 4 ++-- cmd/duffle/key_list.go | 4 ++-- cmd/duffle/main.go | 14 +++++++------- cmd/duffle/main_test.go | 6 +++--- cmd/duffle/pull.go | 10 +++++----- cmd/duffle/push.go | 4 ++-- cmd/duffle/root_test.go | 4 ++-- cmd/duffle/run.go | 4 ++-- cmd/duffle/search.go | 4 ++-- cmd/duffle/status.go | 4 ++-- cmd/duffle/uninstall.go | 2 +- cmd/duffle/upgrade.go | 2 +- cmd/duffle/upgrade_test.go | 4 ++-- cmd/duffle/version.go | 2 +- cmd/duffle/version_test.go | 2 +- docs/guides/bundle-guide.md | 4 ++-- drivers/azure-vm/README.md | 2 +- drivers/azure-vm/duffle-azvm.sh | 2 +- golangci.yml | 2 +- pkg/action/action.go | 8 ++++---- pkg/action/action_test.go | 8 ++++---- pkg/action/install.go | 6 +++--- pkg/action/install_test.go | 4 ++-- pkg/action/run_custom.go | 6 +++--- pkg/action/run_custom_test.go | 6 +++--- pkg/action/status.go | 6 +++--- pkg/action/status_test.go | 4 ++-- pkg/action/uninstall.go | 6 +++--- pkg/action/uninstall_test.go | 4 ++-- pkg/action/upgrade.go | 6 +++--- pkg/action/upgrade_test.go | 4 ++-- pkg/builder/builder.go | 4 ++-- pkg/builder/docker/builder.go | 4 ++-- pkg/builder/docker/builder_test.go | 2 +- pkg/builder/mock/builder.go | 4 ++-- pkg/builder/mock/builder_test.go | 2 +- pkg/claim/claim.go | 2 +- pkg/claim/claimstore.go | 2 +- pkg/claim/claimstore_test.go | 4 ++-- pkg/credentials/credentialset.go | 2 +- pkg/credentials/credentialset_test.go | 2 +- pkg/credentials/testdata/staging.yaml | 2 +- pkg/duffle/manifest/load.go | 2 +- pkg/duffle/manifest/manifest.go | 2 +- pkg/loader/detecting_loader.go | 2 +- pkg/loader/loader.go | 4 ++-- pkg/loader/secure_loader.go | 4 ++-- pkg/loader/secure_loader_test.go | 2 +- pkg/loader/unsigned_loader.go | 2 +- pkg/packager/export.go | 4 ++-- pkg/packager/import.go | 2 +- pkg/packager/import_test.go | 2 +- pkg/repo/remote/index.go | 2 +- pkg/signature/signature.go | 2 +- pkg/signature/signature_test.go | 2 +- pkg/signature/verifier.go | 2 +- 89 files changed, 178 insertions(+), 178 deletions(-) diff --git a/Makefile b/Makefile index c0a94f3f..fc32045c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PROJECT := duffle -ORG := deis +ORG := deislabs DOCKER_REGISTRY ?= brigade.azurecr.io/deis BINDIR := $(CURDIR)/bin GOFLAGS := diff --git a/README.md b/README.md index b2e6e80b..2eae794d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Duffle: The CNAB Installer -![Build Status](http://badges.technosophos.me/v1/github/build/deis/duffle/badge.svg?branch=master) +![Build Status](http://badges.technosophos.me/v1/github/build/deislabs/duffle/badge.svg?branch=master) Duffle is a command line tool that allows you to install and manage CNAB bundles. To learn more about about CNAB and duffle, check out the [docs](docs/000-index.md). @@ -13,8 +13,8 @@ Duffle is a command line tool that allows you to install and manage CNAB bundles 2. Clone this repo: ```console - $ cd $GOPATH/src/github.com/deis/ - $ git clone git@github.com:deis/duffle.git + $ cd $GOPATH/src/github.com/deislabs/ + $ git clone git@github.com:deislabs/duffle.git $ cd duffle ``` @@ -62,7 +62,7 @@ Duffle is a command line tool that allows you to install and manage CNAB bundles *Notes:* * Learn more about what a bundle is and its components [here](https://github.com/deislabs/cnab-spec/blob/master/100-CNAB.md). - * Get a feel for what CNAB bundles look like by referencing the [bundles repo](https://github.com/deis/bundles) on github. + * Get a feel for what CNAB bundles look like by referencing the [bundles repo](https://github.com/deislabs/bundles) on github. # Debugging using VS Code diff --git a/brigade.js b/brigade.js index b36a8fef..44361bbd 100644 --- a/brigade.js +++ b/brigade.js @@ -1,6 +1,6 @@ const { events, Job, Group } = require("brigadier") -const projectOrg = "deis" +const projectOrg = "deislabs" const projectName = "duffle" const goImg = "golang:1.11" diff --git a/cmd/duffle/build.go b/cmd/duffle/build.go index 5c56b2a6..dfebe9dd 100644 --- a/cmd/duffle/build.go +++ b/cmd/duffle/build.go @@ -18,16 +18,16 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/deis/duffle/pkg/builder" - "github.com/deis/duffle/pkg/builder/docker" - "github.com/deis/duffle/pkg/builder/mock" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/crypto/digest" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/duffle/manifest" - "github.com/deis/duffle/pkg/ohai" - "github.com/deis/duffle/pkg/repo" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/builder" + "github.com/deislabs/duffle/pkg/builder/docker" + "github.com/deislabs/duffle/pkg/builder/mock" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/crypto/digest" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/manifest" + "github.com/deislabs/duffle/pkg/ohai" + "github.com/deislabs/duffle/pkg/repo" + "github.com/deislabs/duffle/pkg/signature" ) const buildDesc = ` diff --git a/cmd/duffle/build_test.go b/cmd/duffle/build_test.go index 5350ce42..a07c17b7 100644 --- a/cmd/duffle/build_test.go +++ b/cmd/duffle/build_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/repo" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/repo" + "github.com/deislabs/duffle/pkg/signature" ) func TestBuild(t *testing.T) { diff --git a/cmd/duffle/bundle_list.go b/cmd/duffle/bundle_list.go index 8e7b6491..3b3513e9 100644 --- a/cmd/duffle/bundle_list.go +++ b/cmd/duffle/bundle_list.go @@ -9,8 +9,8 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/repo" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/repo" ) // NamedRepositoryList is a list of bundle references. diff --git a/cmd/duffle/bundle_remove.go b/cmd/duffle/bundle_remove.go index 2690ed1b..7d931a1f 100644 --- a/cmd/duffle/bundle_remove.go +++ b/cmd/duffle/bundle_remove.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/repo" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/repo" "github.com/Masterminds/semver" "github.com/spf13/cobra" diff --git a/cmd/duffle/bundle_sign.go b/cmd/duffle/bundle_sign.go index ef27ff68..ffe5c7b1 100644 --- a/cmd/duffle/bundle_sign.go +++ b/cmd/duffle/bundle_sign.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/crypto/digest" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/crypto/digest" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/signature" ) const bundleSignDesc = `Clear-sign a bundle. diff --git a/cmd/duffle/bundle_sign_test.go b/cmd/duffle/bundle_sign_test.go index 89987384..4e790136 100644 --- a/cmd/duffle/bundle_sign_test.go +++ b/cmd/duffle/bundle_sign_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/home" ) func TestBundleSign(t *testing.T) { diff --git a/cmd/duffle/bundle_verify.go b/cmd/duffle/bundle_verify.go index 1c4fbb92..6cc085dc 100644 --- a/cmd/duffle/bundle_verify.go +++ b/cmd/duffle/bundle_verify.go @@ -5,8 +5,8 @@ import ( "io" "io/ioutil" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/signature" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/claims_show.go b/cmd/duffle/claims_show.go index d2641fb1..3f11e894 100644 --- a/cmd/duffle/claims_show.go +++ b/cmd/duffle/claims_show.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io" - "github.com/deis/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/claim" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/claims_show_test.go b/cmd/duffle/claims_show_test.go index cd272c83..d4cd1238 100644 --- a/cmd/duffle/claims_show_test.go +++ b/cmd/duffle/claims_show_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" "github.com/stretchr/testify/assert" ) diff --git a/cmd/duffle/claims_test.go b/cmd/duffle/claims_test.go index 758544d5..9b0d672c 100644 --- a/cmd/duffle/claims_test.go +++ b/cmd/duffle/claims_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" "github.com/stretchr/testify/assert" ) diff --git a/cmd/duffle/create.go b/cmd/duffle/create.go index 6b15e606..877a2720 100644 --- a/cmd/duffle/create.go +++ b/cmd/duffle/create.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/duffle/manifest" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/manifest" ) const createDesc = ` diff --git a/cmd/duffle/create_test.go b/cmd/duffle/create_test.go index 663eb5ad..24412038 100644 --- a/cmd/duffle/create_test.go +++ b/cmd/duffle/create_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/deis/duffle/pkg/duffle/manifest" + "github.com/deislabs/duffle/pkg/duffle/manifest" ) func TestCreateCmd(t *testing.T) { diff --git a/cmd/duffle/credential_add.go b/cmd/duffle/credential_add.go index f2238f2b..9ec352e9 100644 --- a/cmd/duffle/credential_add.go +++ b/cmd/duffle/credential_add.go @@ -11,8 +11,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/duffle/home" ) const credentialAddDesc = ` diff --git a/cmd/duffle/credential_add_test.go b/cmd/duffle/credential_add_test.go index c798ceb1..d4f590b8 100644 --- a/cmd/duffle/credential_add_test.go +++ b/cmd/duffle/credential_add_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/home" ) func TestCredentialAddFile(t *testing.T) { diff --git a/cmd/duffle/credential_edit.go b/cmd/duffle/credential_edit.go index 140c5d07..7a556a8a 100644 --- a/cmd/duffle/credential_edit.go +++ b/cmd/duffle/credential_edit.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "path/filepath" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/duffle/home" "github.com/ghodss/yaml" "github.com/spf13/cobra" diff --git a/cmd/duffle/credential_generate.go b/cmd/duffle/credential_generate.go index e9114ba3..85b65ed2 100644 --- a/cmd/duffle/credential_generate.go +++ b/cmd/duffle/credential_generate.go @@ -12,9 +12,9 @@ import ( survey "gopkg.in/AlecAivazis/survey.v1" yaml "gopkg.in/yaml.v2" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/duffle/home" ) const credentialGenerateHelp = `Generate credentials from a CNAB bundle diff --git a/cmd/duffle/credential_generate_test.go b/cmd/duffle/credential_generate_test.go index 336e6b84..9c2851b8 100644 --- a/cmd/duffle/credential_generate_test.go +++ b/cmd/duffle/credential_generate_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" "github.com/stretchr/testify/assert" ) diff --git a/cmd/duffle/credential_list.go b/cmd/duffle/credential_list.go index 26f8022c..b79f8414 100644 --- a/cmd/duffle/credential_list.go +++ b/cmd/duffle/credential_list.go @@ -10,8 +10,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/duffle/home" ) type credentialListCmd struct { diff --git a/cmd/duffle/credential_list_test.go b/cmd/duffle/credential_list_test.go index 160b2305..b340f885 100644 --- a/cmd/duffle/credential_list_test.go +++ b/cmd/duffle/credential_list_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/home" ) func TestCredentialList(t *testing.T) { diff --git a/cmd/duffle/credential_remove.go b/cmd/duffle/credential_remove.go index 8bfb1e98..796f5fe4 100644 --- a/cmd/duffle/credential_remove.go +++ b/cmd/duffle/credential_remove.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/home" ) type credentialRemoveCmd struct { diff --git a/cmd/duffle/credential_remove_test.go b/cmd/duffle/credential_remove_test.go index 57c2e90a..e4651c3b 100644 --- a/cmd/duffle/credential_remove_test.go +++ b/cmd/duffle/credential_remove_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/home" ) func TestCredentialRemove(t *testing.T) { diff --git a/cmd/duffle/credential_show.go b/cmd/duffle/credential_show.go index c931e16d..9c9dd6a8 100644 --- a/cmd/duffle/credential_show.go +++ b/cmd/duffle/credential_show.go @@ -5,8 +5,8 @@ import ( "io" "path/filepath" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/duffle/home" "github.com/ghodss/yaml" diff --git a/cmd/duffle/credential_show_test.go b/cmd/duffle/credential_show_test.go index 9feba4d0..0663c38a 100644 --- a/cmd/duffle/credential_show_test.go +++ b/cmd/duffle/credential_show_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/deis/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/credentials" ) func TestPrintCredentials(t *testing.T) { diff --git a/cmd/duffle/default_user.go b/cmd/duffle/default_user.go index 947bdd90..0d653555 100644 --- a/cmd/duffle/default_user.go +++ b/cmd/duffle/default_user.go @@ -6,7 +6,7 @@ import ( "os/user" "strings" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/signature" ) // defaultUserID returns the default user name. diff --git a/cmd/duffle/export.go b/cmd/duffle/export.go index 4c933aac..1f8d8374 100644 --- a/cmd/duffle/export.go +++ b/cmd/duffle/export.go @@ -6,8 +6,8 @@ import ( "io" "path/filepath" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/packager" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/packager" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/import.go b/cmd/duffle/import.go index 64336da8..d767eda6 100644 --- a/cmd/duffle/import.go +++ b/cmd/duffle/import.go @@ -5,8 +5,8 @@ import ( "io" "path/filepath" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/packager" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/packager" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/init.go b/cmd/duffle/init.go index 1288e12b..91ad82e1 100644 --- a/cmd/duffle/init.go +++ b/cmd/duffle/init.go @@ -9,9 +9,9 @@ import ( "gopkg.in/AlecAivazis/survey.v1" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/ohai" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/ohai" + "github.com/deislabs/duffle/pkg/signature" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/install.go b/cmd/duffle/install.go index 633c77ca..da88d913 100644 --- a/cmd/duffle/install.go +++ b/cmd/duffle/install.go @@ -11,11 +11,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/deis/duffle/pkg/action" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/repo" + "github.com/deislabs/duffle/pkg/action" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/repo" ) func newInstallCmd() *cobra.Command { diff --git a/cmd/duffle/install_test.go b/cmd/duffle/install_test.go index 7140931f..cd2260f1 100644 --- a/cmd/duffle/install_test.go +++ b/cmd/duffle/install_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/duffle/home" ) func TestGetBundle(t *testing.T) { diff --git a/cmd/duffle/key_export.go b/cmd/duffle/key_export.go index 2c748a12..bd27bba6 100644 --- a/cmd/duffle/key_export.go +++ b/cmd/duffle/key_export.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/signature" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/key_import.go b/cmd/duffle/key_import.go index 1cb73d16..b0fa4407 100644 --- a/cmd/duffle/key_import.go +++ b/cmd/duffle/key_import.go @@ -4,8 +4,8 @@ import ( "io" "os" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/signature" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/key_list.go b/cmd/duffle/key_list.go index f020b978..74647b7f 100644 --- a/cmd/duffle/key_list.go +++ b/cmd/duffle/key_list.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/signature" "github.com/gosuri/uitable" "github.com/spf13/cobra" diff --git a/cmd/duffle/main.go b/cmd/duffle/main.go index c9071da7..9f2b0e47 100644 --- a/cmd/duffle/main.go +++ b/cmd/duffle/main.go @@ -6,16 +6,16 @@ import ( "runtime" "strings" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/signature" "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/utils/crud" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/utils/crud" ) var ( diff --git a/cmd/duffle/main_test.go b/cmd/duffle/main_test.go index b4bfd052..83a516c0 100644 --- a/cmd/duffle/main_test.go +++ b/cmd/duffle/main_test.go @@ -6,13 +6,13 @@ import ( "path/filepath" "testing" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/credentials" "github.com/ghodss/yaml" "github.com/stretchr/testify/assert" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/duffle/home" ) func CreateTestHome(t *testing.T) home.Home { diff --git a/cmd/duffle/pull.go b/cmd/duffle/pull.go index 6fd9939e..ee8a292b 100644 --- a/cmd/duffle/pull.go +++ b/cmd/duffle/pull.go @@ -10,14 +10,14 @@ import ( "path/filepath" "strings" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/loader" - "github.com/deis/duffle/pkg/reference" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/loader" + "github.com/deislabs/duffle/pkg/reference" "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/crypto/digest" - "github.com/deis/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/crypto/digest" + "github.com/deislabs/duffle/pkg/duffle/home" ) func newPullCmd(w io.Writer) *cobra.Command { diff --git a/cmd/duffle/push.go b/cmd/duffle/push.go index ab888fa0..c7eba8a6 100644 --- a/cmd/duffle/push.go +++ b/cmd/duffle/push.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/duffle/home" - "github.com/deis/duffle/pkg/repo" + "github.com/deislabs/duffle/pkg/duffle/home" + "github.com/deislabs/duffle/pkg/repo" ) func newPushCmd(out io.Writer) *cobra.Command { diff --git a/cmd/duffle/root_test.go b/cmd/duffle/root_test.go index 18398560..9136bff4 100644 --- a/cmd/duffle/root_test.go +++ b/cmd/duffle/root_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/version" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/version" ) func TestHelpWrittenToStdout(t *testing.T) { diff --git a/cmd/duffle/run.go b/cmd/duffle/run.go index b36802ed..1a36115c 100644 --- a/cmd/duffle/run.go +++ b/cmd/duffle/run.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/action" - "github.com/deis/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/action" + "github.com/deislabs/duffle/pkg/claim" ) func newRunCmd(w io.Writer) *cobra.Command { diff --git a/cmd/duffle/search.go b/cmd/duffle/search.go index 4e5f3843..9b3c4c4b 100644 --- a/cmd/duffle/search.go +++ b/cmd/duffle/search.go @@ -14,8 +14,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/repo/remote" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/repo/remote" ) // BundleList is a list of bundle references. diff --git a/cmd/duffle/status.go b/cmd/duffle/status.go index bf88c4ea..17351a63 100644 --- a/cmd/duffle/status.go +++ b/cmd/duffle/status.go @@ -8,8 +8,8 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/action" - "github.com/deis/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/action" + "github.com/deislabs/duffle/pkg/claim" ) func newStatusCmd(w io.Writer) *cobra.Command { diff --git a/cmd/duffle/uninstall.go b/cmd/duffle/uninstall.go index a400d1be..f441a148 100644 --- a/cmd/duffle/uninstall.go +++ b/cmd/duffle/uninstall.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/deis/duffle/pkg/action" + "github.com/deislabs/duffle/pkg/action" ) const usage = `Uninstalls an installation of a CNAB bundle. diff --git a/cmd/duffle/upgrade.go b/cmd/duffle/upgrade.go index 9424ebb2..66c2c45d 100644 --- a/cmd/duffle/upgrade.go +++ b/cmd/duffle/upgrade.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/deis/duffle/pkg/action" + "github.com/deislabs/duffle/pkg/action" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/upgrade_test.go b/cmd/duffle/upgrade_test.go index d04a868a..42089eac 100644 --- a/cmd/duffle/upgrade_test.go +++ b/cmd/duffle/upgrade_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" ) func TestUpgradePersistsClaim(t *testing.T) { diff --git a/cmd/duffle/version.go b/cmd/duffle/version.go index 1b2699f6..8b15f9b7 100644 --- a/cmd/duffle/version.go +++ b/cmd/duffle/version.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/deis/duffle/pkg/version" + "github.com/deislabs/duffle/pkg/version" "github.com/spf13/cobra" ) diff --git a/cmd/duffle/version_test.go b/cmd/duffle/version_test.go index a1aa6550..29eaa05c 100644 --- a/cmd/duffle/version_test.go +++ b/cmd/duffle/version_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/deis/duffle/pkg/version" + "github.com/deislabs/duffle/pkg/version" "github.com/stretchr/testify/assert" ) diff --git a/docs/guides/bundle-guide.md b/docs/guides/bundle-guide.md index c38fc2ed..12f68252 100644 --- a/docs/guides/bundle-guide.md +++ b/docs/guides/bundle-guide.md @@ -2,7 +2,7 @@ A `bundle` is a CNAB package. In its slimmest form, a bundle contains metadata (in a `bundle.cnab` file) which points to a image (we call that the "invocation image") that contains instructions (in a `run` file) on how to install and configure a multi-component cloud native application. -In this guide, you will create a CNAB bundle which does `echo` commands for various actions similar to the [helloworld](https://github.com/deis/duffle/blob/master/examples/helloworld/cnab/app/run) example. +In this guide, you will create a CNAB bundle which does `echo` commands for various actions similar to the [helloworld](https://github.com/deislabs/duffle/blob/master/examples/helloworld/cnab/app/run) example. ## Create the Directory Structure @@ -142,5 +142,5 @@ The output of `duffle install` comes from the run script. `hello world` is print ## Notes and Next steps -- There are alternatives to defining a custom `run` tool. See examples of more complex and different bundles [here](https://github.com/deis/bundles). +- There are alternatives to defining a custom `run` tool. See examples of more complex and different bundles [here](https://github.com/deislabs/bundles). - Read more about the CNAB spec in the [docs](https://github.com/deislabs/cnab-spec/blob/master/100-CNAB.md) diff --git a/drivers/azure-vm/README.md b/drivers/azure-vm/README.md index b05e07fd..48a6cd51 100644 --- a/drivers/azure-vm/README.md +++ b/drivers/azure-vm/README.md @@ -38,7 +38,7 @@ Note that `imageType` is `azure-image` (indicating that it must be looked up in ## Usage 1. Run `make build-drivers` -2. Add `$GOPATH/src/github.com/deis/duffle/bin` to your path +2. Add `$GOPATH/src/github.com/deislabs/duffle/bin` to your path 3. On the Duffle commands, set the driver to `azvm` ```console diff --git a/drivers/azure-vm/duffle-azvm.sh b/drivers/azure-vm/duffle-azvm.sh index 0f1c09ce..0863b1d0 100755 --- a/drivers/azure-vm/duffle-azvm.sh +++ b/drivers/azure-vm/duffle-azvm.sh @@ -7,7 +7,7 @@ # # Note that STDIN gets passed to python, which injects it into the script. ############ -pydir=$GOPATH/src/github.com/deis/duffle/drivers/azure-vm +pydir=$GOPATH/src/github.com/deislabs/duffle/drivers/azure-vm if [[ $1 == "--handles" ]]; then echo -n "azure-image" diff --git a/golangci.yml b/golangci.yml index e9e5cc17..e4eeb17c 100644 --- a/golangci.yml +++ b/golangci.yml @@ -16,4 +16,4 @@ linters: linters-settings: goimports: - local-prefixes: github.com/deis/duffle + local-prefixes: github.com/deislabs/duffle diff --git a/pkg/action/action.go b/pkg/action/action.go index 12309fd7..ef2ee5ab 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -6,10 +6,10 @@ import ( "io" "strings" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" ) // Action describes one of the primary actions that can be executed in CNAB. diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go index 7e16d332..f98580b4 100644 --- a/pkg/action/action_test.go +++ b/pkg/action/action_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" "github.com/stretchr/testify/assert" ) diff --git a/pkg/action/install.go b/pkg/action/install.go index a5dcd19f..75b77f5e 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -3,9 +3,9 @@ package action import ( "io" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" ) // Install describes an installation action diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index 46377a76..ca6d0cdc 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/driver" "github.com/stretchr/testify/assert" ) diff --git a/pkg/action/run_custom.go b/pkg/action/run_custom.go index 85ec6367..bcc4e182 100644 --- a/pkg/action/run_custom.go +++ b/pkg/action/run_custom.go @@ -4,9 +4,9 @@ import ( "errors" "io" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" ) var ( diff --git a/pkg/action/run_custom_test.go b/pkg/action/run_custom_test.go index 62d2a26b..3877d4ef 100644 --- a/pkg/action/run_custom_test.go +++ b/pkg/action/run_custom_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/driver" "github.com/stretchr/testify/assert" ) diff --git a/pkg/action/status.go b/pkg/action/status.go index 19a16353..a3772db8 100644 --- a/pkg/action/status.go +++ b/pkg/action/status.go @@ -3,9 +3,9 @@ package action import ( "io" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" ) // Status runs a status action on a CNAB bundle. diff --git a/pkg/action/status_test.go b/pkg/action/status_test.go index 94f239c4..62464c53 100644 --- a/pkg/action/status_test.go +++ b/pkg/action/status_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/driver" "github.com/stretchr/testify/assert" ) diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go index 9a46b5a0..b427adcb 100644 --- a/pkg/action/uninstall.go +++ b/pkg/action/uninstall.go @@ -3,9 +3,9 @@ package action import ( "io" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" ) // Uninstall runs an uninstall action diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go index 94a1f1fc..b855edb4 100644 --- a/pkg/action/uninstall_test.go +++ b/pkg/action/uninstall_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/driver" "github.com/stretchr/testify/assert" ) diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go index f6a0b4d4..546bea54 100644 --- a/pkg/action/upgrade.go +++ b/pkg/action/upgrade.go @@ -3,9 +3,9 @@ package action import ( "io" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/credentials" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/credentials" + "github.com/deislabs/duffle/pkg/driver" ) // Upgrade runs an upgrade action diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index 9f28014d..277dabdc 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/deis/duffle/pkg/claim" - "github.com/deis/duffle/pkg/driver" + "github.com/deislabs/duffle/pkg/claim" + "github.com/deislabs/duffle/pkg/driver" "github.com/stretchr/testify/assert" ) diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go index c079f609..c181e53b 100644 --- a/pkg/builder/builder.go +++ b/pkg/builder/builder.go @@ -12,8 +12,8 @@ import ( "github.com/Masterminds/semver" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/duffle/manifest" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/duffle/manifest" ) // Builder defines how to interact with a bundle builder diff --git a/pkg/builder/docker/builder.go b/pkg/builder/docker/builder.go index 18fd37a2..32ceb725 100644 --- a/pkg/builder/docker/builder.go +++ b/pkg/builder/docker/builder.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "github.com/deis/duffle/pkg/builder" - "github.com/deis/duffle/pkg/duffle/manifest" + "github.com/deislabs/duffle/pkg/builder" + "github.com/deislabs/duffle/pkg/duffle/manifest" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/image/build" diff --git a/pkg/builder/docker/builder_test.go b/pkg/builder/docker/builder_test.go index d0433386..3ff4e0de 100644 --- a/pkg/builder/docker/builder_test.go +++ b/pkg/builder/docker/builder_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/deis/duffle/pkg/builder" + "github.com/deislabs/duffle/pkg/builder" ) func TestArchiveSrc(t *testing.T) { diff --git a/pkg/builder/mock/builder.go b/pkg/builder/mock/builder.go index 11376680..a68d99a2 100644 --- a/pkg/builder/mock/builder.go +++ b/pkg/builder/mock/builder.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/deis/duffle/pkg/builder" - "github.com/deis/duffle/pkg/duffle/manifest" + "github.com/deislabs/duffle/pkg/builder" + "github.com/deislabs/duffle/pkg/duffle/manifest" ) // Component represents a mock component diff --git a/pkg/builder/mock/builder_test.go b/pkg/builder/mock/builder_test.go index 19fd8e15..77d291f1 100644 --- a/pkg/builder/mock/builder_test.go +++ b/pkg/builder/mock/builder_test.go @@ -3,7 +3,7 @@ package mock import ( "testing" - "github.com/deis/duffle/pkg/builder" + "github.com/deislabs/duffle/pkg/builder" ) func TestComponent_implComponent(t *testing.T) { diff --git a/pkg/claim/claim.go b/pkg/claim/claim.go index b2794e30..57380ec4 100644 --- a/pkg/claim/claim.go +++ b/pkg/claim/claim.go @@ -8,7 +8,7 @@ import ( "github.com/oklog/ulid" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" ) // Status constants define the CNAB status fields on a Result. diff --git a/pkg/claim/claimstore.go b/pkg/claim/claimstore.go index 67cf93ba..13e1b0cb 100644 --- a/pkg/claim/claimstore.go +++ b/pkg/claim/claimstore.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/deis/duffle/pkg/utils/crud" + "github.com/deislabs/duffle/pkg/utils/crud" ) // ErrClaimNotFound represents a claim not found in claim storage diff --git a/pkg/claim/claimstore_test.go b/pkg/claim/claimstore_test.go index 9a4a2274..e0078407 100644 --- a/pkg/claim/claimstore_test.go +++ b/pkg/claim/claimstore_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/utils/crud" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/utils/crud" ) func TestCanSaveReadAndDelete(t *testing.T) { diff --git a/pkg/credentials/credentialset.go b/pkg/credentials/credentialset.go index ecdd82ba..511c85db 100644 --- a/pkg/credentials/credentialset.go +++ b/pkg/credentials/credentialset.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/credentials/credentialset_test.go b/pkg/credentials/credentialset_test.go index 83b09549..b2ae6279 100644 --- a/pkg/credentials/credentialset_test.go +++ b/pkg/credentials/credentialset_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" "github.com/stretchr/testify/assert" ) diff --git a/pkg/credentials/testdata/staging.yaml b/pkg/credentials/testdata/staging.yaml index d0def8bb..4d36b4a9 100644 --- a/pkg/credentials/testdata/staging.yaml +++ b/pkg/credentials/testdata/staging.yaml @@ -2,7 +2,7 @@ name: staging credentials: - name: read_file source: - path: $GOPATH/src/github.com/deis/duffle/pkg/credentials/testdata/someconfig.txt + path: $GOPATH/src/github.com/deislabs/duffle/pkg/credentials/testdata/someconfig.txt - name: run_program source: command: "echo wildebeest" diff --git a/pkg/duffle/manifest/load.go b/pkg/duffle/manifest/load.go index c90e13b8..6360ff7b 100644 --- a/pkg/duffle/manifest/load.go +++ b/pkg/duffle/manifest/load.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/viper" - "github.com/deis/duffle/pkg/duffle" + "github.com/deislabs/duffle/pkg/duffle" ) // Load opens the named file for reading. If successful, the manifest is returned. diff --git a/pkg/duffle/manifest/manifest.go b/pkg/duffle/manifest/manifest.go index eecceb1c..bf9e3ae5 100644 --- a/pkg/duffle/manifest/manifest.go +++ b/pkg/duffle/manifest/manifest.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" "github.com/technosophos/moniker" ) diff --git a/pkg/loader/detecting_loader.go b/pkg/loader/detecting_loader.go index dcf73cef..0c4ccf2d 100644 --- a/pkg/loader/detecting_loader.go +++ b/pkg/loader/detecting_loader.go @@ -1,7 +1,7 @@ package loader import ( - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" "golang.org/x/crypto/openpgp/clearsign" ) diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go index 3af1eace..b6f79225 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -1,8 +1,8 @@ package loader import ( - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/signature" ) // Loader provides an interface for loading a bundle diff --git a/pkg/loader/secure_loader.go b/pkg/loader/secure_loader.go index 2b050113..4db93047 100644 --- a/pkg/loader/secure_loader.go +++ b/pkg/loader/secure_loader.go @@ -1,8 +1,8 @@ package loader import ( - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/signature" ) // SecureLoader loads signed bundles. diff --git a/pkg/loader/secure_loader_test.go b/pkg/loader/secure_loader_test.go index ce6ce76e..95b10072 100644 --- a/pkg/loader/secure_loader_test.go +++ b/pkg/loader/secure_loader_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/deis/duffle/pkg/signature" + "github.com/deislabs/duffle/pkg/signature" "github.com/stretchr/testify/assert" ) diff --git a/pkg/loader/unsigned_loader.go b/pkg/loader/unsigned_loader.go index 0ecbf1ff..c02d7918 100644 --- a/pkg/loader/unsigned_loader.go +++ b/pkg/loader/unsigned_loader.go @@ -7,7 +7,7 @@ import ( "net/url" "os" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" ) // UnsignedLoader loads a bundle.json that is not signed. diff --git a/pkg/packager/export.go b/pkg/packager/export.go index 4b2a0b25..4bb99835 100644 --- a/pkg/packager/export.go +++ b/pkg/packager/export.go @@ -14,8 +14,8 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/pkg/archive" - "github.com/deis/duffle/pkg/bundle" - "github.com/deis/duffle/pkg/loader" + "github.com/deislabs/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/loader" ) var ( diff --git a/pkg/packager/import.go b/pkg/packager/import.go index 93c2ab0c..bc3da0bf 100644 --- a/pkg/packager/import.go +++ b/pkg/packager/import.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/pkg/archive" - "github.com/deis/duffle/pkg/loader" + "github.com/deislabs/duffle/pkg/loader" ) var ( diff --git a/pkg/packager/import_test.go b/pkg/packager/import_test.go index 5e5e435e..9c10cbf2 100644 --- a/pkg/packager/import_test.go +++ b/pkg/packager/import_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/deis/duffle/pkg/loader" + "github.com/deislabs/duffle/pkg/loader" ) func TestImport(t *testing.T) { diff --git a/pkg/repo/remote/index.go b/pkg/repo/remote/index.go index 55c7c38d..6c0b465e 100644 --- a/pkg/repo/remote/index.go +++ b/pkg/repo/remote/index.go @@ -12,7 +12,7 @@ import ( "github.com/Masterminds/semver" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" ) const ( diff --git a/pkg/signature/signature.go b/pkg/signature/signature.go index 8d85f907..58913f09 100644 --- a/pkg/signature/signature.go +++ b/pkg/signature/signature.go @@ -12,7 +12,7 @@ import ( "golang.org/x/crypto/openpgp/clearsign" "golang.org/x/crypto/openpgp/packet" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" ) // ErrNoSignature indicates that no signature was found in a block of text diff --git a/pkg/signature/signature_test.go b/pkg/signature/signature_test.go index 1adc7aa0..c4d50fe2 100644 --- a/pkg/signature/signature_test.go +++ b/pkg/signature/signature_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" ) func TestSigner_Sign(t *testing.T) { diff --git a/pkg/signature/verifier.go b/pkg/signature/verifier.go index 0be8f2ae..221adb74 100644 --- a/pkg/signature/verifier.go +++ b/pkg/signature/verifier.go @@ -7,7 +7,7 @@ import ( "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/clearsign" - "github.com/deis/duffle/pkg/bundle" + "github.com/deislabs/duffle/pkg/bundle" ) // Verifier provides tools to verify a signed bundle.