diff --git a/Dockerfile b/Dockerfile index 1b17eb16..003127bc 100644 --- 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 index ba28925a..00211071 100644 --- 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 index 9b7621e1..37db21c3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ 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/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 security@docker.com. # 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 index 928d5602..93d3e72c 100755 --- 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 index 1a46bf8d..4104838f 100755 --- a/buildscripts/docker-integration-test.py +++ b/buildscripts/docker-integration-test.py @@ -8,7 +8,7 @@ python docker-integration-test.py 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 fake_vendor(): 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 @@ if __name__ == "__main__": .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 index 568641bf..8236f7e4 100644 --- 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 index f9fa552d..d445767a 100644 --- 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 index 94ef4182..11cfe302 100644 --- 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 index 70dc0a2d..e8fb8247 100644 --- 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 index 81411d24..217e9623 100644 --- 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 index 24f9f8f9..d9303c71 100644 --- 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 index f56d1fae..7545f125 100644 --- 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 index 0728594b..78ad63b8 100644 --- 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 index 99a76468..289654e2 100644 --- 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 index ba7759c4..a2d4970e 100644 --- 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 index 186547ee..179d27ec 100644 --- 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 index 6fbd596e..72f5b1cb 100644 --- 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 index ca09fb4e..4e6680dc 100644 --- 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 index 953fda10..cf2242b7 100644 --- 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 index 3eccc2f7..a24d3e60 100644 --- 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) { diff --git a/client/tufclient.go b/client/tufclient.go index 2cf91e27..17be9305 100644 --- a/client/tufclient.go +++ b/client/tufclient.go @@ -4,13 +4,13 @@ import ( "encoding/json" "fmt" - "github.com/docker/notary" - 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/sirupsen/logrus" + "github.com/theupdateframework/notary" + 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" ) // tufClient is a usability wrapper around a raw TUF repo diff --git a/client/witness.go b/client/witness.go index b52239ba..ea6caa1b 100644 --- a/client/witness.go +++ b/client/witness.go @@ -1,9 +1,9 @@ package client import ( - "github.com/docker/notary/client/changelist" - "github.com/docker/notary/tuf" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/client/changelist" + "github.com/theupdateframework/notary/tuf" + "github.com/theupdateframework/notary/tuf/data" ) // Witness creates change objects to witness (i.e. re-sign) the given diff --git a/cmd/escrow/config.go b/cmd/escrow/config.go index 394d0849..1e768507 100644 --- a/cmd/escrow/config.go +++ b/cmd/escrow/config.go @@ -8,11 +8,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/docker/notary" - "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/trustmanager/remoteks" - "github.com/docker/notary/utils" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/trustmanager/remoteks" + "github.com/theupdateframework/notary/utils" ) func parseConfig(path string) (*viper.Viper, error) { diff --git a/cmd/escrow/config_test.go b/cmd/escrow/config_test.go index 1aed64a0..628088b3 100644 --- a/cmd/escrow/config_test.go +++ b/cmd/escrow/config_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/docker/notary" - "github.com/docker/notary/storage" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/storage" ) func TestParseConfigError(t *testing.T) { diff --git a/cmd/notary-server/bootstrap.go b/cmd/notary-server/bootstrap.go index f9d9beec..1303ce57 100644 --- a/cmd/notary-server/bootstrap.go +++ b/cmd/notary-server/bootstrap.go @@ -5,8 +5,8 @@ import ( "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/storage" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/storage" ) func bootstrap(ctx context.Context) error { diff --git a/cmd/notary-server/bootstrap_test.go b/cmd/notary-server/bootstrap_test.go index 3feb16b4..cbafbe93 100644 --- a/cmd/notary-server/bootstrap_test.go +++ b/cmd/notary-server/bootstrap_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/tuf/testutils" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/testutils" ) func TestBootstrap(t *testing.T) { diff --git a/cmd/notary-server/config.go b/cmd/notary-server/config.go index 77279be5..92fddc57 100644 --- a/cmd/notary-server/config.go +++ b/cmd/notary-server/config.go @@ -12,18 +12,18 @@ import ( _ "github.com/docker/distribution/registry/auth/htpasswd" _ "github.com/docker/distribution/registry/auth/token" "github.com/docker/go-connections/tlsconfig" - "github.com/docker/notary" - "github.com/docker/notary/server" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/signer/client" - "github.com/docker/notary/storage/rethinkdb" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/utils" _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" "github.com/sirupsen/logrus" "github.com/spf13/viper" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/signer/client" + "github.com/theupdateframework/notary/storage/rethinkdb" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/utils" "golang.org/x/net/context" "gopkg.in/dancannon/gorethink.v3" ) diff --git a/cmd/notary-server/main.go b/cmd/notary-server/main.go index b836f0ee..39b4a052 100644 --- a/cmd/notary-server/main.go +++ b/cmd/notary-server/main.go @@ -10,10 +10,10 @@ import ( "os/signal" "github.com/docker/distribution/health" - "github.com/docker/notary/server" - "github.com/docker/notary/utils" - "github.com/docker/notary/version" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/server" + "github.com/theupdateframework/notary/utils" + "github.com/theupdateframework/notary/version" ) // DebugAddress is the debug server address to listen on diff --git a/cmd/notary-server/main_test.go b/cmd/notary-server/main_test.go index 55c6a0b1..ef0ed951 100644 --- a/cmd/notary-server/main_test.go +++ b/cmd/notary-server/main_test.go @@ -12,15 +12,15 @@ import ( "time" "github.com/docker/distribution/health" - "github.com/docker/notary" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/signer/client" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/utils" _ "github.com/mattn/go-sqlite3" "github.com/spf13/viper" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/signer/client" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/utils" ) const ( diff --git a/cmd/notary-signer/config.go b/cmd/notary-signer/config.go index 2a071c35..0dd3d08e 100644 --- a/cmd/notary-signer/config.go +++ b/cmd/notary-signer/config.go @@ -14,22 +14,22 @@ import ( "github.com/docker/distribution/health" "github.com/docker/go-connections/tlsconfig" - "github.com/docker/notary" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - pb "github.com/docker/notary/proto" - "github.com/docker/notary/signer" - "github.com/docker/notary/signer/api" - "github.com/docker/notary/signer/keydbstore" - "github.com/docker/notary/storage" - "github.com/docker/notary/storage/rethinkdb" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - tufutils "github.com/docker/notary/tuf/utils" - "github.com/docker/notary/utils" "github.com/sirupsen/logrus" "github.com/spf13/viper" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + pb "github.com/theupdateframework/notary/proto" + "github.com/theupdateframework/notary/signer" + "github.com/theupdateframework/notary/signer/api" + "github.com/theupdateframework/notary/signer/keydbstore" + "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/storage/rethinkdb" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + tufutils "github.com/theupdateframework/notary/tuf/utils" + "github.com/theupdateframework/notary/utils" ghealth "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" "gopkg.in/dancannon/gorethink.v3" diff --git a/cmd/notary-signer/main.go b/cmd/notary-signer/main.go index c691a066..9a5dc643 100644 --- a/cmd/notary-signer/main.go +++ b/cmd/notary-signer/main.go @@ -8,11 +8,11 @@ import ( "os" "os/signal" - "github.com/docker/notary/utils" - "github.com/docker/notary/version" _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/utils" + "github.com/theupdateframework/notary/version" ) const ( diff --git a/cmd/notary-signer/main_test.go b/cmd/notary-signer/main_test.go index 9be92bff..8636bff9 100644 --- a/cmd/notary-signer/main_test.go +++ b/cmd/notary-signer/main_test.go @@ -8,16 +8,16 @@ import ( "os" "testing" - "github.com/docker/notary" - "github.com/docker/notary/signer" - "github.com/docker/notary/signer/keydbstore" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/testutils" "github.com/jinzhu/gorm" _ "github.com/mattn/go-sqlite3" "github.com/spf13/viper" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/signer" + "github.com/theupdateframework/notary/signer/keydbstore" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/testutils" ) const ( diff --git a/cmd/notary/delegations.go b/cmd/notary/delegations.go index fa8c30db..ff8fd0af 100644 --- a/cmd/notary/delegations.go +++ b/cmd/notary/delegations.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/docker/notary" - notaryclient "github.com/docker/notary/client" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/theupdateframework/notary" + notaryclient "github.com/theupdateframework/notary/client" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) var cmdDelegationTemplate = usageTemplate{ diff --git a/cmd/notary/delegations_test.go b/cmd/notary/delegations_test.go index 3cac1765..c5b64897 100644 --- a/cmd/notary/delegations_test.go +++ b/cmd/notary/delegations_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/docker/notary/cryptoservice" - testutils "github.com/docker/notary/tuf/testutils/keys" - "github.com/docker/notary/tuf/utils" "github.com/spf13/viper" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/cryptoservice" + testutils "github.com/theupdateframework/notary/tuf/testutils/keys" + "github.com/theupdateframework/notary/tuf/utils" ) func setup(trustDir string) *delegationCommander { diff --git a/cmd/notary/integration_nonpkcs11_test.go b/cmd/notary/integration_nonpkcs11_test.go index c952fd55..00ce46d5 100644 --- a/cmd/notary/integration_nonpkcs11_test.go +++ b/cmd/notary/integration_nonpkcs11_test.go @@ -5,9 +5,9 @@ package main import ( "testing" - "github.com/docker/notary" - "github.com/docker/notary/passphrase" "github.com/spf13/cobra" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/passphrase" ) func init() { diff --git a/cmd/notary/integration_pkcs11_test.go b/cmd/notary/integration_pkcs11_test.go index 08d50ede..5a7303b0 100644 --- a/cmd/notary/integration_pkcs11_test.go +++ b/cmd/notary/integration_pkcs11_test.go @@ -5,12 +5,12 @@ package main import ( "testing" - "github.com/docker/notary" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/trustmanager/yubikey" - "github.com/docker/notary/tuf/data" "github.com/spf13/cobra" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/trustmanager/yubikey" + "github.com/theupdateframework/notary/tuf/data" ) var _retriever notary.PassRetriever diff --git a/cmd/notary/integration_test.go b/cmd/notary/integration_test.go index d11d389c..a9a10cdd 100644 --- a/cmd/notary/integration_test.go +++ b/cmd/notary/integration_test.go @@ -27,20 +27,20 @@ import ( ctxu "github.com/docker/distribution/context" canonicaljson "github.com/docker/go/canonical/json" - "github.com/docker/notary" - "github.com/docker/notary/client" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/server" - "github.com/docker/notary/server/storage" - nstorage "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - testutils "github.com/docker/notary/tuf/testutils/keys" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/client" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/server" + "github.com/theupdateframework/notary/server/storage" + nstorage "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + testutils "github.com/theupdateframework/notary/tuf/testutils/keys" + "github.com/theupdateframework/notary/tuf/utils" "golang.org/x/net/context" ) diff --git a/cmd/notary/keys.go b/cmd/notary/keys.go index 0625f3e1..22fcfe10 100644 --- a/cmd/notary/keys.go +++ b/cmd/notary/keys.go @@ -14,13 +14,13 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/docker/notary" - notaryclient "github.com/docker/notary/client" - "github.com/docker/notary/cryptoservice" - store "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - tufutils "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary" + notaryclient "github.com/theupdateframework/notary/client" + "github.com/theupdateframework/notary/cryptoservice" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + tufutils "github.com/theupdateframework/notary/tuf/utils" ) var cmdKeyTemplate = usageTemplate{ diff --git a/cmd/notary/keys_nonpkcs11.go b/cmd/notary/keys_nonpkcs11.go index cba9e4bd..38910633 100644 --- a/cmd/notary/keys_nonpkcs11.go +++ b/cmd/notary/keys_nonpkcs11.go @@ -5,9 +5,9 @@ package main import ( "errors" - "github.com/docker/notary" - store "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" + "github.com/theupdateframework/notary" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" ) func getYubiStore(fileKeyStore trustmanager.KeyStore, ret notary.PassRetriever) (trustmanager.KeyStore, error) { diff --git a/cmd/notary/keys_nonpkcs11_test.go b/cmd/notary/keys_nonpkcs11_test.go index 5f74c3c0..35bc8562 100644 --- a/cmd/notary/keys_nonpkcs11_test.go +++ b/cmd/notary/keys_nonpkcs11_test.go @@ -8,15 +8,15 @@ import ( "os" "testing" - "github.com/docker/notary" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - store "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" ) func TestImportKeysNoYubikey(t *testing.T) { diff --git a/cmd/notary/keys_pkcs11.go b/cmd/notary/keys_pkcs11.go index b8545153..b272226f 100644 --- a/cmd/notary/keys_pkcs11.go +++ b/cmd/notary/keys_pkcs11.go @@ -3,10 +3,10 @@ package main import ( - "github.com/docker/notary" - store "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/trustmanager/yubikey" + "github.com/theupdateframework/notary" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/trustmanager/yubikey" ) func getYubiStore(fileKeyStore trustmanager.KeyStore, ret notary.PassRetriever) (*yubikey.YubiStore, error) { diff --git a/cmd/notary/keys_pkcs11_test.go b/cmd/notary/keys_pkcs11_test.go index af488914..2853e0ee 100644 --- a/cmd/notary/keys_pkcs11_test.go +++ b/cmd/notary/keys_pkcs11_test.go @@ -12,13 +12,13 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/docker/notary" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - store "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/trustmanager/yubikey" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/trustmanager/yubikey" + "github.com/theupdateframework/notary/tuf/data" ) func TestImportWithYubikey(t *testing.T) { diff --git a/cmd/notary/keys_test.go b/cmd/notary/keys_test.go index ad932a47..6a74799d 100644 --- a/cmd/notary/keys_test.go +++ b/cmd/notary/keys_test.go @@ -20,17 +20,17 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/client" - "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/utils" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/client" + "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/utils" ) var ret = passphrase.ConstantRetriever("pass") diff --git a/cmd/notary/main.go b/cmd/notary/main.go index 8d6bbfad..30c6a86e 100644 --- a/cmd/notary/main.go +++ b/cmd/notary/main.go @@ -7,14 +7,14 @@ import ( "path/filepath" "strings" - "github.com/docker/notary" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/version" homedir "github.com/mitchellh/go-homedir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/version" ) const ( diff --git a/cmd/notary/main_test.go b/cmd/notary/main_test.go index 23e72833..92125727 100644 --- a/cmd/notary/main_test.go +++ b/cmd/notary/main_test.go @@ -14,11 +14,11 @@ import ( "time" "github.com/docker/go-connections/tlsconfig" - "github.com/docker/notary" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/tuf/data" ) // the default location for the config file is in ~/.notary/config.json - even if it doesn't exist. diff --git a/cmd/notary/prettyprint.go b/cmd/notary/prettyprint.go index 94eafe41..e07d51f8 100644 --- a/cmd/notary/prettyprint.go +++ b/cmd/notary/prettyprint.go @@ -8,9 +8,9 @@ import ( "strings" "text/tabwriter" - "github.com/docker/notary/client" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/client" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" ) const ( diff --git a/cmd/notary/prettyprint_test.go b/cmd/notary/prettyprint_test.go index 5d13591f..f23a0195 100644 --- a/cmd/notary/prettyprint_test.go +++ b/cmd/notary/prettyprint_test.go @@ -11,12 +11,12 @@ import ( "strings" "testing" - "github.com/docker/notary/client" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/client" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // --- tests for pretty printing keys --- diff --git a/cmd/notary/repo_factory.go b/cmd/notary/repo_factory.go index 62dc95fc..0a8702bb 100644 --- a/cmd/notary/repo_factory.go +++ b/cmd/notary/repo_factory.go @@ -5,9 +5,9 @@ import ( "net/http" - "github.com/docker/notary" - "github.com/docker/notary/client" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/client" + "github.com/theupdateframework/notary/tuf/data" ) const remoteConfigField = "api" diff --git a/cmd/notary/tuf.go b/cmd/notary/tuf.go index f1450b21..28eb4c82 100644 --- a/cmd/notary/tuf.go +++ b/cmd/notary/tuf.go @@ -22,18 +22,18 @@ import ( "github.com/docker/distribution/registry/client/transport" "github.com/docker/go-connections/tlsconfig" canonicaljson "github.com/docker/go/canonical/json" - "github.com/docker/notary" - notaryclient "github.com/docker/notary/client" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/trustpinning" - "github.com/docker/notary/tuf/data" - tufutils "github.com/docker/notary/tuf/utils" - "github.com/docker/notary/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/theupdateframework/notary" + notaryclient "github.com/theupdateframework/notary/client" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/trustpinning" + "github.com/theupdateframework/notary/tuf/data" + tufutils "github.com/theupdateframework/notary/tuf/utils" + "github.com/theupdateframework/notary/utils" ) var cmdTUFListTemplate = usageTemplate{ @@ -920,7 +920,7 @@ func tokenAuth(trustServerURL string, baseTransport *http.Transport, gun data.GU } subPath, err := url.Parse(path.Join(endpoint.Path, "/v2") + "/") if err != nil { - return nil, fmt.Errorf("Failed to parse v2 subpath. This error should not have been reached. Please report it as an issue at https://github.com/docker/notary/issues: %s", err.Error()) + return nil, fmt.Errorf("Failed to parse v2 subpath. This error should not have been reached. Please report it as an issue at https://github.com/theupdateframework/notary/issues: %s", err.Error()) } endpoint = endpoint.ResolveReference(subPath) req, err := http.NewRequest("GET", endpoint.String(), nil) diff --git a/cmd/notary/tuf_test.go b/cmd/notary/tuf_test.go index a472ff45..cfad1c86 100644 --- a/cmd/notary/tuf_test.go +++ b/cmd/notary/tuf_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/docker/distribution/registry/client/auth" - "github.com/docker/notary/tuf/data" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" ) // TestImportRootCert does the following diff --git a/cross.Dockerfile b/cross.Dockerfile index f8c9fe4e..71a2b3be 100644 --- a/cross.Dockerfile +++ b/cross.Dockerfile @@ -28,7 +28,7 @@ RUN set -x \ && UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh > /dev/null ENV PATH /osxcross/target/bin:$PATH -ENV NOTARYDIR /go/src/github.com/docker/notary +ENV NOTARYDIR /go/src/github.com/theupdateframework/notary COPY . ${NOTARYDIR} RUN chmod -R a+rw /go diff --git a/cryptoservice/certificate.go b/cryptoservice/certificate.go index 26de5103..0270e89f 100644 --- a/cryptoservice/certificate.go +++ b/cryptoservice/certificate.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // GenerateCertificate generates an X509 Certificate from a template, given a GUN and validity interval diff --git a/cryptoservice/certificate_test.go b/cryptoservice/certificate_test.go index 1e8fcdc4..b3db13aa 100644 --- a/cryptoservice/certificate_test.go +++ b/cryptoservice/certificate_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) func TestGenerateCertificate(t *testing.T) { diff --git a/cryptoservice/crypto_service.go b/cryptoservice/crypto_service.go index 0773f1bf..a558304f 100644 --- a/cryptoservice/crypto_service.go +++ b/cryptoservice/crypto_service.go @@ -6,11 +6,11 @@ import ( "errors" "fmt" - "github.com/docker/notary" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) var ( diff --git a/cryptoservice/crypto_service_test.go b/cryptoservice/crypto_service_test.go index a4d0b368..5131ffc8 100644 --- a/cryptoservice/crypto_service_test.go +++ b/cryptoservice/crypto_service_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils/interfaces" - testutils "github.com/docker/notary/tuf/testutils/keys" - "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils/interfaces" + testutils "github.com/theupdateframework/notary/tuf/testutils/keys" + "github.com/theupdateframework/notary/tuf/utils" ) var algoToSigType = map[string]data.SigAlgorithm{ diff --git a/development.postgresql.yml b/development.postgresql.yml index 3f484802..2106b377 100644 --- a/development.postgresql.yml +++ b/development.postgresql.yml @@ -14,7 +14,7 @@ services: command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.postgres.json" environment: MIGRATIONS_PATH: migrations/server/postgresql - DB_URL: postgres://server@postgresql: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 + DB_URL: postgres://server@postgresql: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 depends_on: - postgresql - signer @@ -31,7 +31,7 @@ services: command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.postgres.json" environment: MIGRATIONS_PATH: migrations/signer/postgresql - DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-signer-key.pem + DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer-key.pem depends_on: - postgresql postgresql: diff --git a/docker-compose.postgresql.yml b/docker-compose.postgresql.yml index 65cc85a5..4146238e 100644 --- a/docker-compose.postgresql.yml +++ b/docker-compose.postgresql.yml @@ -14,7 +14,7 @@ services: command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.postgres.json" environment: MIGRATIONS_PATH: migrations/server/postgresql - DB_URL: postgres://server@postgresql: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 + DB_URL: postgres://server@postgresql: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 depends_on: - postgresql - signer @@ -31,7 +31,7 @@ services: command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.postgres.json" environment: MIGRATIONS_PATH: migrations/signer/postgresql - DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-signer-key.pem + DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer-key.pem depends_on: - postgresql postgresql: diff --git a/docs/changelog.md b/docs/changelog.md index 7786a151..369f86fc 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,7 +17,7 @@ Implements root key and certificate rotation, as well as trust pinning configura Additional improvements and fixes to notary internals, and RethinkDB support. > Detailed release notes can be found here: -v0.3 release notes. +v0.3 release notes. ## v0.2 #### 2/24/2016 @@ -29,7 +29,7 @@ This version also supports managing the snapshot key on notary server, which sho Moreover, this version also adds more key management functionality to the notary CLI, and changes the docker-compose development configuration to use the official MariaDB image. > Detailed release notes can be found here: -v0.2 release notes. +v0.2 release notes. ## v0.1 #### 11/15/2015 @@ -37,4 +37,4 @@ Initial notary non-alpha release. Implements The Update Framework (TUF) with root, targets, snapshot, and timestamp roles to sign and verify content of a trusted collection. > Detailed release notes can be found here: -v0.1 release notes. +v0.1 release notes. diff --git a/docs/getting_started.md b/docs/getting_started.md index bc99c5f1..dbc2815e 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -33,7 +33,7 @@ freshness of your content. You can download precompiled notary binary for 64 bit Linux or Mac OS X from the Notary repository's -releases page on +releases page on GitHub. Windows is not officially supported, but if you are a developer and Windows user, we would appreciate any insight you can provide regarding issues. @@ -65,7 +65,7 @@ tell the client which repository server it should communicate with. The official Docker Hub Notary servers are located at `https://notary.docker.io`. If you would like to use your own Notary server, -it is important to use the same or a newer Notary version +it is important to use the same or a newer Notary version as the client for feature compatibility (ex: client version 0.2, server/signer version >= 0.2). Additionally, Notary stores your own signing keys, and a cache of previously downloaded trust metadata in a directory, provided diff --git a/docs/running_a_service.md b/docs/running_a_service.md index 5be6fd17..d9a09c23 100644 --- a/docs/running_a_service.md +++ b/docs/running_a_service.md @@ -21,10 +21,10 @@ and [Docker Compose](https://docs.docker.com/compose/overview/). The quickest way to spin up a full Notary service for testing and development purposes is to use the Docker compose file in the -Notary project. +Notary project. ```plain -$ git clone https://github.com/docker/notary.git +$ git clone https://github.com/theupdateframework/notary.git $ cd notary $ docker-compose up ``` @@ -51,7 +51,7 @@ To connect using the Notary Client CLI, please see [Getting Started](getting_sta documentation. Please note that the version of Notary server and signer should be greater than or equal to that of the Notary Client CLI to ensure feature compatibility, i.e. if you are using Notary Client CLI 0.2, ensure you are using a server and signer tagged with -an equal or higher version than 0.2 from the releases page. +an equal or higher version than 0.2 from the releases page. The self-signed certificate's subject name and subject alternative names are `notary-server`, `notaryserver`, and `localhost`, so if your Docker host is not diff --git a/escrow.Dockerfile b/escrow.Dockerfile index da7a03ed..bafddacd 100644 --- a/escrow.Dockerfile +++ b/escrow.Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.7.3-alpine MAINTAINER David Lawrence "david.lawrence@docker.com" -ENV NOTARYPKG github.com/docker/notary +ENV NOTARYPKG github.com/theupdateframework/notary # Copy the local repo to the expected go path COPY . /go/src/${NOTARYPKG} diff --git a/fixtures/server-config.postgres.json b/fixtures/server-config.postgres.json index ad8f8a8d..cf9d3cd5 100644 --- a/fixtures/server-config.postgres.json +++ b/fixtures/server-config.postgres.json @@ -18,6 +18,6 @@ }, "storage": { "backend": "postgres", - "db_url": "postgres://server@postgresql: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" + "db_url": "postgres://server@postgresql: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" } } diff --git a/fixtures/signer-config.postgres.json b/fixtures/signer-config.postgres.json index 63d76ba4..05449da3 100644 --- a/fixtures/signer-config.postgres.json +++ b/fixtures/signer-config.postgres.json @@ -10,6 +10,6 @@ }, "storage": { "backend": "postgres", - "db_url": "postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-signer-key.pem" + "db_url": "postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer-key.pem" } } diff --git a/passphrase/passphrase.go b/passphrase/passphrase.go index 69b46482..0d647734 100644 --- a/passphrase/passphrase.go +++ b/passphrase/passphrase.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/docker/notary" + "github.com/theupdateframework/notary" "golang.org/x/crypto/ssh/terminal" ) diff --git a/passphrase/passphrase_test.go b/passphrase/passphrase_test.go index 80e5f5cd..4e294a50 100644 --- a/passphrase/passphrase_test.go +++ b/passphrase/passphrase_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" ) func assertAskOnceForKey(t *testing.T, in, out *bytes.Buffer, retriever notary.PassRetriever, password, role string) { diff --git a/server.Dockerfile b/server.Dockerfile index f69a25ec..308ae13f 100644 --- a/server.Dockerfile +++ b/server.Dockerfile @@ -6,7 +6,7 @@ RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/* # Pin to the specific v3.0.0 version RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate -ENV NOTARYPKG github.com/docker/notary +ENV NOTARYPKG github.com/theupdateframework/notary # Copy the local repo to the expected go path COPY . /go/src/${NOTARYPKG} diff --git a/server/handlers/changefeed.go b/server/handlers/changefeed.go index 1f560643..620f8a0f 100644 --- a/server/handlers/changefeed.go +++ b/server/handlers/changefeed.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/server/errors" - "github.com/docker/notary/server/storage" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/errors" + "github.com/theupdateframework/notary/server/storage" ) type changefeedResponse struct { diff --git a/server/handlers/changefeed_test.go b/server/handlers/changefeed_test.go index f45a478f..bc334b72 100644 --- a/server/handlers/changefeed_test.go +++ b/server/handlers/changefeed_test.go @@ -5,10 +5,10 @@ import ( "testing" ctxu "github.com/docker/distribution/context" - "github.com/docker/notary" - "github.com/docker/notary/server/storage" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/storage" ) type changefeedArgs struct { diff --git a/server/handlers/default.go b/server/handlers/default.go index 182fe1f3..9a7b4e74 100644 --- a/server/handlers/default.go +++ b/server/handlers/default.go @@ -13,15 +13,15 @@ import ( "github.com/gorilla/mux" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/server/errors" - "github.com/docker/notary/server/snapshot" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/server/timestamp" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/validation" - "github.com/docker/notary/utils" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/errors" + "github.com/theupdateframework/notary/server/snapshot" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/server/timestamp" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/validation" + "github.com/theupdateframework/notary/utils" ) // MainHandler is the default handler for the server diff --git a/server/handlers/default_test.go b/server/handlers/default_test.go index 1b637c4d..8f47e2a9 100644 --- a/server/handlers/default_test.go +++ b/server/handlers/default_test.go @@ -15,15 +15,15 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/server/errors" - "github.com/docker/notary/server/storage" - store "github.com/docker/notary/storage" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils" - "github.com/docker/notary/tuf/validation" - "github.com/docker/notary/utils" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/errors" + "github.com/theupdateframework/notary/server/storage" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils" + "github.com/theupdateframework/notary/tuf/validation" + "github.com/theupdateframework/notary/utils" ) type handlerState struct { diff --git a/server/handlers/roles.go b/server/handlers/roles.go index ea67b472..3c6ad027 100644 --- a/server/handlers/roles.go +++ b/server/handlers/roles.go @@ -10,12 +10,12 @@ import ( "encoding/json" "fmt" - "github.com/docker/notary" - "github.com/docker/notary/server/errors" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/server/timestamp" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/errors" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/server/timestamp" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) func getRole(ctx context.Context, store storage.MetaStore, gun data.GUN, role data.RoleName, checksum, version string) (*time.Time, []byte, error) { diff --git a/server/handlers/roles_test.go b/server/handlers/roles_test.go index 9b491e7f..6d68ff51 100644 --- a/server/handlers/roles_test.go +++ b/server/handlers/roles_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/server/errors" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/errors" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) func TestGetMaybeServerSignedNoCrypto(t *testing.T) { diff --git a/server/handlers/validation.go b/server/handlers/validation.go index 5a7adee3..8bcfbddb 100644 --- a/server/handlers/validation.go +++ b/server/handlers/validation.go @@ -7,13 +7,13 @@ import ( "github.com/sirupsen/logrus" "github.com/docker/go/canonical/json" - "github.com/docker/notary/server/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/docker/notary/tuf/validation" + "github.com/theupdateframework/notary/server/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" + "github.com/theupdateframework/notary/tuf/validation" ) // validateUpload checks that the updates being pushed diff --git a/server/handlers/validation_test.go b/server/handlers/validation_test.go index d7ace039..2b01fc2c 100644 --- a/server/handlers/validation_test.go +++ b/server/handlers/validation_test.go @@ -8,14 +8,14 @@ import ( "github.com/docker/go/canonical/json" - "github.com/docker/notary/server/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/testutils" - "github.com/docker/notary/tuf/validation" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/server/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/testutils" + "github.com/theupdateframework/notary/tuf/validation" ) // this is a fake storage that serves errors diff --git a/server/integration_test.go b/server/integration_test.go index b2e66cf1..a782fe3f 100644 --- a/server/integration_test.go +++ b/server/integration_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/server/storage" - store "github.com/docker/notary/storage" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils" - "github.com/docker/notary/tuf/validation" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/storage" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils" + "github.com/theupdateframework/notary/tuf/validation" ) // Ensures that the httpstore can interpret the errors returned from the server diff --git a/server/server.go b/server/server.go index 4719507e..f447887b 100644 --- a/server/server.go +++ b/server/server.go @@ -10,14 +10,14 @@ import ( "github.com/docker/distribution/health" "github.com/docker/distribution/registry/api/errcode" "github.com/docker/distribution/registry/auth" - "github.com/docker/notary/server/errors" - "github.com/docker/notary/server/handlers" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/utils" "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/server/errors" + "github.com/theupdateframework/notary/server/handlers" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/utils" "golang.org/x/net/context" ) diff --git a/server/server_test.go b/server/server_test.go index 37c7b576..ef15e897 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -14,15 +14,15 @@ import ( "testing" _ "github.com/docker/distribution/registry/auth/silly" - "github.com/docker/notary" - "github.com/docker/notary/server/storage" - store "github.com/docker/notary/storage" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils" - tufutils "github.com/docker/notary/tuf/utils" - "github.com/docker/notary/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/server/storage" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils" + tufutils "github.com/theupdateframework/notary/tuf/utils" + "github.com/theupdateframework/notary/utils" "golang.org/x/net/context" ) diff --git a/server/snapshot/snapshot.go b/server/snapshot/snapshot.go index 967b2aee..c79720bd 100644 --- a/server/snapshot/snapshot.go +++ b/server/snapshot/snapshot.go @@ -6,11 +6,11 @@ import ( "github.com/sirupsen/logrus" "github.com/docker/go/canonical/json" - "github.com/docker/notary/server/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/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/trustpinning" + "github.com/theupdateframework/notary/tuf" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) // GetOrCreateSnapshotKey either creates a new snapshot key, or returns diff --git a/server/snapshot/snapshot_test.go b/server/snapshot/snapshot_test.go index 36d5fd94..721d1a5c 100644 --- a/server/snapshot/snapshot_test.go +++ b/server/snapshot/snapshot_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils" ) func TestSnapshotExpired(t *testing.T) { diff --git a/server/storage/interface.go b/server/storage/interface.go index 23331892..d99b776f 100644 --- a/server/storage/interface.go +++ b/server/storage/interface.go @@ -3,7 +3,7 @@ package storage import ( "time" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) // KeyStore provides a minimal interface for managing key persistence diff --git a/server/storage/memory.go b/server/storage/memory.go index abf6e68f..27210320 100644 --- a/server/storage/memory.go +++ b/server/storage/memory.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) type key struct { diff --git a/server/storage/postgresql_test.go b/server/storage/postgresql_test.go index c78c5b86..c59dd597 100644 --- a/server/storage/postgresql_test.go +++ b/server/storage/postgresql_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/docker/notary" "github.com/jinzhu/gorm" _ "github.com/lib/pq" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" ) func init() { diff --git a/server/storage/rethink_realdb_test.go b/server/storage/rethink_realdb_test.go index 10adbdc4..3340ea04 100644 --- a/server/storage/rethink_realdb_test.go +++ b/server/storage/rethink_realdb_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/docker/go-connections/tlsconfig" - "github.com/docker/notary/storage/rethinkdb" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/storage/rethinkdb" + "github.com/theupdateframework/notary/tuf/data" "gopkg.in/dancannon/gorethink.v3" ) diff --git a/server/storage/rethinkdb.go b/server/storage/rethinkdb.go index 3359eb57..8563ec4c 100644 --- a/server/storage/rethinkdb.go +++ b/server/storage/rethinkdb.go @@ -8,9 +8,9 @@ import ( "sort" "time" - "github.com/docker/notary/storage/rethinkdb" - "github.com/docker/notary/tuf/data" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/storage/rethinkdb" + "github.com/theupdateframework/notary/tuf/data" "gopkg.in/dancannon/gorethink.v3" ) diff --git a/server/storage/rethinkdb_models.go b/server/storage/rethinkdb_models.go index 3236a773..611d960d 100644 --- a/server/storage/rethinkdb_models.go +++ b/server/storage/rethinkdb_models.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/docker/notary/storage/rethinkdb" + "github.com/theupdateframework/notary/storage/rethinkdb" ) // These consts are the index names we've defined for RethinkDB diff --git a/server/storage/sqldb.go b/server/storage/sqldb.go index 84fa43c3..333dea50 100644 --- a/server/storage/sqldb.go +++ b/server/storage/sqldb.go @@ -7,10 +7,10 @@ import ( "strconv" "time" - "github.com/docker/notary/tuf/data" "github.com/go-sql-driver/mysql" "github.com/jinzhu/gorm" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/tuf/data" ) // SQLStorage implements a versioned store using a relational database. diff --git a/server/storage/sqldb_test.go b/server/storage/sqldb_test.go index 74a33939..722c03fc 100644 --- a/server/storage/sqldb_test.go +++ b/server/storage/sqldb_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/docker/notary/tuf/data" "github.com/jinzhu/gorm" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" ) func SetupSQLDB(t *testing.T, dbtype, dburl string) *SQLStorage { diff --git a/server/storage/storage_test.go b/server/storage/storage_test.go index 92a9349f..1b8abe1f 100644 --- a/server/storage/storage_test.go +++ b/server/storage/storage_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" ) type StoredTUFMeta struct { diff --git a/server/storage/tuf_store.go b/server/storage/tuf_store.go index 95b7befc..4f1fa7d2 100644 --- a/server/storage/tuf_store.go +++ b/server/storage/tuf_store.go @@ -6,9 +6,9 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary" - "github.com/docker/notary/storage" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/tuf/data" ) // TUFMetaStorage wraps a MetaStore in order to walk the TUF tree for GetCurrent in a consistent manner, diff --git a/server/storage/tuf_store_test.go b/server/storage/tuf_store_test.go index 457b180e..f97ca7bf 100644 --- a/server/storage/tuf_store_test.go +++ b/server/storage/tuf_store_test.go @@ -3,9 +3,9 @@ package storage import ( "testing" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/testutils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/testutils" ) // Produce a series of tufMeta objects and updates given a TUF repo diff --git a/server/storage/types.go b/server/storage/types.go index 9a52712c..471cd095 100644 --- a/server/storage/types.go +++ b/server/storage/types.go @@ -1,6 +1,6 @@ package storage -import "github.com/docker/notary/tuf/data" +import "github.com/theupdateframework/notary/tuf/data" // MetaUpdate packages up the fields required to update a TUF record type MetaUpdate struct { diff --git a/server/timestamp/timestamp.go b/server/timestamp/timestamp.go index 90078b16..f96aee21 100644 --- a/server/timestamp/timestamp.go +++ b/server/timestamp/timestamp.go @@ -5,15 +5,15 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary" - "github.com/docker/notary/trustpinning" - "github.com/docker/notary/tuf" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/trustpinning" + "github.com/theupdateframework/notary/tuf" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" - "github.com/docker/notary/server/snapshot" - "github.com/docker/notary/server/storage" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/server/snapshot" + "github.com/theupdateframework/notary/server/storage" ) // GetOrCreateTimestampKey returns the timestamp key for the gun. It uses the store to diff --git a/server/timestamp/timestamp_test.go b/server/timestamp/timestamp_test.go index ef917653..14ba1431 100644 --- a/server/timestamp/timestamp_test.go +++ b/server/timestamp/timestamp_test.go @@ -7,11 +7,11 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary/server/storage" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/server/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils" ) func TestTimestampExpired(t *testing.T) { diff --git a/signer.Dockerfile b/signer.Dockerfile index fe50bbbb..b6ccf5f9 100644 --- a/signer.Dockerfile +++ b/signer.Dockerfile @@ -6,7 +6,7 @@ RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/* # Pin to the specific v3.0.0 version RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate -ENV NOTARYPKG github.com/docker/notary +ENV NOTARYPKG github.com/theupdateframework/notary # Copy the local repo to the expected go path COPY . /go/src/${NOTARYPKG} diff --git a/signer/api/find_key.go b/signer/api/find_key.go index 5b8ab5ad..02b24d81 100644 --- a/signer/api/find_key.go +++ b/signer/api/find_key.go @@ -1,11 +1,11 @@ package api import ( - "github.com/docker/notary/signer" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/signer" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" - pb "github.com/docker/notary/proto" + pb "github.com/theupdateframework/notary/proto" ) // findKeyByID looks for the key with the given ID in each of the diff --git a/signer/api/rpc_api.go b/signer/api/rpc_api.go index 64ca6bee..a7d97533 100644 --- a/signer/api/rpc_api.go +++ b/signer/api/rpc_api.go @@ -5,15 +5,15 @@ import ( "fmt" ctxu "github.com/docker/distribution/context" - "github.com/docker/notary/signer" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/signer" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" - pb "github.com/docker/notary/proto" + pb "github.com/theupdateframework/notary/proto" ) //KeyManagementServer implements the KeyManagementServer grpc interface diff --git a/signer/client/signer_trust.go b/signer/client/signer_trust.go index 251d0c07..754ef141 100644 --- a/signer/client/signer_trust.go +++ b/signer/client/signer_trust.go @@ -12,9 +12,9 @@ import ( "net" "time" - "github.com/docker/notary" - pb "github.com/docker/notary/proto" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary" + pb "github.com/theupdateframework/notary/proto" + "github.com/theupdateframework/notary/tuf/data" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/signer/keydbstore/cachedcryptoservice.go b/signer/keydbstore/cachedcryptoservice.go index 3ee4a671..2ee16a31 100644 --- a/signer/keydbstore/cachedcryptoservice.go +++ b/signer/keydbstore/cachedcryptoservice.go @@ -3,8 +3,8 @@ package keydbstore import ( "sync" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) type cachedKeyService struct { diff --git a/signer/keydbstore/cachedcryptoservice_test.go b/signer/keydbstore/cachedcryptoservice_test.go index b2b479ed..64ac647a 100644 --- a/signer/keydbstore/cachedcryptoservice_test.go +++ b/signer/keydbstore/cachedcryptoservice_test.go @@ -5,12 +5,12 @@ import ( "fmt" "testing" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) // gets a key from the DB store, and asserts that the key is the expected key diff --git a/signer/keydbstore/keydbstore.go b/signer/keydbstore/keydbstore.go index 367166fb..dc526caf 100644 --- a/signer/keydbstore/keydbstore.go +++ b/signer/keydbstore/keydbstore.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) type activatingPrivateKey struct { diff --git a/signer/keydbstore/keydbstore_test.go b/signer/keydbstore/keydbstore_test.go index 6e34870b..08cbda44 100644 --- a/signer/keydbstore/keydbstore_test.go +++ b/signer/keydbstore/keydbstore_test.go @@ -6,10 +6,10 @@ import ( "fmt" "testing" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) func constRetriever(string, string, bool, int) (string, bool, error) { diff --git a/signer/keydbstore/postgresql_test.go b/signer/keydbstore/postgresql_test.go index a6a4ddec..13cc539f 100644 --- a/signer/keydbstore/postgresql_test.go +++ b/signer/keydbstore/postgresql_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/docker/notary" "github.com/jinzhu/gorm" _ "github.com/lib/pq" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" ) func init() { diff --git a/signer/keydbstore/rethink_keydbstore.go b/signer/keydbstore/rethink_keydbstore.go index 17155639..c4666a2a 100644 --- a/signer/keydbstore/rethink_keydbstore.go +++ b/signer/keydbstore/rethink_keydbstore.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/docker/notary" - "github.com/docker/notary/storage/rethinkdb" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" jose "github.com/dvsekhvalnov/jose2go" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/storage/rethinkdb" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" "gopkg.in/dancannon/gorethink.v3" ) diff --git a/signer/keydbstore/rethink_realkeydbstore_test.go b/signer/keydbstore/rethink_realkeydbstore_test.go index f54f9d45..87e0adb3 100644 --- a/signer/keydbstore/rethink_realkeydbstore_test.go +++ b/signer/keydbstore/rethink_realkeydbstore_test.go @@ -11,12 +11,12 @@ import ( "time" "github.com/docker/go-connections/tlsconfig" - "github.com/docker/notary/storage/rethinkdb" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" "github.com/dvsekhvalnov/jose2go" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/storage/rethinkdb" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" "gopkg.in/dancannon/gorethink.v3" ) diff --git a/signer/keydbstore/sql_keydbstore.go b/signer/keydbstore/sql_keydbstore.go index c94946b9..ffb44ad9 100644 --- a/signer/keydbstore/sql_keydbstore.go +++ b/signer/keydbstore/sql_keydbstore.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/docker/notary" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" jose "github.com/dvsekhvalnov/jose2go" "github.com/jinzhu/gorm" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" ) // Constants diff --git a/signer/keydbstore/sql_keydbstore_test.go b/signer/keydbstore/sql_keydbstore_test.go index d7ca0f80..6f7180cf 100644 --- a/signer/keydbstore/sql_keydbstore_test.go +++ b/signer/keydbstore/sql_keydbstore_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" "github.com/dvsekhvalnov/jose2go" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) // not to the nanosecond scale because mysql timestamps ignore nanoseconds diff --git a/signer/rpc_and_client_test.go b/signer/rpc_and_client_test.go index d75fa186..c4a1cd12 100644 --- a/signer/rpc_and_client_test.go +++ b/signer/rpc_and_client_test.go @@ -14,18 +14,18 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - "github.com/docker/notary" - "github.com/docker/notary/cryptoservice" - pb "github.com/docker/notary/proto" - "github.com/docker/notary/signer" - "github.com/docker/notary/signer/api" - "github.com/docker/notary/signer/client" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils/interfaces" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/cryptoservice" + pb "github.com/theupdateframework/notary/proto" + "github.com/theupdateframework/notary/signer" + "github.com/theupdateframework/notary/signer/api" + "github.com/theupdateframework/notary/signer/client" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils/interfaces" + "github.com/theupdateframework/notary/tuf/utils" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/signer/signer.go b/signer/signer.go index 20d99114..aeedfb08 100644 --- a/signer/signer.go +++ b/signer/signer.go @@ -3,10 +3,10 @@ package signer import ( "crypto/tls" - pb "github.com/docker/notary/proto" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" + pb "github.com/theupdateframework/notary/proto" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) // SigningService is the interface to implement a key management and signing service diff --git a/storage/filestore.go b/storage/filestore.go index 32b35eda..c150d1ce 100644 --- a/storage/filestore.go +++ b/storage/filestore.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/docker/notary" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" ) // NewFileStore creates a fully configurable file store diff --git a/storage/filestore_test.go b/storage/filestore_test.go index 9f84839e..06ac3d63 100644 --- a/storage/filestore_test.go +++ b/storage/filestore_test.go @@ -10,8 +10,8 @@ import ( "fmt" "strconv" - "github.com/docker/notary" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" ) func TestSet(t *testing.T) { diff --git a/storage/httpstore.go b/storage/httpstore.go index d0523fb6..03392d4d 100644 --- a/storage/httpstore.go +++ b/storage/httpstore.go @@ -3,7 +3,7 @@ // - Response bodies for error codes should be unmarshallable as: // {"errors": [{..., "detail": }]} // else validation error details, etc. will be unparsable. The errors -// should have a github.com/docker/notary/tuf/validation/SerializableError +// should have a github.com/theupdateframework/notary/tuf/validation/SerializableError // in the Details field. // If writing your own server, please have a look at // github.com/docker/distribution/registry/api/errcode @@ -22,10 +22,10 @@ import ( "net/url" "path" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/validation" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/validation" ) const ( diff --git a/storage/httpstore_test.go b/storage/httpstore_test.go index 07b58fac..5f0ce2bc 100644 --- a/storage/httpstore_test.go +++ b/storage/httpstore_test.go @@ -13,9 +13,9 @@ import ( "testing" "github.com/docker/go/canonical/json" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/validation" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/validation" ) const testRoot = `{"signed":{"_type":"Root","consistent_snapshot":false,"expires":"2025-07-17T16:19:21.101698314-07:00","keys":{"1ca15c7f4b2b0c6efce202a545e7267152da28ab7c91590b3b60bdb4da723aad":{"keytype":"ecdsa","keyval":{"private":null,"public":"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEb0720c99Cj6ZmuDlznEZ52NA6YpeY9Sj45z51XvPnG63Bi2RSBezMJlPzbSfP39mXKXqOJyT+z9BZhi3FVWczg=="}},"b1d6813b55442ecbfb1f4b40eb1fcdb4290e53434cfc9ba2da24c26c9143873b":{"keytype":"ecdsa-x509","keyval":{"private":null,"public":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJVekNCKzZBREFnRUNBaEFCWDNKLzkzaW8zbHcrZUsvNFhvSHhNQW9HQ0NxR1NNNDlCQU1DTUJFeER6QU4KQmdOVkJBTVRCbVY0Y0dseVpUQWVGdzB4TlRBM01qQXlNekU1TVRkYUZ3MHlOVEEzTVRjeU16RTVNVGRhTUJFeApEekFOQmdOVkJBTVRCbVY0Y0dseVpUQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJFTDhOTFhQCitreUJZYzhYY0FTMXB2S2l5MXRQUDlCZHJ1dEdrWlR3Z0dEYTM1THMzSUFXaWlrUmlPbGRuWmxVVEE5cG5JekoKOFlRQThhTjQ1TDQvUlplak5UQXpNQTRHQTFVZER3RUIvd1FFQXdJQW9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRgpCUWNEQXpBTUJnTlZIUk1CQWY4RUFqQUFNQW9HQ0NxR1NNNDlCQU1DQTBjQU1FUUNJRVJ1ZUVURG5xMlRqRFBmClhGRStqUFJqMEtqdXdEOG9HSmtoVGpMUDAycjhBaUI5cUNyL2ZqSXpJZ1NQcTJVSXZqR0hlYmZOYXh1QlpZZUUKYW8xNjd6dHNYZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"}},"fbddae7f25a6c23ca735b017206a849d4c89304a4d8de4dcc4b3d6f3eb22ce3b":{"keytype":"ecdsa","keyval":{"private":null,"public":"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/xS5fBHK2HKmlGcvAr06vwPITvmxWP4P3CMDCgY25iSaIiM21OiXA1/Uvo3Pa3xh5G3cwCtDvi+4FpflW2iB/w=="}},"fd75751f010c3442e23b3e3e99a1442a112f2f21038603cb8609d8b17c9e912a":{"keytype":"ed25519","keyval":{"private":null,"public":"rc+glN01m+q8jmX8SolGsjTfk6NMhUQTWyj10hjmne0="}}},"roles":{"root":{"keyids":["b1d6813b55442ecbfb1f4b40eb1fcdb4290e53434cfc9ba2da24c26c9143873b"],"threshold":1},"snapshot":{"keyids":["1ca15c7f4b2b0c6efce202a545e7267152da28ab7c91590b3b60bdb4da723aad"],"threshold":1},"targets":{"keyids":["fbddae7f25a6c23ca735b017206a849d4c89304a4d8de4dcc4b3d6f3eb22ce3b"],"threshold":1},"timestamp":{"keyids":["fd75751f010c3442e23b3e3e99a1442a112f2f21038603cb8609d8b17c9e912a"],"threshold":1}},"version":2},"signatures":[{"keyid":"b1d6813b55442ecbfb1f4b40eb1fcdb4290e53434cfc9ba2da24c26c9143873b","method":"ecdsa","sig":"A2lNVwxHBnD9ViFtRre8r5oG6VvcvJnC6gdvvxv/Jyag40q/fNMjllCqyHrb+6z8XDZcrTTDsFU1R3/e+92d1A=="}]}` diff --git a/storage/interfaces.go b/storage/interfaces.go index c9ac03b6..c008f437 100644 --- a/storage/interfaces.go +++ b/storage/interfaces.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) // NoSizeLimit is represented as -1 for arguments to GetMeta diff --git a/storage/memorystore.go b/storage/memorystore.go index b4ae6466..0c92c699 100644 --- a/storage/memorystore.go +++ b/storage/memorystore.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // NewMemoryStore returns a MetadataStore that operates entirely in memory. diff --git a/storage/memorystore_test.go b/storage/memorystore_test.go index 7ce290ef..6352a420 100644 --- a/storage/memorystore_test.go +++ b/storage/memorystore_test.go @@ -4,9 +4,9 @@ import ( "crypto/sha256" "testing" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) func TestMemoryStoreMetadataOperations(t *testing.T) { diff --git a/storage/offlinestore.go b/storage/offlinestore.go index 9a4faf6d..c5062ae6 100644 --- a/storage/offlinestore.go +++ b/storage/offlinestore.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) // ErrOffline is used to indicate we are operating offline diff --git a/trustmanager/interfaces.go b/trustmanager/interfaces.go index 5cce5898..9925d0ff 100644 --- a/trustmanager/interfaces.go +++ b/trustmanager/interfaces.go @@ -1,7 +1,7 @@ package trustmanager import ( - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) // Storage implements the bare bones primitives (no hierarchy) diff --git a/trustmanager/keys.go b/trustmanager/keys.go index e90e4c9a..8ad77a2f 100644 --- a/trustmanager/keys.go +++ b/trustmanager/keys.go @@ -9,10 +9,10 @@ import ( "sort" "strings" - "github.com/docker/notary" - tufdata "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" + tufdata "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // Exporter is a simple interface for the two functions we need from the Storage interface diff --git a/trustmanager/keys_test.go b/trustmanager/keys_test.go index 585afdc9..c108bbb5 100644 --- a/trustmanager/keys_test.go +++ b/trustmanager/keys_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) type TestImportStore struct { diff --git a/trustmanager/keystore.go b/trustmanager/keystore.go index eb42dede..4383f8ed 100644 --- a/trustmanager/keystore.go +++ b/trustmanager/keystore.go @@ -6,11 +6,11 @@ import ( "strings" "sync" - "github.com/docker/notary" - 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" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) type keyInfoMap map[string]KeyInfo diff --git a/trustmanager/keystore_test.go b/trustmanager/keystore_test.go index a287181c..4935c81b 100644 --- a/trustmanager/keystore_test.go +++ b/trustmanager/keystore_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "testing" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) const cannedPassphrase = "passphrase" diff --git a/trustmanager/remoteks/client.go b/trustmanager/remoteks/client.go index 06909972..4889860b 100644 --- a/trustmanager/remoteks/client.go +++ b/trustmanager/remoteks/client.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/docker/notary/trustmanager" + "github.com/theupdateframework/notary/trustmanager" ) // DefaultTimeout is the time a request will block waiting for a response diff --git a/trustmanager/remoteks/client_test.go b/trustmanager/remoteks/client_test.go index 4b25cbe4..abf869e1 100644 --- a/trustmanager/remoteks/client_test.go +++ b/trustmanager/remoteks/client_test.go @@ -13,8 +13,8 @@ import ( "path/filepath" "runtime" - "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" + "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" "google.golang.org/grpc/credentials" ) diff --git a/trustmanager/remoteks/server.go b/trustmanager/remoteks/server.go index 68989945..d398d200 100644 --- a/trustmanager/remoteks/server.go +++ b/trustmanager/remoteks/server.go @@ -5,7 +5,7 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/net/context" - "github.com/docker/notary/trustmanager" + "github.com/theupdateframework/notary/trustmanager" ) // GRPCStorage is an implementer of the GRPC storage server. It passes through diff --git a/trustmanager/remoteks/server_test.go b/trustmanager/remoteks/server_test.go index 70465bfd..97bd3838 100644 --- a/trustmanager/remoteks/server_test.go +++ b/trustmanager/remoteks/server_test.go @@ -3,8 +3,8 @@ package remoteks import ( "testing" - "github.com/docker/notary/storage" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/storage" "golang.org/x/net/context" ) diff --git a/trustmanager/yubikey/import.go b/trustmanager/yubikey/import.go index a51af88b..680ded28 100644 --- a/trustmanager/yubikey/import.go +++ b/trustmanager/yubikey/import.go @@ -6,10 +6,10 @@ import ( "encoding/pem" "errors" - "github.com/docker/notary" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // YubiImport is a wrapper around the YubiStore that allows us to import private diff --git a/trustmanager/yubikey/yubikeystore.go b/trustmanager/yubikey/yubikeystore.go index 33715da3..1fd71eea 100644 --- a/trustmanager/yubikey/yubikeystore.go +++ b/trustmanager/yubikey/yubikeystore.go @@ -16,13 +16,13 @@ import ( "os" "time" - "github.com/docker/notary" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/utils" "github.com/miekg/pkcs11" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) const ( diff --git a/trustmanager/yubikey/yubikeystore_test.go b/trustmanager/yubikey/yubikeystore_test.go index 7f73bad1..4bce941f 100644 --- a/trustmanager/yubikey/yubikeystore_test.go +++ b/trustmanager/yubikey/yubikeystore_test.go @@ -9,12 +9,12 @@ import ( "reflect" "testing" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/miekg/pkcs11" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) var ret = passphrase.ConstantRetriever("passphrase") diff --git a/trustpinning/certs.go b/trustpinning/certs.go index c328a831..9be49ee1 100644 --- a/trustpinning/certs.go +++ b/trustpinning/certs.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "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/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) const wildcard = "*" diff --git a/trustpinning/certs_test.go b/trustpinning/certs_test.go index fd27b7e3..4f5dc96f 100644 --- a/trustpinning/certs_test.go +++ b/trustpinning/certs_test.go @@ -19,16 +19,16 @@ import ( "github.com/cloudflare/cfssl/signer" "github.com/cloudflare/cfssl/signer/local" "github.com/docker/go/canonical/json" - "github.com/docker/notary" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/trustmanager" - "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/docker/notary/tuf/utils" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/trustpinning" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils" + "github.com/theupdateframework/notary/tuf/utils" ) type SignedRSARootTemplate struct { diff --git a/trustpinning/trustpin.go b/trustpinning/trustpin.go index acad5a13..67908f8b 100644 --- a/trustpinning/trustpin.go +++ b/trustpinning/trustpin.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // TrustPinConfig represents the configuration under the trust_pinning section of the config file diff --git a/tuf/builder.go b/tuf/builder.go index b8687437..db0a4d11 100644 --- a/tuf/builder.go +++ b/tuf/builder.go @@ -4,12 +4,12 @@ import ( "fmt" "github.com/docker/go/canonical/json" - "github.com/docker/notary" + "github.com/theupdateframework/notary" - "github.com/docker/notary/trustpinning" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary/trustpinning" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) // ErrBuildDone is returned when any functions are called on RepoBuilder, and it diff --git a/tuf/builder_test.go b/tuf/builder_test.go index b88cd22a..d3f5eb20 100644 --- a/tuf/builder_test.go +++ b/tuf/builder_test.go @@ -10,14 +10,14 @@ import ( "fmt" "testing" - "github.com/docker/notary" - "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/testutils" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "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/testutils" + "github.com/theupdateframework/notary/tuf/utils" ) var _cachedMeta map[data.RoleName][]byte diff --git a/tuf/data/snapshot.go b/tuf/data/snapshot.go index 23419795..2a07105b 100644 --- a/tuf/data/snapshot.go +++ b/tuf/data/snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/docker/go/canonical/json" - "github.com/docker/notary" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" ) // SignedSnapshot is a fully unpacked snapshot.json diff --git a/tuf/data/timestamp.go b/tuf/data/timestamp.go index 883641cd..baf4016e 100644 --- a/tuf/data/timestamp.go +++ b/tuf/data/timestamp.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/docker/go/canonical/json" - "github.com/docker/notary" + "github.com/theupdateframework/notary" ) // SignedTimestamp is a fully unpacked timestamp.json diff --git a/tuf/data/types.go b/tuf/data/types.go index ba973e1f..6f9c1120 100644 --- a/tuf/data/types.go +++ b/tuf/data/types.go @@ -15,8 +15,8 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" ) // GUN is a Globally Unique Name. It is used to identify trust collections. diff --git a/tuf/data/types_test.go b/tuf/data/types_test.go index 394f0c7d..dc4ef2d3 100644 --- a/tuf/data/types_test.go +++ b/tuf/data/types_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/docker/go/canonical/json" - "github.com/docker/notary" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" ) func TestGenerateFileMetaDefault(t *testing.T) { diff --git a/tuf/signed/ed25519.go b/tuf/signed/ed25519.go index e08daba3..b526085a 100644 --- a/tuf/signed/ed25519.go +++ b/tuf/signed/ed25519.go @@ -4,9 +4,9 @@ import ( "crypto/rand" "errors" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) type edCryptoKey struct { diff --git a/tuf/signed/ed25519_test.go b/tuf/signed/ed25519_test.go index 31a70ed5..05b88cb0 100644 --- a/tuf/signed/ed25519_test.go +++ b/tuf/signed/ed25519_test.go @@ -3,8 +3,8 @@ package signed import ( "testing" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" ) // ListKeys only returns the keys for that role diff --git a/tuf/signed/errors.go b/tuf/signed/errors.go index 5d4ff04a..29ec40de 100644 --- a/tuf/signed/errors.go +++ b/tuf/signed/errors.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) // ErrInsufficientSignatures - can not create enough signatures on a piece of diff --git a/tuf/signed/interface.go b/tuf/signed/interface.go index 03b426f1..14f3a33f 100644 --- a/tuf/signed/interface.go +++ b/tuf/signed/interface.go @@ -1,6 +1,6 @@ package signed -import "github.com/docker/notary/tuf/data" +import "github.com/theupdateframework/notary/tuf/data" // KeyService provides management of keys locally. It will never // accept or provide private keys. Communication between the KeyService diff --git a/tuf/signed/sign.go b/tuf/signed/sign.go index be1410d6..b3e329ce 100644 --- a/tuf/signed/sign.go +++ b/tuf/signed/sign.go @@ -14,10 +14,10 @@ package signed import ( "crypto/rand" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // Sign takes a data.Signed and a cryptoservice containing private keys, diff --git a/tuf/signed/sign_test.go b/tuf/signed/sign_test.go index d9064950..babe531f 100644 --- a/tuf/signed/sign_test.go +++ b/tuf/signed/sign_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) const ( diff --git a/tuf/signed/verifiers.go b/tuf/signed/verifiers.go index e32b1537..d5ce7f86 100644 --- a/tuf/signed/verifiers.go +++ b/tuf/signed/verifiers.go @@ -11,8 +11,8 @@ import ( "math/big" "github.com/agl/ed25519" - "github.com/docker/notary/tuf/data" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/tuf/data" ) const ( diff --git a/tuf/signed/verifiers_test.go b/tuf/signed/verifiers_test.go index 8ce9a19c..88b78830 100644 --- a/tuf/signed/verifiers_test.go +++ b/tuf/signed/verifiers_test.go @@ -14,8 +14,8 @@ import ( "testing" "text/template" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" ) type KeyTemplate struct { diff --git a/tuf/signed/verify.go b/tuf/signed/verify.go index c3bf1925..5ae2da48 100644 --- a/tuf/signed/verify.go +++ b/tuf/signed/verify.go @@ -7,9 +7,9 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) // Various basic signing errors diff --git a/tuf/signed/verify_test.go b/tuf/signed/verify_test.go index 5447c560..063b220c 100644 --- a/tuf/signed/verify_test.go +++ b/tuf/signed/verify_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" ) func TestRoleNoKeys(t *testing.T) { diff --git a/tuf/testutils/corrupt_memorystore.go b/tuf/testutils/corrupt_memorystore.go index 17a39380..aebc1efd 100644 --- a/tuf/testutils/corrupt_memorystore.go +++ b/tuf/testutils/corrupt_memorystore.go @@ -1,8 +1,8 @@ package testutils import ( - store "github.com/docker/notary/storage" - "github.com/docker/notary/tuf/data" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/tuf/data" ) // CorruptingMemoryStore corrupts all data returned by GetMeta diff --git a/tuf/testutils/interfaces/cryptoservice.go b/tuf/testutils/interfaces/cryptoservice.go index 1402acd0..7d6c69fd 100644 --- a/tuf/testutils/interfaces/cryptoservice.go +++ b/tuf/testutils/interfaces/cryptoservice.go @@ -4,11 +4,11 @@ import ( "crypto/rand" "testing" - "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/stretchr/testify/require" + "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" ) // These are tests that can be used to test a cryptoservice diff --git a/tuf/testutils/keys/keys.go b/tuf/testutils/keys/keys.go index 7916fe11..3804db25 100644 --- a/tuf/testutils/keys/keys.go +++ b/tuf/testutils/keys/keys.go @@ -5,9 +5,9 @@ import ( "encoding/pem" "fmt" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/utils" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) // CreateOrAddKey creates a new key in case of ECDSA or ED25519 inside the cryptoservice with the given role and gun diff --git a/tuf/testutils/repo.go b/tuf/testutils/repo.go index 9ca08280..3897f135 100644 --- a/tuf/testutils/repo.go +++ b/tuf/testutils/repo.go @@ -7,16 +7,16 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/utils" - "github.com/docker/notary/tuf" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/testutils/keys" + "github.com/theupdateframework/notary/tuf" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/testutils/keys" ) // CreateKey creates a new key inside the cryptoservice for the given role and gun, diff --git a/tuf/testutils/swizzler.go b/tuf/testutils/swizzler.go index d7dcf276..fbc27cd7 100644 --- a/tuf/testutils/swizzler.go +++ b/tuf/testutils/swizzler.go @@ -6,13 +6,13 @@ import ( "time" "github.com/docker/go/canonical/json" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - store "github.com/docker/notary/storage" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) // ErrNoKeyForRole returns an error when the cryptoservice provided to diff --git a/tuf/testutils/swizzler_test.go b/tuf/testutils/swizzler_test.go index 349cd39b..d522685a 100644 --- a/tuf/testutils/swizzler_test.go +++ b/tuf/testutils/swizzler_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - store "github.com/docker/notary/storage" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" "github.com/stretchr/testify/require" + store "github.com/theupdateframework/notary/storage" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" ) // creates a new swizzler with 3 delegation targets (and only 2 metadata files diff --git a/tuf/tuf.go b/tuf/tuf.go index 2136e52d..74f6ceb5 100644 --- a/tuf/tuf.go +++ b/tuf/tuf.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/docker/notary" - "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/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) // ErrSigVerifyFail - signature verification failed diff --git a/tuf/tuf_test.go b/tuf/tuf_test.go index a40c3338..3eff262e 100644 --- a/tuf/tuf_test.go +++ b/tuf/tuf_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "github.com/docker/notary/cryptoservice" - "github.com/docker/notary/passphrase" - "github.com/docker/notary/trustmanager" - "github.com/docker/notary/tuf/data" - "github.com/docker/notary/tuf/signed" - "github.com/docker/notary/tuf/utils" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/cryptoservice" + "github.com/theupdateframework/notary/passphrase" + "github.com/theupdateframework/notary/trustmanager" + "github.com/theupdateframework/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/utils" ) var testGUN data.GUN = "gun" diff --git a/tuf/utils/pkcs8.go b/tuf/utils/pkcs8.go index cd18c687..edcaa77f 100644 --- a/tuf/utils/pkcs8.go +++ b/tuf/utils/pkcs8.go @@ -48,7 +48,7 @@ import ( "golang.org/x/crypto/pbkdf2" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) // Copy from crypto/x509 diff --git a/tuf/utils/pkcs8_test.go b/tuf/utils/pkcs8_test.go index 5681e2f7..93ad360b 100644 --- a/tuf/utils/pkcs8_test.go +++ b/tuf/utils/pkcs8_test.go @@ -6,8 +6,8 @@ import ( "encoding/pem" "testing" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" ) func getRSAKey() (data.PrivateKey, error) { diff --git a/tuf/utils/utils.go b/tuf/utils/utils.go index 2899a034..ada7dc8c 100644 --- a/tuf/utils/utils.go +++ b/tuf/utils/utils.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/docker/notary/tuf/data" + "github.com/theupdateframework/notary/tuf/data" ) // StrSliceContains checks if the given string appears in the slice diff --git a/tuf/utils/utils_test.go b/tuf/utils/utils_test.go index 0e8ffe0c..f593763b 100644 --- a/tuf/utils/utils_test.go +++ b/tuf/utils/utils_test.go @@ -3,8 +3,8 @@ package utils import ( "testing" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary/tuf/data" ) func TestUnusedDelegationKeys(t *testing.T) { diff --git a/tuf/utils/x509.go b/tuf/utils/x509.go index 2a6cf977..7738418a 100644 --- a/tuf/utils/x509.go +++ b/tuf/utils/x509.go @@ -17,9 +17,9 @@ import ( "time" "github.com/agl/ed25519" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" "github.com/sirupsen/logrus" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" ) // CanonicalKeyID returns the ID of the public bytes version of a TUF key. diff --git a/tuf/utils/x509_test.go b/tuf/utils/x509_test.go index 18ea2aef..c8c5351b 100644 --- a/tuf/utils/x509_test.go +++ b/tuf/utils/x509_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/docker/notary" - "github.com/docker/notary/tuf/data" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/data" ) func TestCertsToKeys(t *testing.T) { diff --git a/utils/configuration.go b/utils/configuration.go index 8585ea79..e1461e51 100644 --- a/utils/configuration.go +++ b/utils/configuration.go @@ -17,7 +17,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/viper" - "github.com/docker/notary" + "github.com/theupdateframework/notary" ) // Storage is a configuration about what storage backend a server should use diff --git a/utils/configuration_linux_test.go b/utils/configuration_linux_test.go index d9b4748b..bfa7b116 100644 --- a/utils/configuration_linux_test.go +++ b/utils/configuration_linux_test.go @@ -8,8 +8,8 @@ import ( "syscall" "testing" - "github.com/docker/notary" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" ) func testSetSignalTrap(t *testing.T) { diff --git a/utils/configuration_test.go b/utils/configuration_test.go index b305812d..3b0cc47c 100644 --- a/utils/configuration_test.go +++ b/utils/configuration_test.go @@ -11,11 +11,11 @@ import ( "testing" "github.com/bugsnag/bugsnag-go" - "github.com/docker/notary" - "github.com/docker/notary/tuf/utils" "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/stretchr/testify/require" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/utils" ) const envPrefix = "NOTARY_TESTING_ENV_PREFIX" diff --git a/utils/http.go b/utils/http.go index 2feb46fd..39ffca30 100644 --- a/utils/http.go +++ b/utils/http.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/mux" "golang.org/x/net/context" - "github.com/docker/notary" - "github.com/docker/notary/tuf/signed" + "github.com/theupdateframework/notary" + "github.com/theupdateframework/notary/tuf/signed" ) // ContextHandler defines an alternate HTTP handler interface which takes in diff --git a/utils/http_test.go b/utils/http_test.go index a6d44c61..de30ad2e 100644 --- a/utils/http_test.go +++ b/utils/http_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "github.com/docker/notary/tuf/signed" + "github.com/theupdateframework/notary/tuf/signed" ) func MockContextHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) error {