From c75637d759522e788358a365372adcbea68861e0 Mon Sep 17 00:00:00 2001 From: Geoff Greer Date: Fri, 11 May 2018 17:51:53 -0700 Subject: [PATCH] Rename for packaging: coreos-inc/bridge -> openshift/console. Fixes issues with `go get` and confusing docs. --- .gitignore | 2 +- README.md | 2 +- auth/auth.go | 2 +- build-backend | 4 ++-- builder-run | 4 ++-- cmd/bridge/main.go | 10 +++++----- docs-internal/operators.md | 4 ++-- docs-internal/releases.md | 4 ++-- frontend/package.json | 2 +- glide.yaml | 2 +- jenkins | 2 +- server/middleware.go | 2 +- server/server.go | 8 ++++---- test-backend | 2 +- version/version.go | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 15515735fe6..7788c7d30e8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ .vscode /bin /gopath -/Godeps/_workspace/src/github.com/coreos-inc/bridge +/Godeps/_workspace/src/github.com/openshift/console /frontend/.cache-loader /frontend/__coverage__ /frontend/public/bower_components diff --git a/README.md b/README.md index 2007f31f09c..d64d423e4f2 100644 --- a/README.md +++ b/README.md @@ -234,7 +234,7 @@ Remove the `--headless` flag to Chrome (chromeOptions) in `frontend/integration- Checkout and build [dex](https://github.com/coreos/dex/). -`./bin/dex serve ../../coreos-inc/bridge/contrib/dex-config-dev.yaml` +`./bin/dex serve ../../openshift/console/contrib/dex-config-dev.yaml` Run bridge with the following options: diff --git a/auth/auth.go b/auth/auth.go index 33121733f6b..d1954fb5989 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -35,7 +35,7 @@ const ( errorInvalidCode = "invalid_code" ) -var log = capnslog.NewPackageLogger("github.com/coreos-inc/bridge", "auth") +var log = capnslog.NewPackageLogger("github.com/openshift/console", "auth") type Authenticator struct { tokenVerifier func(string) (*loginState, error) diff --git a/build-backend b/build-backend index a2c0af6139e..5de8690458a 100755 --- a/build-backend +++ b/build-backend @@ -8,6 +8,6 @@ set -e PROJECT_DIR=$(basename ${PWD}) GIT_TAG=`git describe --always --tags HEAD` -LD_FLAGS="-w -X github.com/coreos-inc/bridge/version.Version=${GIT_TAG}" +LD_FLAGS="-w -X github.com/openshift/console/version.Version=${GIT_TAG}" -CGO_ENABLED=0 go build -ldflags "${LD_FLAGS}" -o bin/bridge github.com/coreos-inc/bridge/cmd/bridge +CGO_ENABLED=0 go build -ldflags "${LD_FLAGS}" -o bin/bridge github.com/openshift/console/cmd/bridge diff --git a/builder-run b/builder-run index 61dfff426fd..c3bd62af1cc 100755 --- a/builder-run +++ b/builder-run @@ -29,6 +29,6 @@ done docker run $ENV_STR --rm --net=host \ --user="${BUILDER_RUN_USER}" \ $VOLUME_MOUNT \ - -v "$(pwd)":/go/src/github.com/coreos-inc/bridge \ - -w /go/src/github.com/coreos-inc/bridge \ + -v "$(pwd)":/go/src/github.com/openshift/console \ + -w /go/src/github.com/openshift/console \ $BUILDER_IMAGE "$@" \ No newline at end of file diff --git a/cmd/bridge/main.go b/cmd/bridge/main.go index 700fa6044de..3ec738777ce 100644 --- a/cmd/bridge/main.go +++ b/cmd/bridge/main.go @@ -15,13 +15,13 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/flagutil" - "github.com/coreos-inc/bridge/auth" - "github.com/coreos-inc/bridge/pkg/proxy" - "github.com/coreos-inc/bridge/server" + "github.com/openshift/console/auth" + "github.com/openshift/console/pkg/proxy" + "github.com/openshift/console/server" ) var ( - log = capnslog.NewPackageLogger("github.com/coreos-inc/bridge", "cmd/main") + log = capnslog.NewPackageLogger("github.com/openshift/console", "cmd/main") ) const ( @@ -30,7 +30,7 @@ const ( ) func main() { - rl := capnslog.MustRepoLogger("github.com/coreos-inc/bridge") + rl := capnslog.MustRepoLogger("github.com/openshift/console") capnslog.SetFormatter(capnslog.NewStringFormatter(os.Stderr)) fs := flag.NewFlagSet("bridge", flag.ExitOnError) diff --git a/docs-internal/operators.md b/docs-internal/operators.md index f2fc670e1be..78d349e30b3 100644 --- a/docs-internal/operators.md +++ b/docs-internal/operators.md @@ -4,13 +4,13 @@ The UI detects if operators are installed in the cluster and conditionally enabl ## Operator feature detection -We determine if the feature is enabled by first checking if the operator feature exists. For more information, see [k8s/k8s.js](https://github.com/coreos-inc/bridge/blob/master/frontend/public/module/k8s/k8s.js). +We determine if the feature is enabled by first checking if the operator feature exists. For more information, see [k8s/k8s.js](https://github.com/openshift/console/blob/master/frontend/public/module/k8s/k8s.js). ## UI Components The update UI is divided into several key components and is abstracted such that additional channels could be added in the future e.g. Tectonic channel, Container Linux channel, etc. -All components live in [components/cluster-updates](https://github.com/coreos-inc/bridge/blob/master/frontend/public/components/cluster-updates). Each major component has a description in the file of how it's intended to be used. +All components live in [components/cluster-updates](https://github.com/openshift/console/blob/master/frontend/public/components/cluster-updates). Each major component has a description in the file of how it's intended to be used. ## Data flow diff --git a/docs-internal/releases.md b/docs-internal/releases.md index 0a26df9f82b..f32359ae63c 100644 --- a/docs-internal/releases.md +++ b/docs-internal/releases.md @@ -8,7 +8,7 @@ Decide on an incremented release semantic $VERSION. ## Docs -Add changes to the [changelog](https://github.com/coreos-inc/bridge/blob/master/CHANGES.md) for the new version. +Add changes to the [changelog](https://github.com/openshift/console/blob/master/CHANGES.md) for the new version. Make note of any newly introduced known issues, breaking changes or removed features. ## Tag @@ -33,7 +33,7 @@ docker push quay.io/coreos/tectonic-console:$VERSION ## Github -Create a [release](https://github.com/coreos-inc/bridge/releases) on Github with release notes by copying the changelog. +Create a [release](https://github.com/openshift/console/releases) on Github with release notes by copying the changelog. ## Update Installer diff --git a/frontend/package.json b/frontend/package.json index 9730580ce51..84ca71a7cc8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,7 @@ { "name": "bridge", "description": "CoreOS Tectonic Dashboard", - "repository": "https://github.com/coreos-inc/bridge", + "repository": "https://github.com/openshift/console", "version": "0.1.0", "private": true, "scripts": { diff --git a/glide.yaml b/glide.yaml index 7289d026854..0ef21365c83 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/coreos-inc/bridge +package: github.com/openshift/console testImports: [] import: - package: gopkg.in/square/go-jose.v2 diff --git a/jenkins b/jenkins index d60e6918b58..86686b63b96 100755 --- a/jenkins +++ b/jenkins @@ -36,7 +36,7 @@ EOF # shellcheck disable=SC2154 curl -o /dev/null --silent -X POST --user "${GITHUB_CREDENTIALS}" \ --data "$data" \ - "https://api.github.com/repos/coreos-inc/bridge/statuses/${ghprbActualCommit}" + "https://api.github.com/repos/openshift/console/statuses/${ghprbActualCommit}" set -x } diff --git a/server/middleware.go b/server/middleware.go index bc59fe98baf..cf549f6bbdd 100644 --- a/server/middleware.go +++ b/server/middleware.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/coreos-inc/bridge/auth" + "github.com/openshift/console/auth" ) // Middleware generates a middleware wrapper for request hanlders. diff --git a/server/server.go b/server/server.go index bb9130b2dae..c48931fe4d4 100644 --- a/server/server.go +++ b/server/server.go @@ -21,9 +21,9 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/health" - "github.com/coreos-inc/bridge/auth" - "github.com/coreos-inc/bridge/pkg/proxy" - "github.com/coreos-inc/bridge/version" + "github.com/openshift/console/auth" + "github.com/openshift/console/pkg/proxy" + "github.com/openshift/console/version" "github.com/Sirupsen/logrus" ) @@ -40,7 +40,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos-inc/bridge", "server") + plog = capnslog.NewPackageLogger("github.com/openshift/console", "server") ) type jsGlobals struct { diff --git a/test-backend b/test-backend index fdaab6e503b..2fc37ef9895 100755 --- a/test-backend +++ b/test-backend @@ -37,7 +37,7 @@ fi # split TEST into an array and prepend repo path to each local package split=(${TEST// / }) -TEST=${split[@]/#/github.com/coreos-inc/bridge/} +TEST=${split[@]/#/github.com/openshift/console/} echo "Running tests..." go test ${COVER} $@ ${TEST} diff --git a/version/version.go b/version/version.go index c0835c88a68..dc5dae858b3 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version // version.Version should be provided at build time with -//-ldflags "-X github.com/coreos-inc/bridge/version.Version $GIT_TAG" +//-ldflags "-X github.com/openshift/console/version.Version $GIT_TAG" var Version string