updating imports and paths for new notary location

Signed-off-by: David Lawrence <[email protected]> (github: endophage)
inadarei · Oct 26, 2017 · 332094e · 332094e
1 parent 2f476ff
commit 332094e
Show file tree

Hide file tree

Showing 166 changed files with 579 additions and 579 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ RUN useradd -ms /bin/bash notary \
 	&& pip install codecov \
 	&& go get github.com/golang/lint/golint github.com/fzipp/gocyclo github.com/client9/misspell/cmd/misspell github.com/gordonklaus/ineffassign github.com/HewlettPackard/gas
 
-ENV NOTARYDIR /go/src/github.com/docker/notary
+ENV NOTARYDIR /go/src/github.com/theupdateframework/notary
 
 COPY . ${NOTARYDIR}
 RUN chmod -R a+rw /go && chmod 0600 ${NOTARYDIR}/fixtures/database/*

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ PREFIX?=$(shell pwd)
 
 # Populate version variables
 # Add to compile time flags
-NOTARY_PKG := github.com/docker/notary
+NOTARY_PKG := github.com/theupdateframework/notary
 NOTARY_VERSION := $(shell cat NOTARY_VERSION)
 GITCOMMIT := $(shell git rev-parse --short HEAD)
 GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no)
@@ -15,7 +15,7 @@ GO_LDFLAGS=-ldflags "-w $(CTIMEVAR)"
 GO_LDFLAGS_STATIC=-ldflags "-w $(CTIMEVAR) -extldflags -static"
 GOOSES = darwin linux windows
 NOTARY_BUILDTAGS ?= pkcs11
-NOTARYDIR := /go/src/github.com/docker/notary
+NOTARYDIR := /go/src/github.com/theupdateframework/notary
 
 GO_VERSION := $(shell go version | grep "1\.[7-9]\(\.[0-9]+\)*\|devel")
 # check to make sure we have the right version. development versions of Go are
@@ -164,7 +164,7 @@ ci: override TESTOPTS = -race
 # Codecov knows how to merge multiple coverage files, so covmerge is not needed
 ci: gen-cover
 
-yubikey-tests: override PKGS = github.com/docker/notary/cmd/notary github.com/docker/notary/trustmanager/yubikey
+yubikey-tests: override PKGS = github.com/theupdateframework/notary/cmd/notary github.com/theupdateframework/notary/trustmanager/yubikey
 yubikey-tests: ci
 
 covmerge:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <img src="docs/images/notary-blk.svg" alt="Notary" width="400px"/>
 
-[![Circle CI](https://circleci.com/gh/docker/notary/tree/master.svg?style=shield)](https://circleci.com/gh/docker/notary/tree/master) [![CodeCov](https://codecov.io/github/docker/notary/coverage.svg?branch=master)](https://codecov.io/github/docker/notary) [![GoReportCard](https://goreportcard.com/badge/docker/notary)](https://goreportcard.com/report/github.com/docker/notary)
+[![Circle CI](https://circleci.com/gh/docker/notary/tree/master.svg?style=shield)](https://circleci.com/gh/docker/notary/tree/master) [![CodeCov](https://codecov.io/github/docker/notary/coverage.svg?branch=master)](https://codecov.io/github/docker/notary) [![GoReportCard](https://goreportcard.com/badge/docker/notary)](https://goreportcard.com/report/github.com/theupdateframework/notary)
 
 # Notice
 
@@ -52,7 +52,7 @@ Any security vulnerabilities can be reported to [email protected].
 
 # Getting started with the Notary CLI
 
-Please get the Notary Client CLI binary from [the official releases page](https://github.com/docker/notary/releases) or you can [build one yourself](#building-notary).
+Please get the Notary Client CLI binary from [the official releases page](https://github.com/theupdateframework/notary/releases) or you can [build one yourself](#building-notary).
 The version of Notary server and signer should be greater than or equal to Notary CLI's version to ensure feature compatibility (ex: CLI version 0.2, server/signer version >= 0.2), and all official releases are associated with GitHub tags.
 
 To use the Notary CLI with Docker hub images, please have a look at our
@@ -64,7 +64,7 @@ For more advanced usage, please see the
 To use the CLI against a local Notary server rather than against Docker Hub:
 
 1. Please ensure that you have [docker and docker-compose](http://docs.docker.com/compose/install/) installed.
-1. `git clone https://github.com/docker/notary.git` and from the cloned repository path,
+1. `git clone https://github.com/theupdateframework/notary.git` and from the cloned repository path,
     start up a local Notary server and signer and copy the config file and testing certs to your
     local notary config directory:
 
@@ -89,8 +89,8 @@ to use `notary` with Docker images.
 
 ## Building Notary
 
-Note that our [latest stable release](https://github.com/docker/notary/releases) is at the head of the
-[releases branch](https://github.com/docker/notary/tree/releases).  The master branch is the development
+Note that our [latest stable release](https://github.com/theupdateframework/notary/releases) is at the head of the
+[releases branch](https://github.com/theupdateframework/notary/tree/releases).  The master branch is the development
 branch and contains features for the next release.
 
 Prerequisites:

diff --git a/buildscripts/dbtests.sh b/buildscripts/dbtests.sh
@@ -16,7 +16,7 @@ case ${db} in
   postgresql*)
     db="postgresql"
     dbContainerOpts="--name postgresql_tests postgresql -l"
-    DBURL="postgres://server@postgresql_tests:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-server-key.pem"
+    DBURL="postgres://server@postgresql_tests:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server-key.pem"
     ;;
   *)
     echo "Usage: $0 (mysql|rethink)"
@@ -57,5 +57,5 @@ trap cleanup SIGINT SIGTERM EXIT
 docker-compose -p "${project}_${db}" -f "${composeFile}" run --no-deps -d ${dbContainerOpts}
 docker-compose -p "${project}_${db}" -f "${composeFile}" run --no-deps \
     -e NOTARY_BUILDTAGS="${db}db" -e DBURL="${DBURL}" \
-    -e PKGS="github.com/docker/notary/server/storage github.com/docker/notary/signer/keydbstore" \
+    -e PKGS="github.com/theupdateframework/notary/server/storage github.com/theupdateframework/notary/signer/keydbstore" \
     client bash -c "${clientCmd}"
diff --git a/buildscripts/docker-integration-test.py b/buildscripts/docker-integration-test.py
@@ -8,7 +8,7 @@
 
 This assumes that your docker directory is in $GOPATH/src/github.com/docker/docker
 and your notary directory, irrespective of where this script is located, is
-at $GOPATH/src/github.com/docker/notary.
+at $GOPATH/src/github.com/theupdateframework/notary.
 """
 from __future__ import print_function
 import os
@@ -31,7 +31,7 @@ def from_gopath(gopkg):
 
 
 DOCKER_DIR = from_gopath("github.com/docker/docker")
-NOTARY_DIR = from_gopath("github.com/docker/notary")
+NOTARY_DIR = from_gopath("github.com/theupdateframework/notary")
 
 
 def fake_vendor():
@@ -40,7 +40,7 @@ def fake_vendor():
     vendor directory - also appending several lines into the Dockerfile because
     it pulls down notary from github and builds the binaries
     """
-    docker_notary_relpath = "vendor/src/github.com/docker/notary"
+    docker_notary_relpath = "vendor/src/github.com/theupdateframework/notary"
     docker_notary_abspath = os.path.join(DOCKER_DIR, docker_notary_relpath)
 
     print("copying notary ({0}) into {1}".format(NOTARY_DIR, docker_notary_abspath))
@@ -66,8 +66,8 @@ def ignore_dirs(walked_dir, _):
     dockerfile_addition = ("\n"
         "RUN set -x && "
         "export GO15VENDOREXPERIMENT=1 && "
-        "go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server &&"
-        "go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary")
+        "go build -o /usr/local/bin/notary-server github.com/theupdateframework/notary/cmd/notary-server &&"
+        "go build -o /usr/local/bin/notary github.com/theupdateframework/notary/cmd/notary")
 
     with open(os.path.join(DOCKER_DIR, "Dockerfile")) as dockerfile:
         text = dockerfile.read()
@@ -106,7 +106,7 @@ def run_integration_test():
               .format(os.getenv("GOPATH")))
         sys.exit(1)
     if NOTARY_DIR == "":
-        print("ERROR: Could not find github.com/docker/notary in your GOPATH='{0}'"
+        print("ERROR: Could not find github.com/theupdateframework/notary in your GOPATH='{0}'"
               .format(os.getenv("GOPATH")))
         sys.exit(1)
     fake_vendor()

diff --git a/client/backwards_compatibility_test.go b/client/backwards_compatibility_test.go
@@ -12,12 +12,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/notary"
-	"github.com/docker/notary/passphrase"
-	store "github.com/docker/notary/storage"
-	"github.com/docker/notary/trustpinning"
-	"github.com/docker/notary/tuf/data"
 	"github.com/stretchr/testify/require"
+	"github.com/theupdateframework/notary"
+	"github.com/theupdateframework/notary/passphrase"
+	store "github.com/theupdateframework/notary/storage"
+	"github.com/theupdateframework/notary/trustpinning"
+	"github.com/theupdateframework/notary/tuf/data"
 )
 
 // Once a fixture is read in, ensure that it's valid by making sure the expiry

diff --git a/client/changelist/change.go b/client/changelist/change.go
@@ -1,7 +1,7 @@
 package changelist
 
 import (
-	"github.com/docker/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/data"
 )
 
 // Scopes for TUFChanges are simply the TUF roles.

diff --git a/client/changelist/change_test.go b/client/changelist/change_test.go
@@ -3,9 +3,9 @@ package changelist
 import (
 	"testing"
 
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/signed"
 	"github.com/stretchr/testify/require"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/signed"
 )
 
 func TestTUFDelegation(t *testing.T) {

diff --git a/client/changelist/interface.go b/client/changelist/interface.go
@@ -1,6 +1,6 @@
 package changelist
 
-import "github.com/docker/notary/tuf/data"
+import "github.com/theupdateframework/notary/tuf/data"
 
 // Changelist is the interface for all TUF change lists
 type Changelist interface {

diff --git a/client/client.go b/client/client.go
@@ -17,9 +17,9 @@ Use this package by creating a new repository object and calling methods on it.
 		"github.com/docker/distribution/registry/client/auth"
 		"github.com/docker/distribution/registry/client/auth/challenge"
 		"github.com/docker/distribution/registry/client/transport"
-		notary "github.com/docker/notary/client"
-		"github.com/docker/notary/trustpinning"
-		"github.com/docker/notary/tuf/data"
+		notary "github.com/theupdateframework/notary/client"
+		"github.com/theupdateframework/notary/trustpinning"
+		"github.com/theupdateframework/notary/tuf/data"
 	)
 
 	func main() {
@@ -98,16 +98,16 @@ import (
 	"time"
 
 	canonicaljson "github.com/docker/go/canonical/json"
-	"github.com/docker/notary"
-	"github.com/docker/notary/client/changelist"
-	"github.com/docker/notary/cryptoservice"
-	store "github.com/docker/notary/storage"
-	"github.com/docker/notary/trustpinning"
-	"github.com/docker/notary/tuf"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/signed"
-	"github.com/docker/notary/tuf/utils"
 	"github.com/sirupsen/logrus"
+	"github.com/theupdateframework/notary"
+	"github.com/theupdateframework/notary/client/changelist"
+	"github.com/theupdateframework/notary/cryptoservice"
+	store "github.com/theupdateframework/notary/storage"
+	"github.com/theupdateframework/notary/trustpinning"
+	"github.com/theupdateframework/notary/tuf"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/signed"
+	"github.com/theupdateframework/notary/tuf/utils"
 )
 
 const (

diff --git a/client/client_pkcs11_test.go b/client/client_pkcs11_test.go
@@ -2,7 +2,7 @@
 
 package client
 
-import "github.com/docker/notary/trustmanager/yubikey"
+import "github.com/theupdateframework/notary/trustmanager/yubikey"
 
 // clear out all keys
 func init() {

diff --git a/client/client_test.go b/client/client_test.go
@@ -22,22 +22,22 @@ import (
 
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/go/canonical/json"
-	"github.com/docker/notary"
-	"github.com/docker/notary/client/changelist"
-	"github.com/docker/notary/cryptoservice"
-	"github.com/docker/notary/passphrase"
-	"github.com/docker/notary/server"
-	"github.com/docker/notary/server/storage"
-	store "github.com/docker/notary/storage"
-	"github.com/docker/notary/trustmanager"
-	"github.com/docker/notary/trustpinning"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/signed"
-	testutils "github.com/docker/notary/tuf/testutils/keys"
-	"github.com/docker/notary/tuf/utils"
-	"github.com/docker/notary/tuf/validation"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
+	"github.com/theupdateframework/notary"
+	"github.com/theupdateframework/notary/client/changelist"
+	"github.com/theupdateframework/notary/cryptoservice"
+	"github.com/theupdateframework/notary/passphrase"
+	"github.com/theupdateframework/notary/server"
+	"github.com/theupdateframework/notary/server/storage"
+	store "github.com/theupdateframework/notary/storage"
+	"github.com/theupdateframework/notary/trustmanager"
+	"github.com/theupdateframework/notary/trustpinning"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/signed"
+	testutils "github.com/theupdateframework/notary/tuf/testutils/keys"
+	"github.com/theupdateframework/notary/tuf/utils"
+	"github.com/theupdateframework/notary/tuf/validation"
 )
 
 const password = "passphrase"

diff --git a/client/client_update_test.go b/client/client_update_test.go
@@ -15,15 +15,15 @@ import (
 	"time"
 
 	"github.com/docker/go/canonical/json"
-	"github.com/docker/notary"
-	"github.com/docker/notary/passphrase"
-	store "github.com/docker/notary/storage"
-	"github.com/docker/notary/trustpinning"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/signed"
-	"github.com/docker/notary/tuf/testutils"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/require"
+	"github.com/theupdateframework/notary"
+	"github.com/theupdateframework/notary/passphrase"
+	store "github.com/theupdateframework/notary/storage"
+	"github.com/theupdateframework/notary/trustpinning"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/signed"
+	"github.com/theupdateframework/notary/tuf/testutils"
 )
 
 func newBlankRepo(t *testing.T, url string) *repository {

diff --git a/client/delegations.go b/client/delegations.go
@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/docker/notary"
-	"github.com/docker/notary/client/changelist"
-	store "github.com/docker/notary/storage"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/utils"
 	"github.com/sirupsen/logrus"
+	"github.com/theupdateframework/notary"
+	"github.com/theupdateframework/notary/client/changelist"
+	store "github.com/theupdateframework/notary/storage"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/utils"
 )
 
 // AddDelegation creates changelist entries to add provided delegation public keys and paths.

diff --git a/client/errors.go b/client/errors.go
@@ -3,7 +3,7 @@ package client
 import (
 	"fmt"
 
-	"github.com/docker/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/data"
 )
 
 // ErrRepoNotInitialized is returned when trying to publish an uninitialized

diff --git a/client/helpers.go b/client/helpers.go
@@ -6,13 +6,13 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/docker/notary/client/changelist"
-	store "github.com/docker/notary/storage"
-	"github.com/docker/notary/tuf"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/signed"
-	"github.com/docker/notary/tuf/utils"
 	"github.com/sirupsen/logrus"
+	"github.com/theupdateframework/notary/client/changelist"
+	store "github.com/theupdateframework/notary/storage"
+	"github.com/theupdateframework/notary/tuf"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/signed"
+	"github.com/theupdateframework/notary/tuf/utils"
 )
 
 // Use this to initialize remote HTTPStores from the config settings

diff --git a/client/helpers_test.go b/client/helpers_test.go
@@ -8,12 +8,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/notary/client/changelist"
-	"github.com/docker/notary/storage"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/testutils"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
+	"github.com/theupdateframework/notary/client/changelist"
+	"github.com/theupdateframework/notary/storage"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/testutils"
 )
 
 func TestApplyTargetsChange(t *testing.T) {

diff --git a/client/interface.go b/client/interface.go
@@ -1,9 +1,9 @@
 package client
 
 import (
-	"github.com/docker/notary/client/changelist"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/signed"
+	"github.com/theupdateframework/notary/client/changelist"
+	"github.com/theupdateframework/notary/tuf/data"
+	"github.com/theupdateframework/notary/tuf/signed"
 )
 
 // Repository represents the set of options that must be supported over a TUF repo.

diff --git a/client/repo.go b/client/repo.go
@@ -5,8 +5,8 @@ package client
 import (
 	"fmt"
 
-	"github.com/docker/notary"
-	"github.com/docker/notary/trustmanager"
+	"github.com/theupdateframework/notary"
+	"github.com/theupdateframework/notary/trustmanager"
 )
 
 func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {

diff --git a/client/repo_pkcs11.go b/client/repo_pkcs11.go
@@ -5,9 +5,9 @@ package client
 import (
 	"fmt"
 
-	"github.com/docker/notary"
-	"github.com/docker/notary/trustmanager"
-	"github.com/docker/notary/trustmanager/yubikey"
+	"github.com/theupdateframework/notary"
+	"github.com/theupdateframework/notary/trustmanager"
+	"github.com/theupdateframework/notary/trustmanager/yubikey"
 )
 
 func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {